rails_lookup 0.0.2 → 0.0.3

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'  
 require 'echoe'  
   
-Echoe.new('rails_lookup', '0.0.2') do |s|  
+Echoe.new('rails_lookup', '0.0.3') do |s|  
   s.description = File.read(File.join(File.dirname(__FILE__), 'README')) 
   s.summary     = "Lookup table macro for ActiveRecords" 
   s.url             = "http://github.com/Nimster/RailsLookup/"
   s.author      = "Nimrod Priell"
   s.email       = "@nimrodpriell" #Twitter
-  s.ignore_pattern  = ["tmp/*", "script/*"]  
+  s.ignore_pattern  = ["tmp/*", "script/*", "Manifest"]  
   s.development_dependencies = []  
 end  
   

data/lib/active_record/lookup.rb

@@ -105,27 +105,27 @@ module ActiveRecord
         #Rails ActiveRecord support:
         @cls_for_name = {} if @cls_for_name.nil?
         @cls_for_name[as_name.to_s.to_sym] = cls
-        #We need to override this for the dynamic finders.
-        def method_missing(method_id, *arguments, &block)
-          if match = ActiveRecord::DynamicFinderMatch.match(method_id)
-            #reroute kind to _kind_id
-            idxs = match.attribute_names.collect.with_index { |n,i| [i,n.to_sym] if @cls_for_name.has_key? n.to_sym }.compact
-            idxs.each do |elm|
-              if method_id =~ /^find_by_/
-                arguments[elm[0]] = @cls_for_name[elm[1]].gen_id_for arguments[elm[0]] #Change the argument
-              end
-            end 
-          end 
-          super
-        end
 
-        def where(opts, *rest)
-          #Change the values of the keys in the lookup to their ids
-          mapped = opts.map { |k,v| @cls_for_name.has_key?(k) ? [k, @cls_for_name[k].id_for(v)] : [k, v] }
-          opts = Hash[mapped]
+        #This makes find_and_create_by, find_all and where methods all work as
+        #they should. This will not work if you use reset_column_information,
+        #like if you use find_by_session_id in SessionStore. You must redefine
+        #it so it re-sets rel to this singleton object
+        rel = ActiveRecord::Relation.new(self, arel_table)
+        def rel.where(opts, *rest)
+          if opts.is_a? Hash
+            mapped = opts.map { |k,v| @cls_for_name.has_key?(k.to_sym) ? [k, @cls_for_name[k.to_sym].id_for(v)] : [k, v] }
+            opts = Hash[mapped]
+          end
           super(opts, *rest)
         end
 
+        def rel.cls_for_name=(cls_for_name)
+          @cls_for_name = cls_for_name
+        end
+
+        rel.cls_for_name = @cls_for_name
+        instance_variable_set(:@relation, rel)
+
         #Might need to be in class_eval
         belongs_to lookup_name.to_s.to_sym, :foreign_key => "#{as_name}_id"
         validates as_name.to_s.to_sym, :presence => true

data/rails_lookup.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_lookup}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Nimrod Priell}]
-  s.date = %q{2011-08-08}
+  s.date = %q{2011-08-09}
   s.description = %q{Lookup tables with ruby-on-rails
 --------------------------------
 
@@ -152,7 +152,7 @@ I hope this helped you and saved a lot of time and frustration. Follow me on twi
 }
   s.email = %q{@nimrodpriell}
   s.extra_rdoc_files = [%q{README}, %q{lib/active_record/lookup.rb}]
-  s.files = [%q{README}, %q{Rakefile}, %q{lib/active_record/lookup.rb}, %q{rails_lookup.gemspec}, %q{test/20110808002412_create_test_lookup_db.rb}, %q{test/test_lookup.rb} ]
+  s.files = [%q{README}, %q{Rakefile}, %q{lib/active_record/lookup.rb}, %q{rails_lookup.gemspec}, %q{test/20110808002412_create_test_lookup_db.rb}, %q{test/test_lookup.rb}]
   s.homepage = %q{http://github.com/Nimster/RailsLookup/}
   s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Rails_lookup}, %q{--main}, %q{README}]
   s.require_paths = [%q{lib}]

data/test/test_lookup.rb

@@ -120,29 +120,53 @@ class TestLookup < MiniTest::Unit::TestCase
     bimba2 = Car.find_by_kind "Compact"
     assert_equal bimba, bimba2
     assert_equal "Yellow", bimba2.color
+    cars = Car.find_all_by_color "Yellow"
+    assert_equal 2, cars.size
+    cars = Car.find_all_by_kind "Compact"
+    assert_equal 1, cars.size
     bimba2 = Car.find_by_kind_and_color_and_name "Compact", "Yellow", "Bimba"
     assert_equal bimba, bimba2
     assert_equal "Yellow", bimba2.color
     assert_equal "Compact", bimba2.kind
+    cars_before_creation = Car.count
     susita = Car.find_or_create_by_name_and_kind_and_color "Susita", "Compact", "Gray"
     assert_equal "Gray", susita.color
     assert_equal "Compact", susita.kind
+    assert_equal cars_before_creation + 1, Car.count
     bimba2 = Car.find_or_create_by_name_and_kind_and_color "Bimba", "Compact", "Yellow"
     assert_equal "Yellow", bimba2.color
     assert_equal "Compact", bimba2.kind
     assert_equal "Bimba", bimba2.name
+    assert_equal cars_before_creation + 1, Car.count
+    p Car.all
     f16 = Plane.find_or_create_by_kind_and_name "Fighter Jet", "F-16"
     assert_equal "Fighter Jet", f16.kind
     assert_equal "F-16", f16.name
     ferrari = Car.find_or_create_by_kind_and_color "Sports", "Yellow"
     assert_equal "Yellow", ferrari.color
     assert_equal "Sports", ferrari.kind
+    assert_equal cars_before_creation + 1, Car.count
     batmobile = Car.find_or_create_by_kind_and_color "Fantasy", "Black"
     assert_equal "Black", batmobile.color
     assert_equal "Fantasy", batmobile.kind
+    assert_equal cars_before_creation + 2, Car.count
     assert_equal 3, CarKind.count
     assert_equal 3, CarColor.count
     assert_equal 1, PlaneKind.count
+    batmobile2 = Car.find_or_initialize_by_color "Black"
+    refute batmobile.new_record?
+    assert_equal batmobile, batmobile2
+    batmobile2 = Car.find_or_initialize_by_color_and_kind "Black", "Fantasy"
+    refute batmobile.new_record?
+    assert_equal batmobile, batmobile2
+    bimba2 = Car.find_or_initialize_by_name "Bimba"
+    refute bimba2.new_record?
+    assert_equal bimba, bimba2
+    delorhean = Car.find_or_initialize_by_color_and_kind "Grey", "Fantasy"
+    assert delorhean.new_record?
+    assert_equal "Grey", delorhean.color
+    assert_equal "Fantasy", delorhean.kind
+    delorhean.save!
   end
 
   #This test will issue warnings as we re-set existing constants

metadata

@@ -2,7 +2,7 @@
 name: rails_lookup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nimrod Priell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 Z
+date: 2011-08-09 00:00:00 Z
 dependencies: []
 
 description: "Lookup tables with ruby-on-rails\n\