datts_right 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    datts_right (0.0.4)
+    datts_right (0.0.5)
       datts_right
       rails (>= 3.0.0)
 

data/README.textile

@@ -12,23 +12,41 @@ h2. Why make this?
 # The "available":http://codaset.com/joelmoss/dynamic-attributes "plugins":https://github.com/moiristo/dynamic_attributes out there that did something like this stuffed the dynamic attributes in a column in the model that had dynamic attributes. Because of this, you:
 ** Could not order things by dynamic columns straight with SQL
 ** Could not (as far as I know) chain scopes, like so: @MyModel.where(:name_which_is_a_real_attribute => "Joe").where_datt(:phone_which_is_dynamic => "23218793")@
-** Could not find by dynamic attribute straight with SQL, like so: @MyModel.find_by_phone_which_is_dynamic("2398291308")@
+** Could not find by dynamic attribute straight with SQL, like so: @MyModel.find_by_datt_phone_which_is_dynamic("2398291308")@
 ** Had to add migrations to each model that you wanted to have dynamic attributes
 
 h2. Installation
 
 Create a migration:
 
-pre. create_table :datts do |t|
-  t.string :name, :null => false
-  t.string :attr_key, :null => false
-  t.string :object_type, :null => false
-  t.string :attributable_type, :null => false
-  t.integer :attributable_id, :null => false
-  %w(integer string boolean text float).each do |type|
-    t.send(type, "#{type}_value".to_sym)
+<pre>
+class CreateDatts < ActiveRecord::Migration
+  def self.up
+    create_table(:datts) do |t|
+      t.string :name, :null => false
+      t.string :attr_key, :null => false
+      t.string :object_type, :null => false
+      t.string :attributable_type, :null => false
+      t.integer :attributable_id, :null => false
+      %w(integer string boolean text float).each do |type|
+        t.send(type, "#{type}_value".to_sym)
+      end
+    end
+
+    add_index "datts", ["attributable_id"], :name => "index_datts_on_attributable_id"
+    add_index "datts", ["attributable_type"], :name => "index_datts_on_attributable_type"
+    add_index "datts", ["attr_key"], :name => "index_datts_on_attr_key"
+  end
+
+  def self.down
+    remove_index "datts", :name => "index_datts_on_attr_key"
+    remove_index "datts", :name => "index_datts_on_attributable_type"
+    remove_index "datts", :name => "index_datts_on_attributable_id"
+
+    drop_table(:datts)
   end
 end
+</pre>
 
 * *name* is not important at the moment, but I intend to make better use of it in the future.
 * *attr_key* the name of the dynamic attribute
@@ -76,6 +94,15 @@ h3. dynamic_attribute?(:some_attribute)
 
 Returns true or false
 
+h3. Dynamic find
+
+pre. User.find_by_datt_age(240) # returns the first user with that age
+
+You can also use:
+
+pre. find_all_by_datt
+find_last_by_datt
+
 h2. Stuff that make things faster
 
 The dynamic attributes are only actually saved when save is called on the record that has them.
@@ -155,7 +182,7 @@ You can do:
 
 pre. Product.where_datt(:price => 200.0, :rating => 5)
 
-As of now it accepts a hash only. If you want to search normal attributes, use the normal @where@ method.
+As of now it accepts a hash only. If you want to scope to normal attributes, use the normal @where@ method.
 
 h2. Contributing to datts_right
 
@@ -177,8 +204,7 @@ If you want to contribute:
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+h2. Copyright
 
 Copyright (c) 2011 Ramon Tayag. See LICENSE.txt for
 further details.
-

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/datts_right.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datts_right}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Tayag"]
@@ -148,6 +148,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<autotest>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<datts_right>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
@@ -242,6 +248,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<autotest>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<datts_right>, [">= 0"])
@@ -337,6 +349,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<autotest>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
 

data/lib/datts_right.rb

@@ -68,11 +68,65 @@ module DattsRight
 
     def self.method_missing(method_id, *arguments)
       # TODO better way to hook this into the rails code, and not define my own
-      if method_id.to_s =~ /^find_(all_|last_)?by_([_a-zA-Z]\w*)$/
-        attributes = $2.split("_and_")
-        #puts "Will find by #{attributes.inspect}"
-        arg = arguments.first
-        scope_self.joins(:datts).where("datts.#{Datt.attr_column(arg)} = :value", :value => arg)
+      begin # Prioritize ActiveRecord's method_missing
+        super(method_id, *arguments)
+      rescue NoMethodError => e
+        #puts "Method missing: #{method_id}"
+        if method_id.to_s =~ /^find_(all_|last_)?by_datt_([_a-z]\w*)$/
+          all_or_last = $1
+          attributes = $2.split("_and_")
+          results = self
+          attributes.each_with_index do |attribute, i|
+            results = results.where_datt(attribute.to_sym => arguments[i])
+          end
+
+          #puts "this is $1 of the method '#{method_id}': #{all_or_last}."
+          case all_or_last
+          when "all_"
+            results
+          when "last_"
+            results.last
+          when nil
+            results.first
+          else
+            nil
+          end
+        else
+          raise e
+        end
+
+        #if method_id.to_s =~ /^find_(all_|last_)by_datt_([_a-z]\w*)$/
+          #all_or_last = $1
+          #attributes = $2.split("_and_")
+          #results = self
+          #attributes.each_with_index do |attribute, i|
+            #results = results.where_datt(attribute.to_sym => arguments[i])
+          #end
+
+          #puts "this is $1 of the method '#{method_id}': #{all_or_last}."
+          #case all_or_last
+          #when "all_"
+            #results
+          #when "last_"
+            #results.last
+          #else
+            #nil
+          #end
+        #elsif method_id.to_s =~ /^find_by_datt_([_a-z]\w*)$/
+          ##puts "returning a find_by_datt_#{$1}"
+          #attributes = $1.split("_and_")
+          ##puts "here are the attributes: #{attributes.inspect}"
+          #results = self
+          #attributes.each_with_index do |attribute, i|
+            ##puts "Adding where_datt(:#{attribute} => #{arguments[i]})"
+            #results = results.where_datt(attribute.to_sym => arguments[i])
+          #end
+
+          ##puts "Will return the FIRST of #{results.to_sql}"
+          #results.first
+        #else
+          #nil
+        #end
       end
     end
 

data/spec/datts_right_spec.rb

@@ -48,7 +48,7 @@ describe DattsRight do
   describe ".dynamic_columns(reload)" do
     it "should return an array of symbols of the available dynamic columns" do
       @page.add_dynamic_attribute(:rocks, "string")
-      @page.is_dynamic_attribute?(:rocks).should be_true
+      @page.dynamic_attribute?(:rocks).should be_true
     end
   end
 
@@ -135,11 +135,11 @@ describe DattsRight do
     @page.farce = "Nothing here my friend"
     @page.save
     @page.farce = nil
-    @page.is_dynamic_attribute?(:farce).should be_true
+    @page.dynamic_attribute?(:farce).should be_true
   end
 
-  describe "on dynamic find_by methods" do
-    it "should work" do
+  describe "on dynamic find_by_datt methods" do
+    it "should be able to return single records" do
       @page.add_dynamic_attribute(:price, "integer")
       @page.price = 400
       @page.save
@@ -149,8 +149,53 @@ describe DattsRight do
       @page_2.price = 500
       @page_2.save
 
-      Page.find_by_price(400).should include(@page)
-      Page.find_by_price(400).should_not include(@page_2)
+      Page.find_by_datt_price(400).should == @page
+      Page.find_by_datt_price(400).should_not == @page_2
+    end
+
+    it "should be able to return all matching records" do
+      @page.add_dynamic_attribute(:price, "integer")
+      @page.price = 400
+      @page.save
+
+      @page_2 = Page.create
+      @page_2.add_dynamic_attribute(:price, "integer")
+      @page_2.price = 500
+      @page_2.save
+
+      @page_3 = Page.create
+      @page_3.add_dynamic_attribute(:price, "integer")
+      @page_3.price = 400
+      @page_3.save
+
+      @results = Page.find_all_by_datt_price(400)
+      @results.should include(@page)
+      @results.should_not include(@page_2)
+      @results.should include(@page_3)
+    end
+
+    it "should still allow raising of NoMethodError if the original attribute does not exist" do
+      lambda { Page.find_by_faker("hi") }.should raise_error(NoMethodError)
+    end
+
+    it "should be able to return the last record" do
+      @page.add_dynamic_attribute(:price, "integer")
+      @page.price = 400
+      @page.save
+
+      @page_2 = Page.create
+      @page_2.add_dynamic_attribute(:price, "integer")
+      @page_2.price = 400
+      @page_2.save
+
+      Page.find_last_by_datt_price(400) == @page_2
+    end
+
+    it "should allow normal attributes to work" do
+      @page.name = "Roland"
+      @page.save
+
+      Page.find_by_name("Roland").should == @page
     end
 
     it "should allow chaining" do
@@ -164,9 +209,9 @@ describe DattsRight do
       @page_2.price = 500
       @page_2.save
 
-      @pages = Page.where(:name => "fixed").find_by_price(400)
-      @pages.should include(@page)
-      @pages.should_not include(@page_2)
+      @pages = Page.where(:name => "fixed").find_by_datt_price(400)
+      @pages.should == @page
+      @pages.should_not == @page_2
     end
   end
 
@@ -174,19 +219,19 @@ describe DattsRight do
     @page.add_dynamic_attribute(:price, "integer")
     @page.price = 400
     @page.add_dynamic_attribute(:farce, "string")
-    @page.farce = "hi"
+    @page.farce = "hitt"
     @page.save
 
     @page_2 = Page.create
     @page_2.add_dynamic_attribute(:price, "integer")
     @page_2.price = 400
     @page_2.add_dynamic_attribute(:farce, "string")
-    @page_2.farce = "hitt"
+    @page_2.farce = "hi"
     @page_2.save
 
-    @pages = Page.find_by_farce_and_price("hi", 400)
-    @pages.should include(@page)
-    @pages.should_not include(@page_2)
+    @pages = Page.find_by_datt_price_and_farce(400, "hi")
+    @pages.should == @page_2
+    @pages.should_not == @page
   end
 
   describe "when the value being assigned is not of the same type (with exceptions)" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datts_right
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ramon Tayag
@@ -1414,6 +1414,96 @@ dependencies:
   name: rcov
   version_requirements: *id093
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id094 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: autotest
+  version_requirements: *id094
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id095 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: sqlite3
+  version_requirements: *id095
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id096 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  name: rspec
+  version_requirements: *id096
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id097 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  name: bundler
+  version_requirements: *id097
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id098 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  name: jeweler
+  version_requirements: *id098
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id099 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rcov
+  version_requirements: *id099
+  prerelease: false
 description: Creates a separate table that saves all your dynamic attributes.
 email: ramon@tayag.net
 executables: []