bulk_updater 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0602240cc3436e129c8b7aa97fbc9d4ac7e809fd
-  data.tar.gz: 7a5c7b5672aa89bb47067bb36b70364f33db0442
+  metadata.gz: 2baae495ca7a7c60ede032edaaeabf4126d261a2
+  data.tar.gz: 444e1dea03657b0ad8fdd2ff9ee767ac499c071d
 SHA512:
-  metadata.gz: efd0b1749f840d68860c0a490d3ea4942d5d0b07bdf2c43bbff6a2e4c6cd35942082c1e4f6c656c1083c72862a9710166d61f7b7b184523abd514d81aed8b3c1
-  data.tar.gz: 0bac70e0c18c7fae2352f4da12dac97d47107ebad07e0dc435ec2cbaa87020ae5c1c0f45cde9ffe9b6cf6f5133d18dda75bfc57b4c937e106cfd3c78959f0f50
+  metadata.gz: e037db7978e15a00877668c13678a348eb6f425a73483ba6faf013927b4220b6e4245a9a8b8db8c9c2135c64a15d490b2187857487d9ea8da69b3d032cefd351
+  data.tar.gz: 77c4da2b34ba53dba9f2151142e5f284057e30ee36f57d8bf2943e54c6db0adf31e524d17dbea8ad173112a0e42c968440bac34294d7d080503c0ca9d15c391d

data/Rakefile

@@ -1,2 +1,7 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
 
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.pattern = "test/*_test.rb"
+end

data/bulk_updater.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'bulk_updater/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "bulk_updater"
-  spec.version       = BulkUpdater::VERSION
+  spec.version       = '0.0.2'
   spec.author        = "Alex Teut"
   spec.email         = ["jaturken@gmail.com"]
   spec.summary       = %q{Generate and execute SQL UPDATE for bulk updating multiple records by one request.}
@@ -20,5 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", '>= 0'
+  spec.add_development_dependency "minitest"
   spec.add_runtime_dependency 'activerecord', '>= 0'
 end

data/lib/bulk_updater.rb

@@ -1,10 +1,8 @@
-require "bulk_updater/version"
-
 class BulkUpdater
   attr_reader :model, :columns_to_find, :columns_to_update, :data
   
   def self.update!(model, columns_to_find, columns_to_update, data)
-    new(model, columns_to_find, columns_to_update, data).update!
+    new(model, columns_to_find, columns_to_update, data).send(:update!)
   end
 
   private
@@ -26,8 +24,6 @@ class BulkUpdater
     end
   end
 
-  private
-
   def update_condition
     columns_to_find.map do |column|
       values = data.map do |data_unit|
@@ -40,12 +36,10 @@ class BulkUpdater
 
   def update_statement
     columns_to_update.map do |column|
-      case_conditions = data.map do |data_unit|
-        case_condition = when_then(column, data_unit)
+      conditions = data.map do |data_unit|
+        when_then(column, data_unit)
       end.compact.join(' ')
-      if case_conditions.present?
-        "#{column.to_s} = CASE #{case_conditions} ELSE #{column.to_s} end"
-      end
+      "#{column} = CASE #{conditions} ELSE #{column} END" if !conditions.empty?
     end.compact.join(', ')
   end
 
@@ -53,12 +47,11 @@ class BulkUpdater
     one_record_condition = columns_to_find.map do |column_to_find|
       value = data_unit[column_to_find]
       value = quote_value(value)
-      "#{column_to_find.to_s} = #{value}"
+      "#{column_to_find} = #{value}"
     end.compact.join(' AND ')
     update_value = data_unit[column_to_update]
-    if update_value.present?
-      update_value = quote_value(update_value)
-      "WHEN #{one_record_condition} THEN #{update_value}" 
+    if !update_value.nil?
+      "WHEN #{one_record_condition} THEN #{quote_value(update_value)}"
     end
   end
 
@@ -66,7 +59,7 @@ class BulkUpdater
     if value.is_a?(Integer)
       value.to_s
     else
-      ActiveRecord::Base.connection.quote(value)
+      model.connection.quote(value)
     end
   end
 

data/test/bulk_updater_test.rb

@@ -0,0 +1,19 @@
+require "minitest/autorun"
+require 'bulk_updater'
+require 'fake_connection'
+
+class BulkUpdaterTest < Minitest::Test
+  def setup
+    @model = Minitest::Mock.new
+    @model.expect(:table_name, 'users')
+    connection = Minitest::Mock.new
+    connection.expect(:quote, 1, [Object])
+    connection.expect(:execute, 2)
+    @model.expect(:connection, connection)
+  end
+
+  def test_bulk_updater_has_update_method
+    assert_equal Method, BulkUpdater.method(:update!).class
+  end
+
+end

data/test/fake_connection.rb

@@ -0,0 +1,9 @@
+class FakeConnection
+  def quote(value)
+    value.to_s
+  end
+
+  def execute(sql)
+    sql
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+require 'bulk_updater'
+require 'minitest/unit'
+require 'minitest/autorun'
+require 'minitest/mock'
+require 'minitest/pride'

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: bulk_updater
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Teut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !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: 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: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem for joining multiple UPDATE requests into one. Useful when you regular
@@ -60,14 +74,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bulk_updater.gemspec
 - lib/bulk_updater.rb
-- lib/bulk_updater/version.rb
+- test/bulk_updater_test.rb
+- test/fake_connection.rb
+- test/test_helper.rb
 homepage: https://github.com/jaturken/bulk_updater
 licenses:
 - MIT
@@ -78,19 +94,22 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Generate and execute SQL UPDATE for bulk updating multiple records by one
   request.
-test_files: []
+test_files:
+- test/bulk_updater_test.rb
+- test/fake_connection.rb
+- test/test_helper.rb

data/lib/bulk_updater/version.rb

@@ -1,3 +0,0 @@
-module BulkUpdater
-  VERSION = "0.0.1"
-end