hydra_attribute 0.3.1 → 0.3.2.beta

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**0.3.1 (July 28, 2012)**
+* Fix bug "ActiveModel::MassAssignmentSecurity::Error: Can't mass-assign protected attributes: name, backend_type, default_value" during creation hydra attributes 
+
 **0.3.0 (July 27, 2012)**
 * All attribibutes are now stored in database
 * Support default value for attributes

data/README.md

@@ -71,11 +71,15 @@ Product.hydra_attributes.create(name: 'title', backend_type: 'string')
 Product.hydra_attributes.create(name: 'total', backend_type: 'integer', default_value: 1)
 ```
 
-So we created three hydra attributes: **color**, **title** and **total**.
-* `name` is **required** and it is the name of attribute.  
-* `backend_type` is **required** and tells us in what table the value for this attribute will be stored.
-The whole list of allowed backend types are: `string`, `text`, `integer`, `float`, `boolean` and `datetime`  
-* `default_value` is **optional** and it sets the default value for attribute.
+Creating method accepts the following options:
+* **name**. The **required** parameter. Allowed any string.   
+* **backend_type**. The **required** parameter. Allowed one of the following strings: `string`, `text`, `integer`, `float`, `boolean` and `datetime`.
+* **default_value**. The **optional** parameter. Allowed any value. By default is `nil`.
+* **white_list**. The **optional** parameter. Should be `true` or `flase`. By defauls is `false`. if pass `white_list: true` this attribute will be added to white list and will be allowed for mass-assignment. This parameter is in black list for creation by default so if you want to pass it, you have to pass the role `as: :admin` too.
+
+  ```ruby
+    Product.hydra_attributes.create({name: 'title', backend_type: 'string', white_list: true}, as: :admin)
+  ```
 
 ##### Create several objects
 

data/features/attributes/create.feature

@@ -3,20 +3,20 @@ Feature: create hydra attributes
   Then entity should respond to it
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" model with attributes as "hashes":
-      | entity_type | name  | backend_type |
-      | Product     | price | float        |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name           | backend_type   | white_list     |
+      | [string:price] | [string:float] | [boolean:true] |
 
   Scenario: create hydra attribute in runtime
     # Important: when respond_to? is called the hydra attributes are being loaded for entity class
     Then model "Product" should respond to "price"
-    Given create "HydraAttribute::HydraAttribute" model with attributes as "hashes":
-      | entity_type | name  | backend_type |
-      | Product     | title | string       |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name  | backend_type |
+      | title | string       |
     Then model "Product" should respond to "title"
 
   Scenario: create hydra attribute from entity class
-    Given create "hydra_attributes" association for "Product" with attributes as "hashes":
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
       | name | backend_type |
       | code | integer      |
     Then model "Product" should respond to "code"

data/features/attributes/destroy.feature

@@ -4,15 +4,14 @@ Feature: destroy hydra attributes
   And all values for this attribute should be removed
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" model with attributes as "hashes":
-      | entity_type | name  | backend_type |
-      | Product     | price | float        |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name           | backend_type   | white_list     |
+      | [string:price] | [string:float] | [boolean:true] |
 
   Scenario: destroy hydra attribute in runtime
     Given create "Product" model with attributes as "rows_hash":
       | price | 10 |
-    When destroy all "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name  |
-      | Product     | price |
+    When destroy all "HydraAttribute::HydraAttribute" models with attributes as "rows_hash":
+      |name | price |
     Then model "Product" should not respond to "price"
     And total "HydraAttribute::HydraFloatProduct" records should be "0"

data/features/attributes/update.feature

@@ -3,9 +3,9 @@ Feature: update hydra attribute
   Then model should be notified about this
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" model with attributes as "hashes":
-      | entity_type | name | backend_type | default_value |
-      | Product     | code | integer      | 1             |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name          | backend_type     | default_value | white_list     |
+      | [string:code] | [string:integer] | [integer:1]   | [boolean:true] |
 
   Scenario: update default value in runtime
     Given create "Product" model

data/features/create.feature

@@ -3,13 +3,13 @@ Feature: create models with hydra attributes
   Then hydra attributes should be saved with default values
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name    | backend_type | default_value       |
-      | Product     | code    | string       | [nil:]              |
-      | Product     | price   | float        | [string:0]          |
-      | Product     | active  | boolean      | [string:0]          |
-      | Product     | info    | text         | [string:]           |
-      | Product     | started | datetime     | [string:2012-01-01] |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name             | backend_type      | default_value       | white_list     |
+      | [string:code]    | [string:string]   | [nil:]              | [boolean:true] |
+      | [string:price]   | [string:float]    | [string:0]          | [boolean:true] |
+      | [string:active]  | [string:boolean]  | [string:0]          | [boolean:true] |
+      | [string:info]    | [string:text]     | [string:]           | [boolean:true] |
+      | [string:started] | [string:datetime] | [string:2012-01-01] | [boolean:true] |
 
   Scenario: create model without hydra attributes
     Given create "Product" model

data/features/define.feature

@@ -3,10 +3,10 @@ Feature: define hydra attributes
   Then entity should respond to attributes which are saved in hydra_attributes table
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name  | backend_type |
-      | Product     | code  | string       |
-      | Product     | price | float        |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name           | backend_type    |
+      | [string:code]  | [string:string] |
+      | [string:price] | [string:float]  |
 
   Scenario Outline: models should respond to hydra attributes
       Then model "<model>" <action> respond to "<attributes>"

data/features/destroy.feature

@@ -3,13 +3,13 @@ Feature: destroy model
   Then all associated values should be deleted too
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name    | backend_type | default_value       |
-      | Product     | code    | string       | [nil:]              |
-      | Product     | price   | float        | [string:0]          |
-      | Product     | active  | boolean      | [string:0]          |
-      | Product     | info    | text         | [string:]           |
-      | Product     | started | datetime     | [string:2012-01-01] |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name             | backend_type      | default_value       | white_list     |
+      | [string:code]    | [string:string]   | [nil:]              | [boolean:true] |
+      | [string:price]   | [string:float]    | [string:0]          | [boolean:true] |
+      | [string:active]  | [string:boolean]  | [string:0]          | [boolean:true] |
+      | [string:info]    | [string:text]     | [string:]           | [boolean:true] |
+      | [string:started] | [string:datetime] | [string:2012-01-01] | [boolean:true] |
 
   Scenario: destroy model
     Given create "Product" model with attributes as "hashes":

data/features/query_methods/group.feature

@@ -3,11 +3,11 @@ Feature: group conditions by hydra attributes
   Then correct table should be joined and group condition should be added
 
   Background: create models and describe hydra attributes
-    Given create "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name  | backend_type |
-      | Product     | code  | integer      |
-      | Product     | title | string       |
-      | Product     | total | integer      |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name           | backend_type     | white_list     |
+      | [string:code]  | [string:integer] | [boolean:true] |
+      | [string:title] | [string:string]  | [boolean:true] |
+      | [string:total] | [string:integer] | [boolean:true] |
     Given create "Product" model with attributes as "hashes":
       | name       | code        | title      | total       |
       | [string:a] | [integer:1] | [string:q] | [integer:5] |

data/features/query_methods/order.feature

@@ -12,11 +12,11 @@ Feature: order conditions by hydra attributes
   Then old hydra attributes should be removed and new should be added
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name  | backend_type |
-      | Product     | code  | integer      |
-      | Product     | state | integer      |
-      | Product     | title | string       |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name           | backend_type     | white_list     |
+      | [string:code]  | [string:integer] | [boolean:true] |
+      | [string:state] | [string:integer] | [boolean:true] |
+      | [string:title] | [string:string]  | [boolean:true] |
 
   Scenario Outline: order by one field
     Given create "Product" model with attributes as "hashes":

data/features/query_methods/select.feature

@@ -3,14 +3,14 @@ Feature: select concrete attributes
   Then model should response only to these attributes
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name     | backend_type |
-      | Product     | code     | integer      |
-      | Product     | price    | float        |
-      | Product     | title    | string       |
-      | Product     | note     | text         |
-      | Product     | active   | boolean      |
-      | Product     | schedule | datetime     |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name              | backend_type      | white_list     |
+      | [string:code]     | [string:integer]  | [boolean:true] |
+      | [string:price]    | [string:float]    | [boolean:true] |
+      | [string:title]    | [string:string]   | [boolean:true] |
+      | [string:note]     | [string:text]     | [boolean:true] |
+      | [string:active]   | [string:boolean]  | [boolean:true] |
+      | [string:schedule] | [string:datetime] | [boolean:true] |
     And create "Product" model with attributes as "hashes":
       | name       | code        | price     | title      | note       | active          | schedule              |
       | [string:a] | [integer:1] | [float:4] | [string:q] | [string:z] | [boolean:true]  | [datetime:2012-06-01] |

data/features/query_methods/where.feature

@@ -6,14 +6,14 @@ Feature: hydra attribute where conditions
   Then records with nil and blank value should be selected
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name    | backend_type |
-      | Product     | code    | string       |
-      | Product     | summary | string       |
-      | Product     | title   | string       |
-      | Product     | price   | float        |
-      | Product     | active  | boolean      |
-      | Product     | state   | integer      |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name             | backend_type     | white_list     |
+      | [string:code]    | [string:string]  | [boolean:true] |
+      | [string:summary] | [string:string]  | [boolean:true] |
+      | [string:title]   | [string:string]  | [boolean:true] |
+      | [string:price]   | [string:float]   | [boolean:true] |
+      | [string:active]  | [string:boolean] | [boolean:true] |
+      | [string:state]   | [string:integer] | [boolean:true] |
 
   Scenario: filter by one hydra attribute
     Given create "Product" model with attributes as "hashes":

data/features/step_definitions/model_steps.rb

@@ -8,6 +8,12 @@ Given /^create "([^"]+)" model with attributes as "([^"]+):"$/ do |klass, format
   end
 end
 
+Given /^create hydra attributes for "([^"]+)" with role "([^"]+)" as "([^"]+)":$/ do |klass, role, format, table|
+  Array.wrap(table.send(format)).each do |hash|
+    klass.constantize.hydra_attributes.create!(type_cast_hash(hash), as: role.to_sym)
+  end
+end
+
 Given /^(load and )?(save|create|update(?: all| attributes)?|destroy(?: all)?|delete(?: all)?)(?: for)? "([^"]+)" models? with attributes as "([^"]+)":$/ do |load, action, klass, format, table|
   action = action.gsub(' ', '_')
   klass  = klass.constantize
@@ -20,12 +26,6 @@ Given /^(load and )?(save|create|update(?: all| attributes)?|destroy(?: all)?|de
   end
 end
 
-Given /^create "([^"]+)" association for "([^"]+)" with attributes as "([^"]+)":$/ do |association, klass, format, table|
-  Array.wrap(table.send(format)).each do |hash|
-    klass.constantize.send(association).create(hash)
-  end
-end
-
 Then /^model "([^"]+)" (should(?:\snot)?) respond to "([^"]+)"$/ do |klass, method, attributes|
   model  = klass.constantize.new
   method = method.gsub(/\s+/, '_')

data/features/support/env.rb

@@ -3,11 +3,16 @@ require 'hydra_attribute'
 require 'database_cleaner'
 require 'database_cleaner/cucumber'
 
+ActiveSupport.on_load(:active_record) do
+  self.attr_accessible :name # we create entity model with one column "name" for testing
+  self.default_timezone = :utc
+  unless ActiveRecord::VERSION::STRING.start_with?('3.1.')
+    self.mass_assignment_sanitizer = :strict
+  end
+  extend HydraAttribute::ActiveRecord
+end
 
-ActiveRecord::Base.default_timezone = :utc
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
-ActiveRecord::Base.extend(HydraAttribute::ActiveRecord)
-
 DatabaseCleaner.strategy = :truncation
 
 Before do

data/features/support/schema.rb

@@ -10,6 +10,7 @@ ActiveRecord::Schema.define do
     t.string   "name",          :limit => 32, :null => false
     t.string   "backend_type",  :limit => 16, :null => false
     t.string   "default_value"
+    t.boolean  "white_list",                  :null => false, :default => false
     t.datetime "created_at",                  :null => false
     t.datetime "updated_at",                  :null => false
   end

data/features/update.feature

@@ -3,11 +3,11 @@ Feature: update hydra attributes
   Then entity should be touched
 
   Background: create hydra attributes
-    Given create "HydraAttribute::HydraAttribute" models with attributes as "hashes":
-      | entity_type | name  | backend_type | default_value |
-      | Product     | code  | string       | [string:###]  |
-      | Product     | title | string       |               |
-      | Product     | total | integer      | [integer:1]   |
+    Given create hydra attributes for "Product" with role "admin" as "hashes":
+      | name           | backend_type     | default_value | white_list     |
+      | [string:code]  | [string:string]  | [string:###]  | [boolean:true] |
+      | [string:title] | [string:string]  |               | [boolean:true] |
+      | [string:total] | [string:integer] | [integer:1]   | [boolean:true] |
     And create "Product" model
 
   Scenario Outline: update attributes

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
   specs:
-    hydra_attribute (0.3.0.beta1)
+    hydra_attribute (0.3.2.beta)
       activerecord (>= 3.1.0)
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/kostyantyn/Sites/github/gems/hydra_attribute
   specs:
-    hydra_attribute (0.3.0.beta1)
+    hydra_attribute (0.3.2.beta)
       activerecord (>= 3.1.0)
 
 GEM

data/lib/hydra_attribute/builder.rb

@@ -19,9 +19,22 @@ module HydraAttribute
     end
 
     def build
+      build_associations
+      build_white_list
+    end
+
+    private
+
+    def build_associations
       SUPPORT_TYPES.each do |type|
         AssociationBuilder.build(klass, type)
       end
     end
+
+    def build_white_list
+      klass.hydra_attributes.each do |hydra_attribute|
+        klass.accessible_attributes.add(hydra_attribute.name) if hydra_attribute.white_list?
+      end
+    end
   end
 end

data/lib/hydra_attribute/hydra_attribute.rb

@@ -4,7 +4,10 @@ module HydraAttribute
   class HydraAttribute < ActiveRecord::Base
     self.table_name = 'hydra_attributes'
 
-    attr_accessible :name, :backend_type, :default_value
+    with_options as: [:default, :admin] do |klass|
+      klass.attr_accessible :name, :backend_type, :default_value
+    end
+    attr_accessible :white_list, as: :admin
 
     with_options presence: true do |klass|
       klass.validates :entity_type,  inclusion: { in: lambda { |attr| [(attr.entity_type.constantize.name rescue nil)] } }
@@ -23,7 +26,19 @@ module HydraAttribute
     end
 
     def reload_entity_attributes
-      entity_type.constantize.reset_hydra_attribute_methods
+      entity_type.constantize.reset_hydra_attribute_methods # TODO should not remove all generated methods just for this attribute
+      destroyed? ? remove_from_white_list : add_to_white_list
+    end
+
+    # Add attribute to white list for entity if it has a white list mark
+    def add_to_white_list
+      entity_type.constantize.accessible_attributes.add(name) if white_list?
+    end
+
+    # Don't check if this attribute is in white list or has a white list mark.
+    # Just remove it from white list for entity
+    def remove_from_white_list
+      entity_type.constantize.accessible_attributes.remove(name)
     end
   end
 end

data/lib/hydra_attribute/migrator.rb

@@ -47,10 +47,11 @@ module HydraAttribute
 
     def create_attribute
       create_table :hydra_attributes do |t|
-        t.string :entity_type,  limit: 32, null: false
-        t.string :name,         limit: 32, null: false
-        t.string :backend_type, limit: 16, null: false
-        t.string :default_value
+        t.string  :entity_type,  limit: 32, null: false
+        t.string  :name,         limit: 32, null: false
+        t.string  :backend_type, limit: 16, null: false
+        t.string  :default_value
+        t.boolean :white_list,              null: false, default: false
         t.timestamps
       end
       add_index :hydra_attributes, [:entity_type, :name], unique: true, name: 'hydra_attributes_index'

data/lib/hydra_attribute/version.rb

@@ -1,3 +1,3 @@
 module HydraAttribute
-  VERSION = '0.3.1'
+  VERSION = '0.3.2.beta'
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: hydra_attribute
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Kostyantyn Stepanyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000Z
+date: 2012-07-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152245340 !ruby/object:Gem::Requirement
+  requirement: &2152216280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152245340
+  version_requirements: *2152216280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152244520 !ruby/object:Gem::Requirement
+  requirement: &2152215740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152244520
+  version_requirements: *2152215740
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152243160 !ruby/object:Gem::Requirement
+  requirement: &2152215160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152243160
+  version_requirements: *2152215160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152241780 !ruby/object:Gem::Requirement
+  requirement: &2152214620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152241780
+  version_requirements: *2152214620
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2152240900 !ruby/object:Gem::Requirement
+  requirement: &2152214080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152240900
+  version_requirements: *2152214080
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2152240020 !ruby/object:Gem::Requirement
+  requirement: &2152191360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152240020
+  version_requirements: *2152191360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152238740 !ruby/object:Gem::Requirement
+  requirement: &2152190940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152238740
+  version_requirements: *2152190940
 description: hydra_attribute is an implementation of EAV pattern for ActiveRecord
   models.
 email: kostya.stepanyuk@gmail.com
@@ -164,9 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10