warp 1.3.3 → 1.4.0

data/lib/warp/controller_matchers/assign_matcher.rb

@@ -2,92 +2,171 @@ require "warp/matcher"
 
 module Warp
   module ControllerMatchers
-    class AssignMatcher < Warp::Matcher
-      attr_reader :assign_key, :assign_with, :assign_with_a, :assign_with_a_new
-      attr_reader :controller, :failure_message, :failure_message_when_negated, :description
+    class AssignMatcherBuilder
+      attr_reader :assign_key, :controller
 
       def initialize(assign_key, controller)
         @assign_key = assign_key
         @controller = controller
       end
 
-      def with(assign_eq)
-        @assign_with = assign_eq
-        self
+      def with(value)
+        AssignWithMatcher.new(@controller, @assign_key, value)
+      end
+
+      def with_a(klass)
+        AssignWithAMatcher.new(@controller, @assign_key, klass)
+      end
+
+      def with_a_new(klass)
+        AssignWithANewMatcher.new(@controller, @assign_key, klass)
       end
 
-      def with_a(assign_class)
-        @assign_with_a = assign_class
-        self
+      def method_missing(method, *args)
+        matcher.send(method, *args)
+      end
+
+      private
+
+      def matcher
+        @matcher ||= AssignMatcher.new(@controller, @assign_key)
       end
+    end
 
-      def with_a_new(assign_class)
-        @assign_with_a_new = assign_class
-        self
+    def assign(assign_key)
+      AssignMatcherBuilder.new(controller, assign_key)
+    end
+
+    class AssignMatcher < Warp::Matcher
+      attr_reader :assign_key, :controller
+
+      def initialize(assign_key, controller)
+        @assign_key = assign_key
+        @controller = controller
       end
-      
+
       def matches?(actual)
         @controller = actual if actual.is_a?(ActionController::Metal)
+        check_assign
+      end
 
-        if multiple_assertions?
-          raise "Only one of .with, .with_a, and .with_a_new can be used with the assigns matcher."
-        end
+      def description
+        "assign @#{assign_key}"
+      end
 
-        return check_assign_with if assign_with
-        return check_assign_with_a if assign_with_a
-        return check_assign_with_a_new if assign_with_a_new
-        return check_assign
+      def failure_message
+        "expected @#{assign_key} to be assigned"
       end
-      
+
+      def failure_message_when_negated
+        "expected @#{assign_key} to not be assigned"
+      end
+
       private
 
       def check_assign
-        @description = "assign @#{assign_key}"
-        @failure_message = "expected @#{assign_key} to be assigned"
-        @failure_message_when_negated = "expected @#{assign_key} to not be assigned"
-
         values_match?(false, assign_value.nil?)
       end
 
-      def check_assign_with
-        @description = "assign @#{assign_key} with #{description_of(assign_with)}"
-        @failure_message = "expected @#{assign_key} to be assigned with #{description_of(assign_with)} but was assigned with #{assign_value.inspect}"
-        @failure_message_when_negated = "expected @#{assign_key} to not be assigned with #{description_of(assign_with)}"
+      def assign_value
+        controller.view_assigns[assign_key.to_s]
+      end
+      def has_ancestor?(expected_class, actual)
+        actual.class.ancestors.any? {|ancestor| values_match?(expected_class, ancestor) }
+      end
+    end
+
+    class AssignWithMatcher < AssignMatcher
+      attr_reader :assign_with
+
+      def initialize(controller, assign_key, assign_with)
+        super(controller, assign_key)
+        @assign_with = assign_with
+      end
 
+      def description
+        "assign @#{assign_key} with #{description_of(assign_with)}"
+      end
+
+      def failure_message
+        if assign_value.nil?
+          "expected @#{assign_key} to be assigned with #{description_of(assign_with)} but was not assigned"
+        else
+          "expected @#{assign_key} to be assigned with #{description_of(assign_with)} but was assigned with #{assign_value.inspect}"
+        end
+      end
+
+      def failure_message_when_negated
+        "expected @#{assign_key} to not be assigned with #{description_of(assign_with)}"
+      end
+
+      private
+
+      def check_assign
         values_match?(assign_with, assign_value)
       end
+    end
+
+    class AssignWithAMatcher < AssignMatcher
+      attr_reader :assign_with_a
+
+      def initialize(controller, assign_key, assign_with_a)
+        super(controller, assign_key)
+        @assign_with_a = assign_with_a
+      end
 
-      def check_assign_with_a
-        @description = "assign @#{assign_key} with an instance of #{assign_with_a.name}"
-        @failure_message = "expected @#{assign_key} to be assigned with an instance of #{assign_with_a.name} but was assigned with an instance of #{assign_value.class.name}"
-        @failure_message_when_negated = "expected @#{assign_key} to not be assigned with an instance of #{assign_with_a.name}"
+      def description
+        "assign @#{assign_key} with an instance of #{assign_with_a.name}"
+      end
+
+      def failure_message
+        if assign_value.nil?
+          "expected @#{assign_key} to be assigned with an instance of #{assign_with_a.name} but was not assigned"
+        else
+          "expected @#{assign_key} to be assigned with an instance of #{assign_with_a.name} but was assigned with an instance of #{assign_value.class.name}"
+        end
+      end
 
+      def failure_message_when_negated
+        "expected @#{assign_key} to not be assigned with an instance of #{assign_with_a.name}"
+      end
+
+      private
+
+      def check_assign
         has_ancestor?(assign_with_a, assign_value)
       end
+    end
 
-      def check_assign_with_a_new
-        @description = "assign @#{assign_key} with a new instance of #{assign_with_a_new.name}"
-        @failure_message = "expected @#{assign_key} to be assigned with a new instance of #{assign_with_a_new.name} but was assigned with a #{assign_value.persisted? ? "persisted" : "new"} instance of #{assign_value.class.name}"
-        @failure_message_when_negated = "expected @#{assign_key} to not be assigned with a new instance of #{assign_with_a_new.name}"
+    class AssignWithANewMatcher < AssignMatcher
+      attr_reader :assign_with_a_new
 
-        has_ancestor?(assign_with_a_new, assign_value) && values_match?(false, assign_value.persisted?)
+      def initialize(controller, assign_key, assign_with_a_new)
+        super(controller, assign_key)
+        @assign_with_a_new = assign_with_a_new
       end
 
-      def assign_value
-        controller.view_assigns[assign_key.to_s]
+      def description
+        "assign @#{assign_key} with a new instance of #{assign_with_a_new.name}"
       end
 
-      def multiple_assertions?
-        [@assign_with, @assign_with_a, @assign_with_a_new].compact.size > 1
+      def failure_message
+        if assign_value.nil?
+          "expected @#{assign_key} to be assigned with a new instance of #{assign_with_a_new.name} but was not assigned"
+        else
+          "expected @#{assign_key} to be assigned with a new instance of #{assign_with_a_new.name} but was assigned with a #{assign_value.try(:persisted?) ? "persisted" : "new"} instance of #{assign_value.class.name}"
+        end
       end
 
-      def has_ancestor?(expected_class, actual)
-        actual.class.ancestors.any? {|ancestor| values_match?(expected_class, ancestor) }
+      def failure_message_when_negated
+        "expected @#{assign_key} to not be assigned with a new instance of #{assign_with_a_new.name}"
       end
-    end
 
-    def assign(assign_key)
-      AssignMatcher.new(assign_key, controller)
+      private
+
+      def check_assign
+        has_ancestor?(assign_with_a_new, assign_value) && values_match?(false, assign_value.try(:persisted?))
+      end
     end
   end
-end
+end

data/lib/warp/instrument.rb

@@ -12,7 +12,7 @@ module Warp
       def register(instrument)
         @@registry ||= {}
         @@registry[instrument.klass] ||= {}
-        @@registry[instrument.klass][instrument.method] = instrument        
+        @@registry[instrument.klass][instrument.method] = instrument
       end
     end
 
@@ -43,7 +43,7 @@ module Warp
     end
 
     def log(args)
-      calls << args
+      calls << args if enabled?
     end
 
     private
@@ -57,33 +57,15 @@ module Warp
     end
 
     def setup_hook
-      if Module.method_defined?(:prepend)
-        hook = Module.new
+      original_method = klass.instance_method(method)
 
-        hook.send(:define_method, method) do |*args|
-          result = super(*args)
+      klass.send(:define_method, method) do |*args|
+        result = original_method.bind(self).call(*args)
 
-          if Warp::Instrument.for(self.class, __method__).enabled?
-            Warp::Instrument.for(self.class, __method__).log([args, result])
-          end
+        Warp::Instrument.for(self.class, __method__).log([args, result])
 
-          return result
-        end
-
-        klass.prepend(hook)
-      else
-        original_method = klass.instance_method(method)
-
-        klass.send(:define_method, method) do |*args|
-          result = original_method.bind(self).call(*args)
-
-          if Warp::Instrument.for(self.class, __method__).enabled?
-            Warp::Instrument.for(self.class, __method__).log([args, result])
-          end
-
-          return result
-        end
+        result
       end
     end
   end
-end
+end

data/lib/warp/matcher.rb

@@ -2,31 +2,6 @@ require "rspec"
 
 module Warp
   class Matcher
-    # Composable matchers are new in RSpec 3.
-    # Define basic helpers in their absence.
-    if defined?(RSpec::Matchers::Composable)
-      include RSpec::Matchers::Composable
-    else
-      def description_of(object)
-        object.inspect
-      end
-
-      def values_match?(expected, actual)
-        expected === actual || actual == expected
-      end
-    end
-
-    # RSpec 2 and 3 have different methods
-    # that they call on matcher to get the
-    # failure messages.
-    if RSpec::Version::STRING[0] == "2" || RSpec::Version::STRING == "3.0.0.beta1"
-      def failure_message_for_should
-        failure_message
-      end
-
-      def failure_message_for_should_not
-        failure_message_when_negated
-      end
-    end
+    include RSpec::Matchers::Composable
   end
-end
+end

data/lib/warp/version.rb

@@ -1,8 +1,8 @@
 module Warp
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    PATCH = 3
+    MINOR = 4
+    PATCH = 0
 
     BETA = nil
 

data/spec/spec_helper.rb

@@ -8,17 +8,6 @@ unless ENV["TRAVIS_CI"]
   end
 end
 
-if ENV["TRAVIS_CI"]
-  require "simplecov"
-  require "coveralls"
-
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-
-  SimpleCov.start do
-    add_filter "/spec/"
-  end
-end
-
 if ENV["TRAVIS_CI"]
   Bundler.require
 else

data/spec/warp/action_matchers/create_matcher_spec.rb

@@ -9,7 +9,7 @@ describe Warp::ActionMatchers::CreateMatcher do
     end
   end
 
-  before { Warp::Instrument.for(model, Warp::ActionMatchers::CreateMatcher.instrument_method).calls << Object.new }
+  before { Warp::Instrument.for(model, Warp::ActionMatchers::CreateMatcher.new(Object.new).send(:instrument_method)).calls << Object.new }
 
   subject { create(model) }
 

data/spec/warp/action_matchers/destroy_matcher_spec.rb

@@ -5,7 +5,7 @@ describe Warp::ActionMatchers::DestroyMatcher do
 
   let!(:instance) { model.create }
 
-  before { Warp::Instrument.for(model, Warp::ActionMatchers::DestroyMatcher.instrument_method).calls << Object.new }
+  before { Warp::Instrument.for(model, Warp::ActionMatchers::DestroyMatcher.new(Object.new).send(:instrument_method)).calls << Object.new }
 
   subject { destroy(model) }
 

data/spec/warp/action_matchers/update_matcher_spec.rb

@@ -9,7 +9,7 @@ describe Warp::ActionMatchers::UpdateMatcher do
     end
   end
 
-  before { Warp::Instrument.for(model, Warp::ActionMatchers::UpdateMatcher.instrument_method).calls << Object.new }
+  before { Warp::Instrument.for(model, Warp::ActionMatchers::UpdateMatcher.new(Object.new).send(:instrument_method)).calls << Object.new }
 
   let(:instance) { model.create(foo: "bar") }