Merge remote-tracking branch 'origin/master' into store-api-client-no…

…t-just-id

Gemfile.lock

@@ -1,45 +1,46 @@
 PATH
   remote: .
   specs:
-    stitches (3.0.0)
+    stitches (3.1.0)
       apitome
       pg
       rails
+      rspec (>= 3)
       rspec-rails (~> 3)
 
 GEM
   remote: https://www.rubygems.org/
   specs:
-    actionmailer (4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.2)
-      actionview (= 4.2.2)
-      activesupport (= 4.2.2)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.2)
-      activemodel (= 4.2.2)
-      activesupport (= 4.2.2)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.2)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -49,39 +50,39 @@ GEM
       kramdown
       railties
       rspec_api_documentation
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
     json (1.8.3)
-    kramdown (1.7.0)
+    kramdown (1.8.0)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mustache (0.99.8)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pg (0.18.2)
-    rack (1.6.2)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.2)
-      actionmailer (= 4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      activemodel (= 4.2.2)
-      activerecord (= 4.2.2)
-      activesupport (= 4.2.2)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.2)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -91,25 +92,25 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.2)
-      actionpack (= 4.2.2)
-      activesupport (= 4.2.2)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-rails (3.3.2)
+    rspec-rails (3.3.3)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
@@ -123,9 +124,9 @@ GEM
       json (~> 1.4, >= 1.4.6)
       mustache (~> 0.99, >= 0.99.4)
       rspec (>= 3.0.0)
-    sprockets (3.2.0)
+    sprockets (3.3.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -140,3 +141,6 @@ PLATFORMS
 DEPENDENCIES
   rake
   stitches!
+
+BUNDLED WITH
+   1.10.6

lib/stitches/generator_files/spec/acceptance/ping_v1_spec.rb

@@ -17,7 +17,7 @@
       result = JSON.parse(response_body)
       expect(result).to eq({ "ping" =>  { "status" => "ok" }})
 
-      status.should == 201
+      expect(status).to eql 201
 
     end
   end
@@ -39,7 +39,7 @@
       result = JSON.parse(response_body)
       expect(result).to eq({ "errors" => [ { "code" => "test", "message" => "OH NOES!" }]})
 
-      status.should == 422
+      expect(status).to eql 422
 
     end
   end

lib/stitches/generator_files/spec/features/api_spec.rb

@@ -80,7 +80,7 @@
       correct_code && correct_header
     end
 
-    failure_message_for_should do
+    failure_message do
       correct_code,_ = evaluate_response(response)
       if correct_code
         "Expected WWW-Authenticate header to be 'CustomKeyAuth realm=#{Rails.application.class.parent.to_s}', but was #{response['WWW-Authenticate']}"

lib/stitches/spec/be_iso_8601_utc_encoded.rb

@@ -3,7 +3,7 @@
     string =~ /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d[Zz]$/
   end
 
-  failure_message_for_should do |string|
+  failure_message do |string|
     "'#{string}' doesn't look like a UTC IS8601-encoded date"
   end
 end

lib/stitches/version.rb

@@ -1,3 +1,3 @@
 module Stitches
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

stitches.gemspec

@@ -6,20 +6,21 @@ Gem::Specification.new do |s|
   s.name        = "stitches"
   s.version     = Stitches::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Dave Copeland']
-  s.email       = ['dave@stitchfix.com', 'opensource@stitchfix.com']
+  s.authors     = ["Stitch Fix Engineering","Andrew Peterson","Dave Copeland","Jonathan Dean"]
+  s.email       = ["opensource@stitchfix.com","andy@ndpsoftware.com","[email protected]","[email protected]"]
   s.homepage    = "https://github.com/stitchfix/stitches"
   s.summary     = "You'll be in stitches at how easy it is to create a service at Stitch Fix"
   s.description = "You'll be in stitches at how easy it is to create a service at Stitch Fix"
   s.license     = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- exe/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency("rails")
-  s.add_dependency("pg")
+  s.add_runtime_dependency("rails")
+  s.add_runtime_dependency("pg")
   s.add_development_dependency("rake")
-  s.add_dependency("rspec-rails", "~> 3")
-  s.add_dependency("apitome")
+  s.add_runtime_dependency("rspec", ">= 3")
+  s.add_runtime_dependency("rspec-rails", "~> 3")
+  s.add_runtime_dependency("apitome")
 end