active_hash 0.9.13 → 0.9.14

data/CHANGELOG

@@ -1,3 +1,7 @@
+2013-05-23 (v0.9.14)
+  - enum_accessor can now take multiple field names when generating the constant
+  - temporarily disabled rails edge specs since there's an appraisal issue with minitest
+
 2013-01-22
   - Fix find_by_id and find method returning nil unless .all called in ActiveYaml (mattheworiordan)
 

data/README.md

@@ -43,6 +43,7 @@ A quick example would be:
 You can also use _create_:
 
     class Country < ActiveHash::Base
+      field :name
       create :id => 1, :name => "US"
       create :id => 2, :name => "Canada"
     end
@@ -50,6 +51,7 @@ You can also use _create_:
 If you are Pat Nakajima,  you probably prefer _add_:
 
     class Country < ActiveHash::Base
+      field :name
       add :id => 1, :name => "US"
       add :id => 2, :name => "Canada"
     end
@@ -62,7 +64,7 @@ If you add data to an ActiveHash file during an initializer, it will not be relo
 
 ActiveHash will auto-define all fields for you when you load the hash.  For example, if you have the following class:
 
-    class CustomField < ActiveYaml::Base
+    class CustomField < ActiveHash::Base
       self.data = [
         {:custom_field_1 => "foo"},
         {:custom_field_2 => "foo"},
@@ -74,7 +76,7 @@ Once you call CustomField.all it will define methods for :custom_field_1, :custo
 
 If you need the fields at load time, as opposed to after .all is called, you can also define them manually, like so:
 
-    class CustomField < ActiveYaml::Base
+    class CustomField < ActiveHash::Base
       fields :custom_field_1, :custom_field_2, :custom_field_3
     end
 
@@ -367,7 +369,21 @@ Records can be accessed by looking up the field constant:
     => 3
     >> Country::CANADA
     => #<Country:0x10229fb28 @attributes={:name=>"Canada", :id=>2}
-    
+
+You may also use multiple attributes to generate the constant, like so:
+
+    class Town < ActiveHash::Base
+      include ActiveHash::Enum
+      self.data = [
+          {:id => 1, :name => "Columbus", :state => "NY"},
+          {:id => 2, :name => "Columbus", :state => "OH"}
+      ]
+      enum_accessor :name, :state
+    end
+
+    >> Town::COLUMBUS_NY
+    >> Town::COLUMBUS_OH
+
 Constants are formed by first stripping all non-word characters and then upcasing the result. This means strings like "Blazing Saddles", "ReBar", "Mike & Ike" and "Ho! Ho! Ho!" become BLAZING_SADDLES, REBAR, MIKE_IKE and HO_HO_HO.
 
 The field specified as the _enum_accessor_ must contain unique data values.

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "0.9.13"
+    VERSION = "0.9.14"
   end
 end

data/lib/associations/associations.rb

@@ -29,12 +29,23 @@ module ActiveHash
           end
         end
 
-        create_reflection(
+        method = ActiveRecord::Base.method(:create_reflection)
+        if method.respond_to?(:parameters) && method.parameters.length == 5
+          create_reflection(
+            :belongs_to,
+            association_id.to_sym,
+            nil,
+            options,
+            self
+          )
+        else
+          create_reflection(
             :belongs_to,
             association_id.to_sym,
             options,
             options[:class_name].constantize
-            )
+          )
+        end
       end
 
     end
@@ -54,7 +65,9 @@ module ActiveHash
 
           klass = options[:class_name].constantize
 
-          if klass.respond_to?(:scoped)
+          if ActiveRecord.const_defined?(:Relation) && klass.all.class < ActiveRecord::Relation
+            klass.where(options[:foreign_key] => id)
+          elsif klass.respond_to?(:scoped)
             klass.scoped(:conditions => {options[:foreign_key] => id})
           else
             klass.send("find_all_by_#{options[:foreign_key]}", id)

data/lib/enum/enum.rb

@@ -6,23 +6,23 @@ module ActiveHash
     def self.included(base)
       base.extend(Methods)
     end
-    
+
     module Methods
 
-      def enum_accessor(field_name)
-        @enum_accessor = field_name
+      def enum_accessor(*field_names)
+        @enum_accessors = field_names
         reload
       end
 
       def insert(record)
         super
-        set_constant(record) if @enum_accessor.present?
+        set_constant(record) if @enum_accessors.present?
       end
 
       def delete_all
-        if @enum_accessor.present?
+        if @enum_accessors.present?
           @records.each do |record|
-            constant = constant_for(record.attributes[@enum_accessor])
+            constant = constant_for(record, @enum_accessors)
             remove_const(constant) if const_defined?(constant)
           end
         end
@@ -30,7 +30,7 @@ module ActiveHash
       end
 
       def set_constant(record)
-        constant = constant_for(record.attributes[@enum_accessor])
+        constant = constant_for(record, @enum_accessors)
         return nil if constant.blank?
 
         unless const_defined?(constant)
@@ -42,7 +42,8 @@ module ActiveHash
 
       private :set_constant
 
-      def constant_for(field_value)
+      def constant_for(record, field_names)
+        field_value = field_names.map { |name| record.attributes[name] }.join("_")
         if constant = !field_value.nil? && field_value.dup
           constant.gsub!(/\W+/, "_")
           constant.gsub!(/^_|_$/, '')

data/spec/associations/associations_spec.rb

@@ -37,7 +37,7 @@ describe ActiveHash::Base, "associations" do
       end
 
       if Object.const_defined?(:ActiveModel)
-        scope :published, {:conditions => {:published => true}}
+        scope( :published, proc { where(:published => true) })
       else
         named_scope :published, {:conditions => {:published => true}}
       end

data/spec/enum/enum_spec.rb

@@ -4,33 +4,48 @@ describe ActiveHash::Base, "enum" do
 
   before do
     ActiveYaml::Base.set_root_path File.expand_path(File.dirname(__FILE__) + "/../fixtures")
-    
+
     class Borough < ActiveYaml::Base
       include ActiveHash::Enum
       fields :name, :county, :population
       enum_accessor :name
     end
+
+    class Neighborhood < ActiveHash::Base
+      include ActiveHash::Enum
+      fields :name, :county
+      enum_accessor :name, :county
+
+      self.data = [
+        {name: "Queen Ann", county: "King"}
+      ]
+    end
   end
 
   after do
     Object.send(:remove_const, :Borough)
+    Object.send(:remove_const, :Neighborhood)
   end
 
   describe "#enum_accessor" do
-    it "sets the field used for accessing records by constants" do
+    it "can use a custom method" do
       Borough::BROOKLYN.should == Borough.find_by_name("Brooklyn")
     end
 
+    it "sets the field used for accessing records by constants" do
+      Neighborhood::QUEEN_ANN_KING.should == Neighborhood.find_by_name("Queen Ann")
+    end
+
     it "ensures that values stored in the field specified are unique" do
       lambda do
         Class.new(ActiveHash::Base) do
           include ActiveHash::Enum
           self.data = [
-            { :name => 'Woodford Reserve' },
-            { :name => 'Bulliet Bourbon' },
-            { :name => 'Woodford Reserve' }
+            {:name => 'Woodford Reserve'},
+            {:name => 'Bulliet Bourbon'},
+            {:name => 'Woodford Reserve'}
           ]
-          enum_accessor :name 
+          enum_accessor :name
         end
       end.should raise_error(ActiveHash::Enum::DuplicateEnumAccessor)
     end
@@ -41,7 +56,7 @@ describe ActiveHash::Base, "enum" do
         self.data = [
           {:name => 'Die Hard 2', :rating => '4.3'},
           {:name => 'The Informant!', :rating => '4.3'},
-          {:name => 'In & Out', :rating => '4.3'}          
+          {:name => 'In & Out', :rating => '4.3'}
         ]
         enum_accessor :name
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
   prerelease: 
 platform: ruby
 authors:
@@ -148,6 +148,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 385675444061652865
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource