active_restrictors 0.2.1 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== v0.2.2
+* Added support for formtastic to view helpers
+* Cleaned up dynamic method generation
+
 == v0.2.1
 * Restrictors not added if table does not exist (allows restrictors to be defined before migration has setup model)
 

data/lib/active_restrictors/active_restrictor.rb

@@ -223,34 +223,47 @@ module ActiveRestrictor
   end
 
   def self.included(klass)
+    patch_base_restrictors(klass) unless klass.instance_methods.include?(:add_restrictor)
+    patch_user_restrictors(klass)
+  end
+
+  def self.patch_base_restrictors(klass)
     # Patch up the model we have been called on
-    ([klass] + klass.descendants).compact.each do |base|
-      base.class_eval do
-        cattr_accessor :restrictors
-        
-        extend ClassMethods
-        include InstanceMethods
+    klass.class_eval do
+      cattr_accessor :restrictors
+      
+      extend ClassMethods
+      include InstanceMethods
 
-        unless(base.singleton_methods.map(&:to_sym).include?(:_restrictor_custom_user_class))
-          class << self
-            # This can be overridden for customization
-            def _restrictor_custom_user_class
-              User
-            end
+      unless(klass.singleton_methods.map(&:to_sym).include?(:_restrictor_custom_user_class))
+        class << self
+          # This can be overridden for customization
+          def _restrictor_custom_user_class
+            User
           end
         end
-        scope :allowed_for, lambda{|*args|
-          user = args.detect{|item|item.is_a?(User)}
-          if(user.present?)
-            r_scope = user.send("allowed_#{base.name.tableize}").select("#{base.table_name}.id")
-            r_scope.arel.ast.cores.first.projections.delete_if{|item| item != "#{base.table_name}.id"}
-            where("#{table_name}.id IN (#{r_scope.to_sql})")
-          else
-            where('null')
-          end
-        }
+      end
+      scope :allowed_for, lambda{|*args|
+        user = args.detect{|item|item.is_a?(User)}
+        if(user.present?)
+          r_scope = user.send("allowed_#{klass.name.tableize}").select("#{klass.table_name}.id")
+          r_scope.arel.ast.cores.first.projections.delete_if{|item| item != "#{klass.table_name}.id"}
+          where("#{table_name}.id IN (#{r_scope.to_sql})")
+        else
+          where('null')
+        end
+      }
+
+      class << self
+        def inherited(klass)
+          ActiveRestrictor.patch_user_restrictors(klass)
+          super
+        end
       end
     end
+  end
+
+  def self.patch_user_restrictors(klass)
     # Patch up the user to provide restricted methods
     ([klass._restrictor_custom_user_class] + klass._restrictor_custom_user_class.descendants).compact.each do |user_klass|
       user_klass.class_eval do

data/lib/active_restrictors/active_restrictor_views.rb

@@ -40,28 +40,42 @@ module ActiveRestrictors
             if(restrictor[:views][:user_values_only].respond_to?(:call))
               user = restrictor[:views][:user_values_only].call
               if(user)
-                values = user.send(restrictor[:name].to_sym).find(:all, :order => restrictor[:value])
+                values = user.send(restrictor[:name].to_sym).order(restrictor[:value]).all
               else
-                values = restrictor[:views][:user_values_only].send(restrictor[:name].to_sym).find(:all, :order => restrictor[:views][:value])
+                values = restrictor[:value][:user_values_only].send(restrictor[:name].to_sym).order(restrictor[:view][:value]).all
               end
             end
           end
           @_restrictor_inflector_helper ||= Class.send(:include, ActiveSupport::Inflector).new
           values = restrictor[:class].find(:all, :order => restrictor[:views][:value]) unless values
-          [
-            form.label(restrictor[:name]),
-            form.collection_select(
-              "#{@_restrictor_inflector_helper.singularize(restrictor[:name])}_ids",
-              values,
-              restrictor[:views][:id],
-              restrictor[:views][:value],
-              {
-                :include_blank => restrictor[:views][:include_blank],
-                :selected => Array(obj.send(restrictor[:name])).map(&restrictor[:views][:id].to_sym)
-              },
-              :multiple => restrictor[:views][:multiple]
+          if(defined?(Formtastic) && form.is_a?(Formtastic::FormBuilder))
+            form.input(
+              restrictor[:name],
+              :as => :select,
+              :collection => ActiveSupport::OrderedHash[
+                *restrictor[:class].order(restrictor[:views][:value]).all.map{|r|
+                  [r.send(restrictor[:views][:value]), r.id]
+                }.flatten
+              ],
+              :multiple => restrictor[:views][:multiple],
+              :include_blank => true
             )
-          ]
+          else
+            [
+              form.label(restrictor[:name]),
+              form.collection_select(
+                "#{@_restrictor_inflector_helper.singularize(restrictor[:name])}_ids",
+                values,
+                restrictor[:views][:id],
+                restrictor[:views][:value],
+                {
+                  :include_blank => restrictor[:views][:include_blank],
+                  :selected => Array(obj.send(restrictor[:name])).map(&restrictor[:views][:id].to_sym)
+                },
+                :multiple => restrictor[:views][:multiple]
+              )
+            ]
+          end
         end
       else
         []

data/lib/active_restrictors/version.rb

@@ -13,5 +13,5 @@ module ActiveRestrictors
     end
   end
 
-  VERSION = Version.new('0.2.1')
+  VERSION = Version.new('0.2.2')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_restrictors
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 -08:00
+date: 2012-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency