cancan-unit-test 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 152e62cc388cf4a4ac5318cf460adf7f6f2bd725
-  data.tar.gz: 5bbe663f37bc9787002e0ccfb1b42c66f1c2f9c9
+  metadata.gz: e9eac8ccda8627bf87ea9a3300901414fac3806c
+  data.tar.gz: 727e13fa64a7f78ccca27ea3c62f7af510ba3a76
 SHA512:
-  metadata.gz: 5ad368e034e59e0f45df4c3206081c002120b619478067d1d92f7d1bd8ac48d563249e052b52ab7671e4488c8e26b67c9c3de98641998f41dabb3f363e72ffc7
-  data.tar.gz: ed0744b2111cefbaba0f5e6ab24302873609bb04236472cd2005a4faf4d148e4a0c541886b36728c09dc3a6fbefe80705fd3f9c18fd95de761f493a870ff101e
+  metadata.gz: 22bd573b90db60fe476fa4546e3bd812629cf547555310bed7f082d56a05400b5ada2e4e06b16cf32fa07cc9568c468c4135ed943d0df4466aee74d76126c04e
+  data.tar.gz: 9924637bb57e3054df0c80a796104bc060a9400e675a37304705ee1be9c1ac3e9028762ea8d9708d6fcb0b3832d533bc49098f43c321428e3f7217dd04ae01c8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cancan-unit-test (0.0.4)
+    cancan-unit-test (0.0.5)
       activesupport
       cancan
 

data/cancan_unit_test.gemspec

@@ -6,7 +6,7 @@ require 'cancan_unit_test/version'
 Gem::Specification.new do |gem|
   gem.name          = "cancan-unit-test"
   gem.version       = CancanUnitTest::VERSION
-  gem.authors       = ["Todd Mohney, Rasheed Abdul-Aziz"]
+  gem.authors       = ["Todd Mohney, Rasheed Abdul-Aziz, Alex Babkin, Peter Swan"]
   gem.email         = ["zephyr-dev@googlegroups.com"]
   gem.description   = %q{Unit test helpers for CanCan}
   gem.summary       = %q{Unit test helpers for CanCan}

data/integration/controllers/comments_controller_spec.rb

@@ -30,7 +30,5 @@ describe CommentsController do
         assigns(:post_author).should == post_author
       end
     end
-
   end
-
 end

data/integration/fixtures/dummy/app/controllers/comments_controller.rb

@@ -6,6 +6,5 @@ class CommentsController < ApplicationController
   def index
     head :ok
   end
-
 end
 

data/lib/cancan_unit_test/action_controller/stub_registry.rb

@@ -2,9 +2,9 @@ module CancanUnitTest
   module ActionController
     module StubRegistry
 
-      def _add_cancan_unit_test_stub(method, resource_type, model, options, &block)
+      def _add_cancan_unit_test_stub(method, resource_type, resource, options, &block)
         method_list = _get_cancan_unit_test_stubs(method)
-        method_list << { resource_type: resource_type, model: model, options: options, block: block }
+        method_list << { resource_type: resource_type, resource: resource, options: options, block: block }
       end
 
       def _get_cancan_unit_test_stubs(method)

data/lib/cancan_unit_test/cancan/controller_resource.rb

@@ -15,43 +15,41 @@ module CancanUnitTest
       end
 
       def _shim_load_and_authorize_resource
-        model_name = resource_class.model_name.underscore
         method_name = :load_and_authorize_resource
 
         stub_finder = StubFinder.new(@controller, method_name)
 
-        singleton_stub = stub_finder.find_by_singleton(model_name.to_sym, @options)
-        collection_stub = stub_finder.find_by_collection(model_name.to_sym, @options)
+        singleton_stub = stub_finder.find_by_singleton(name.to_sym, @options)
+        collection_stub = stub_finder.find_by_collection(name.to_sym, @options)
 
         if (singleton_stub || collection_stub)
           self.resource_instance = singleton_stub.call if singleton_stub
           self.collection_instance = collection_stub.call if collection_stub
         else
-          warn_about_missing_stub(model_name, method_name) if ControllerResource.show_warnings
+          warn_about_missing_stub(name.to_sym, method_name) if ControllerResource.show_warnings
           _original_load_and_authorize_resource
         end
       end
 
       def _shim_load_resource
-        model_name = resource_class.model_name.underscore
         method_name = :load_resource
 
         stub_finder = StubFinder.new(@controller, method_name)
 
-        singleton_stub = stub_finder.find_by_singleton(model_name.to_sym, @options)
+        singleton_stub = stub_finder.find_by_singleton(name.to_sym, @options)
 
         if singleton_stub
           self.resource_instance = singleton_stub.call if singleton_stub
         else
-          warn_about_missing_stub(model_name, method_name) if ControllerResource.show_warnings
+          warn_about_missing_stub(name.to_sym, method_name) if ControllerResource.show_warnings
           _original_load_resource
         end
       end
 
       private
 
-      def warn_about_missing_stub(model_name, method)
-        puts("\e[33mCancanUnitTest Warning:\e[0m no stub found for '#{method} :#{model_name}'")
+      def warn_about_missing_stub(name, method)
+        puts("\e[33mCancanUnitTest Warning:\e[0m no stub found for '#{method} :#{name}'")
         ControllerResource.show_warnings = false
       end
 

data/lib/cancan_unit_test/stub_finder.rb

@@ -5,18 +5,18 @@ module CancanUnitTest
       @stub_list = controller._get_cancan_unit_test_stubs(method)
     end
 
-    def find_by_singleton(model, options)
-      find_by_resource_type(model, :singleton, options)
+    def find_by_singleton(resource, options)
+      find_by_resource_type(resource, :singleton, options)
     end
 
-    def find_by_collection(model, options)
-      find_by_resource_type(model, :collection, options)
+    def find_by_collection(resource, options)
+      find_by_resource_type(resource, :collection, options)
     end
 
     private
 
-    def find_by_resource_type(model, resource_type, options)
-      filtered_stub_list = filter_stub_list(model, resource_type, options)
+    def find_by_resource_type(resource, resource_type, options)
+      filtered_stub_list = filter_stub_list(resource, resource_type, options)
 
       return nil if filtered_stub_list.empty?
 
@@ -25,11 +25,11 @@ module CancanUnitTest
       filtered_stub_list.first[:block]
     end
 
-    def filter_stub_list(model, resource_type, options)
+    def filter_stub_list(resource, resource_type, options)
       stub_list.select do |stub|
         stub[:resource_type] == resource_type &&
-          stub[:model] == model &&
-          stub[:options] == options 
+          stub[:resource] == resource &&
+          stub[:options] == options
       end
     end
 

data/lib/cancan_unit_test/version.rb

@@ -1,3 +1,3 @@
 module CancanUnitTest
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/cancan/controller_resource_spec.rb

@@ -3,11 +3,10 @@ require 'spec_helper'
 module CancanUnitTest
   module CanCan
     describe ControllerResource do
-
       class TestControllerResource
-        def initialize(model_name, options, controller)
+        def initialize(name, options, controller)
           @options = options
-          @model_name = model_name
+          @name = name
           @controller = controller
         end
 
@@ -23,29 +22,27 @@ module CancanUnitTest
           raise "original called"
         end
 
-        def resource_class
-          OpenStruct.new({ model_name: @model_name })
-        end
+        attr_reader :name
 
         include CancanUnitTest::CanCan::ControllerResource
       end
 
-      describe "#load_and_authorize_resource" do
+      let(:name) { :the_name }
+      let(:controller_resource) { TestControllerResource.new(name, options, controller) }
 
-        let(:controller_resource) { TestControllerResource.new(model_name, options, controller) }
-        let(:model_name) { "TheModelName" }
-        let_double(:controller)
-        let_double(:options)
+      let_double(:controller)
+      let_double(:options)
 
-        let_double(:block_result)
-        let(:block) { double(:block, call: block_result) }
+      let_double(:block_result)
+      let(:block) { double(:block, call: block_result) }
 
-        let_double(:stub_finder)
+      let_double(:stub_finder)
 
+      describe "#load_and_authorize_resource" do
         before do
           StubFinder.stub(:new).with(controller, :load_and_authorize_resource) { stub_finder }
-          stub_finder.stub(:find_by_singleton).with(:the_model_name, options) { singleton_results }
-          stub_finder.stub(:find_by_collection).with(:the_model_name, options) { collection_results }
+          stub_finder.stub(:find_by_singleton).with(:the_name, options) { singleton_results }
+          stub_finder.stub(:find_by_collection).with(:the_name, options) { collection_results }
         end
 
         context "when a stub doesn't exist for the resource" do
@@ -59,7 +56,7 @@ module CancanUnitTest
           context "when showing warning" do
             it "does not warn that there was no stub found" do
               ControllerResource.show_warnings = true
-              STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :the_model_name'")
+              STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :the_name'")
               begin
                 controller_resource.load_and_authorize_resource
               rescue
@@ -70,7 +67,7 @@ module CancanUnitTest
           context "when suppressing warning" do
             it "warns that there was no stub found" do
               ControllerResource.show_warnings = false
-              STDOUT.should_not_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :the_model_name'")
+              STDOUT.should_not_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_and_authorize_resource :the_name'")
               begin
                 controller_resource.load_and_authorize_resource
               rescue
@@ -111,20 +108,9 @@ module CancanUnitTest
       end
 
       describe "#load_resource" do
-
-        let(:controller_resource) { TestControllerResource.new(model_name, options, controller) }
-        let(:model_name) { "TheModelName" }
-        let_double(:controller)
-        let_double(:options)
-
-        let_double(:block_result)
-        let(:block) { double(:block, call: block_result) }
-
-        let_double(:stub_finder)
-
         before do
           StubFinder.stub(:new).with(controller, :load_resource) { stub_finder }
-          stub_finder.stub(:find_by_singleton).with(:the_model_name, options) { singleton_results }
+          stub_finder.stub(:find_by_singleton).with(:the_name, options) { singleton_results }
         end
 
         context "when a stub doesn't exist for the resource" do
@@ -137,7 +123,7 @@ module CancanUnitTest
           context "when showing warning" do
             it "does not warn that there was no stub found" do
               ControllerResource.show_warnings = true
-              STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_resource :the_model_name'")
+              STDOUT.should_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_resource :the_name'")
               begin
                 controller_resource.load_resource
               rescue
@@ -148,7 +134,7 @@ module CancanUnitTest
           context "when suppressing warning" do
             it "warns that there was no stub found" do
               ControllerResource.show_warnings = false
-              STDOUT.should_not_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_resource :the_model_name'")
+              STDOUT.should_not_receive(:puts).with("\e[33mCancanUnitTest Warning:\e[0m no stub found for 'load_resource :the_name'")
               begin
                 controller_resource.load_resource
               rescue

data/spec/rails/action_controller/stub_registry_spec.rb

@@ -11,14 +11,14 @@ module CancanUnitTest
 
       subject(:test_controller) { TestController.new }
 
-      let(:model) { :some_model }
+      let(:resource) { :some_resource }
       let(:options) { double(:options) }
       let(:block) { ->{} }
 
       let(:expected_singleton_definition) do
         {
           resource_type: :singleton,
-          model: model,
+          resource: resource,
           options: options,
           block: block
         }
@@ -27,7 +27,7 @@ module CancanUnitTest
       let(:expected_collection_definition) do
         {
           resource_type: :collection,
-          model: model,
+          resource: resource,
           options: options,
           block: block
         }
@@ -45,26 +45,26 @@ module CancanUnitTest
 
         context "added one stub" do
           before do
-            test_controller._add_cancan_unit_test_stub(:falaffel, :singleton, model, options, &block)
+            test_controller._add_cancan_unit_test_stub(:falaffel, :singleton, resource, options, &block)
           end
 
           it "should be possible to find the stub with a matching key" do
             test_controller._get_cancan_unit_test_stubs(:falaffel).should == [expected_singleton_definition]
           end
 
-          context "adding another with the same model name" do
+          context "adding another with the same resource name" do
             let(:another_singleton_definition) do
               {
                 resource_type: :singleton,
-                model: model,
-                  options: options,
-                  block: block
+                resource: resource,
+                options: options,
+                block: block
               }
             end
 
             context "and the same resource type" do
               before do
-                test_controller._add_cancan_unit_test_stub(:falaffel, :singleton, model, options, &block)
+                test_controller._add_cancan_unit_test_stub(:falaffel, :singleton, resource, options, &block)
               end
 
               it "returns both stubs" do
@@ -76,7 +76,7 @@ module CancanUnitTest
 
             context "and a different resource type" do
               before do
-                test_controller._add_cancan_unit_test_stub(:falaffel, :collection, model, options, &block)
+                test_controller._add_cancan_unit_test_stub(:falaffel, :collection, resource, options, &block)
               end
 
               it "returns both stubs" do
@@ -87,20 +87,19 @@ module CancanUnitTest
             end
           end
 
-
-          context "adding another with a different model name" do
+          context "adding another with a different resource name" do
             let(:waffle_options) { { syrup: :maple } }
             let(:waffle_stub_definition) do
               {
                 resource_type: :singleton,
-                model: model,
+                resource: resource,
                 options: waffle_options,
                 block: block
               }
             end
 
             before do
-              test_controller._add_cancan_unit_test_stub(:waffle, :singleton, model, waffle_options, &block)
+              test_controller._add_cancan_unit_test_stub(:waffle, :singleton, resource, waffle_options, &block)
             end
 
             it "return the other definition" do

data/spec/stub_finder_spec.rb

@@ -4,14 +4,14 @@ module CancanUnitTest
   describe StubFinder do
     let_double(:controller)
     let_double(:method)
-    let_double(:model)
+    let_double(:resource)
     let_double(:options)
     let_double(:block)
 
     let(:finder) { StubFinder.new(controller, method) }
 
     describe "#find_by_singleton" do
-      subject { finder.find_by_singleton(model, options) }
+      subject { finder.find_by_singleton(resource, options) }
 
       before do
         controller.
@@ -26,18 +26,18 @@ module CancanUnitTest
       end
 
       context "the controller has a stub for the method" do
-        context "with no matching model" do
-          let(:results) { [{ resource_type: :singleton, model: double(:other_model), options: options, block: block }] }
+        context "with no matching resource" do
+          let(:results) { [{ resource_type: :singleton, resource: double(:other_resource), options: options, block: block }] }
           it { should be_nil }
         end
 
         context "with no matching options" do
-          let(:results) { [{ resource_type: :singleton, model: model, options: double(:other_options), block: block }] }
+          let(:results) { [{ resource_type: :singleton, resource: resource, options: double(:other_options), block: block }] }
           it { should be_nil }
         end
 
-        context "with matching model and options" do
-          let(:results) { [{ resource_type: :singleton, model: model, options: options, block: block }] }
+        context "with matching resource and options" do
+          let(:results) { [{ resource_type: :singleton, resource: resource, options: options, block: block }] }
           it { should == block }
         end
       end
@@ -46,8 +46,8 @@ module CancanUnitTest
         context "with a different resource type" do
           let(:results) do
             [
-              { resource_type: :collection, model: model, options: options, block: -> {} },
-              { resource_type: :singleton, model: model, options: options, block: block }
+              { resource_type: :collection, resource: resource, options: options, block: -> {} },
+              { resource_type: :singleton, resource: resource, options: options, block: block }
             ]
           end
 
@@ -57,13 +57,13 @@ module CancanUnitTest
         context "with the same resource type" do
           let(:results) do
             [
-              { resource_type: :singleton, model: model, options: options, block: block },
-              { resource_type: :singleton, model: model, options: options, block: block }
+              { resource_type: :singleton, resource: resource, options: options, block: block },
+              { resource_type: :singleton, resource: resource, options: options, block: block }
             ]
           end
 
           it "raises an exception" do
-            expect { finder.find_by_singleton(model, options) }.to raise_error
+            expect { finder.find_by_singleton(resource, options) }.to raise_error
           end
         end
       end
@@ -71,7 +71,7 @@ module CancanUnitTest
     end
 
     describe "#find_by_collection" do
-      subject { finder.find_by_collection(model, options) }
+      subject { finder.find_by_collection(resource, options) }
 
       before do
         controller.
@@ -83,8 +83,8 @@ module CancanUnitTest
       context "with a different resource type" do
         let(:results) do
           [
-            { resource_type: :singleton, model: model, options: options, block: -> {} },
-            { resource_type: :collection, model: model, options: options, block: block }
+            { resource_type: :singleton, resource: resource, options: options, block: -> {} },
+            { resource_type: :collection, resource: resource, options: options, block: block }
           ]
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cancan-unit-test
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
-- Todd Mohney, Rasheed Abdul-Aziz
+- Todd Mohney, Rasheed Abdul-Aziz, Alex Babkin, Peter Swan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Unit test helpers for CanCan