enumerated_attribute 0.2.12 → 0.2.13

data/README.rdoc

@@ -20,14 +20,16 @@ Install
 
 == Notice
 
-Not yet Rails3 compliant -- but getting close.  Stay tuned.
+* Rails 3 ... dynamic finders working... should be rails3 ready.  We are completing form tests.
 
-Be a good coder ... get state pattern support for your enumerated attributes (enumerated_state[http://github.com/jeffp/enumerated_state])
+* Rails 2.3.8 breaks find_or_create_by_... and find_or_initialize_by_... methods.  Write me if you gotta have it... otherwise happy Rails3.
+
+* Write cleaner code ... implement state patterns for your enumerated attributes (enumerated_state[http://github.com/jeffp/enumerated_state])
 
 == How to submit an Issue
 
 If something needs fixed, please submit issues to this Github project in the Issues tab and
-provide a series of FAILING RSPEC files that I can drop into the current RSpec
+provide a series of FAILING RSPEC tests that I can drop into the current RSpec
 test framework and run with little to no coersing.  Thanks.
 
 == Contributors
@@ -47,7 +49,7 @@ along with the following features:
 * Scaffold generator integration
 * Definable enumeration labels
 * Enum helper methods
-* Syntactical predicate methods
+* Dynamic predicate methods
 * Initialization
 * State pattern support (enumerated_state[http://github.com/jeffp/enumerated_state])
 

data/lib/enumerated_attribute/integrations/active_record.rb

@@ -70,9 +70,9 @@ module EnumeratedAttribute
 				private
 				
 				def construct_attributes_from_arguments(attribute_names, arguments)
-					attributes = super
-					attributes.each { |k,v| attributes[k] = v.to_s if has_enumerated_attribute?(k) }
-					attributes
+          attributes = {}
+          attribute_names.each_with_index{|name, idx| attributes[name] = has_enumerated_attribute?(name) ? arguments[idx].to_s : arguments[idx]}
+          attributes
 				end
 				
 				def instantiate(record)
@@ -99,10 +99,15 @@ module EnumeratedAttribute
 									result
 								end
 							end
+              unless private_method_defined?(:method_missing_without_enumerated_attribute)
+                define_chained_method(:method_missing, :enumerated_attribute) do |method_id, *arguments|
+                  arguments = arguments.map{|arg| arg.is_a?(Symbol) ? arg.to_s : arg }
+                  method_missing_without_enumerated_attribute(method_id, *arguments)
+                end
+              end
 						end
           end
 				end
-
 			end
 		end	
 	end

data/spec/active_record/active_record_spec.rb

@@ -65,8 +65,29 @@ describe "RaceCar" do
 		s.gear_is_nil?.should be_false
 		s.gear_is_not_nil?.should be_true
 	end
-	
-	it "should find record by enumerated column :gear attributes" do
+
+  it "should be created and found with dynamic find or creator method" do
+    s = RaceCar.find_or_create_by_name_and_gear('specialty', :second)
+    s.should_not be_nil
+    s.gear.should == :second
+    s.name.should == 'specialty'
+
+    s0 = RaceCar.find_or_create_by_name_and_gear('specialty', :second)
+    s0.gear.should == :second
+    s0.id.should == s.id
+  end
+  it "should be initialized with dynamic find or initialize method" do
+    s = RaceCar.find_or_initialize_by_name_and_gear('myspecialty', :second)
+    s.should_not be_nil
+    s.gear.should == :second
+    s.name.should == 'myspecialty'
+    lambda { s.save! }.should_not raise_exception
+
+    s0 = RaceCar.find_or_initialize_by_name_and_gear('myspecialty', :second)
+    s0.gear.should == :second
+    s0.id.should == s.id
+  end
+	it "should find record using dynamic finder by enumerated column :gear attributes" do
 		r=RaceCar.new
 		r.gear = :second
 		r.name = 'special'

data/spec/active_record/df.rb

@@ -0,0 +1,12 @@
+require 'cfg'
+
+r=RaceCar.new
+r.gear = :second
+r.name = 'special'
+r.save!
+
+#RaceCar.find_by_gear_and_name(:second, 'special')
+car = RaceCar.find_or_create_by_name_and_gear('special', :second)
+debugger
+car0 = RaceCar.find_or_create_by_name_and_gear('special', :second)
+car0

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: enumerated_attribute
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
   - 2
-  - 12
-  version: 0.2.12
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - Jeff Patmon
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 -07:00
+date: 2010-05-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: meta_programming
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 2
@@ -62,6 +59,7 @@ files:
 - spec/active_record/associations_spec.rb
 - spec/active_record/sti_classes.rb
 - spec/active_record/active_record_spec.rb
+- spec/active_record/df.rb
 - spec/active_record/single_table_inheritance_spec.rb
 - spec/active_record/association_test_classes.rb
 - spec/active_record/inheritance_classes.rb
@@ -158,27 +156,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Add enumerated attributes to your models and expose them in drop-down lists in your views