Refactor

lib/json_spec.rb

@@ -1,8 +1,9 @@
 require "json"
 require "rspec"
-require "json_spec/errors"
+require "json_spec/at_path"
 require "json_spec/configuration"
 require "json_spec/exclusion"
+require "json_spec/errors"
 require "json_spec/helpers"
 require "json_spec/messages"
 require "json_spec/matchers"

lib/json_spec/at_path.rb

@@ -0,0 +1,10 @@
+module JsonSpec
+  module AtPath
+    extend self
+
+    def at_path(path)
+      @path = path
+      self
+    end
+  end
+end

lib/json_spec/cucumber.rb

@@ -2,6 +2,14 @@
 
 World(JsonSpec::Helpers, JsonSpec::Matchers)
 
+def _match(negative, matcher)
+  if negative
+    last_json.should_not matcher
+  else
+    last_json.should matcher
+  end
+end
+
 After do
   JsonSpec.forget
 end
@@ -11,51 +19,27 @@
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should( not)? be:$/ do |path, negative, json|
-  if negative
-    last_json.should_not be_json_eql(JsonSpec.remember(json)).at_path(path)
-  else
-    last_json.should be_json_eql(JsonSpec.remember(json)).at_path(path)
-  end
+  _match negative, be_json_eql(JsonSpec.remember(json)).at_path(path)
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should( not)? be file "(.+)"$/ do |path, negative, file_path|
-  if negative
-    last_json.should_not be_json_eql.to_file(file_path).at_path(path)
-  else
-    last_json.should be_json_eql.to_file(file_path).at_path(path)
-  end
+  _match negative, be_json_eql.to_file(file_path).at_path(path)
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should( not)? be (".*"|\-?\d+(?:\.\d+)?(?:[eE][\+\-]?\d+)?|\[.*\]|%?\{.*\}|true|false|null)$/ do |path, negative, value|
-  if negative
-    last_json.should_not be_json_eql(JsonSpec.remember(value)).at_path(path)
-  else
-    last_json.should be_json_eql(JsonSpec.remember(value)).at_path(path)
-  end
+  _match negative, be_json_eql(JsonSpec.remember(value)).at_path(path)
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should( not)? include:$/ do |path, negative, json|
-  if negative
-    last_json.should_not include_json(JsonSpec.remember(json)).at_path(path)
-  else
-    last_json.should include_json(JsonSpec.remember(json)).at_path(path)
-  end
+  _match negative, include_json(JsonSpec.remember(json)).at_path(path)
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should( not)? include file "(.+)"$/ do |path, negative, file_path|
-  if negative
-    last_json.should_not include_json.from_file(file_path).at_path(path)
-  else
-    last_json.should include_json.from_file(file_path).at_path(path)
-  end
+  _match negative, include_json.from_file(file_path).at_path(path)
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should( not)? include (".*"|\-?\d+(?:\.\d+)?(?:[eE][\+\-]?\d+)?|\[.*\]|%?\{.*\}|true|false|null)$/ do |path, negative, value|
-  if negative
-    last_json.should_not include_json(JsonSpec.remember(value)).at_path(path)
-  else
-    last_json.should include_json(JsonSpec.remember(value)).at_path(path)
-  end
+  _match negative, include_json(JsonSpec.remember(value)).at_path(path)
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should have the following:$/ do |base, table|
@@ -71,25 +55,13 @@
 end
 
 Then /^the (?:JSON|json)(?: response)? should( not)? have "(.*)"$/ do |negative, path|
-  if negative
-    last_json.should_not have_json_path(path)
-  else
-    last_json.should have_json_path(path)
-  end
+  _match negative, have_json_path(path)
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should( not)? be an? (.*)$/ do |path, negative, type|
-  if negative
-    last_json.should_not have_json_type(type).at_path(path)
-  else
-    last_json.should have_json_type(type).at_path(path)
-  end
+  _match negative, have_json_type(type).at_path(path)
 end
 
 Then /^the (?:JSON|json)(?: response)?(?: at "(.*)")? should( not)? have (\d+)/ do |path, negative, size|
-  if negative
-    last_json.should_not have_json_size(size.to_i).at_path(path)
-  else
-    last_json.should have_json_size(size.to_i).at_path(path)
-  end
+  _match negative, have_json_size(size.to_i).at_path(path)
 end

lib/json_spec/exclusion.rb

@@ -2,6 +2,16 @@ module JsonSpec
   module Exclusion
     extend self
 
+    def excluding(*keys)
+      excluded_keys.merge(keys.map(&:to_s))
+      self
+    end
+
+    def including(*keys)
+      excluded_keys.subtract(keys.map(&:to_s))
+      self
+    end
+
     def exclude_keys(ruby)
       case ruby
       when Hash

lib/json_spec/matchers/be_json_eql.rb

@@ -1,6 +1,7 @@
 module JsonSpec
   module Matchers
     class BeJsonEql
+      include JsonSpec::AtPath
       include JsonSpec::Helpers
       include JsonSpec::Exclusion
       include JsonSpec::Messages
@@ -22,26 +23,11 @@ def matches?(actual_json)
         @actual == @expected
       end
 
-      def at_path(path)
-        @path = path
-        self
-      end
-
       def to_file(path)
         @expected_json = load_json(path)
         self
       end
 
-      def excluding(*keys)
-        excluded_keys.merge(keys.map(&:to_s))
-        self
-      end
-
-      def including(*keys)
-        excluded_keys.subtract(keys.map(&:to_s))
-        self
-      end
-
       def failure_message_for_should
         message_with_path("Expected equivalent JSON")
       end

lib/json_spec/matchers/have_json_size.rb

@@ -1,6 +1,7 @@
 module JsonSpec
   module Matchers
     class HaveJsonSize
+      include JsonSpec::AtPath
       include JsonSpec::Helpers
       include JsonSpec::Messages
 
@@ -14,11 +15,6 @@ def matches?(json)
         @actual == @expected
       end
 
-      def at_path(path)
-        @path = path
-        self
-      end
-
       def failure_message_for_should
         message_with_path("Expected JSON value size to be #{@expected}, got #{@actual}")
       end

lib/json_spec/matchers/have_json_type.rb

@@ -1,6 +1,7 @@
 module JsonSpec
   module Matchers
     class HaveJsonType
+      include JsonSpec::AtPath
       include JsonSpec::Helpers
       include JsonSpec::Messages
 
@@ -13,11 +14,6 @@ def matches?(json)
         @classes.any?{|c| c === @ruby }
       end
 
-      def at_path(path)
-        @path = path
-        self
-      end
-
       def failure_message_for_should
         message_with_path("Expected JSON value type to be #{@classes.join(", ")}, got #{@ruby.class}")
       end

lib/json_spec/matchers/include_json.rb

@@ -1,6 +1,7 @@
 module JsonSpec
   module Matchers
     class IncludeJson
+      include JsonSpec::AtPath
       include JsonSpec::Helpers
       include JsonSpec::Exclusion
       include JsonSpec::Messages
@@ -22,26 +23,11 @@ def matches?(actual_json)
         end
       end
 
-      def at_path(path)
-        @path = path
-        self
-      end
-
       def from_file(path)
         @expected_json = load_json(path)
         self
       end
 
-      def excluding(*keys)
-        excluded_keys.merge(keys.map(&:to_s))
-        self
-      end
-
-      def including(*keys)
-        excluded_keys.subtract(keys.map(&:to_s))
-        self
-      end
-
       def failure_message_for_should
         message_with_path("Expected included JSON")
       end

spec/json_spec/configuration_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe JsonSpec::Configuration do
+  before { JsonSpec.reset }
+
   it "excludes id and timestamps by default" do
     JsonSpec.excluded_keys.should == ["id", "created_at", "updated_at"]
   end

spec/json_spec/memory_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe JsonSpec::Memory do
+  before { JsonSpec.reset }
+
   it "has a memory" do
     JsonSpec.memory.should == {}
   end

spec/spec_helper.rb

@@ -1,9 +1,6 @@
 require "json_spec"
 
 RSpec.configure do |config|
-  config.before do
-    JsonSpec.reset
-  end
 end
 
 def files_path