has_scope 0.4 → 0.4.1

data/README.rdoc

@@ -22,7 +22,7 @@ Now, if you want to apply them to an specific resource, you just need to call <t
     has_scope :by_degree
 
     def index
-      @graduations = apply_scopes(Graduations).all
+      @graduations = apply_scopes(Graduation).all
     end
   end
 
@@ -54,26 +54,19 @@ If you want it as plugin, just do:
 
 HasScope supports several options:
 
-* <tt>:type</tt> - Checks the type of the parameter sent. If set to :boolean
-                   it just calls the named scope, without any argument. By default,
-                   it does not allow hashes or arrays to be given, except if type
-                   :hash or :array are set.
+* <tt>:type</tt> - Checks the type of the parameter sent. If set to :boolean it just calls the named scope, without any argument. By default, it does not allow hashes or arrays to be given, except if type :hash or :array are set.
 
 * <tt>:only</tt> - In which actions the scope is applied.
 
 * <tt>:except</tt> - In which actions the scope is not applied.
 
-* <tt>:as</tt> - The key in the params hash expected to find the scope.
-                 Defaults to the scope name.
+* <tt>:as</tt> - The key in the params hash expected to find the scope. Defaults to the scope name.
 
-* <tt>:if</tt> - Specifies a method, proc or string to call to determine
-                 if the scope should apply
+* <tt>:if</tt> - Specifies a method, proc or string to call to determine if the scope should apply.
 
-* <tt>:unless</tt> - Specifies a method, proc or string to call to determine
-                     if the scope should NOT apply.
+* <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the scope should NOT apply.
 
-* <tt>:default</tt> - Default value for the scope. Whenever supplied the scope
-                      is always called.
+* <tt>:default</tt> - Default value for the scope. Whenever supplied the scope is always called.
 
 * <tt>:allow_blank</tt> - Blank values are not sent to scopes by default. Set to true to overwrite.
 

data/Rakefile

@@ -27,7 +27,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "has_scope"
-    s.version = "0.4"
+    s.version = "0.4.1"
     s.summary = "Maps controller filters to your resource scopes"
     s.email = "contact@plataformatec.com.br"
     s.homepage = "http://github.com/plataformatec/has_scope"

data/lib/has_scope.rb

@@ -12,9 +12,7 @@ module HasScope
     base.class_eval do
       extend ClassMethods
       helper_method :current_scopes
-
       class_inheritable_hash :scopes_configuration, :instance_writer => false
-      self.scopes_configuration ||= {}
     end
   end
 
@@ -63,16 +61,13 @@ module HasScope
     def has_scope(*scopes, &block)
       options = scopes.extract_options!
       options.symbolize_keys!
-
-      if options.delete(:boolean)
-        options[:type] ||= :boolean
-        ActiveSupport::Deprecation.warn(":boolean => true is deprecated, use :type => :boolean instead", caller)
-      end
       options.assert_valid_keys(:type, :only, :except, :if, :unless, :default, :as, :allow_blank)
 
       options[:only]   = Array(options[:only])
       options[:except] = Array(options[:except])
 
+      self.scopes_configuration ||= {}
+
       scopes.each do |scope|
         self.scopes_configuration[scope] ||= { :as => scope, :type => :default, :block => block }
         self.scopes_configuration[scope].merge!(options)
@@ -94,6 +89,8 @@ module HasScope
   #   end
   #
   def apply_scopes(target)
+    return target unless scopes_configuration
+
     self.scopes_configuration.each do |scope, options|
       next unless apply_scope_to_action?(options)
       key = options[:as]
@@ -119,7 +116,7 @@ module HasScope
     if type == :boolean
       current_scopes[key] = TRUE_VALUES.include?(value)
     elsif ALLOWED_TYPES[type].none?{ |klass| value.is_a?(klass) }
-      raise "Expected type :#{type} in params[:#{key}], got :#{value.class}"
+      raise "Expected type :#{type} in params[:#{key}], got #{value.class}"
     else
       current_scopes[key] = value
     end
@@ -127,10 +124,12 @@ module HasScope
 
   # Apply the scope taking into account its type.
   def apply_scope_by_type(type, scope, target, value, block) #:nodoc:
-    return target if type == :boolean && value == false
-
     if type == :boolean
-      block ? block.call(self, target) : target.send(scope)
+      if value
+        block ? block.call(self, target) : target.send(scope)
+      else
+        target
+      end
     else
       block ? block.call(self, target, value) : target.send(scope, value)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: has_scope
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 +01:00
+date: 2010-01-29 00:00:00 +01:00
 default_executable: 
 dependencies: []