bogus 0.1.0 → 0.1.1

data/lib/bogus/adds_recording.rb

@@ -10,6 +10,7 @@ module Bogus
       new_klass = create_proxy_class.call(name, klass)
       overwrites_classes.overwrite(klass.name, new_klass)
       overwritten_classes.add(klass.name, klass)
+      new_klass
     end
   end
 end

data/lib/bogus/any_args.rb

@@ -1,7 +1,36 @@
 module Bogus
-  module AnyArgs
-    def self.inspect
-      "any_args"
+  class WithArguments
+    attr_reader :predicate
+
+    def initialize(&predicate)
+      @predicate = predicate
     end
+
+    def matches?(args)
+      predicate.call(*args)
+    end
+
+    def self.matches?(opts = {})
+      stubbed = opts.fetch(:stubbed)
+      recorded = opts.fetch(:recorded)
+      return false unless with_matcher?(stubbed)
+      return extract(stubbed).matches?(recorded)
+    end
+
+    def self.with_matcher?(args)
+      args.first.is_a?(WithArguments)
+    end
+
+    private
+
+    def self.extract(args)
+      args.first
+    end
+  end
+
+  AnyArgs = WithArguments.new{ true }
+
+  def AnyArgs.inspect
+    "any_args"
   end
 end

data/lib/bogus/class_methods.rb

@@ -4,7 +4,7 @@ module Bogus
     takes :klass
 
     def all
-      klass.methods - Class.methods
+      klass.methods - Class.methods - bogus_methods
     end
 
     def get(name)
@@ -18,5 +18,11 @@ module Bogus
     def define(body)
       klass.instance_eval(body)
     end
+
+    private
+
+    def bogus_methods
+      [:__shadow__, :__reset__, :__overwrite__, :__overwritten_methods__, :__record__]
+    end
   end
 end

data/lib/bogus/copies_classes.rb

@@ -5,8 +5,11 @@ module Bogus
     takes :copies_methods
 
     def copy(klass)
-      copy_class = Class.new(Bogus::Fake)
-      copy_class.__copied_class__ = klass
+      copy_class = Class.new(Bogus::Fake) do
+        define_singleton_method(:__copied_class__) do
+          klass
+        end
+      end
       copies_methods.copy(klass, copy_class)
       copy_class
     end

data/lib/bogus/fake.rb

@@ -26,8 +26,6 @@ module Bogus
     end
 
     class << self
-      attr_accessor :__copied_class__
-
       alias :__create__ :new
 
       def new(*args, &block)

data/lib/bogus/have_received_matcher.rb

@@ -35,6 +35,11 @@ module Bogus
       proxy(:set_method)
     end
 
+    def build(*args)
+      return method_call if args.empty?
+      set_method(*args)
+    end
+
     def set_method(name, *args, &block)
       @name = name
       @args = args

data/lib/bogus/interaction.rb

@@ -1,5 +1,11 @@
 module Bogus
   class Interaction < Struct.new(:method, :args, :return_value, :error, :has_result)
+    attr_accessor :arguments
+
+    def self.same?(opts = {})
+      InteractionComparator.new(opts).same?
+    end
+
     def initialize(method, args, &block)
       self.method = method
       self.args = args
@@ -10,53 +16,78 @@ module Bogus
       end
     end
 
-    def ==(other)
-      method == other.method && same_args?(other) && same_result?(other)
-    end
+    private
 
-    def any_args?
-      [AnyArgs] == args
+    def evaluate_return_value(block)
+      self.return_value = block.call
+    rescue => e
+      self.error = e.class
     end
 
-    def args
-      args = super.map { |arg| remove_default_values_from_hash(arg) }
-      args.reject { |arg| arg.eql?(DefaultValue) }
-    end
+    class InteractionComparator
+      attr_reader :recorded, :stubbed
 
-    private
+      def initialize(opts = {})
+        @recorded = opts.fetch(:recorded)
+        @stubbed = opts.fetch(:stubbed)
+      end
 
-    def same_args?(other)
-      return true if any_args? || other.any_args?
+      def same?
+        return false unless recorded.method == stubbed.method
+        return false unless same_result?
+        same_args?
+      end
 
-      other_args = normalize_other_args(args, other.args)
-      return false unless args.size == other_args.size
-      args.zip(other_args).all?{|a1, a2| a1 == a2 || a2 == a1}
-    end
+      private
 
-    def normalize_other_args(args, other_args)
-      if args.last.is_a?(Hash) && !other_args.last.is_a?(Hash)
-        other_args + [{}]
-      else
-        other_args
+      def same_args?
+        ArgumentComparator.new(recorded: recorded.args, stubbed: stubbed.args).same?
       end
-    end
 
-    def same_result?(other)
-      return true unless has_result && other.has_result
-      return_value == other.return_value && error == other.error
+      def same_result?
+        return true unless recorded.has_result && stubbed.has_result
+        recorded.return_value == stubbed.return_value && recorded.error == stubbed.error
+      end
     end
 
-    def evaluate_return_value(block)
-      self.return_value = block.call
-    rescue => e
-      self.error = e.class
-    end
+    class ArgumentComparator
+      attr_reader :recorded, :stubbed
+
+      def initialize(opts = {})
+        @recorded = opts.fetch(:recorded)
+        @stubbed = opts.fetch(:stubbed)
+      end
+
+      def same?
+        return true if with_matcher_args?
+
+        stubbed == recorded_without_defaults
+      end
+
+      private
+
+      def recorded_without_defaults
+        without_defaults = recorded.reject{|v| DefaultValue == v}
+        remove_default_keywords(without_defaults)
+      end
+
+      def remove_default_keywords(recorded)
+        return recorded unless recorded_has_keyword?
+        positional = recorded[0...-1]
+        keyword = recorded.last
+        without_defaults = keyword.reject{|_, v| DefaultValue == v}
+        return positional if without_defaults.empty?
+        positional + [without_defaults]
+      end
+
+      def with_matcher_args?
+        WithArguments.matches?(stubbed: stubbed, recorded: recorded_without_defaults)
+      end
 
-    def remove_default_values_from_hash(arg)
-      if arg.is_a?(Hash)
-        arg.reject { |_, val| val.eql?(DefaultValue) }
-      else
-        arg
+      def recorded_has_keyword?
+        last_recorded = recorded.last
+        return false unless last_recorded.is_a?(Hash)
+        last_recorded.values.any? { |v| DefaultValue == v }
       end
     end
   end

data/lib/bogus/interactions_repository.rb

@@ -9,7 +9,7 @@ module Bogus
     end
 
     def recorded?(fake_name, interaction)
-      @interactions[fake_name].include?(interaction)
+      @interactions[fake_name].any?{ |i| Interaction.same?(stubbed: interaction, recorded: i) }
     end
 
     def for_fake(fake_name)

data/lib/bogus/makes_substitute_methods.rb

@@ -7,8 +7,9 @@ module Bogus
     def stringify(method)
       args = method_stringifier.argument_values(method.parameters)
 
-      method_stringifier.stringify(method,
-        "__record__(:#{method.name}, #{args})")
+      send_args = [method.name.inspect, args].reject(&:empty?).join(', ')
+
+      method_stringifier.stringify(method, "__record__(#{send_args})")
     end
   end
 end

data/lib/bogus/mocking_dsl.rb

@@ -28,6 +28,14 @@ module Bogus
       Bogus::AnyArgs
     end
 
+    def with(&block)
+      Bogus::WithArguments.new(&block)
+    end
+
+    def any(klass)
+      Bogus::SameClass.new(klass)
+    end
+
     def anything
       Bogus::Anything
     end

data/lib/bogus/public_methods.rb

@@ -34,7 +34,7 @@ module Bogus
     end
 
     def have_received(*args)
-      inject.have_received_matcher(*args).method_call
+      inject.have_received_matcher.build(*args)
     end
 
     def fake_for(*args, &block)

data/lib/bogus/rspec_extensions.rb

@@ -11,8 +11,15 @@ module Bogus
     end
 
     def verify_contract(name)
+      old_described_class = described_class
+
       before do
-        Bogus.record_calls_for(name, described_class)
+        new_class = Bogus.record_calls_for(name, described_class)
+        example.metadata[:example_group][:described_class] = new_class
+      end
+
+      after do
+        example.metadata[:example_group][:described_class] = old_described_class
       end
 
       RSpec.configure do |config|

data/lib/bogus/same_class.rb

@@ -0,0 +1,14 @@
+module Bogus
+  class SameClass
+    extend Takes
+    takes :klass
+
+    def inspect
+      "any(#{klass.name})"
+    end
+
+    def ==(other)
+      other.is_a?(klass)
+    end
+  end
+end

data/lib/bogus/shadow.rb

@@ -5,7 +5,6 @@ module Bogus
     def initialize
       @calls = []
       @stubs = []
-      @defaults = {}
       @required = Set.new
     end
 
@@ -16,14 +15,13 @@ module Bogus
     end
 
     def has_received(name, args)
-      @calls.include?(Interaction.new(name, args))
+      @calls.any? { |i| Interaction.same?(recorded: i, stubbed: Interaction.new(name, args)) }
     end
 
     def stubs(name, *args, &return_value)
       interaction = Interaction.new(name, args)
       add_stub(interaction, return_value)
-      override_default(interaction, return_value)
-      @required.delete(interaction)
+      @required.reject! { |i| Interaction.same?(recorded: i, stubbed: interaction) }
       interaction
     end
 
@@ -33,7 +31,11 @@ module Bogus
     end
 
     def unsatisfied_interactions
-      @required.reject { |i| @calls.include?(i) }
+      @required.reject do |stubbed|
+        @calls.any? do |recorded|
+          Interaction.same?(recorded: recorded, stubbed: stubbed)
+        end
+      end
     end
 
     def self.has_shadow?(object)
@@ -42,18 +44,12 @@ module Bogus
 
     private
 
-    def override_default(interaction, return_value)
-      return unless interaction.any_args?
-      @defaults[interaction.method] = return_value || proc{nil}
-    end
-
     def add_stub(interaction, return_value_block)
       @stubs << [interaction, return_value_block] if return_value_block
     end
 
     def return_value(interaction)
-      _, return_value = @stubs.reverse.find{|i, v| i == interaction}
-      return_value ||= @defaults[interaction.method]
+      _, return_value = @stubs.reverse.find{|i, v| Interaction.same?(recorded: interaction, stubbed: i)}
       return_value ||= proc{ UndefinedReturnValue.new(interaction) }
       return_value.call
     end

data/lib/bogus/verifies_stub_definition.rb

@@ -7,7 +7,7 @@ module Bogus
     def verify!(object, method_name, args)
       stubbing_non_existent_method!(object, method_name) unless object.respond_to?(method_name)
       return unless object.methods.include?(method_name)
-      return if any_args?(args)
+      return if WithArguments.with_matcher?(args)
       method = object.method(method_name)
       verify_call!(method, args)
     end
@@ -31,9 +31,5 @@ module Bogus
     def stubbing_non_existent_method!(object, method_name)
       raise NameError, "#{object.inspect} does not respond to #{method_name}"
     end
-
-    def any_args?(args)
-      [Bogus::AnyArgs] == args
-    end
   end
 end

data/lib/bogus/version.rb

@@ -1,3 +1,3 @@
 module Bogus
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/bogus/adds_recording_spec.rb

@@ -43,6 +43,10 @@ describe Bogus::AddsRecording do
     it "records the overwritten class, so that it can be later restored" do
       overwritten_classes.should have_received.add("SampleModule::Library", SampleModule::Library)
     end
+
+    it "returns the proxy class" do
+      adds_recording.add(:library).should == Object
+    end
   end
 
   context "with class argument" do
@@ -65,5 +69,9 @@ describe Bogus::AddsRecording do
     it "records the overwritten class, so that it can be later restored" do
       overwritten_classes.should have_received.add("SampleModule::OtherClass", SampleModule::OtherClass)
     end
+
+    it "returns the proxy class" do
+      adds_recording.add(:library, SampleModule::OtherClass).should == Object
+    end
   end
 end

data/spec/bogus/class_methods_spec.rb

@@ -11,12 +11,18 @@ module Bogus
 
       def self.hello
       end
+
+      def self.__shadow__; end
+      def self.__reset__; end
+      def self.__overwrite__; end
+      def self.__overwritten_methods__; end
+      def self.__record__; end
     end
 
     let(:class_methods) { ClassMethods.new(SampleClass) }
 
-    it "lists the instance methods" do
-      class_methods.all.should == [:bar, :hello]
+    it "lists the class methods excluding the ones added by Bogus" do
+      class_methods.all.should =~ [:bar, :hello]
     end
 
     it "returns the instance methods by name" do

data/spec/bogus/clean_ruby_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "Ruby syntax" do
+  it "is clean" do
+    bogus_warnings.should == []
+  end
+
+  def bogus_warnings
+    warnings.select { |w| w =~ %r{lib/bogus} }
+  end
+
+  def warnings
+    `ruby -w lib/bogus.rb 2>&1`.split("\n")
+  end
+end