active_hash 1.2.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTE0YzI0ZDYzNTQ0OTVmOTI1Zjk4MmZlZWZlNGNlNGVmZjEyMzAxMg==
-  data.tar.gz: !binary |-
-    YTQwOGViNjkwZWJlOTkzZWZiZDgxNGU0NDgwZDVkNzE4OWY2MTE5Nw==
-SHA512:
-  metadata.gz: !binary |-
-    Y2U2MGUzZjdkZDg3ODYyM2Q1NDNmODgyNTY0YjM0N2U2ZTYyOGIzZmFlYWMz
-    MTBmNjBjMTVjZDFhMzU4M2Q5ODcxMmI4NzYxMGNlNWNiNTg2MjZhNGQ1MmZk
-    MmRhYTI0OWIzMzliNWFkN2E3ZjRmMDhmNmViNzg1ZTNlYjZjYjE=
-  data.tar.gz: !binary |-
-    MTU4NzNmZjdiNzM1MzkyYjA4MTMxOTJjZjhkMzJhNTQ4MTMzYTQ5NGFkOWI1
-    YjRmYzRlZmRhMWRmYzQ1OWY0ZjY1ZWY4NGUyZDZmMjEwNGIwMzNjZjMzZTJl
-    NjhjMzZlNTFkOTA2MDU4YjQwZTMwN2U0ODhjNTY3NWM2ZWIwZmM=
+--- 
+SHA512: 
+  data.tar.gz: 9d8d6b6e4fa0369a177c9b9b67ef4e143ebb3bd4e427adf5e77dc0e8447d794fa3f5a40598dc1daa0452f52cb636745933b0b07a3239a947066032ff009d848f
+  metadata.gz: 0f191d2cae8465f16f94f91d6c063274d4f381b1ea354549e48555fc0811467eadc61714d12970bd9b330c795b90d9a2dec428f9fe963addd4121d243e412aa6
+SHA1: 
+  data.tar.gz: 854bde47211e64f3ff0654dafb5758ac53ab324b
+  metadata.gz: 602de7a522546a375e46d7d75a576ffcfd1ab076

data/CHANGELOG

@@ -1,3 +1,7 @@
+2013-10-24 (v1.2.1)
+  - fixed nasty bug in belongs_to that would prevent users from passing procs (thanks for the issue freebird0221)
+  - fixed bug where passing in a separate class name to belongs_to_active_hash would raise an exception (mauriciopasquier)
+
 2013-10-01 (v1.2.0)
   - belongs_to is back!
   - added support for primary key options for belongs_to (tomtaylor)

data/README.md

@@ -54,7 +54,7 @@ You can also use _create_:
       create :id => 2, :name => "Canada"
     end
 
-If you are Pat Nakajima,  you probably prefer _add_:
+You can also use _add_:
 
     class Country < ActiveHash::Base
       field :name
@@ -192,13 +192,26 @@ In versions of ActiveRecord previous to 3.1, you should be able to do the follow
       belongs_to :country
     end
 
-However, as of ActiveRecord 3.1 support for ActiveRecord's `belong_to` is broken.  Instead, you must use the `belongs_to_active_hash` method:
+However, as of ActiveRecord 3.1 support for ActiveRecord's `belong_to` is broken.  Instead, you must extend ActiveHash::Associations::ActiveRecordExtensions method:
 
     class Country < ActiveHash::Base
     end
 
     class Person < ActiveRecord::Base
       extend ActiveHash::Associations::ActiveRecordExtensions
+      belongs_to :country
+    end
+
+NOTE: this needs to be called on a subclass of ActiveRecord::Base.  If you extend ActiveRecord::Base, it will not work.
+If you want to extend ActiveRecord::Base so all your AR models can belong to ActiveHash::Base objects, you can use the
+`belongs_to_active_hash` method:
+
+    ActiveRecord::Base.extend ActiveHash::Associations::ActiveRecordExtensions
+
+    class Country < ActiveHash::Base
+    end
+
+    class Person < ActiveRecord::Base
       belongs_to_active_hash :country
     end
 

data/lib/active_hash/version.rb

@@ -1,5 +1,5 @@
 module ActiveHash
   module Gem
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/lib/associations/associations.rb

@@ -3,7 +3,10 @@ module ActiveHash
 
     module ActiveRecordExtensions
 
-      def belongs_to(name, options = {})
+      def belongs_to(*args)
+        our_args = args.dup
+        options = our_args.extract_options!
+        name = our_args.shift
         options = {:class_name => name.to_s.camelize }.merge(options)
         klass = options[:class_name].constantize
         if klass < ActiveHash::Base
@@ -17,9 +20,10 @@ module ActiveHash
         options = {
           :class_name => association_id.to_s.camelize,
           :foreign_key => association_id.to_s.foreign_key,
-          :primary_key => association_id.to_s.camelize.constantize.primary_key,
           :shortcuts => []
         }.merge(options)
+        # Define default primary_key with provided class_name if any
+        options[:primary_key] ||= options[:class_name].constantize.primary_key
         options[:shortcuts] = [options[:shortcuts]] unless options[:shortcuts].kind_of?(Array)
 
         define_method(association_id) do

data/spec/associations/associations_spec.rb

@@ -178,6 +178,21 @@ describe ActiveHash::Base, "associations" do
   describe ActiveHash::Associations::ActiveRecordExtensions do
 
     describe "#belongs_to" do
+
+      if ActiveRecord::VERSION::MAJOR > 3
+        it "doesn't interfere with AR's procs in belongs_to methods" do
+          School.belongs_to :country, lambda{ where( ) }
+          school = School.new
+          country = Country.create!
+          school.country = country
+          school.country.should == country
+          school.country_id.should == country.id
+          school.save!
+          school.reload
+          school.reload.country_id.should == country.id
+        end
+      end
+
       it "sets up an ActiveRecord association for non-ActiveHash objects" do
         School.belongs_to :country
         school = School.new
@@ -260,6 +275,13 @@ describe ActiveHash::Base, "associations" do
         association.should_not be_nil
         association.klass.name.should == SchoolStatus.name
       end
+
+      it "handles custom association names" do
+        School.belongs_to_active_hash :status, :class_name => 'SchoolStatus'
+        association = School.reflect_on_association(:status)
+        association.should_not be_nil
+        association.klass.name.should == SchoolStatus.name
+      end
     end
   end
 

metadata

@@ -1,9 +1,9 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: active_hash
-version: !ruby/object:Gem::Version
-  version: 1.2.0
+version: !ruby/object:Gem::Version 
+  version: 1.2.1
 platform: ruby
-authors:
+authors: 
 - Jeff Dean
 - Mike Dalessio
 - Corey Innis
@@ -27,86 +27,74 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+
+date: 2012-01-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :development
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "4"
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.2
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id005 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  name: sqlite3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "4"
+  name: activerecord
+  prerelease: false
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id005
+  name: appraisal
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id006
 description: 
 email: jeff@zilkey.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - CHANGELOG
 - LICENSE
 - README.md
@@ -131,28 +119,28 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/zilkey/active_hash
 licenses: []
+
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id005
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id005
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.10
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-like model that uses a hash or file as a datasource
-test_files:
+test_files: 
 - Gemfile
 - spec/active_file/base_spec.rb
 - spec/active_hash/base_spec.rb