datts_right 0.0.25 → 0.0.26

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    datts_right (0.0.24)
+    datts_right (0.0.25)
       datts_right
+      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/

data/VERSION

@@ -1 +1 @@
-0.0.25
+0.0.26

data/datts_right.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datts_right}
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-04-27}
   s.description = %q{Creates a separate table that saves all your dynamic attributes.}
   s.email = %q{ramon@tayag.net}
   s.extra_rdoc_files = [

data/lib/datts_right/instance_methods.rb

@@ -118,13 +118,14 @@ module DattsRight
 
     def create_dynamic_attribute_definition_if_needed
       if dynamic_attributes_options[:definition]
-        DynamicAttributeDefinition.create :attribute_defineable_id => self.id, :attribute_defineable_type => self.class.name
+        DynamicAttributeDefinition.create :attribute_defineable_id => self.id, :attribute_defineable_type => self.class.name, :definition => {}
       end
     end
 
     def add_definition(key, value)
       if key
         key = key.to_sym
+        #puts "add_definition(:#{key}, #{value.inspect}). current definition: #{definition.nil?}"
         if dynamic_attributes_options[:definition]
           if definition[key]
             raise AlreadyDefined, "#{key} is already defined"
@@ -153,14 +154,14 @@ module DattsRight
             #puts "#{v} IS a hash"
             add_definition k, v
           else # v is not a hash; item is like {"name"=>"A key", "attr_key"=>"a_key"}, {"name"=>"B key", "attr_key"=>"b_key"}
-            #puts "#{v} is not a hash"
-            #puts "item is: #{item.inspect}. item.first: #{item.first.inspect}"
-            item.symbolize_keys! # {:name=>"A key", :description=>"asd", :attr_key=>"a_key"}
+            # Sometimes the item is a ActiveRecord::HashWithIndifferentAccess, which doesn't have the method symbolize_keys!, so we do it manually
+            #item = item.symbolize_keys # {:name=>"A key", :description=>"asd", :attr_key=>"a_key"}
             #puts "item is symbolized: #{item.inspect}"
-            attr_key = item.delete(:attr_key)
+            attr_key = item.delete("attr_key")
             #puts "This is the attr_key: #{attr_key}"
             if attr_key # we only want to work on it if there's an attr_key
               attr_key = attr_key.to_sym
+              #puts "Adding: :#{attr_key}, #{item.inspect}"
               add_definition(attr_key, item)
             end
           end

data/spec/datts_right/add_definitions_spec.rb

@@ -15,15 +15,22 @@ describe DattsRight, ".add_definitions(hash)" do
   it "should accept 'flat' hashes in an array (straight from a form)" do
     # [{"name"=>"A key", "description"=>"asd", "attr_key"=>"a_key"}, {"name"=>"A key", "description"=>"asd", "attr_key"=>"b_key"}]
     c = Category.create
-    c.should_receive(:add_definition).with(:a_key, {:name=>"A key"})
-    c.should_receive(:add_definition).with(:b_key, {:name=>"B key"})
+    c.should_receive(:add_definition).with(:a_key, {"name"=>"A key"})
+    c.should_receive(:add_definition).with(:b_key, {"name"=>"B key"})
     c.add_definitions({"name"=>"A key", "attr_key"=>"a_key"}, {"name"=>"B key", "attr_key"=>"b_key"})
     c = Category.create
-    c.should_receive(:add_definition).with(:a_key, {:name=>"A key"})
-    c.should_receive(:add_definition).with(:b_key, {:name=>"B key"})
+    c.should_receive(:add_definition).with(:a_key, {"name"=>"A key"})
+    c.should_receive(:add_definition).with(:b_key, {"name"=>"B key"})
     c.add_definitions([{"name"=>"A key", "attr_key"=>"a_key"}, {"name"=>"B key", "attr_key"=>"b_key"}])
   end
 
+  # HashWithIndifferentAccess is something Rails seems to use for the params hash
+  it "should work with HashWithIndifferentAccess" do
+    hash = ActiveSupport::HashWithIndifferentAccess.new("name"=>"A key", "attr_key"=>"a_key")
+    c = Category.create
+    lambda {c.add_definitions(hash)}.should_not raise_error(NoMethodError)
+  end
+
   it "should not explode if nil is passed" do
     lambda {Category.create.add_definitions(nil)}.should_not raise_error(NoMethodError)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datts_right
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 0
-  - 25
-  version: 0.0.25
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 +08:00
+date: 2011-04-27 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency