warp 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6cbf9ef52e08774d01f175a2332feeb01860963
-  data.tar.gz: 30b1477e764a15f0bf98fff122558e7adbd9a4c6
+  metadata.gz: 7b1b1e989d088f3bbda7a83d127547473043ee8e
+  data.tar.gz: f573120f00d484663e0a6d7aa86f431dcb58e04e
 SHA512:
-  metadata.gz: 451e896e044e7c5cd8f22f1f766c7f338eaf7f5826e27d2e65dbe7344eda07ec75a261ecdd1f89dc35048439b039e00e732c992545555f527a6e98f168433792
-  data.tar.gz: 44f2d8b79a1fc65ee0a8bde854ed658b7db548dd0e1e0396968a2ab27933ad5dd029f1785d807332f870678e0530d522079de5f09d3f9ce3d73fecd84c23c24a
+  metadata.gz: b741742b5f1c7591651a413c68d29dbb5f081cf30d1ff4d2729ed582e278bc81aa19bea725f4209b504d8d42d38e6df4dc9d6b3fe73ed9c5b31a8d85910dee4f
+  data.tar.gz: 0224f05bd32daf3d0277f6eed683a87b113e68d7629915c646bcf2b66d3c6018f5ed157f7ae3853ade9101a17b02221c65bdbc2b3f4ea39e7876e051304a7046

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+- 1.3.2
+  - Added model deletion matcher.
+
+- 1.3.1
+  - Fixed issue where model creation matcher would unconditionally pass on subsequent matches.
+
+- 1.3.0
+  - Matchers are now only included into relevant spec types.
+  - Matchers can now be individually required.
+  - Added model creation matcher.
+
 - 1.2.3
   - Now compatible with Rails 4.2.
 
@@ -18,4 +29,4 @@
   - Fixed issue where matchers would error unless explicitly passed the controller object.
 
 - 1.0.0
-  - Initial release
+  - Initial release

data/Gemfile

@@ -5,14 +5,14 @@ gemspec
 gem "bundler"
 gem "appraisal"
 
+gem "jamjar"
+
 gem "rake"
 gem "fuubar"
 
 gem "simplecov", require: false
 gem "coveralls", require: false
 
-gem "activerecord-nulldb-adapter", require: false
-
 group :tools do
   gem "guard"
   gem "guard-rspec"

data/README.md

@@ -220,7 +220,7 @@ specify { expect(user).to validate_uniqueness_of(:email, scope: :company) }
 
 ### Creation Matchers
 
-#### creates
+#### create
 
 Ensures that a record is created.
 
@@ -228,6 +228,14 @@ Ensures that a record is created.
 specify { expect{post :create, params}.to create(Post) }
 ```
 
+#### destroy
+
+Ensures that a record is destroyed.
+
+```ruby
+specify { expect{delete :destroy, id: id}.to destroy(Post) }
+```
+
 ## Contributing
 
 1. Fork it

data/gemfiles/rails_3.2_rspec_2.14.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 3.2", :require => "active_support/all"
 gem "actionpack", "~> 3.2", :require => "action_controller"
 gem "activerecord", "~> 3.2", :require => "active_record"

data/gemfiles/rails_3.2_rspec_2.99.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 3.2", :require => "active_support/all"
 gem "actionpack", "~> 3.2", :require => "action_controller"
 gem "activerecord", "~> 3.2", :require => "active_record"

data/gemfiles/rails_3.2_rspec_3.1.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 3.2", :require => "active_support/all"
 gem "actionpack", "~> 3.2", :require => "action_controller"
 gem "activerecord", "~> 3.2", :require => "active_record"

data/gemfiles/rails_4.0_rspec_2.14.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.0", :require => "active_support/all"
 gem "actionpack", "~> 4.0", :require => "action_controller"
 gem "activerecord", "~> 4.0", :require => "active_record"

data/gemfiles/rails_4.0_rspec_2.99.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.0", :require => "active_support/all"
 gem "actionpack", "~> 4.0", :require => "action_controller"
 gem "activerecord", "~> 4.0", :require => "active_record"

data/gemfiles/rails_4.0_rspec_3.1.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.0", :require => "active_support/all"
 gem "actionpack", "~> 4.0", :require => "action_controller"
 gem "activerecord", "~> 4.0", :require => "active_record"

data/gemfiles/rails_4.1_rspec_2.14.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.1", :require => "active_support/all"
 gem "actionpack", "~> 4.1", :require => "action_controller"
 gem "activerecord", "~> 4.1", :require => "active_record"

data/gemfiles/rails_4.1_rspec_2.99.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.1", :require => "active_support/all"
 gem "actionpack", "~> 4.1", :require => "action_controller"
 gem "activerecord", "~> 4.1", :require => "active_record"

data/gemfiles/rails_4.1_rspec_3.1.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.1", :require => "active_support/all"
 gem "actionpack", "~> 4.1", :require => "action_controller"
 gem "activerecord", "~> 4.1", :require => "active_record"

data/gemfiles/rails_4.2.rc1_rspec_2.14.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.2.rc1", :require => "active_support/all"
 gem "actionpack", "~> 4.2.rc1", :require => "action_controller"
 gem "activerecord", "~> 4.2.rc1", :require => "active_record"

data/gemfiles/rails_4.2.rc1_rspec_2.99.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.2.rc1", :require => "active_support/all"
 gem "actionpack", "~> 4.2.rc1", :require => "action_controller"
 gem "activerecord", "~> 4.2.rc1", :require => "active_record"

data/gemfiles/rails_4.2.rc1_rspec_3.1.gemfile

@@ -4,11 +4,11 @@ source "https://rubygems.org"
 
 gem "bundler"
 gem "appraisal"
+gem "jamjar"
 gem "rake"
 gem "fuubar"
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "activerecord-nulldb-adapter", :require => false
 gem "activesupport", "~> 4.2.rc1", :require => "active_support/all"
 gem "actionpack", "~> 4.2.rc1", :require => "action_controller"
 gem "activerecord", "~> 4.2.rc1", :require => "active_record"

data/lib/warp/action_matchers.rb

@@ -3,6 +3,7 @@ unless defined?(ActiveModel)
 end
 
 require "warp/action_matchers/create_matcher"
+require "warp/action_matchers/destroy_matcher"
 
 RSpec.configure do |config|
   config.include Warp::ActionMatchers

data/lib/warp/action_matchers/create_matcher.rb

@@ -17,9 +17,7 @@ module Warp
       end
 
       def matches?(actual)
-        unless actual.respond_to?(:call)
-          raise "The create matcher can only match against callables."
-        end
+        check_callable!(actual)
 
         instrument = Warp::Instrument.for(model, CREATE_METHOD)
 
@@ -30,15 +28,15 @@ module Warp
       end
 
       def description
-        "create a #{model.name}"
+        "create a #{model_name}"
       end
 
       def failure_message
-        "expected a #{model.name} to be created"
+        "expected a #{model_name} to be created"
       end
 
       def failure_message_when_negated
-        "expected no #{model.name} to be created"
+        "expected no #{model_name} to be created"
       end
     end
 

data/lib/warp/action_matchers/destroy_matcher.rb

@@ -0,0 +1,47 @@
+require "warp/action_matchers/matcher"
+require "warp/instrument"
+
+module Warp
+  module ActionMatchers
+    class DestroyMatcher < Warp::ActionMatchers::Matcher
+      if ActiveRecord::Base.private_method_defined?(:destroy_row)
+        DESTROY_METHOD = :destroy_row
+      else
+        DESTROY_METHOD = :destroy
+      end
+
+      attr_reader :model
+
+      def initialize(model)
+        @model = model
+      end
+
+      def matches?(actual)
+        check_callable!(actual)
+
+        instrument = Warp::Instrument.for(model, DESTROY_METHOD)
+
+        instrument.reset
+        instrument.run { actual.call }
+
+        instrument.calls.size > 0
+      end
+
+      def description
+        "destroy a #{model_name}"
+      end
+
+      def failure_message
+        "expected a #{model_name} to be destroyed"
+      end
+
+      def failure_message_when_negated
+        "expected no #{model_name} to be destroyed"
+      end
+    end
+
+    def destroy(model)
+      DestroyMatcher.new(model)
+    end
+  end
+end

data/lib/warp/action_matchers/matcher.rb

@@ -3,9 +3,17 @@ require "warp/matcher"
 module Warp
   module ActionMatchers
     class Matcher < Warp::Matcher
-
       private
 
+      def check_callable!(object)
+        unless object.respond_to?(:call)
+          raise "#{self.class.name} can only match against callables."
+        end
+      end
+
+      def model_name
+        model.model_name.to_s
+      end
     end
   end
 end

data/lib/warp/instrument.rb

@@ -16,7 +16,7 @@ module Warp
       end
     end
 
-    attr_accessor :klass, :method, :hook, :enabled, :calls
+    attr_accessor :klass, :method, :enabled, :calls
 
     def initialize(klass, method)
       self.klass = klass
@@ -58,14 +58,16 @@ module Warp
 
     def setup_hook
       if Module.method_defined?(:prepend)
-        self.hook = Module.new
+        hook = Module.new
 
         hook.send(:define_method, method) do |*args|
+          result = super(*args)
+
           if Warp::Instrument.for(self.class, __method__).enabled?
-            Warp::Instrument.for(self.class, __method__).log(args)
+            Warp::Instrument.for(self.class, __method__).log([args, result])
           end
 
-          super(*args)
+          return result
         end
 
         klass.prepend(hook)
@@ -73,11 +75,13 @@ module Warp
         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)
+            Warp::Instrument.for(self.class, __method__).log([args, result])
           end
 
-          original_method.bind(self).call(*args)
+          return result
         end
       end
     end

data/lib/warp/model_matchers/matcher.rb

@@ -16,7 +16,7 @@ module Warp
       end
 
       def model_name
-        model.name
+        model.model_name.to_s
       end
     end
   end

data/lib/warp/version.rb

@@ -2,7 +2,7 @@ module Warp
   module VERSION
     MAJOR = 1
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
 
     BETA = nil
 

data/spec/spec_helper.rb

@@ -33,17 +33,13 @@ if defined?(Rails) && !Rails.respond_to?(:env)
   end
 end
 
-require "activerecord-nulldb-adapter"
-ActiveRecord::Base.establish_connection adapter: :nulldb
-
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f }
 
 RSpec.configure do |config|
-  config.order = 'random'
+  config.order = "random"
 
   config.extend ControllerHelpers
   config.extend FailureMessageHelpers
-  config.extend ModelHelpers
   config.extend WithContextsHelpers
   config.include MatchHelpers
 end

data/spec/warp/action_matchers/create_matcher_spec.rb

@@ -1,10 +1,12 @@
 require "spec_helper"
 
 describe Warp::ActionMatchers::CreateMatcher do
-  build_model do
-    column :foo
+  let(:model) do
+    JamJar.model do
+      column :foo, :string
 
-    validates :foo, presence: true
+      validates :foo, presence: true
+    end
   end
 
   before { Warp::Instrument.for(model, Warp::ActionMatchers::CreateMatcher::CREATE_METHOD).calls << Object.new }

data/spec/warp/action_matchers/destroy_matcher_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+
+describe Warp::ActionMatchers::DestroyMatcher do
+  let(:model) { JamJar.model }
+
+  let!(:instance) { model.create }
+
+  before { Warp::Instrument.for(model, Warp::ActionMatchers::DestroyMatcher::DESTROY_METHOD).calls << Object.new }
+
+  subject { destroy(model) }
+
+  with_contexts do
+    context "when destroyed with #destroy" do
+      let(:block) { -> { instance.destroy } }
+    end
+
+    context "when destroyed with #destroy_all" do
+      let(:block) { -> { model.destroy_all } }
+    end
+
+    behaviour do        
+      specify { expect(subject).to match block }
+    end
+  end
+
+  context "when nothing destroyed" do
+    let(:block) { -> { return } }
+
+    specify { expect(subject).to_not match block }
+  end
+
+  describe "#desciption" do
+    subject { super().description }
+
+    specify { expect(subject).to eq "destroy a TestModel" }
+  end
+
+  describe_failure_message do
+    specify { expect(subject).to eq "expected a TestModel to be destroyed" }
+  end
+
+  describe_failure_message_when_negated do
+    specify { expect(subject).to eq "expected no TestModel to be destroyed" }
+  end
+end

data/spec/warp/instrument_spec.rb

@@ -3,10 +3,13 @@ require "spec_helper"
 describe Warp::Instrument do
   let(:klass) { Class.new }
   let(:method) { :foo }
+  let(:result) { Object.new }
   let(:instrument) { Warp::Instrument.for(klass, method) }
 
   before do
-    klass.send(:define_method, method) {|*_| return nil }
+    klass.class_eval { cattr_accessor :result }
+    klass.result = result
+    klass.send(:define_method, method) {|*_| return result }
   end
 
   describe ".for" do
@@ -44,7 +47,7 @@ describe Warp::Instrument do
     end
 
     context "when a call has been logged" do
-      let(:args) { [{baz: :quz}] }
+      let(:args) { [12, {baz: :quz}] }
 
       before do
         instrument.run do
@@ -52,7 +55,7 @@ describe Warp::Instrument do
         end
       end
 
-      specify { expect(subject).to eq [args] }
+      specify { expect(subject).to eq [[args, result]] }
     end
   end
 end

data/spec/warp/model_helpers/association_matcher_spec.rb

@@ -1,11 +1,13 @@
 require "spec_helper"
 
 describe Warp::ModelMatchers::AssociationMatcher, type: :model do
-  build_model do
-    belongs_to :foo
-    has_many :bars
-    has_one :baz
-    has_and_belongs_to_many :qux
+  let(:model) do
+    JamJar.model do
+      belongs_to :foo
+      has_many :bars
+      has_one :baz
+      has_and_belongs_to_many :qux
+    end
   end
 
   with_contexts do

data/spec/warp/model_helpers/attribute_matcher_spec.rb

@@ -1,8 +1,10 @@
 require "spec_helper"
 
 describe Warp::ModelMatchers::AttributeMatcher, type: :model do
-  build_model do
-    column :foo
+  let(:model) do
+    JamJar.model do
+      column :foo, :string
+    end
   end
 
   with_contexts do

data/spec/warp/model_helpers/validation_matcher_spec.rb

@@ -1,8 +1,10 @@
 require "spec_helper"
 
 describe Warp::ModelMatchers::ValidationMatcher, type: :model do
-  build_model do
-    column :foo
+  let(:model) do
+    JamJar.model do
+      column :foo, :string
+    end
   end
 
   let(:attr_name) { :foo }

data/warp.gemspec

@@ -17,5 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 1.9.2"
+
   spec.add_runtime_dependency "rspec", ">= 2.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warp
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Thomas Drake-Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -59,6 +59,7 @@ files:
 - lib/warp.rb
 - lib/warp/action_matchers.rb
 - lib/warp/action_matchers/create_matcher.rb
+- lib/warp/action_matchers/destroy_matcher.rb
 - lib/warp/action_matchers/matcher.rb
 - lib/warp/controller_matchers.rb
 - lib/warp/controller_matchers/assign_matcher.rb
@@ -76,9 +77,9 @@ files:
 - spec/support/controller_helpers.rb
 - spec/support/failure_message_helpers.rb
 - spec/support/match_helpers.rb
-- spec/support/model_helpers.rb
 - spec/support/with_contexts_helpers.rb
 - spec/warp/action_matchers/create_matcher_spec.rb
+- spec/warp/action_matchers/destroy_matcher_spec.rb
 - spec/warp/controller_matchers/assign_matcher_spec.rb
 - spec/warp/controller_matchers/set_flash_matcher_spec.rb
 - spec/warp/instrument_spec.rb
@@ -98,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -115,9 +116,9 @@ test_files:
 - spec/support/controller_helpers.rb
 - spec/support/failure_message_helpers.rb
 - spec/support/match_helpers.rb
-- spec/support/model_helpers.rb
 - spec/support/with_contexts_helpers.rb
 - spec/warp/action_matchers/create_matcher_spec.rb
+- spec/warp/action_matchers/destroy_matcher_spec.rb
 - spec/warp/controller_matchers/assign_matcher_spec.rb
 - spec/warp/controller_matchers/set_flash_matcher_spec.rb
 - spec/warp/instrument_spec.rb

data/spec/support/model_helpers.rb

@@ -1,41 +0,0 @@
-module ModelHelpers
-  def build_model(&blk)
-    let(:model) do
-      Class.new(ActiveRecord::Base) do
-        attr_accessor :id
-        
-        def self.name
-          "TestModel"
-        end
-
-        def self.primary_key
-          "id"
-        end
-
-        def self.columns
-          @columns ||= []
-        end
-
-        def self.attribute_names
-          @columns.map(&:name)
-        end
-
-        def self.attribute_method?(method)
-          method = method.to_s.sub("=", "")
-          columns.any? {|c| c.name == method }
-        end
-
-        def self.column(name, sql_type = "varchar(255)", default = nil, null = true)
-          if ActiveRecord::ConnectionAdapters::AbstractAdapter.method_defined?(:lookup_cast_type)
-            cast_type = ActiveRecord::ConnectionAdapters::AbstractAdapter.new(nil, nil, nil).lookup_cast_type(sql_type)
-            columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, cast_type, sql_type.to_s, null)
-          else
-            columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
-          end
-        end
-
-        instance_eval(&blk) if blk
-      end
-    end
-  end
-end