polymorphic_integer_type 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzliMzI1OWVkMzQ3NGI5YWRmNzgyYjgwYmZmMzdjZmJlNGE3ZmY3Nw==
-  data.tar.gz: !binary |-
-    MTc3MWM1MjQzMjQ3OTFhMzk2MDczN2I0ZDQ5MDE1ZThiZTgxOGVmZA==
+SHA1:
+  metadata.gz: 3150bb1aade940d2d7bcc14f11346b94c9d0371a
+  data.tar.gz: a1f64074b2044039215457482bb86a25f01d41bb
 SHA512:
-  metadata.gz: !binary |-
-    YzRjYzIwNTk4NmFlYmU2ZTEzMGFmNDRlMWFhYjVmOWY0MDEwNGJmMGVmNGU2
-    YzA1NGYxMTBmN2M0YTZhZWI1YzAwN2UwNDgxNGJjMmMxYmI1ODhmOWY2MDYx
-    MmM3MTRkZWVlOTgxZjMyYTcwMzU1NTBhNmU2YzlhZjVmYzUzZTQ=
-  data.tar.gz: !binary |-
-    YTIzYjA4NzcxMWZhOTUyYjg3OGEyMjQ3MTRhNGVlY2VlN2Y2MDI3YTc5ZjE2
-    ZTU3MzBhYWY1MmI4NzNjMTI4NGMyYTM3YTllNmE3YjM5MzI1MTU3YTBhODNj
-    ZDU5OWNlMmI2MjJiYjgzNDM3MGRhYWQ4ZTE5OTVhNjc0YWNlYTQ=
+  metadata.gz: e50a25927c9f53b06562122c1006a0659c8ba8eeefff14641d6b84f849d128ed6f416825837b06c1b22721653606ca6bb2be60dc66f512c54794d866f8a03b77
+  data.tar.gz: 2cff25efb18334cfd06db9cfc6f2c299738c559bd961db6386a73c49d42167a3ce481f3fde8e6c0f22e0cbbc37cf0fdea7692a8772ba609d88f6cdd1bc2ee616

data/lib/polymorphic_integer_type/extensions.rb

@@ -48,7 +48,12 @@ module PolymorphicIntegerType
           options[:foreign_key] ||= "#{poly_type}_id"
           foreign_type = options.delete(:foreign_type) || "#{poly_type}_type"
           options[:conditions] ||= {}
-          options[:conditions].merge!({foreign_type => klass_mapping.to_i})
+          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
         end
       end
 

data/lib/polymorphic_integer_type/version.rb

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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: polymorphic_integer_type
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   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
@@ -84,14 +84,14 @@ dependencies:
   name: debugger
   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: Allows the *_type field in the DB to be an integer rather than a string
@@ -101,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -136,12 +136,12 @@ 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'
 requirements: []