fakes 1.1.1 → 1.1.2

data/lib/fakes.rb

@@ -1,7 +1,7 @@
 require 'fakes/arg_matching/arg_match_factory'
 require 'fakes/arg_matching/block_arg_matcher'
 require 'fakes/arg_matching/combined_arg_matcher'
-require 'fakes/arg_matching/matches'
+require 'fakes/arg_matching/argument_matching'
 require 'fakes/arg_matching/regular_arg_matcher'
 require 'fakes/arg_behaviour'
 require 'fakes/arg_set'

data/lib/fakes/arg_matching/argument_matching.rb

@@ -0,0 +1,34 @@
+module Fakes
+  module ArgumentMatching
+    extend self
+
+    def not_nil
+      condition { |item| item != nil }
+    end
+
+    def nil
+      condition { |item| item == nil }
+    end
+
+    def any
+      condition { |ignored| true }
+    end
+
+    def greater_than(value)
+      condition { |number| number > value }
+    end
+
+
+    def in_range(range)
+      condition { |item| range === item }
+    end
+
+    def regex(pattern)
+      condition { |string_value| pattern =~ string_value }
+    end
+
+    def condition(&conditional_block)
+      return BlockArgMatcher.new(conditional_block)
+    end
+  end
+end

data/lib/fakes/fakes.rb

@@ -1,22 +1,22 @@
-class Object
+module Fakes
   def fake(invocations = {})
-    item = Fakes::Fake.new
+    item = Fake.new
     invocations.each{|method,return_value| item.stub(method).and_return(return_value)}
     item
   end
 
   def arg_match
-    return Fakes::Matches
+    return ArgumentMatching
   end
 
   def fake_class(klass,invocations = {})
     item = fake(invocations)
-    Fakes::ClassSwaps.instance.add_fake_for(klass,item)
+    ClassSwaps.instance.add_fake_for(klass,item)
     item
   end
 
   def reset_fake_classes
-    Fakes::ClassSwaps.instance.reset
+    ClassSwaps.instance.reset
   end
 end
 

data/lib/fakes/version.rb

@@ -1,3 +1,3 @@
 module Fakes
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/specs/arg_matching_scenarios_spec.rb

@@ -7,7 +7,7 @@ module Fakes
 
       fake.hello("World")
 
-      fake.received(:hello).called_with(Matches.any).should_not be_nil
+      fake.received(:hello).called_with(ArgumentMatching.any).should_not be_nil
     end
 
     it "should be able to intercept using greater than matchers" do
@@ -15,7 +15,7 @@ module Fakes
 
       fake.hello(10)
 
-      fake.received(:hello).called_with(Matches.greater_than(2)).should_not be_nil
+      fake.received(:hello).called_with(ArgumentMatching.greater_than(2)).should_not be_nil
     end
 
     it "should be able to intercept using regex matchers" do
@@ -23,7 +23,7 @@ module Fakes
 
       fake.hello("This is cool")
 
-      fake.received(:hello).called_with(Matches.regex(/is/)).should_not be_nil
+      fake.received(:hello).called_with(ArgumentMatching.regex(/is/)).should_not be_nil
     end
 
     it "should be able to intercept using range matchers" do
@@ -31,7 +31,7 @@ module Fakes
 
       fake.hello(7)
 
-      fake.received(:hello).called_with(Matches.in_range(4..8)).should_not be_nil
+      fake.received(:hello).called_with(ArgumentMatching.in_range(4..8)).should_not be_nil
     end
 
     it "should be able to intercept using conditional matchers" do
@@ -39,7 +39,7 @@ module Fakes
 
       fake.hello(7)
 
-      fake.received(:hello).called_with(Matches.condition{|item| item < 10}).should_not be_nil
+      fake.received(:hello).called_with(ArgumentMatching.condition{|item| item < 10}).should_not be_nil
     end
 
     it "should be able to intercept by mixing regular arguments with matchers" do
@@ -47,10 +47,10 @@ module Fakes
 
       fake.hello(7,4,"Yes")
 
-      fake.received(:hello).called_with(7,Matches.greater_than(2),Matches.regex(/Y/)).should_not be_nil
-      fake.received(:hello).called_with(7,Matches.any,Matches.regex(/Y/)).should_not be_nil
-      fake.received(:hello).called_with(7,Matches.any,"Yes").should_not be_nil
-      fake.received(:hello).called_with(6,Matches.any,"Yes").should be_nil
+      fake.received(:hello).called_with(7,ArgumentMatching.greater_than(2),ArgumentMatching.regex(/Y/)).should_not be_nil
+      fake.received(:hello).called_with(7,ArgumentMatching.any,ArgumentMatching.regex(/Y/)).should_not be_nil
+      fake.received(:hello).called_with(7,ArgumentMatching.any,"Yes").should_not be_nil
+      fake.received(:hello).called_with(6,ArgumentMatching.any,"Yes").should be_nil
     end
   end
 

data/spec/specs/{matches_spec.rb → argument_matching_spec.rb}

@@ -1,40 +1,40 @@
 module Fakes
-  describe Matches do
+  describe ArgumentMatching do
     context "when creating matchers" do
       it "should be able to create a matcher that matches anything" do
-        (1..10).each{|item| Matches.any.matches?(item).should be_true}
+        (1..10).each{|item| ArgumentMatching.any.matches?(item).should be_true}
       end
       it "should be able to create a numeric greater than matcher" do
-        match = Matches.greater_than(5)
+        match = ArgumentMatching.greater_than(5)
         match.matches?(4).should be_false
         match.matches?(5).should be_false
         match.matches?(6).should be_true
         
       end
       it "should be able to create a range matcher" do
-        match = Matches.in_range((1..10))
+        match = ArgumentMatching.in_range((1..10))
         match.matches?(4).should be_true
         match.matches?(10).should be_true
         match.matches?(11).should be_false
       end
       it "should be able to create a nil matcher" do
-        match = Matches.nil
+        match = ArgumentMatching.nil
         match.matches?(nil).should be_true
         match.matches?(10).should be_false
       end
       it "should be able to create a not nil matcher" do
-        match = Matches.not_nil
+        match = ArgumentMatching.not_nil
         match.matches?(10).should be_true
         match.matches?(nil).should be_false
       end
       it "should be able to create a regex string matcher" do
-        match = Matches.regex(/a|e|i|o|u/)
+        match = ArgumentMatching.regex(/a|e|i|o|u/)
         match.matches?("awwef").should be_true
         match.matches?("rwwgf").should be_false
       end
 
       it "should be able to create a lambda based matcher" do
-        match = Matches.condition{|item| item > 3}
+        match = ArgumentMatching.condition{|item| item > 3}
         match.matches?(2).should be_false
         match.matches?(7).should be_true
       end

data/spec/specs/fake_spec.rb

@@ -200,13 +200,13 @@ module Fakes
         it "should be able to intercept on methods using the matches factory" do
           fake = Fake.new
 
-          fake.stub(:hello).with(Matches.regex(/W/)).and_return("Hello World") 
+          fake.stub(:hello).with(ArgumentMatching.regex(/W/)).and_return("Hello World") 
           fake.hello("World").should == "Hello World"
         end
         it "should be able to intercept on methods using combinations of explicit values and matchers" do
           fake = Fake.new
 
-          fake.stub(:hello).with(Matches.regex(/W/),Matches.greater_than(3),10).and_return("Hello World") 
+          fake.stub(:hello).with(ArgumentMatching.regex(/W/),ArgumentMatching.greater_than(3),10).and_return("Hello World") 
 
           fake.hello("World",4,10).should == "Hello World"
           fake.hello("World",2,10).should == nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fakes
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -93,9 +93,9 @@ files:
 - lib/fakes.rb
 - lib/fakes/arg_behaviour.rb
 - lib/fakes/arg_matching/arg_match_factory.rb
+- lib/fakes/arg_matching/argument_matching.rb
 - lib/fakes/arg_matching/block_arg_matcher.rb
 - lib/fakes/arg_matching/combined_arg_matcher.rb
-- lib/fakes/arg_matching/matches.rb
 - lib/fakes/arg_matching/regular_arg_matcher.rb
 - lib/fakes/arg_set.rb
 - lib/fakes/class_swap.rb
@@ -110,6 +110,7 @@ files:
 - spec/specs/arg_match_factory_spec.rb
 - spec/specs/arg_matching_scenarios_spec.rb
 - spec/specs/arg_set_spec.rb
+- spec/specs/argument_matching_spec.rb
 - spec/specs/block_arg_matcher_spec.rb
 - spec/specs/class_swap_spec.rb
 - spec/specs/class_swaps_spec.rb
@@ -117,7 +118,6 @@ files:
 - spec/specs/extensions_spec.rb
 - spec/specs/fake_spec.rb
 - spec/specs/ignore_set_spec.rb
-- spec/specs/matches_spec.rb
 - spec/specs/method_stub_spec.rb
 - spec/specs/regular_arg_matcher_spec.rb
 homepage: http://www.developwithpassion.com
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 560141686594498555
+      hash: -2245733213966306634
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 560141686594498555
+      hash: -2245733213966306634
 requirements: []
 rubyforge_project: fakes
 rubygems_version: 1.8.25
@@ -156,6 +156,7 @@ test_files:
 - spec/specs/arg_match_factory_spec.rb
 - spec/specs/arg_matching_scenarios_spec.rb
 - spec/specs/arg_set_spec.rb
+- spec/specs/argument_matching_spec.rb
 - spec/specs/block_arg_matcher_spec.rb
 - spec/specs/class_swap_spec.rb
 - spec/specs/class_swaps_spec.rb
@@ -163,6 +164,5 @@ test_files:
 - spec/specs/extensions_spec.rb
 - spec/specs/fake_spec.rb
 - spec/specs/ignore_set_spec.rb
-- spec/specs/matches_spec.rb
 - spec/specs/method_stub_spec.rb
 - spec/specs/regular_arg_matcher_spec.rb

data/lib/fakes/arg_matching/matches.rb

@@ -1,34 +0,0 @@
-module Fakes
-  class Matches
-    class << self
-      def not_nil
-        condition { |item| item != nil }
-      end
-
-      def nil
-        condition { |item| item == nil }
-      end
-
-      def any
-        condition { |ignored| true }
-      end
-
-      def greater_than(value)
-        condition { |number| number > value }
-      end
-      
-
-      def in_range(range)
-        condition { |item| range === item }
-      end
-
-      def regex(pattern)
-        condition { |string_value| pattern =~ string_value }
-      end
-
-      def condition(&conditional_block)
-        return BlockArgMatcher.new(conditional_block)
-      end
-    end
-  end
-end