attr_accessible_block 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.6)
+    activesupport (3.0.7)
+    arel (2.0.9)
     builder (2.1.2)
     git (1.2.5)
     i18n (0.5.0)
@@ -22,8 +22,10 @@ GEM
     rake (0.8.7)
     rcov (0.9.9)
     shoulda (2.11.3)
-    sqlite3-ruby (1.3.2)
-    tzinfo (0.3.23)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,5 @@
-AttrAccessibleBlock 0.2
-=======================
+AttrAccessibleBlock 0.2.1
+=========================
 
 This is an ActiveRecord plugin with possibility to define block inside the `attr_accessible` class method.
 
@@ -12,7 +12,7 @@ It's also still possible to define class level accessibles, so an old `attr_acce
 Main features:
 
 * Possibility to add an accessible attributes based on current `record` state (eg. record.new_record?)
-* Possibility to add additional variables and use it in the block (eg. user.role) `ActiveRecord::AttrAccessibleBlock.before_options :user, lambda { User.current || User.new }`
+* Possibility to add additional variables and use it in the block (eg. user.role) `ActiveRecord::AttrAccessibleBlock.add_variable(:user) { User.current || User.new }`
 * Possibility to add permanently total accessibility in defined condition (eg.user.admin?) `ActiveRecord::AttrAccessibleBlock.always_accessible { user.admin? }`
 
 Also it's possible to check directly is attribute mass-assignable or no using `attr_accessible?` instance method.
@@ -22,7 +22,7 @@ See an examples to understand the conception.
 Installation
 ============
 
-    script/plugin install git://github.com//dmitry/attr_accessible_block.git
+    gem install attr_accessible_block
 
 Examples
 ========
@@ -69,7 +69,7 @@ How do I add something similar to `record`, for example I want to check current
 
 Easy, with `sentient_user` gem and add the code to the `config/initializers/plugins.rb` file:
 
-    ActiveRecord::AttrAccessibleBlock.before_options :user, lambda { User.current || User.new }
+    ActiveRecord::AttrAccessibleBlock.add_variable(:user) { User.current || User.new }
 
 Now `user` method available, you can check:
 

data/Rakefile

@@ -14,11 +14,11 @@ Jeweler::Tasks.new do |gem|
   gem.name = "attr_accessible_block"
   gem.homepage = "http://github.com/dmitry/attr_accessible_block"
   gem.license = "MIT"
-  gem.summary = %Q{Attribute accessible block (attr_accessible with a block, dynamic)}
-  gem.description = %Q{Now it's possible to change attr_accessible using definition of the required accessible attributes in a block.}
+  gem.summary = %Q{Attribute accessible block (attr_accessible with a dynamic block possibility)}
+  gem.description = %Q{Convinient possibility to change attr_accessible on the fly, using definition of the required accessible attributes in a block.}
   gem.email = "dmitry.polushkin@gmail.com"
   gem.authors = ["Dmitry Polushkin"]
-  gem.version = '0.2.0'
+  gem.version = '0.2.1'
   gem.add_runtime_dependency 'activerecord', '>= 2.3.5'
 end
 Jeweler::RubygemsDotOrgTasks.new

data/attr_accessible_block.gemspec

@@ -0,0 +1,75 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{attr_accessible_block}
+  s.version = "0.2.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Dmitry Polushkin"]
+  s.date = %q{2011-05-01}
+  s.description = %q{Convinient possibility to change attr_accessible on the fly, using definition of the required accessible attributes in a block.}
+  s.email = %q{dmitry.polushkin@gmail.com}
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "MIT-LICENSE",
+    "README.md",
+    "Rakefile",
+    "attr_accessible_block.gemspec",
+    "init.rb",
+    "install.rb",
+    "lib/attr_accessible_block.rb",
+    "tasks/attr_accessible_block_tasks.rake",
+    "test/schema.rb",
+    "test/test_attr_accessible_block.rb",
+    "test/test_helper.rb",
+    "uninstall.rb"
+  ]
+  s.homepage = %q{http://github.com/dmitry/attr_accessible_block}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{Attribute accessible block (attr_accessible with a dynamic block possibility)}
+  s.test_files = [
+    "test/schema.rb",
+    "test/test_attr_accessible_block.rb",
+    "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+  end
+end
+

data/lib/attr_accessible_block.rb

@@ -38,16 +38,21 @@ end
 class ActiveRecord::AttrAccessibleBlock < Array
   attr_reader :attrs, :record
 
+  @@variables = {}
+  @@always_accessible = nil
+
   def initialize(attrs, record, &block)
     @attrs = attrs
 
-    @@before_options.each do |name, func|
+    @@variables.each do |name, func|
       instance_variable_set("@#{name}", func.call)
     end
 
     @record = record
 
-    unless instance_eval(&@@always_accessible)
+    always_accessible = (@@always_accessible ? instance_eval(&@@always_accessible) : false)
+
+    unless always_accessible
       instance_eval(&block)
 
       flatten!
@@ -55,9 +60,8 @@ class ActiveRecord::AttrAccessibleBlock < Array
     end
   end
 
-  def self.before_options(name, func)
-    @@before_options ||= {}
-    @@before_options[name] = func
+  def self.add_variable(name, &block)
+    @@variables[name] = block
     attr_reader name
   end
 

data/test/test_attr_accessible_block.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
-ActiveRecord::AttrAccessibleBlock.before_options :user, lambda { User.current || User.new }
-ActiveRecord::AttrAccessibleBlock.always_accessible { 'admin' == user.role }
+ActiveRecord::AttrAccessibleBlock.add_variable(:user) { User.current || User.new }
 
 class AttrAccessibleBlockTest < Test::Unit::TestCase
   def setup
@@ -26,6 +25,10 @@ class AttrAccessibleBlockTest < Test::Unit::TestCase
   end
 
   def test_should_always_accessible
+    assert_nil ActiveRecord::AttrAccessibleBlock.send(:class_variable_get, :@@always_accessible)
+    ActiveRecord::AttrAccessibleBlock.always_accessible { 'admin' == user.role }
+    assert_not_nil ActiveRecord::AttrAccessibleBlock.send(:class_variable_get, :@@always_accessible)
+
     user = User.new(:email => 'test@test.com', :password => 'test', :profile_attributes => {:first_name => 'first name', :last_name => 'last name'})
     user.role = 'admin'
     assert user.save
@@ -34,6 +37,9 @@ class AttrAccessibleBlockTest < Test::Unit::TestCase
     assert_equal 'first name', user.profile.first_name
     assert user.update_attributes(:profile_attributes => {:id => user.profile.id, :first_name => 'first'})
     assert_equal 'first', user.profile.first_name
+
+    ActiveRecord::AttrAccessibleBlock.send(:class_variable_set, :@@always_accessible, nil)
+    assert_nil ActiveRecord::AttrAccessibleBlock.send(:class_variable_get, :@@always_accessible)
   end
 
   def test_should_change_only_on_create
@@ -57,7 +63,7 @@ class AttrAccessibleBlockTest < Test::Unit::TestCase
     assert_equal false, l.attr_accessible?(:code)
   end
 
-  def test_should_access_to_before_options_reader
+  def test_should_access_to_add_variable_reader
     user = User.new(:email => 'test@test.com', :password => 'test', :profile_attributes => {:first_name => 'first name', :last_name => 'last name'})
     user.role = 'manager'
     assert user.save

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: attr_accessible_block
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Dmitry Polushkin
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 +00:00
+date: 2011-05-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +31,12 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: bundler
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +61,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
   type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +77,12 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
+  prerelease: false
   type: :development
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +93,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: rcov
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,12 +107,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,9 +123,10 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
+  prerelease: false
   type: :runtime
-  version_requirements: *id007
-description: Now it's possible to change attr_accessible using definition of the required accessible attributes in a block.
+  requirement: *id007
+description: Convinient possibility to change attr_accessible on the fly, using definition of the required accessible attributes in a block.
 email: dmitry.polushkin@gmail.com
 executables: []
 
@@ -140,6 +140,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- attr_accessible_block.gemspec
 - init.rb
 - install.rb
 - lib/attr_accessible_block.rb
@@ -178,10 +179,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Attribute accessible block (attr_accessible with a block, dynamic)
+summary: Attribute accessible block (attr_accessible with a dynamic block possibility)
 test_files: 
 - test/schema.rb
 - test/test_attr_accessible_block.rb