polymorphic_integer_type 1.0.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3150bb1aade940d2d7bcc14f11346b94c9d0371a
-  data.tar.gz: a1f64074b2044039215457482bb86a25f01d41bb
+  metadata.gz: 08271771790e3d2546b8584b6fe792c8f494b640
+  data.tar.gz: 27d420188711bc29f27712c91d8cb8e386ff8f8b
 SHA512:
-  metadata.gz: e50a25927c9f53b06562122c1006a0659c8ba8eeefff14641d6b84f849d128ed6f416825837b06c1b22721653606ca6bb2be60dc66f512c54794d866f8a03b77
-  data.tar.gz: 2cff25efb18334cfd06db9cfc6f2c299738c559bd961db6386a73c49d42167a3ce481f3fde8e6c0f22e0cbbc37cf0fdea7692a8772ba609d88f6cdd1bc2ee616
+  metadata.gz: c2bfd9fc2c3a12b560cf8bd3ddc2c8863b434d21253b552f854d1fcc20ed5584c9f514d1cfed66e38873324f7af6e3a4e780d5b23ba28d0287b6c8a2a8d41b1b
+  data.tar.gz: c293b70d040633371e16e5cad37c4a93005170f9be936202f8e74ec671ccdfc843214fb86c2ecf6587de5b1c252691d02f9daaf49e8219b4c51fb0cfeaaa5f94

data/README.md

@@ -45,6 +45,8 @@ Or install it yourself as:
 
     $ gem install polymorphic_integer_type
 
+For Rails 3.2 use version < 2. Version >= 2 has been tested on Rails 4.2 and Ruby 2.1
+
 ## Usage
 
 The gem is pretty straightforward to use.

data/lib/polymorphic_integer_type/extensions.rb

@@ -3,12 +3,13 @@ module PolymorphicIntegerType
   module Extensions
     module ClassMethods
 
-      def belongs_to(name, options = {})
+      def belongs_to(name, scope = nil, options = {})
+        options = scope if scope.kind_of? Hash
         integer_type = options.delete :integer_type
         super
         if options[:polymorphic] && integer_type
           mapping = PolymorphicIntegerType::Mapping[name]
-          foreign_type = reflections[name].foreign_type
+          foreign_type = reflections[name.to_s].foreign_type
           self._polymorphic_foreign_types << foreign_type
 
           define_method foreign_type do
@@ -16,7 +17,7 @@ module PolymorphicIntegerType
             mapping[t]
           end
 
-          define_method "#{foreign_type}=" do |klass|            
+          define_method "#{foreign_type}=" do |klass|
             enum = mapping.key(klass.to_s)
             enum ||= mapping.key(klass.base_class.to_s) if klass.kind_of?(Class) && klass <= ActiveRecord::Base
             enum ||= klass if klass != NilClass
@@ -37,7 +38,7 @@ module PolymorphicIntegerType
         end
       end
 
-      def remove_type_and_establish_mapping(name, options)
+      def remove_type_and_establish_mapping(name, options, scope)
         integer_type = options.delete :integer_type
         if options[:as] && integer_type
           poly_type = options.delete(:as)
@@ -47,24 +48,35 @@ module PolymorphicIntegerType
 
           options[:foreign_key] ||= "#{poly_type}_id"
           foreign_type = options.delete(:foreign_type) || "#{poly_type}_type"
-          options[:conditions] ||= {}
-          if options[:conditions].is_a?(Array)
-            cond = options[:conditions].first
-            options[:conditions][0] = "(#{cond}) AND #{foreign_type}=#{klass_mapping.to_i}"
-          else
-            options[:conditions].merge!({foreign_type => klass_mapping.to_i})
-          end
+
+          options[:scope] ||= -> {
+            condition = where(foreign_type => klass_mapping.to_i)
+            condition = instance_exec(&scope).merge(condition) if scope.is_a?(Proc)
+            condition
+          }
+        else
+          options[:scope] ||= scope
         end
       end
 
-      def has_many(name, options = {}, &extension)
-        remove_type_and_establish_mapping(name, options)
-        super(name, options, &extension)
+      def has_many(name, scope = nil, options = {}, &extension)
+        if scope.kind_of? Hash
+          options = scope
+          scope = nil
+        end
+
+        remove_type_and_establish_mapping(name, options, scope)
+        super(name, options.delete(:scope), options, &extension)
       end
 
-      def has_one(name, options = {})
-        remove_type_and_establish_mapping(name, options)
-        super(name, options)
+      def has_one(name, scope = nil, options = {})
+        if scope.kind_of? Hash
+          options = scope
+          scope = nil
+        end
+
+        remove_type_and_establish_mapping(name, options, scope)
+        super(name, options.delete(:scope), options)
       end
 
 

data/lib/polymorphic_integer_type/version.rb

@@ -1,3 +1,3 @@
 module PolymorphicIntegerType
-  VERSION = "1.0.6"
+  VERSION = "2.0.0"
 end

data/polymorphic_integer_type.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "activerecord", "3.2.11"
-  spec.add_development_dependency "mysql", "2.8.1"
-  spec.add_development_dependency "debugger"  
+  spec.add_development_dependency "activerecord", "4.2.0"
+  spec.add_development_dependency "mysql2", "0.3.16"
+  spec.add_development_dependency "byebug"
 
 end

data/spec/support/active_record.rb

@@ -2,7 +2,7 @@ require 'active_record'
 Dir["#{File.dirname(__FILE__)}/migrations/*.rb"].each {|f| require f}
 
 config = {
-  :adapter => "mysql",
+  :adapter => "mysql2",
   :host => "localhost",
   :database => "polymorphic_integer_type_test",
   :username => "root",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,30 +58,30 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 0.3.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 0.3.16
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="