bhm-admin 0.1.4 → 0.2.0

data/bhm-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bhm-admin}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-07-18}
+  s.date = %q{2010-07-27}
   s.description = %q{Provides a reasonably dynamic and simple to use admin area for Rails 3 application. Built on a bunch of open source libraries.}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [

data/lib/bhm/admin/attr_accessible_scoping.rb

@@ -8,7 +8,11 @@ module BHM
         attr_accessor :verbose
 
         def disabled?
-          !!Thread.current[:attr_accessible_disabled]
+          !enabled?
+        end
+
+        def enabled?
+          !Thread.current[:attr_accessible_disabled]
         end
 
         def disable!
@@ -22,29 +26,40 @@ module BHM
         def disable
           disabled = disabled?
           disable! if !disabled
-          begin
-            yield if block_given?
-          ensure
-            enable! if disabled
-          end
+          yield if block_given?
+        ensure
+          enable! if disabled
         end
 
       end
 
-      module ARMixin
+      class Sanitizer < ActiveModel::MassAssignmentSecurity::WhiteList
 
-        def self.included(parent)
-          parent.alias_method_chain :remove_attributes_protected_from_mass_assignment, :global_disable
+        def deny?(attribute)
+          return false if BHM::Admin::AttrAccessibleScoping.disabled? || self.include?("all")
+          super
         end
 
-        def remove_attributes_protected_from_mass_assignment_with_global_disable(attributes)
-          unless AttrAccessibleScoping.disabled? || (self.class.accessible_attributes && self.class.accessible_attributes.include?("all"))
-            trusted_attributes = Array(self.class.accessible_attributes)
-            attributes.each_pair do |k, v|
-              raise UnassignableAttribute, "The attribute #{k} can't be assigned on #{self.class.name}" unless trusted_attributes.include?(k.to_s.gsub(/\(\d+\w\)$/, ''))
+        protected
+
+        def warn!(attrs)
+          super
+          raise UnassignableAttribute.new("Unable to assign attributes: #{attrs.join(", ")}")
+        end
+
+      end
+
+      module ARMixin
+
+        def accessible_attributes
+          if _accessible_attributes.blank? || !_accessible_attributes.is_a?(BHM::Admin::AttrAccessibleScoping::Sanitizer)
+            existing = _accessible_attributes
+            self._accessible_attributes = BHM::Admin::AttrAccessibleScoping::Sanitizer.new.tap do |w|
+              w.logger = self.logger if self.respond_to?(:logger)
             end
+            self._accessible_attributes += existing if existing.present?
           end
-          attributes
+          _accessible_attributes
         end
 
       end

data/lib/bhm/admin/engine.rb

@@ -1,16 +1,9 @@
 module BHM
   module Admin
     class Engine < Rails::Engine
-            
-      # paths.config.locales     = BHM::Admin.root.join('config', 'locales')
-      # paths.config.controllers = BHM::Admin.root.join('app', 'controller')
-      # paths.config.views       = BHM::Admin.root.join('app', 'views')
-      
-      initializer :configure_compass do
-      end
       
       initializer :extend_activerecord do
-        ActiveRecord::Base.send :include, BHM::Admin::AttrAccessibleScoping::ARMixin
+        ActiveRecord::Base.extend BHM::Admin::AttrAccessibleScoping::ARMixin
       end
       
     end

data/lib/bhm/admin.rb

@@ -3,7 +3,7 @@ require 'active_support'
 module BHM
   module Admin
     
-    VERSION = "0.1.4".freeze
+    VERSION = "0.2.0".freeze
     
     # Helpers for use in the admin area.
     autoload :SidebarHelper,         'bhm/admin/sidebar_helper'
@@ -30,6 +30,18 @@ module BHM
       [SidebarHelper, PresentationHelper, NestedFormHelper]
     end
     
+    def self.disable_attr_accessible(&blk)
+      AttrAccessibleScoping.disable(&blk)
+    end
+
+    def self.disable_attr_accessible!
+      AttrAccessibleScoping.disable!
+    end
+
+    def self.enable_attr_accessible!
+      AttrAccessibleScoping.enable!
+    end
+
     # Hook into rails.
     require 'bhm/admin/engine'            if defined?(Rails::Engine)
     require 'bhm/admin/compass_framework' if defined?(Compass)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bhm-admin
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 +08:00
+date: 2010-07-27 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency