permitters 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTE2MWYzNGU3OWQ3NzllN2E1M2NjZDg5ZWQzMzY3YWM1ZmNjOTk2Yg==
-  data.tar.gz: !binary |-
-    YWM5ODEyZGFmMGJkOWUwNzYwMWI3MzVlOGY0MjEyY2ViMTYxZWY3ZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWQxZWU1YjIzNWYyOGY5OWQ5ODE5ZmRkNTllNzA2NmRkMDQwZTdhNzVkNTMy
-    MzMzMDNkZWEyNWU2YzdlYjM3NjRlMzFmZDE0MDE5Mjg5NzdjOTQwOWIyMTU5
-    MjE0MTc2YTJlYjVmZDdiMGZjYWFkZWNjMTU2N2UyM2E3ZGZmNTU=
-  data.tar.gz: !binary |-
-    NmNjMDMwYWJiODE1NjI2NGI4YTgwZDg3MDM1YmQ1ODYzOTc1OTU4NGFlMTFi
-    NDAwMDQ3M2I4MDA0MDM2ODZmNjBiYTM3MWMzN2I5Y2UwNjJjZDY1OGZlODE3
-    YTJlY2RjOTQyNDdkNGQ3Mjc5OTgzNzNhZDRlM2ExZjk0Y2U1Y2I=
+SHA1:
+  metadata.gz: f351ee08b99b4cf2f20067b636ec23b480e36219
+  data.tar.gz: fda272a871a9ed928c5e299792b6991242c46906
+SHA512:
+  metadata.gz: f02e98b29e0b14095d7a58d36640775bc4ac8c7376b1a883a906705c3938fcb80940d8148b0475d8e509c91bc17fe16edf5e9066e82c9c65f74a2828915e9cfd
+  data.tar.gz: 78c0568d329074e5745ed2936f1c647e2f80ccac7d1a983fa1a5d3dc785e9bce0b7fdd9f16f8973f8c147ff07815b136203735a965381354506a44b40ebb7d0a

data/Rakefile

@@ -3,7 +3,7 @@ require 'bundler/gem_tasks'
 require 'appraisal'
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec_for_appraisal)
 
 # Override the default task
 task :default => [] # Just in case it hasn't already been set
@@ -12,8 +12,12 @@ task :default => :appraise
 
 task :appraise do |t|
   if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
-    Rake::Task[:spec].invoke
+    Rake::Task[:spec_for_appraisal].invoke
   else
     exec 'rake appraisal:install && rake appraisal'
   end
 end
+
+task :spec do |t|
+  warn "To run the specs please use `rake` (or for faster tests, `rake appraise`)"
+end

data/lib/action_controller/permitter.rb

@@ -1,5 +1,7 @@
 module ActionController
   class PermitterAttribute < Struct.new(:name, :options); end
+  class PermitterError < StandardError #:nodoc:
+  end 
   class Permitter
 
     # Application-wide configuration
@@ -12,17 +14,10 @@ module ActionController
       # To change this value, use the `resource` class method.
       def inherited(subclass)
         subclass.class_eval do
-          class_attribute :permitted_attributes
-          class_attribute :resource_name
+          class_attribute :permitted_attributes, :resource_name_override
+          private_class_method :resource_name_override, :resource_name_override=
 
           self.permitted_attributes = []
-          name = self.name
-
-          # in Rails 3.2+ could do:
-          # name.demodulize.chomp('Permitter').underscore.to_sym
-          # Rails < 3.2
-          last_index = name.rindex('::')
-          self.resource_name = (last_index ? name[(last_index+2)..-1] : name).chomp('Permitter').underscore.to_sym
         end
       end
 
@@ -41,7 +36,17 @@ module ActionController
       end
 
       def resource(name)
-        self.resource_name = name
+        self.resource_name_override = name
+      end
+
+      def resource_name
+        name = self.name
+
+        # in Rails 3.2+ could do:
+        # name.demodulize.chomp('Permitter').underscore.to_sym
+        # Rails < 3.2
+        last_index = name.rindex('::')
+        resource_name_override || (last_index ? name[(last_index+2)..-1] : name).chomp('Permitter').underscore.to_sym
       end
     end
 
@@ -64,7 +69,9 @@ module ActionController
       permitted_attributes.select {|a| a.options[:authorize]}.each do |attribute|
         scope_name = attribute.options[:scope]
         values = scope_name ? Array.wrap(@filtered_params[scope_name]).collect {|hash| hash[attribute.name]}.compact : Array.wrap(@filtered_params[attribute.name])
-        klass = (attribute.options[:as].try(:to_s) || attribute.name.to_s.split(/(.+)_ids?/)[1]).classify.constantize
+        klass_name = attribute.options[:as].try(:to_s) || attribute.name.to_s.split(/(.+)_ids?/)[1]
+        raise PermitterError.new("Cannot permit #{attribute.name.inspect} unless you specify the the attribute name (e.g. :something_id or :something_ids), or a class name via the :as option (e.g. :as => Something)") unless klass_name
+        klass = klass_name.classify.constantize
 
         values.each do |record_id|
           record = klass.find record_id
@@ -81,6 +88,9 @@ module ActionController
       authorizer ? authorizer.__send__(:authorize!, *args, &block) : nil
     end
 
+    def resource_name
+      self.class.resource_name
+    end
 
   private
 

data/lib/permitters/version.rb

@@ -1,3 +1,3 @@
 module Permitters
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: permitters
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Adam Hawkins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies: []
 description: Permitters are an object-oriented way of defining what request parameters
   are permitted. using Strong Parameters. It is to Strong Parameters what ActiveModel::Serializers
@@ -38,17 +38,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Object-oriented parameter authorization with Strong Parameters