custom-attributes 0.2.1 → 0.2.2

data/Gemfile

@@ -2,9 +2,13 @@ source :gemcutter
 
 # Rails 3.0
 gem 'rails',        '3.0.0'
-gem 'rspec',        '2.0.0.beta.22'
+gem 'rspec',        '2.0.0'
 gem 'sqlite3-ruby', :require => 'sqlite3'
 gem 'mysql'
 gem 'pg'
 gem 'jeweler'
-gem 'rcov'
+gem 'rcov'
+
+group :test do
+  gem 'formtastic'
+end

data/Gemfile.lock

@@ -34,6 +34,10 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    formtastic (1.1.0)
+      actionpack (>= 2.3.0)
+      activesupport (>= 2.3.0)
+      i18n (>= 0.4.0)
     gemcutter (0.6.1)
     git (1.2.5)
     i18n (0.4.1)
@@ -42,7 +46,7 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
-    mail (2.2.6.1)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -70,20 +74,20 @@ GEM
       thor (~> 0.14.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     sqlite3-ruby (1.3.1)
-    thor (0.14.2)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -92,10 +96,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  formtastic
   jeweler
   mysql
   pg
   rails (= 3.0.0)
   rcov
-  rspec (= 2.0.0.beta.22)
+  rspec (= 2.0.0)
   sqlite3-ruby

data/README.markdown

@@ -12,7 +12,7 @@ Contents of the package
 
 * Extension for ActiveRecord
 * Extension for Formtastic (including jQuery widget)
-* Extension for Cucumber
+* Extension for Cucumber for integration testing
 
 Usage
 =====

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/active_record/custom_attributes.rb

@@ -108,10 +108,15 @@ module ActiveRecord
       end
 
       module InstanceMethods
+
         def custom_attributes
           @custom_attributes ||= ActiveRecord::CustomAttributes::CustomAttributeList.new(self)
         end
 
+        def custom_attributes= post_data
+          custom_attributes.set_post_data post_data
+        end
+
         private
 
         def cache_custom_attributes

data/lib/active_record/custom_attributes/custom_attribute.rb

@@ -4,16 +4,35 @@ class ActiveRecord::CustomAttributes::CustomAttribute
     @main_model = main_model
     @item_list = item_list
     @attribute_model = attribute_model
+    @marked_for_deletion = false
     load if @attribute_model
   end
 
-  attr_accessor :type, :value, :label, :internal_label
+  [:type, :value, :label, :internal_label].each do |property|
+    attr_accessor property
+
+    define_method "#{property}_with_activation=" do |new_value|
+      @marked_for_deletion = false
+      send("#{property}_without_activation=".to_sym, new_value)
+    end
+    alias_method_chain "#{property}=".to_sym, :activation
+  end
 
   def rename_to new_name
     item_list.rename_label_of self, new_name
   end
 
+  def mark_for_deletion
+    @marked_for_deletion = true
+  end
+
+  def marked_for_deletion?
+    @marked_for_deletion
+  end
+
   def save
+    attribute_model.destroy and return if marked_for_deletion?
+
     attribute_model.value_type = type.to_s
     attribute_model.field_name = internal_label.to_s
     attribute_model.field_label = label

data/lib/active_record/custom_attributes/custom_attribute_list.rb

@@ -7,8 +7,25 @@ class ActiveRecord::CustomAttributes::CustomAttributeList
     define_attribute_methods
   end
 
+  def set_post_data(post_data)
+    loaded_attributes.each(&:mark_for_deletion)
+    post_data.each do |attribute_type, values|
+      attribute_type = attribute_type.to_sym
+      if supported_attribute_types.keys.include? attribute_type
+        label_list = values["label"]
+        value_list = values["value"]
+
+        label_list.each_with_index do |label, index|
+          add attribute_type, label, value_list[index]
+        end
+
+      end # TODO: Now what? Custom defined attributes also come here. Or should that be changed?
+    end
+  end
+
   def add(type, label, value)
     type = type.to_sym
+    return if label.blank? and value.respond_to? :blank? and value.blank?
     internal_label = convert_to_internal_label(type, label)
     attribute = get_attribute(type, internal_label || label, true)
     attribute.value = value
@@ -58,7 +75,7 @@ class ActiveRecord::CustomAttributes::CustomAttributeList
   end
 
   def attributes_of_type(type)
-    loaded_attributes.select { |i| i.type == type.to_sym }
+    loaded_attributes.select { |i| i.type == type.to_sym and !i.marked_for_deletion? }
   end
 
   private
@@ -104,6 +121,7 @@ class ActiveRecord::CustomAttributes::CustomAttributeList
 
   def get_value_of(type, internal_label)
     found = get_attribute(type, internal_label)
+    return nil if found and found.marked_for_deletion?
     found.value if found
   end
 

data/lib/formtastic/custom_attributes.rb

@@ -123,7 +123,11 @@ module Formtastic
     end
 
     def field_name_for(attribute_type, field_type)
-      "#{@object.class.model_name.underscore}[custom_attributes][#{attribute_type}][#{field_type}][]"
+      if @object.custom_attributes.supported_attribute_types.keys.include? attribute_type
+        "#{@object.class.model_name.underscore}[custom_attributes][#{attribute_type}][#{field_type}][]"
+      else
+        "#{@object.class.model_name.underscore}[#{attribute_type}][#{field_type}][]"
+      end
     end
 
     def custom_field_input(attribute_type, field_method_priority, label, value, options = {})

data/spec/custom_attributes/has_custom_attributes_spec.rb

@@ -21,7 +21,7 @@ describe "Custom attributes of a person" do
     clean_database!
 
     I18n.backend.store_translations :'nl', {
-      :activerecord => { :custom_attributes => { :person => { :telephone => { :private => "Prive" }}}}
+            :activerecord => {:custom_attributes => {:person => {:telephone => {:private => "Prive"}}}}
     }
     I18n.default_locale = 'nl'
 
@@ -43,7 +43,7 @@ describe "Custom attributes of a person" do
   it "should cache the 'born on' date locally" do
     @person.custom_attributes.add_date "Born on", Date.civil(1981, 5, 31)
     @person.save
-    @person.born_on.should == Date.civil(1981,5, 31)
+    @person.born_on.should == Date.civil(1981, 5, 31)
   end
 
   it "should store values in the database" do
@@ -83,6 +83,44 @@ describe "Custom attributes of a person" do
     @person.custom_attributes.defined_labels_for(:date).should =~ ["Born on", "Wed on", "Died on"]
   end
 
+  it "should mark attributes for deletion" do
+    @person.custom_attributes.add_telephone "Prive", "06 28 61 06 28"
+
+    fields = @person.custom_attributes.telephone_attributes
+    fields.should have(1).item
+    fields[0].mark_for_deletion
+
+    deleted_fields = @person.custom_attributes.telephone_attributes
+    deleted_fields.should have(0).items
+
+    @person.custom_attributes.telephone_value_of(:private).should == nil
+  end
+
+
+  it "should accept post data in an custom_attributes hash" do
+    # field format is #{@object.class.model_name.underscore}[custom_attributes][#{attribute_type}][#{field_type}][]
+
+    custom_attribute_post_data = {
+            "telephone" => {
+                    "label" => ["Prive", "Werk", ""],
+                    "value" => ["06 28 61 06 28", "1234567890", ""]
+            },
+            "email" => {
+                    "label" => ["Prive", ""],
+                    "value" => ["matthijs.groen@gmail.com", ""]
+            }
+    }
+
+    @person.custom_attributes = custom_attribute_post_data
+
+    fields = @person.custom_attributes.telephone_attributes
+    fields.should have(2).items
+    fields[0].value.should == "06 28 61 06 28"
+    fields[1].value.should == "1234567890"
+
+
+  end
+
 end
 
 describe "Custom attributes of a product" do

data/spec/models.rb

@@ -17,7 +17,6 @@ class Product < ActiveRecord::Base
     fields.url :details, :on_model => { :details => :details_url }
   end
 
-
 end
 
 class Location < ActiveRecord::Base

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: custom-attributes
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matthijs Groen