datts_right 0.0.23 → 0.0.24

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/datts_right.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datts_right}
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
@@ -47,13 +47,18 @@ Gem::Specification.new do |s|
     "spec/datts_right/create_definitions_spec.rb",
     "spec/datts_right/definition_spec.rb",
     "spec/datts_right/dynamic_attribute_definition_spec.rb",
+    "spec/datts_right/dynamic_attribute_details_spec.rb",
     "spec/datts_right/find_by_dynamic_attribute_spec.rb",
     "spec/datts_right/inheritance_spec.rb",
+    "spec/datts_right/order_by_dynamic_attribute_spec.rb",
     "spec/datts_right/read_dynamic_attribute_spec.rb",
     "spec/datts_right/remove_definition_spec.rb",
     "spec/datts_right/remove_definitions_spec.rb",
     "spec/datts_right/remove_dynamic_attribute_spec.rb",
     "spec/datts_right/where_dynamic_attribute_spec.rb",
+    "spec/datts_right/with_dynamic_attribute_key_spec.rb",
+    "spec/datts_right/with_dynamic_attribute_type_spec.rb",
+    "spec/datts_right/write_dynamic_attribute_spec.rb",
     "spec/datts_right_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -72,13 +77,18 @@ Gem::Specification.new do |s|
     "spec/datts_right/create_definitions_spec.rb",
     "spec/datts_right/definition_spec.rb",
     "spec/datts_right/dynamic_attribute_definition_spec.rb",
+    "spec/datts_right/dynamic_attribute_details_spec.rb",
     "spec/datts_right/find_by_dynamic_attribute_spec.rb",
     "spec/datts_right/inheritance_spec.rb",
+    "spec/datts_right/order_by_dynamic_attribute_spec.rb",
     "spec/datts_right/read_dynamic_attribute_spec.rb",
     "spec/datts_right/remove_definition_spec.rb",
     "spec/datts_right/remove_definitions_spec.rb",
     "spec/datts_right/remove_dynamic_attribute_spec.rb",
     "spec/datts_right/where_dynamic_attribute_spec.rb",
+    "spec/datts_right/with_dynamic_attribute_key_spec.rb",
+    "spec/datts_right/with_dynamic_attribute_type_spec.rb",
+    "spec/datts_right/write_dynamic_attribute_spec.rb",
     "spec/datts_right_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/datts_right/category.rb

@@ -1,4 +1,8 @@
 class Category < ActiveRecord::Base
   has_dynamic_attributes :definition => true
   has_many :pages
+
+  def definition_attributes=(new_attributes)
+    add_definitions(new_attributes)
+  end
 end

data/lib/datts_right/errors.rb

@@ -10,4 +10,7 @@ module DattsRight
 
   class NotDefinedError < DattsRightError
   end
+
+  class AttributeKeyRequired < DattsRightError
+  end
 end

data/lib/datts_right/instance_methods.rb

@@ -92,10 +92,13 @@ module DattsRight
         else
           #respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(UnknownAttributeError, "unknown attribute: #{k}")
           begin
-            send("#{k}=", v)
+            #puts "Attempt to set super #{k} to #{v}"
+            #puts "Checking to see if #{self.inspect} responds to #{k}= ........... #{self.class.name}##{self.class.respond_to?(:"#{k}=")}, or the record itself: #{respond_to?(:"#{k}=")}"
+            respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(ActiveRecord::UnknownAttributeError, "unknown attribute: #{k}")
+            #send("#{k}=", v)
             #puts "Set super #{k} to #{v}"
-          rescue NoMethodError => e
-            #puts "NoMethodError was raised: #{e}, so we now check to see if '#{k}' is dynamic_attribute"
+          rescue ActiveRecord::UnknownAttributeError => e
+            #puts "ActiveRecord::UnknownAttributeError was raised: #{e}, so we now check to see if '#{k}' is dynamic_attribute"
             if dynamic_attribute?(k)
               write_dynamic_attribute("#{k}", v)
             else
@@ -120,22 +123,43 @@ module DattsRight
     end
 
     def add_definition(key, value)
-      key = key.to_sym
-      if dynamic_attributes_options[:definition]
-        if definition[key]
-          raise AlreadyDefined, "#{key} is already defined"
+      if key
+        key = key.to_sym
+        if dynamic_attributes_options[:definition]
+          if definition[key]
+            raise AlreadyDefined, "#{key} is already defined"
+          else
+            definition.merge!({key => value})
+          end
         else
-          definition.merge!({key => value})
+          raise NoDefinitionError
         end
       else
-        raise NoDefinitionError
+        raise AttributeKeyRequired
       end
     end
 
-    def add_definitions(hash)
-      if hash
-        hash.each do |k, v|
-          add_definition k, v
+    def add_definitions(*args)
+      args.compact! #remove the nil items
+      #puts "args after compacting: #{args.inspect}"
+      args.each do |item|
+        #puts "Working on #{item.inspect} is is a hash? (#{item.is_a?(Hash)}) or something else?"
+        item.each do |k, v|
+          #puts "Working on this k,v pair: #{k}, #{v}"
+          if v.is_a?(Hash) # item is like :robot => {:object_type => "text"}, :robot@ => {:object_type => "text"}
+            #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"
+            item.symbolize_keys! # {:name=>"A key", :description=>"asd", :attr_key=>"a_key"}
+            #puts "item is symbolized: #{item.inspect}"
+            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
+              add_definition(attr_key, item)
+            end
+          end
         end
       end
     end

data/lib/datts_right/page.rb

@@ -1,4 +1,8 @@
 class Page < ActiveRecord::Base
   belongs_to :category
   has_dynamic_attributes :of => :category
+
+  def virtual_attribute=(something)
+    puts "Setting virtual_attribute to #{something}"
+  end
 end

data/spec/datts_right/add_definition_spec.rb

@@ -24,4 +24,8 @@ describe DattsRight, ".add_definition(key, value)" do
   it "should raise NoMethodError if it doesn't have definition => true" do
     lambda {Page.create.add_definition(:fake, :object_type => "string")}.should raise_error(DattsRight::NoDefinitionError)
   end
+
+  it "should raise AttributeKeyRequired if no attr_key is passed" do
+    lambda {Page.create.add_definition(nil, {})}.should raise_error(DattsRight::AttributeKeyRequired)
+  end
 end

data/spec/datts_right/add_definitions_spec.rb

@@ -12,6 +12,14 @@ describe DattsRight, ".add_definitions(hash)" do
     c.add_definitions(:robot => {:object_type => "text"}, :another => {:object_type => "string"})
   end
 
+  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.add_definitions({"name"=>"A key", "attr_key"=>"a_key"}, {"name"=>"B key", "attr_key"=>"b_key"})
+  end
+
   it "should not explode if nil is passed" do
     lambda {Category.create.add_definitions(nil)}.should_not raise_error(NoMethodError)
   end

data/spec/datts_right/dynamic_attribute_details_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe DattsRight, ".dynamic_attribute_details(key)" do
+  before do
+    reset_database
+    @page = Page.create
+  end
+
+  it "should be aliased by datt_details" do
+    Page.instance_method(:dynamic_attribute_details).should == Page.instance_method(:datt_details)
+  end
+
+  it "should allow access to the dynamic_attribute" do
+    @page.add_dynamic_attribute(:price, "integer")
+    @page.dynamic_attribute_details(:price).class.should == DynamicAttribute
+  end
+end

data/spec/datts_right/order_by_dynamic_attribute_spec.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe DattsRight, "order_by_dynamic_attribute" do
+  before do
+    reset_database
+    @page = Page.create
+  end
+
+  it "should be aliased by order_by_datt" do
+    @page.add_dynamic_attribute(:price, "integer")
+    @page.write_dynamic_attribute :price, 2
+    @page.save
+    Page.order_by_dynamic_attribute("price", "integer").should == Page.order_by_datt("price", "integer")
+  end
+
+  it "should default to asc" do
+    @page.add_dynamic_attribute(:price, "integer")
+    @page.write_dynamic_attribute :price, 2
+    @page.save
+    @page_2 = Page.create
+    @page_2.add_dynamic_attribute(:price, "integer")
+    @page_2.write_dynamic_attribute :price, 1
+    @page_2.save
+    @page_3 = Page.create
+    @page_3.add_dynamic_attribute(:price, "float")
+    @page_3.write_dynamic_attribute :price, 3.0
+    @page_3.save
+    @page_4 = Page.create
+    @page_4.add_dynamic_attribute(:price, "float")
+    @page_4.write_dynamic_attribute :price, 3.5
+    @page_4.save
+
+    # What if different records have price but they are of different object_type?
+    #   page_1.read_dynamic_attribute(:price) is an "integer" and it's saved in "integer_value" column
+    #   page_2.read_dynamic_attribute(:price) is a "float" and it's saved in "float_value"
+    #
+    #   How would you work on Page.order_by_dynamic_attribute("price")?
+    #
+    #   Answer 1: we could require passing of the object_type in the order method
+    #     This way, we know which column to look at => order_by_dynamic_attribute("price", "integer")
+    Page.order_by_dynamic_attribute("price", "integer").should == [@page_2, @page]
+    Page.order_by_dynamic_attribute("price DESC", "float").should == [@page_4, @page_3]
+  end
+end

data/spec/datts_right/with_dynamic_attribute_key_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ".with_dynamic_attribute_key" do
+  before do
+    reset_database
+    @page = Page.create
+  end
+
+  it "should be aliased by .with_datt_key" do
+    @page.add_dynamic_attribute(:price, "float")
+    Page.with_dynamic_attribute_key(:price).should == Page.with_datt_key(:price)
+  end
+end

data/spec/datts_right/with_dynamic_attribute_type_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ".with_dynamic_attribute_type" do
+  before do
+    reset_database
+    @page = Page.create
+  end
+
+  it "should be aliased by .with_datt_type" do
+    @page.add_dynamic_attribute(:price, "float")
+    Page.with_dynamic_attribute_type("float").should == Page.with_datt_type("float")
+  end
+end

data/spec/datts_right/write_dynamic_attribute_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe DattsRight, ".write_dynamic_attribute" do
+  it "should be aliased by write_datt" do
+    Page.instance_method(:write_dynamic_attribute).should == Page.instance_method(:write_datt)
+  end
+end

data/spec/datts_right_spec.rb

@@ -143,75 +143,6 @@ describe DattsRight do
     @page.read_dynamic_attribute(:price).should == 200
   end
 
-  describe "order_by_dynamic_attribute" do
-    it "should be aliased by order_by_datt" do
-      @page.add_dynamic_attribute(:price, "integer")
-      @page.write_dynamic_attribute :price, 2
-      @page.save
-      Page.order_by_dynamic_attribute("price", "integer").should == Page.order_by_datt("price", "integer")
-    end
-
-    it "should default to asc" do
-      @page.add_dynamic_attribute(:price, "integer")
-      @page.write_dynamic_attribute :price, 2
-      @page.save
-      @page_2 = Page.create
-      @page_2.add_dynamic_attribute(:price, "integer")
-      @page_2.write_dynamic_attribute :price, 1
-      @page_2.save
-      @page_3 = Page.create
-      @page_3.add_dynamic_attribute(:price, "float")
-      @page_3.write_dynamic_attribute :price, 3.0
-      @page_3.save
-      @page_4 = Page.create
-      @page_4.add_dynamic_attribute(:price, "float")
-      @page_4.write_dynamic_attribute :price, 3.5
-      @page_4.save
-
-      # What if different records have price but they are of different object_type?
-      #   page_1.read_dynamic_attribute(:price) is an "integer" and it's saved in "integer_value" column
-      #   page_2.read_dynamic_attribute(:price) is a "float" and it's saved in "float_value"
-      #
-      #   How would you work on Page.order_by_dynamic_attribute("price")?
-      #
-      #   Answer 1: we could require passing of the object_type in the order method
-      #     This way, we know which column to look at => order_by_dynamic_attribute("price", "integer")
-      Page.order_by_dynamic_attribute("price", "integer").should == [@page_2, @page]
-      Page.order_by_dynamic_attribute("price DESC", "float").should == [@page_4, @page_3]
-    end
-  end
-
-  describe ".write_dynamic_attribute" do
-    it "should be aliased by write_datt" do
-      Page.instance_method(:write_dynamic_attribute).should == Page.instance_method(:write_datt)
-    end
-  end
-
-  describe ".with_dynamic_attribute_key" do
-    it "should be aliased by .with_datt_key" do
-      @page.add_dynamic_attribute(:price, "float")
-      Page.with_dynamic_attribute_key(:price).should == Page.with_datt_key(:price)
-    end
-  end
-
-  describe ".with_dynamic_attribute_type" do
-    it "should be aliased by .with_datt_type" do
-      @page.add_dynamic_attribute(:price, "float")
-      Page.with_dynamic_attribute_type("float").should == Page.with_datt_type("float")
-    end
-  end
-
-  describe ".dynamic_attribute_details(key)" do
-    it "should be aliased by datt_details" do
-      Page.instance_method(:dynamic_attribute_details).should == Page.instance_method(:datt_details)
-    end
-
-    it "should allow access to the dynamic_attribute" do
-      @page.add_dynamic_attribute(:price, "integer")
-      @page.dynamic_attribute_details(:price).class.should == DynamicAttribute
-    end
-  end
-
   describe "when loading from database" do
     it "should load the dynamic attributes for use" do
       @page.add_datt(:body, "text")
@@ -243,4 +174,8 @@ describe DattsRight do
     @page.save
     @page.body.should == "dude"
   end
+
+  it "should still allow virtual attributes to work (for mass assignment)" do
+    lambda {Category.create.update_attributes(:definition_attributes => {"attr_key" => "some_attr", "object_type" => "string"}, :name => "hello")}.should_not raise_error(ActiveRecord::UnknownAttributeError)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datts_right
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 0
-  - 23
-  version: 0.0.23
+  - 24
+  version: 0.0.24
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -178,13 +178,18 @@ files:
 - spec/datts_right/create_definitions_spec.rb
 - spec/datts_right/definition_spec.rb
 - spec/datts_right/dynamic_attribute_definition_spec.rb
+- spec/datts_right/dynamic_attribute_details_spec.rb
 - spec/datts_right/find_by_dynamic_attribute_spec.rb
 - spec/datts_right/inheritance_spec.rb
+- spec/datts_right/order_by_dynamic_attribute_spec.rb
 - spec/datts_right/read_dynamic_attribute_spec.rb
 - spec/datts_right/remove_definition_spec.rb
 - spec/datts_right/remove_definitions_spec.rb
 - spec/datts_right/remove_dynamic_attribute_spec.rb
 - spec/datts_right/where_dynamic_attribute_spec.rb
+- spec/datts_right/with_dynamic_attribute_key_spec.rb
+- spec/datts_right/with_dynamic_attribute_type_spec.rb
+- spec/datts_right/write_dynamic_attribute_spec.rb
 - spec/datts_right_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -231,12 +236,17 @@ test_files:
 - spec/datts_right/create_definitions_spec.rb
 - spec/datts_right/definition_spec.rb
 - spec/datts_right/dynamic_attribute_definition_spec.rb
+- spec/datts_right/dynamic_attribute_details_spec.rb
 - spec/datts_right/find_by_dynamic_attribute_spec.rb
 - spec/datts_right/inheritance_spec.rb
+- spec/datts_right/order_by_dynamic_attribute_spec.rb
 - spec/datts_right/read_dynamic_attribute_spec.rb
 - spec/datts_right/remove_definition_spec.rb
 - spec/datts_right/remove_definitions_spec.rb
 - spec/datts_right/remove_dynamic_attribute_spec.rb
 - spec/datts_right/where_dynamic_attribute_spec.rb
+- spec/datts_right/with_dynamic_attribute_key_spec.rb
+- spec/datts_right/with_dynamic_attribute_type_spec.rb
+- spec/datts_right/write_dynamic_attribute_spec.rb
 - spec/datts_right_spec.rb
 - spec/spec_helper.rb