activemodel-associations 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d9c6e4e10b3abbddc32adb581c7986a5cb62efc
-  data.tar.gz: 5dc2e3d9acb6351c8d041f252e43454d221bd3e9
+  metadata.gz: 017e2f0b46163726880d4703ec352add2b9b9b05
+  data.tar.gz: b5afa0902988cd9cae5656126178bc720d2fc12d
 SHA512:
-  metadata.gz: bdb223dd6a00f9571869a04cde42dbaabe997fefd9a02fc9bb9dac6ceb964b48f36ef84f5b8c41f259083ff7ddc315875013e01278cb6038961ce63919669e09
-  data.tar.gz: 1b75beaef925ef9149e7ebcefaf167eb094263a2b552224e56972d5ea6fafa331ab293d0960679378bbf71ffcf3813b910b19fe93bacd07f31749c615a48db8d
+  metadata.gz: 57be72dc156c9913ed2de207b866385eb32391263b5d81f7695a431c9c54fe701bab046d2f608111be3d6fa75facf14d1744eca905231d719c1717338773c85c
+  data.tar.gz: bbbed9c4019bf1a309c4670ff54802dae9e04db77795882b171f59a4b2db1d5af10e2859eb947f44bbd03ca5ccb3185a158aca09da7c53dcd52f648184f4a0b4

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
 gemfile:
   - gemfiles/activerecord-40.gemfile
   - gemfiles/activerecord-41.gemfile
+  - gemfiles/activerecord-42.gemfile

data/Rakefile

@@ -6,7 +6,7 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 namespace :spec do
-  %w(activerecord-40 activerecord-41).each do |gemfile|
+  %w(activerecord-40 activerecord-41 activerecord-412 activerecord-42).each do |gemfile|
     desc "Run Tests by #{gemfile}.gemfile"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle install --path .bundle"
@@ -16,7 +16,7 @@ namespace :spec do
 
   desc "Run All Tests"
   task :all do
-    %w(activerecord-40 activerecord-41).each do |gemfile|
+    %w(activerecord-40 activerecord-41 activerecord-412 activerecord-42).each do |gemfile|
       Rake::Task["spec:#{gemfile}"].invoke
     end
   end

data/activemodel-associations.gemspec

@@ -29,4 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
 end

data/gemfiles/activerecord-41.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.1.0"
-gem "activemodel", "~> 4.1.0"
-gem "activesupport", "~> 4.1.0"
+gem "activerecord", "~> 4.1.0", "<= 4.1.1"
+gem "activemodel", "~> 4.1.0", "<= 4.1.1"
+gem "activesupport", "~> 4.1.0", "<= 4.1.1"
 
 gemspec :path => "../"

data/gemfiles/activerecord-412.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.1.2"
+gem "activemodel", "~> 4.1.2"
+gem "activesupport", "~> 4.1.2"
+
+gemspec :path => "../"

data/gemfiles/activerecord-42.gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "activerecord", github: "rails/rails"
+gem "arel", github: "rails/arel"
+gem "activemodel", github: "rails/rails"
+gem "activesupport", github: "rails/rails"
+
+gemspec :path => "../"

data/lib/active_model/associations/active_record_reflection.rb

@@ -3,8 +3,13 @@ module ActiveModel::Associations
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :reflections
-      self.reflections = {}
+      if ActiveRecord.version.to_s >= "4.1.2"
+        class_attribute :_reflections
+        self._reflections = ActiveSupport::HashWithIndifferentAccess.new
+      else
+        class_attribute :reflections
+        self.reflections = {}
+      end
     end
 
     module ClassMethods
@@ -22,7 +27,11 @@ module ActiveModel::Associations
       end
 
       def reflect_on_association(association)
-        reflections[association]
+        if ActiveRecord.version.to_s >= "4.1.2"
+          _reflections[association.to_s]
+        else
+          reflections[association]
+        end
       end
     end
   end

data/lib/active_model/associations/override_methods.rb

@@ -52,6 +52,10 @@ module ActiveModel::Associations
       association
     end
 
+    def read_attribute(name)
+      send(name)
+    end
+
     private
 
     # override

data/lib/active_model/associations/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   module Associations
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/active_record/associations/has_many_for_active_model_association.rb

@@ -50,5 +50,14 @@ module ActiveRecord::Associations
 
       target
     end
+
+    private
+
+    def get_records
+      return scope.to_a if reflection.scope_chain.any?(&:any?)
+
+      target_ids = reflection.options[:target_ids]
+      klass.where(id: owner[target_ids]).to_a
+    end
   end
 end

data/spec/lib/active_model/association_spec.rb

@@ -53,7 +53,7 @@ describe ActiveModel::Associations do
           end
 
           it "can validate" do
-            expect(comment.valid?).to be_true
+            expect(comment.valid?).to be_truthy
           end
         end
 
@@ -180,7 +180,7 @@ describe ActiveModel::Associations do
           end
 
           it "can validate" do
-            expect(group.valid?).to be_true
+            expect(group.valid?).to be_truthy
           end
         end
 

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'coveralls'
 Coveralls.wear!
 
+require 'byebug'
+require 'pry-byebug'
+
 require 'activemodel/associations'
 ActiveModel::Associations::Hooks.init
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-associations
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -150,6 +150,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveRecord Association Helper for PORO (Plain Old Ruby Object)
 email:
 - kakyoin.hierophant@gmail.com
@@ -167,6 +209,8 @@ files:
 - activemodel-associations.gemspec
 - gemfiles/activerecord-40.gemfile
 - gemfiles/activerecord-41.gemfile
+- gemfiles/activerecord-412.gemfile
+- gemfiles/activerecord-42.gemfile
 - lib/active_model/associations.rb
 - lib/active_model/associations/active_record_reflection.rb
 - lib/active_model/associations/association_scope_extension.rb