action_args 1.0.1 → 1.0.2

data/README.rdoc

@@ -36,7 +36,7 @@ Hence, raises an error if the `id` value has not been specified, in the same way
     end
   end
 
-If you don't want ActionArgs to check the existence of some action parameters, you can make them optional by defining option values.
+If you don't want ActionArgs to check the existence of some action parameters, you can make them optional by defining their default values.
 Again, it just acts in the same way as usual Ruby methods do.
 
   class UsersController < ApplicationController

data/lib/action_args/abstract_controller.rb

@@ -6,17 +6,16 @@ module AbstractController
       values = if defined? ActionController::StrongParameters
         target_model_name = self.class.name.sub(/Controller$/, '').singularize.underscore.to_sym
         permitted_attributes = self.class.instance_variable_get '@permitted_attributes'
-        method(method_name).parameters.map {|type, key|
-          next if type == :block
+        method(method_name).parameters.reject {|type, _| type == :block }.map do |type, key|
           params.require key if type == :req
           if (key == target_model_name) && permitted_attributes
             params[key].try :permit, *permitted_attributes
           else
             params[key]
           end
-        }.compact
+        end
       else
-        method(method_name).parameters.map {|type, key| params[key] unless type == :block }.compact
+        method(method_name).parameters.reject {|type, _| type == :block }.map(&:last).map {|key| params[key]}
       end
       send method_name, *values
     end

data/lib/action_args/version.rb

@@ -1,3 +1,3 @@
 module ActionArgs
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/controllers/action_args_controller_spec.rb

@@ -11,6 +11,14 @@ describe BooksController do
       before { get :index, page: 3 }
       its(:response) { should be_success }
     end
+
+    context 'first param is nil and second is not nil' do
+      let!(:rhg) { Book.create! title: 'RHG' }
+      let!(:awdwr) { Book.create! title: 'AWDwR' }
+      before { get :index, q: 'RH' }
+      subject { assigns :books }
+      it { should == [rhg] }
+    end
   end
 
   describe 'GET show' do

data/spec/fake_app.rb

@@ -40,8 +40,9 @@ class AuthorsController < ApplicationController
 end
 class BooksController < ApplicationController
   # optional parameter
-  def index(page = 1)
-    @books = Book.limit(10).offset((page.to_i - 1) * 10)
+  def index(page = 1, q = nil)
+    @books = Book.limit(10).offset(([page.to_i - 1, 0].max) * 10)
+    @books = @books.where('title like ?', "%#{q}%") unless q.blank?
     render text: 'index'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3