action_args 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bc1d9d90cd395b886fc828a35a63c5d0064af53
-  data.tar.gz: 15bbdff4daa2bfa5413ed8a1a14f54770359fd87
+  metadata.gz: 3ccd1f7e360a0022028839049722507a17dd7cee
+  data.tar.gz: 47dbf523322610689ceebdab7262f48b5a1c81f4
 SHA512:
-  metadata.gz: 03ab97f8deb9229b3c1c158ad0d4a414324e848665c8ee3bf090dc4d9367a3bdf87d9991b9c054ae19436201dd10f942b1b401200d2b16949af994c2e1789c98
-  data.tar.gz: d1e480e53600b3a14e39741c85678f76fc8f3f1c3dba7a31b3fd27c9b1a5c7b40e911cfe37200e19e8dd7e05a5fa60b48ddc2789cbc93aefd6482f21c9ac6ea8
+  metadata.gz: 4120e5d6c4e0ad9e6d264859d98211cd9448f52138cf3fcb4918479195ab6f5c785dec3c8ea0335bc1d4573f7f86d926194965adc8da15feaaadf817d3b7036c
+  data.tar.gz: a6d93141be8036c6f3728489f9a305be1ca48a826342fa3d01af43bdbcff5b1d0716d0f123bbadd4a33b2685fbec853f4f390345872db6232dd904741af3523f

data/README.md

@@ -86,6 +86,16 @@ class UsersController < ApplicationController
 end
 ```
 
+By default, action_args deduces the target model name from the controller name.
+For example, the `permits` call in `UsersController` expects the model name to be `User`.
+If this is not the case, you can specify the :model_name option:
+
+```ruby
+class MembersController < ApplicationController
+  # white-lists User model's attributes
+  permits :name, :age, model_name: 'User'
+end
+```
 
 ## The Scaffold Generator
 

data/lib/action_args/abstract_controller.rb

@@ -24,6 +24,8 @@ module AbstractController
       #   end
       #
       def self.permits(*attributes)
+        options = attributes.extract_options!
+        @permitting_model_name = options[:model_name] if options.has_key? :model_name
         @permitted_attributes = attributes
       end
     # no StrongParameters

data/lib/action_args/params_handler.rb

@@ -25,8 +25,8 @@ module ActionArgs
     # permits declared model attributes in the params Hash
     # note that this method mutates the given params Hash
     def self.strengthen_params!(controller_class, method_parameters, params)
-      target_model_name = controller_class.name.sub(/.+::/, '').sub(/Controller$/, '').singularize.underscore.to_sym
-      permitted_attributes = controller_class.instance_variable_get '@permitted_attributes'
+      target_model_name = (controller_class.instance_variable_get(:'@permitting_model_name') || controller_class.name.sub(/.+::/, '').sub(/Controller$/, '')).singularize.underscore.to_sym
+      permitted_attributes = controller_class.instance_variable_get :'@permitted_attributes'
 
       method_parameters.each do |type, key|
         if (key == target_model_name) && permitted_attributes

data/lib/action_args/version.rb

@@ -1,3 +1,3 @@
 module ActionArgs
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/spec/mailers/action_mailer_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe UserMailer do
   describe '#send_email_without_args' do
     it "should not raise NameError: undefined local variable or method `params' for ..." do
-      expect{ UserMailer.send_email_without_args }.to_not raise_error(NameError)
+      expect{ UserMailer.send_email_without_args }.to_not raise_error
     end
   end
 end

data/spec/params_handler/params_handler_spec.rb

@@ -157,6 +157,14 @@ describe ActionArgs::ParamsHandler do
           end
         KWARGS_TEST
       end
+
+      describe '"model_name" option' do
+        let(:controller) { PiyoController ||= Class.new(ApplicationController) { permits :a, :b, model_name: 'Foo'; def a(foo) end } }
+        subject { params[:foo] }
+        it { should be_permitted }
+        its([:a]) { should be }
+        its([:b]) { should be }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies: []
 description: Rails plugin gem that supports Merbish style controller action arguments.
 email:
@@ -76,3 +76,4 @@ test_files:
 - spec/mailers/action_mailer_spec.rb
 - spec/params_handler/params_handler_spec.rb
 - spec/spec_helper.rb
+has_rdoc: