active_hash 0.9.12 → 0.9.13

data/CHANGELOG

@@ -1,3 +1,6 @@
+2013-01-22
+  - Fix find_by_id and find method returning nil unless .all called in ActiveYaml (mattheworiordan)
+
 2012-07-25
   - Make find_by_id lookups faster by indexing records by id (desmondmonster)
 

data/README.md

@@ -214,6 +214,35 @@ You can also use standard rails view helpers, like #collection_select:
 
     <%= collection_select :person, :country_id, Country.all, :id, :name %>
 
+### Using shortcuts
+
+Since ActiveHashes usually are static, we can use shortcuts to assign via an easy to remember string instead of an obscure ID number.
+
+    # app/models/country.rb
+    class Country < ActiveHash::Base
+    end
+
+    # app/models/person.rb
+    class Person < ActiveRecord::Base
+      extend ActiveHash::Associations::ActiveRecordExtensions
+      belongs_to_active_hash :country, :shortcuts => [:name]
+    end
+
+    # config/initializers/data.rb
+    Country.data = [
+        {:id => 1, :name => "US"},
+        {:id => 2, :name => "Canada"}
+    ]
+
+    # Using `rails console`
+    john = Person.new
+    john.country_name = "US"
+    # Is the same as doing `john.country = Country.find_by_name("US")`
+    john.country_name
+    # Will return "US", and is the same as doing `john.country.try(:name)`
+
+You can have multiple shortcuts, so settings `:shortcuts => [:name, :friendly_name]` will enable you to use `#country_name=` and `#country_friendly_name=`.
+
 ## Referencing ActiveRecord objects from ActiveHash
 
 If you include the ActiveHash::Associations module, you can also create associations from your ActiveHash classes, like so:

data/active_hash.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
     "Vladimir Andrijevik",
     "Adam Anderson",
     "Keenan Brock",
-    "Desmond Bowe"
+    "Desmond Bowe",
+    "Matthew O'Riordan"
   ]
   s.date = %q{2012-01-18}
   s.email = %q{jeff@zilkey.com}

data/lib/active_file/base.rb

@@ -54,6 +54,16 @@ module ActiveFile
         raise "Override Me"
       end
 
+      def find(*args)
+        reload unless data_loaded
+        return super
+      end
+
+      def find_by_id(*args)
+        reload unless data_loaded
+        return super
+      end
+
       protected :extension
 
     end

data/lib/active_hash/version.rb

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

data/lib/associations/associations.rb

@@ -5,9 +5,11 @@ module ActiveHash
 
       def belongs_to_active_hash(association_id, options = {})
         options = {
-          :class_name => association_id.to_s.classify,
-          :foreign_key => association_id.to_s.foreign_key
+          :class_name => association_id.to_s.camelize,
+          :foreign_key => association_id.to_s.foreign_key,
+          :shortcuts => []
         }.merge(options)
+        options[:shortcuts] = [options[:shortcuts]] unless options[:shortcuts].kind_of?(Array)
 
         define_method(association_id) do
           options[:class_name].constantize.find_by_id(send(options[:foreign_key]))
@@ -17,6 +19,16 @@ module ActiveHash
           send "#{options[:foreign_key]}=", new_value ? new_value.id : nil
         end
 
+        options[:shortcuts].each do |shortcut|
+          define_method("#{association_id}_#{shortcut}") do
+            send(association_id).try(shortcut)
+          end
+
+          define_method("#{association_id}_#{shortcut}=") do |new_value|
+            send "#{association_id}=", new_value ? options[:class_name].constantize.send("find_by_#{shortcut}", new_value) : nil
+          end
+        end
+
         create_reflection(
             :belongs_to,
             association_id.to_sym,

data/spec/active_yaml/base_spec.rb

@@ -82,4 +82,22 @@ describe ActiveYaml::Base do
 
   end
 
+  describe 'ID finders without reliance on a call to all, even with fields specified' do
+
+    before do
+      class City < ActiveYaml::Base
+        fields :id, :state, :name
+      end
+    end
+
+    it 'returns a single city based on #find' do
+      City.find(1).name.should == 'Albany'
+    end
+
+    it 'returns a single city based on find_by_id' do
+      City.find_by_id(1).name.should == 'Albany'
+    end
+
+  end
+
 end

data/spec/associations/associations_spec.rb

@@ -26,6 +26,9 @@ describe ActiveHash::Base, "associations" do
       include ActiveHash::Associations
     end
 
+    class SchoolStatus < ActiveHash::Base
+    end
+
     class Book < ActiveRecord::Base
       establish_connection :adapter => "sqlite3", :database => ":memory:"
       connection.create_table(:books, :force => true) do |t|
@@ -120,6 +123,24 @@ describe ActiveHash::Base, "associations" do
           school.city.should == city
         end
 
+        it "is assignable by name attribute" do
+          School.belongs_to_active_hash :city, :shortcuts => [:name]
+          City.data = [ {:id => 1, :name => 'gothan'} ]
+          city = City.find_by_name 'gothan'
+          school = School.create :city_name => 'gothan'
+          school.city.should == city
+          school.city_name.should == 'gothan'
+        end
+
+        it "have custom shortcut" do
+          School.belongs_to_active_hash :city, :shortcuts => :friendly_name
+          City.data = [ {:id => 1, :friendly_name => 'Gothan City'} ]
+          city = City.find_by_friendly_name 'Gothan City'
+          school = School.create :city_friendly_name => 'Gothan City'
+          school.city.should == city
+          school.city_friendly_name.should == 'Gothan City'
+        end
+
         it "returns nil when the record does not exist" do
           School.belongs_to_active_hash :city
           school = School.create! :city => nil
@@ -133,6 +154,13 @@ describe ActiveHash::Base, "associations" do
         association.should_not be_nil
         association.klass.name.should == City.name
       end
+
+      it "handles classes ending with an 's'" do
+        School.belongs_to_active_hash :school_status
+        association = School.reflect_on_association(:school_status)
+        association.should_not be_nil
+        association.klass.name.should == SchoolStatus.name
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -23,14 +23,15 @@ authors:
 - Adam Anderson
 - Keenan Brock
 - Desmond Bowe
+- Matthew O'Riordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70291036455660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +39,15 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70291036455660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70291036454000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +55,15 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70291036454000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70291036451580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -60,10 +71,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291036451580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70291036450320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,10 +87,15 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *70291036450320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70291036449280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -82,7 +103,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291036449280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: jeff@zilkey.com
 executables: []
@@ -130,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource