active_record_patch_first_or_create 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5478264fa26b04687d1f600cec8ebcf8c26cf68
-  data.tar.gz: 26c207ae53c67c8b4b128d5c7d81aeeac0e598f8
+  metadata.gz: b56bc4e68ceb6b1ae6089c20fe56b25d324497fa
+  data.tar.gz: 7d90a7e02899bee82c47cf3f260998b6cfb7ec11
 SHA512:
-  metadata.gz: 7742d1e4bc569d0288d14bb27e64755acacac0718edc1355efc5003ec31cecf6859c4e23bc61b8c4c2dac4705edcb6b8592d19c07a1bb87ed50d11613f57cb2a
-  data.tar.gz: 125ae54308548403d7ef4993f5ae457c786a55f94314ceb0a2e93fe237e7889ec9c11f572439e6eefe63e3ffe53997220352bfc6731bd596b9d438a978e3aa5e
+  metadata.gz: 391e2fe0cf2643db27a2cd3e4bff5d470b396f9f5e529aae934f64d8055f87ce4417383aaeffcb6e525f51b4627fbdfcdd942a709cee8adf32af07a0d24966e7
+  data.tar.gz: de16600866569f8b6ee9f409ee49046fbfeab5a6641a0b0eddd50cf05e7264906bbdce2845002031cb2fb1129dd43e35f0792c7663912b3ee871a9fc8bbd7f86

data/README.md

@@ -26,15 +26,19 @@ We find out that methods like first_or_create or find_or_create_by are not atomi
 
 Finds the first record with the given attributes, or creates a record with the attributes if one is not found:
 
+```ruby 
 # Find the first user with uid "abc123" or create a new one.
 User.where(uid: 'abc123').atomic_first_or_create(name: 'John', uid: 'abc123')
 # => #<User id: 1, uid: "abc123", name: 'John'>
-
+```
+```ruby 
 # Find the first user with uid "abc123" or create a new one.
 # We already have one so the existing record will be returned.
 User.where(uid: 'abc123').atomic_first_or_create(name: 'John', uid: 'abc123')
 # => #<User id: 1, uid: "abc123", name: 'John'>
-
+```
+```ruby 
 # Find the first user with uid "abc1234" or create a new one
 User.where(uid: 'abc123').atomic_first_or_create(name: 'Johansson', uid: 'abc1234')
 # => #<User id: 2, uid: "abc1234", name: 'Johansson'>
+```

data/active_record_patch_first_or_create.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 0"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "mocha"
-  spec.add_development_dependency "webmock"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "minitest", "~> 0"
+  spec.add_development_dependency "mocha", "~> 0"
+  spec.add_development_dependency "webmock", "~> 0"
+  spec.add_development_dependency "activerecord", "~> 0"
+  spec.add_development_dependency "sqlite3", "~> 0"
 end

data/lib/active_record_patch_first_or_create.rb

@@ -1,16 +1,14 @@
 require "active_record_patch_first_or_create/version"
+require "active_record_patch_first_or_create/arel_query_creator"
 
 module ActiveRecordPatchFirstOrCreate
   def self.first_or_create relation, attributes
+
     attributes = attributes.merge(relation.where_values_hash)
     attributes = attributes.merge(rails_timestamps(relation))
     attributes = serialize_columns(relation, attributes)
 
-    sql = "INSERT INTO #{relation.table_name} (#{attributes.keys.join(",")})
-           SELECT #{(['?'] * attributes.values.count).join(', ')}
-           WHERE NOT EXISTS (#{relation.select('1').to_sql})"
-
-    relation.klass.find_by_sql([sql] + attributes.values)
+    ActiveRecord::Base.connection.execute(ArelQueryCreator.new(relation, attributes).to_sql)
 
     relation.first
   end
@@ -22,9 +20,8 @@ module ActiveRecordPatchFirstOrCreate
 
   def self.serialize_columns relation, attributes
     Hash[attributes.map do |key, value|
-      serializer = relation.klass.serialized_attributes[key.to_s]
-      value = serializer.dump(value) unless serializer.nil?
-      [key, value]
+      column = relation.klass.columns.find { |c| c.name == key.to_s }
+      [key, column ? column.cast_type.type_cast_for_database(value) : value]
     end]
   end
 end
@@ -35,4 +32,4 @@ module ActiveRecord
       ActiveRecordPatchFirstOrCreate.first_or_create(self, attributes)
     end
   end
-end
+end

data/lib/active_record_patch_first_or_create/arel_query_creator.rb

@@ -0,0 +1,42 @@
+module ActiveRecordPatchFirstOrCreate
+  class ArelQueryCreator < Struct.new(:relation, :attributes)
+    def to_sql
+      insert_query.to_sql
+    end
+
+    private
+
+    def insert_query
+      manager = Arel::InsertManager.new(ActiveRecord::Base)
+      manager.into table
+
+      attributes.keys.each do |name|
+        manager.columns << table[name]
+      end
+
+      manager.select select_query
+      manager
+    end
+
+    def select_query
+      select = Arel::SelectManager.new(ActiveRecord::Base)
+      attributes.values.each do |value|
+        select.project Arel.sql(ActiveRecord::Base.connection.quote(value))
+      end
+      select.where(not_exists_query.exists.not)
+      select
+    end
+
+    def not_exists_query
+      query = table.project(Arel.sql('1'))
+      relation.where_values_hash.each do |k,v|
+        query.where(table[k.to_sym].eq(v))
+      end
+      query
+    end
+
+    def table
+      Arel::Table.new relation.table_name
+    end
+  end
+end

data/lib/active_record_patch_first_or_create/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordPatchFirstOrCreate
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_patch_first_or_create
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - NDrive DevOps Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,70 +42,70 @@ dependencies:
   name: minitest
   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: mocha
   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: webmock
   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: activerecord
   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: sqlite3
   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: This patch provides first_or_create method to be atomic, once the default
@@ -122,6 +122,7 @@ files:
 - Rakefile
 - active_record_patch_first_or_create.gemspec
 - lib/active_record_patch_first_or_create.rb
+- lib/active_record_patch_first_or_create/arel_query_creator.rb
 - lib/active_record_patch_first_or_create/version.rb
 homepage: http://www.ndrive.com
 licenses:
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord patch first_or_create atomic version