activemodel-associations 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017e2f0b46163726880d4703ec352add2b9b9b05
-  data.tar.gz: b5afa0902988cd9cae5656126178bc720d2fc12d
+  metadata.gz: 79477d111d595a8744d9aa8791e2af76140472c6
+  data.tar.gz: 2049c89ed6dcd5469f6c7d6038b4e61f8d53fc76
 SHA512:
-  metadata.gz: 57be72dc156c9913ed2de207b866385eb32391263b5d81f7695a431c9c54fe701bab046d2f608111be3d6fa75facf14d1744eca905231d719c1717338773c85c
-  data.tar.gz: bbbed9c4019bf1a309c4670ff54802dae9e04db77795882b171f59a4b2db1d5af10e2859eb947f44bbd03ca5ccb3185a158aca09da7c53dcd52f648184f4a0b4
+  metadata.gz: b14400b269f6fa840d48b83d0aa4713a95a64632abbd2c0585cc05214d3291932b8cecc9884f2f9e735cbccdb6edf56ac39d523053a018bbb793ba38a3905594
+  data.tar.gz: bafe78db7336da6457d3cb303c23f2c03f88bb6281513b9bf5c803f6b21a478b491ecc264cb185ea91ade09f7e47b7dc31f424f053bfc35f0cea684e853fc0c9

data/.travis.yml

@@ -1,8 +1,20 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.1.1
-  - 2.0.0
+  - 2.2
+  - 2.1
+  - 2.0
 gemfile:
   - gemfiles/activerecord-40.gemfile
   - gemfiles/activerecord-41.gemfile
+  - gemfiles/activerecord-412.gemfile
   - gemfiles/activerecord-42.gemfile
+  - gemfiles/activerecord-master.gemfile
+matrix:
+  exclude:
+    - rvm: 2.0
+      gemfile: gemfiles/activerecord-master.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/activerecord-master.gemfile
+  allow_failures:
+    - gemfile: gemfiles/activerecord-master.gemfile

data/README.md

@@ -8,7 +8,7 @@
 
 Add this line to your application's Gemfile:
 
-    gem 'activemodel-association'
+    gem 'activemodel-associations'
 
 And then execute:
 
@@ -16,7 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install activemodel-association
+    $ gem install activemodel-associations
 
 ## Usage
 
@@ -115,7 +115,7 @@ Support associations is only `belongs_to` and simple `has_many`
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/activemodel-association/fork )
+1. Fork it ( https://github.com/[my-github-username]/activemodel-associations/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -6,7 +6,7 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 namespace :spec do
-  %w(activerecord-40 activerecord-41 activerecord-412 activerecord-42).each do |gemfile|
+  %w(activerecord-40 activerecord-41 activerecord-412 activerecord-42 activerecord-master).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 activerecord-412 activerecord-42).each do |gemfile|
+    %w(activerecord-40 activerecord-41 activerecord-412 activerecord-42 activerecord-master).each do |gemfile|
       Rake::Task["spec:#{gemfile}"].invoke
     end
   end

data/gemfiles/activerecord-42.gemfile

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

data/gemfiles/activerecord-master.gemfile

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "activerecord", github: "rails/rails", branch: 'master'
+gem "arel", github: "rails/arel", branch: 'master'
+gem "activemodel", github: "rails/rails", branch: 'master'
+gem "activesupport", github: "rails/rails", branch: 'master'
+gem 'i18n', github: 'svenfuchs/i18n', branch: 'master'
+
+gemspec :path => "../"

data/lib/active_model/associations/override_methods.rb

@@ -2,17 +2,6 @@ module ActiveModel::Associations
   module OverrideMethods
     extend ActiveSupport::Concern
 
-    included do
-      # borrow method definition from ActiveRecord::Inheritance
-      # use in Rails internal
-      mod = Module.new do
-        unbound = ActiveRecord::Inheritance::ClassMethods.instance_method(:compute_type)
-        define_method(:compute_type, unbound)
-        protected :compute_type
-      end
-      extend mod
-    end
-
     module ClassMethods
       def generated_association_methods
         @generated_association_methods ||= begin
@@ -33,6 +22,34 @@ module ActiveModel::Associations
       def pluralize_table_names
         self.to_s.pluralize
       end
+
+      protected
+
+      def compute_type(type_name)
+        if type_name.match(/^::/)
+          # If the type is prefixed with a scope operator then we assume that
+          # the type_name is an absolute reference.
+          ActiveSupport::Dependencies.constantize(type_name)
+        else
+          # Build a list of candidates to search for
+          candidates = []
+          name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }
+          candidates << type_name
+
+          candidates.each do |candidate|
+            begin
+              constant = ActiveSupport::Dependencies.constantize(candidate)
+              return constant if candidate == constant.to_s
+              # We don't want to swallow NoMethodError < NameError errors
+            rescue NoMethodError
+              raise
+            rescue NameError
+            end
+          end
+
+          raise NameError.new("uninitialized constant #{candidates.first}", candidates.first)
+        end
+      end
     end
 
     # use by association accessor
@@ -55,6 +72,12 @@ module ActiveModel::Associations
     def read_attribute(name)
       send(name)
     end
+    alias :_read_attribute :read_attribute
+
+    # dummy
+    def new_record?
+      false
+    end
 
     private
 

data/lib/active_model/associations/version.rb

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

data/lib/active_record/associations/has_many_for_active_model_association.rb

@@ -10,6 +10,15 @@ module ActiveRecord::Associations
       false
     end
 
+    # not support counter_cache
+    def empty?
+      if loaded?
+        size.zero?
+      else
+        @target.blank? && !scope.exists?
+      end
+    end
+
     # full replace simplely
     def replace(other_array)
       original_target = load_target.dup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel-associations
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -211,6 +211,7 @@ files:
 - gemfiles/activerecord-41.gemfile
 - gemfiles/activerecord-412.gemfile
 - gemfiles/activerecord-42.gemfile
+- gemfiles/activerecord-master.gemfile
 - lib/active_model/associations.rb
 - lib/active_model/associations/active_record_reflection.rb
 - lib/active_model/associations/association_scope_extension.rb
@@ -246,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Association Helper for PORO (Plain Old Ruby Object)