basic_assumption 0.3.8 → 0.3.9

data/lib/basic_assumption/default_assumption/restful_rails.rb

@@ -20,13 +20,14 @@ module BasicAssumption
       end
 
       # Returns a block that will attempt to do the correct thing depending
-      # on which action the request is triggering. If the action is 'show',
-      # 'edit', 'update', or 'destroy', then +assume+ will find an instance of
-      # an ActiveRecord model based on the +name+ that it recieved and an id
+      # on the plurality of the name passed to +assume+ and the action for the
+      # current request. If the name is singular and the action is not 'new'
+      # or 'create', then +assume+ will find an instance of
+      # an ActiveRecord model of the name that it received and an id
       # value in the parameters. If the action is 'new' or 'create', +assume+
       # will instantiate a new instance of the model class, passing in the
-      # values it finds in the +params+ hash with a key of the singularized
-      # form of the +name+ passed to +assume+. For example:
+      # values it finds in the +params+ hash with for a key of the name passed
+      # to +assume+. For example:
       #
       #    class WidgetController < ApplicationController
       #      default_assumption :restful_rails
@@ -38,16 +39,15 @@ module BasicAssumption
       #    end
       #
       # Note the object will have been instantiated but not saved, destroyed,
-      # etc. If the action is 'index', there are two possibilities for the
-      # behavior of +assume+. If the +name+ passed is of singular form, then
-      # a find will be performed, just as for a show or edit action. If the
-      # +name+ is a plural word, then +assume+ will find all instances of
-      # the model class.
+      # etc.
       #
-      # However, if the model responds to +paginate+ and there is a +page+
-      # key in the +params+ hash, +assume+ will attempt to paginate the
-      # results, also observing a +per_page+ value in the +params+ hash or
-      # defaulting to 15 if one is not found.
+      # If the name passed to assume is plural, there are two possibilities
+      # for the # behavior of +assume+. If the model responds to +paginate+ and
+      # there is a +page+ key in the +params+ hash, +assume+ will attempt to
+      # find all records of the model type paginated based on the +page+
+      # value in params and also a +per_page+ value. 15 will be the default
+      # if +per_page+ is not present. Otherwise, it returns all # records for
+      # the model.
       def block
         super
       end
@@ -57,17 +57,13 @@ module BasicAssumption
           list
         elsif make?
           model_class.new(resource_attributes)
-        else
+        elsif lookup?
           model_class.find(lookup_id)
         end
       end
 
       protected
 
-      def find? #:nodoc:
-        %w(show edit update destroy).include? action
-      end
-
       def list #:nodoc:
         if page?
           model_class.paginate('page' => page, 'per_page' => per_page)
@@ -77,7 +73,7 @@ module BasicAssumption
       end
 
       def list? #:nodoc:
-        action.eql?('index') && plural_name.eql?(name)
+       plural_name.eql?(name)
       end
 
       def lookup_id #:nodoc:
@@ -85,11 +81,11 @@ module BasicAssumption
       end
 
       def lookup? #:nodoc:
-        lookup_id.present?
+        lookup_id.present? && !list?
       end
 
       def make? #:nodoc:
-        %w(new create).include?(action) || !lookup?
+        %w(new create).include?(action) || !(lookup? || list?)
       end
 
       def page? #:nodoc:

data/lib/basic_assumption/version.rb

@@ -1,3 +1,3 @@
 module BasicAssumption
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

data/spec/lib/basic_assumption/default_assumption/restful_rails_spec.rb

@@ -22,136 +22,257 @@ describe BasicAssumption::DefaultAssumption::RestfulRails do
       default.stub!(:params).and_return(params)
     end
 
-    context "in the show action" do
-      let(:params)  { { 'id' => 42, 'action' => 'show' } }
+    context "when the name given to assume is plural" do
+      let(:name) { :models }
 
-      it "attempts to find a model instance based off the given name" do
-        Model.should_receive(:find).with(42).and_return(:model)
-        default.block.call(:model).should eql(:model)
+      context "without pagination" do
+        %w(create destroy edit index new show update).each do |action|
+          let(:params) { {'action' => action} }
+
+          context "when there is an id in the params" do
+            before { params['id'] = 123 }
+            context "when action is #{action}" do
+              before { Model.should_receive(:all) }
+              context "when 'page' exists in the request params" do
+                before { params['page'] = '5' }
+                it "finds all the records of the model class" do
+                  default.block.call(name)
+                end
+              end
+              context "when 'page' does not exist in the request params" do
+                it "finds all the records of the model class" do
+                  default.block.call(name)
+                end
+              end
+            end
+          end
+
+          context "when there is not an id in the params" do
+            context "when action is #{action}" do
+              before { Model.should_receive(:all) }
+              context "when 'page' exists in the request params" do
+                before { params['page'] = '5' }
+                it "finds all the records of the model class" do
+                  default.block.call(name)
+                end
+              end
+              context "when 'page' does not exist in the request params" do
+                it "finds all the records of the model class" do
+                  default.block.call(name)
+                end
+              end
+            end
+          end
+        end
       end
-    end
 
-    context "in the edit action" do
-      let(:params)  { { 'id' => 42, 'action' => 'edit' } }
+      %w(create destroy edit index new show update).each do |action|
+        let(:params) { {'action' => action} }
 
-      it "attempts to find a model instance based off the given name" do
-        Model.should_receive(:find).with(42).and_return(:model)
-        default.block.call(:model).should eql(:model)
+        context "with pagination" do
+          context "when there is an id in the params" do
+            before { params['id'] = 123 }
+            context "when action is #{action}" do
+              before { Model.stub! :paginate }
+              context "when 'page' exists in the request params" do
+                before { params['page'] = '5' }
+                it "paginates the records of the model class" do
+                  Model.should_receive(:paginate)
+                  default.block.call(name)
+                end
+                context "when 'per_page' exists in the request params" do
+                  it "paginates using 'page' and 'per_page' from the params" do
+                    params['per_page'] = '10'
+                    Model.should_receive(:paginate).with('page' => '5', 'per_page' => '10')
+                    default.block.call(name)
+                  end
+                end
+                context "when 'per_page' does not exist in the request params" do
+                  it "paginates using 'page' from the params and a default 'per_page' of 15" do
+                    Model.should_receive(:paginate).with('page' => '5', 'per_page' => '15')
+                    default.block.call(name)
+                  end
+                end
+              end
+              context "when 'page' does not exist in the request params" do
+                it "finds all the records of the model class" do
+                  Model.should_receive(:all)
+                  default.block.call(name)
+                end
+              end
+            end
+          end
+
+          context "when there is not an id in the params" do
+            context "when action is #{action}" do
+              before { Model.stub! :paginate }
+              context "when 'page' exists in the request params" do
+                before { params['page'] = '5' }
+                it "paginates the records of the model class" do
+                  Model.should_receive(:paginate)
+                  default.block.call(name)
+                end
+                context "when 'per_page' exists in the request params" do
+                  it "paginates using 'page' and 'per_page' from the params" do
+                    params['per_page'] = '10'
+                    Model.should_receive(:paginate).with('page' => '5', 'per_page' => '10')
+                    default.block.call(name)
+                  end
+                end
+                context "when 'per_page' does not exist in the request params" do
+                  it "paginates using 'page' from the params and a default 'per_page' of 15" do
+                    Model.should_receive(:paginate).with('page' => '5', 'per_page' => '15')
+                    default.block.call(name)
+                  end
+                end
+              end
+              context "when 'page' does not exist in the request params" do
+                it "finds all the records of the model class" do
+                  Model.should_receive(:all)
+                  default.block.call(name)
+                end
+              end
+            end
+          end
+        end
       end
     end
 
-    context "in the update action" do
-      let(:params)  do
-        { 'id' => 42 }
+    context "when the name given to assume is singular" do
+      let(:name) { :model }
+      context "in the index action" do
+        let(:params)  { { 'action' => 'index' } }
+        context "and there is an id in params" do
+          before { params['id'] = 1 }
+          it "attempts to find a model instance based off the given name" do
+            Model.should_receive(:find).with(1).and_return(name)
+            default.block.call(name).should eql(name)
+          end
+        end
+        context "and there is no id in params" do
+          before { params['model'] = :initializers }
+          it "creates a new model instance and passes in appropriate params" do
+            Model.should_receive(:new).with(:initializers).and_return(name)
+            default.block.call(name).should eql(name)
+          end
+        end
       end
 
-      it "attempts to find a model instance based off the given name" do
-        Model.should_receive(:find).with(42).and_return(:model)
-        default.block.call(:model).should eql(:model)
+      context "in the show action" do
+        let(:params)  { { 'id' => 42, 'action' => 'show' } }
+
+        it "attempts to find a model instance based off the given name" do
+          Model.should_receive(:find).with(42).and_return(name)
+          default.block.call(name).should eql(:model)
+        end
       end
-    end
 
-    context "in the destroy action" do
-      let(:params)  { { 'id' => 42, 'action' => 'destroy' } }
+      context "in the edit action" do
+        let(:params)  { { 'id' => 42, 'action' => 'edit' } }
 
-      it "attempts to find a model instance based off the given name" do
-        Model.should_receive(:find).with(42).and_return(:model)
-        default.block.call(:model).should eql(:model)
+        it "attempts to find a model instance based off the given name" do
+          Model.should_receive(:find).with(42).and_return(name)
+          default.block.call(name).should eql(:model)
+        end
       end
-    end
 
-    context "in the create action" do
-      let(:params) do
-        {
-          'action' => 'create',
-          'model'  => { 'age' => 27, 'color' => 'blue' }
-        }
+      context "in the update action" do
+        let(:params)  do
+          { 'id' => 42 }
+        end
+
+        it "attempts to find a model instance based off the given name" do
+          Model.should_receive(:find).with(42).and_return(name)
+          default.block.call(name).should eql(:model)
+        end
       end
 
-      context "the model instance" do
-      subject { default.block.call(:model) }
-        its(:age)   { should be(27) }
-        its(:color) { should eql('blue') }
+      context "in the destroy action" do
+        let(:params)  { { 'id' => 42, 'action' => 'destroy' } }
+
+        it "attempts to find a model instance based off the given name" do
+          Model.should_receive(:find).with(42).and_return(name)
+          default.block.call(name).should eql(:model)
+        end
       end
-    end
 
-    context "in the new action" do
-      let(:params) do
-        {
-          'action' => 'new',
-          'model'  => { 'age' => 27, 'color' => 'blue' }
-        }
+      context "in the create action" do
+        let(:params) do
+          {
+            'action' => 'create',
+            'model'  => { 'age' => 27, 'color' => 'blue' }
+          }
+        end
+
+        context "the model instance" do
+        subject { default.block.call(name) }
+          its(:age)   { should be(27) }
+          its(:color) { should eql('blue') }
+        end
       end
 
-      context "the model instance" do
-      subject { default.block.call(:model) }
-        its(:age)   { should be(27) }
-        its(:color) { should eql('blue') }
+      context "in the new action" do
+        let(:params) do
+          {
+            'action' => 'new',
+            'model'  => { 'age' => 27, 'color' => 'blue' }
+          }
+        end
+
+        context "the model instance" do
+        subject { default.block.call(name) }
+          its(:age)   { should be(27) }
+          its(:color) { should eql('blue') }
+        end
       end
     end
+  end
 
-    context "in the index action" do
-      let(:params)  { { 'action' => 'index' } }
-      context "when the name given to assume is plural" do
-        let(:name) { :models }
-        context "without pagination" do
-          before { Model.should_receive(:all) }
-          context "when 'page' exists in the request params" do
-            before { params['page'] = '5' }
-            it "finds all the records of the model class" do
-              default.block.call(name)
-            end
-          end
-          context "when 'page' does not exist in the request params" do
-            it "finds all the records of the model class" do
-              default.block.call(name)
-            end
-          end
+  context "#make?" do
+    let(:rr) { BasicAssumption::DefaultAssumption::RestfulRails.new }
+    subject { rr.send(:make?) }
+    before { rr.stub(:list? => false, :lookup? => false) }
+    context "when the action is not new or create" do
+      context "when #list? is true" do
+        before { rr.stub(:list? => true) }
+        context "when #lookup? is true" do
+          before { rr.stub(:lookup? => true) }
+          it { should be_false }
         end
-        context "with pagination" do
-          before { Model.stub! :paginate }
-          context "when 'page' exists in the request params" do
-            before { params['page'] = '5' }
-            it "paginates the records of the model class" do
-              Model.should_receive(:paginate)
-              default.block.call(name)
-            end
-            context "when 'per_page' exists in the request params" do
-              it "paginates using 'page' and 'per_page' from the params" do
-                params['per_page'] = '10'
-                Model.should_receive(:paginate).with('page' => '5', 'per_page' => '10')
-                default.block.call(name)
-              end
-            end
-            context "when 'per_page' does not exist in the request params" do
-              it "paginates using 'page' from the params and a default 'per_page' of 15" do
-                Model.should_receive(:paginate).with('page' => '5', 'per_page' => '15')
-                default.block.call(name)
-              end
-            end
-          end
-          context "when 'page' does not exist in the request params" do
-            it "finds all the records of the model class" do
-              Model.should_receive(:all)
-              default.block.call(name)
-            end
-          end
+        context "when #lookup? is false" do
+          it { should be_false }
         end
       end
-      context "when the name given to assume is singular" do
-        let(:name) { :model }
-        context "and there is an id in params" do
-          before { params['id'] = 1 }
-          it "attempts to find a model instance based off the given name" do
-            Model.should_receive(:find).with(1).and_return(:model)
-            default.block.call(name).should eql(:model)
+      context "when #list? is false" do
+        context "when #lookup? is true" do
+          before { rr.stub(:lookup? => true) }
+          it { should be_false }
+        end
+        context "when #lookup? is false" do
+          it { should be_true }
+        end
+      end
+    end
+    %w(new create).each do |action|
+      context "when the action is #{action}" do
+        before { rr.stub(:action => action) }
+        context "when #list? is true" do
+          before { rr.stub(:list? => true) }
+          context "when #lookup? is true" do
+            before { rr.stub(:lookup? => true) }
+            it { should be_true }
+          end
+          context "when #lookup? is false" do
+            it { should be_true }
           end
         end
-        context "and there is no id in params" do
-          before { params['model'] = :initializers }
-          it "creates a new model instance and passes in appropriate params" do
-            Model.should_receive(:new).with(:initializers).and_return(:model)
-            default.block.call(name).should eql(:model)
+        context "when #list? is false" do
+          context "when #lookup? is true" do
+            before { rr.stub(:lookup? => true) }
+            it { should be_true }
+          end
+          context "when #lookup? is false" do
+            it { should be_true }
           end
         end
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Matt Yoho
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -05:00
+date: 2010-06-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,7 @@ dependencies:
         version: 2.3.5
   type: :development
   version_requirements: *id003
-description: "\n    Allows a simple declarative idiom for accessing resources in controllers and views\n    "
+description: "\n    Allows a simple declarative idiom for accessing resources in controllers and views\n    via a well-defined interface that increases testability and reduces shared state.\n    "
 email: mby@mattyoho.com
 executables: []