delta_attributes 0.0.4 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a71dc316af524b943bef7a6af497e90077d4c636
+  data.tar.gz: 44411f7fcf26f7784227866a2eefd07c63911fef
+SHA512:
+  metadata.gz: 418d3a188bb3b6cdc36eb1d918ae3fdc4fc6493c27fbf2dd12785f188c9fd5f83e6f09ea0b7723f44cfd7802905a5f911ec55b9e743bf951a51cb74231f074a2
+  data.tar.gz: 5d6e5763c209d8d4eda6de700930e12afa3e544cd282cc664d5e05c57c2f5e487501b739bc9261bcf00881fd2e5eb5c8409a9ff079f4f8665f3b56c55be893a7

data/README.md

@@ -78,7 +78,7 @@ Or install it yourself as:
   It doesn't matter as delta is calculated as difference between original value received from database and new value
   before update.
 
-  Tested with rails 3.1.0, 3.2.0, 3.2.8, 3.2.9.
+  Tested with rails 4.0, 3.2.9, 3.2.8, 3.2.0, 3.1.0
 
 ## Contributing
 

data/delta_attributes.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'delta_attributes/version'
+require 'shared/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "delta_attributes"
+  gem.name          = 'delta_attributes'
   gem.version       = DeltaAttributes::VERSION
-  gem.authors       = ["Oleh (izbor) Novosad, Yuriy Lavryk, Arya"]
-  gem.email         = ["oleh.novosad@gmail.com"]
+  gem.authors       = ['Oleh Novosad, Yuriy Lavryk, Arya']
+  gem.email         = %w(oleh.novosad@gmail.com)
   gem.description   = %q{
     This gem makes updating specified number fields by ActiveRecord in unusual way.
 
@@ -31,11 +31,12 @@ Gem::Specification.new do |gem|
     Source code: https://github.com/izbor/delta_attributes
   }
   gem.summary       = %q{ delta attributes }
-  gem.homepage      = ""
+  gem.homepage      = 'https://github.com/izbor/delta_attributes'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  gem.add_dependency "rails", ">= 3.1.0"
+  gem.require_paths = %w(lib)
+  gem.add_dependency 'rails', '>= 3.2'
+  gem.license = 'MIT'
 end

data/lib/delta_attributes.rb

@@ -1,2 +1,9 @@
-require "delta_attributes/version"
-require 'delta_attributes/railtie' if defined?(Rails)
+require 'shared/version'
+
+if defined?(Rails)
+
+  load 'delta_attributes3_2/railtie.rb' if Rails::VERSION::MAJOR == 3
+
+  load 'delta_attributes4/railtie.rb' if Rails::VERSION::MAJOR == 4
+
+end

data/lib/{delta_attributes → delta_attributes3_2}/main.rb

@@ -1,10 +1,10 @@
 require 'set'
-require "delta_attributes/update_statement"
-require "delta_attributes/update_manager"
-require "delta_attributes/to_sql"
-require "delta_attributes/mysql"
-require "delta_attributes/crud"
-require "delta_attributes/visitor"
+require 'delta_attributes3_2/update_statement'
+require 'delta_attributes3_2/update_manager'
+require 'delta_attributes3_2/to_sql'
+require 'delta_attributes3_2/mysql'
+require 'delta_attributes3_2/crud'
+require 'delta_attributes3_2/visitor'
 
 module ActiveRecord
   # = Active Record Persistence

data/lib/delta_attributes3_2/railtie.rb

@@ -0,0 +1,9 @@
+class DeltaAttributesRailtie < Rails::Railtie
+
+  initializer 'delta_attributes.configure_rails_initialization' do
+    ActiveSupport.on_load(:active_record) do
+      require 'delta_attributes3_2/main.rb'
+    end
+  end
+
+end

data/lib/delta_attributes4/bind_visitor.rb

@@ -0,0 +1,25 @@
+module Arel
+  module Visitors
+    module BindVisitor
+      private
+
+      def visit_Arel_Nodes_Assignment(o)
+        if o.right.is_a? Arel::Nodes::BindParam
+          if o.left && o.left.expr && o.left.expr.relation \
+            && o.left.expr.relation.engine \
+            && o.left.expr.relation.engine.respond_to?(:delta_attributes)  \
+            && o.left.expr.relation.engine.delta_attributes.include?(o.left.name)
+
+            l = visit o.left
+            "#{l} = #{l} + #{visit o.right}"
+          else
+            "#{visit o.left} = #{visit o.right}"
+          end
+        else
+          super
+        end
+      end
+
+    end
+  end
+end

data/lib/delta_attributes4/main.rb

@@ -0,0 +1,39 @@
+require 'delta_attributes4/bind_visitor'
+require 'delta_attributes4/persistence'
+
+module ActiveRecord
+  # = Active Record Persistence
+  module Persistence
+
+    class InvalidDeltaColumn < StandardError;
+    end
+
+    def self.included(base) #:nodoc:
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+
+      def delta_attributes(*args)
+        @_delta_attributes ||= Set.new
+
+        return @_delta_attributes if args.empty?
+
+        args.each do |attribute|
+
+          if self.columns_hash[attribute.to_s].blank?
+            raise InvalidDeltaColumn.new("#{self.to_s} model doesn't have attribute with name '#{attribute}.")
+          end
+
+          if self.columns_hash[attribute.to_s] && !self.columns_hash[attribute.to_s].number?
+            raise InvalidDeltaColumn.new("Delta attributes only work with number attributes, column `#{attribute}` is not a number.")
+          end
+
+          @_delta_attributes.add(attribute.to_s)
+        end
+
+      end
+    end
+  end
+
+end

data/lib/delta_attributes4/persistence.rb

@@ -0,0 +1,36 @@
+module ActiveRecord
+  # = Active Record Persistence
+  module Persistence
+
+    # Updates the associated record with values matching those of the instance attributes.
+    # Returns the number of affected rows.
+    def update_record(attribute_names = @attributes.keys)
+      attributes_with_values = arel_attributes_with_values_for_update(attribute_names)
+      if attributes_with_values.empty?
+        0
+      else
+        klass = self.class
+        column_hash = klass.connection.schema_cache.columns_hash klass.table_name
+        db_columns_with_values = attributes_with_values.map { |attr,value|
+          real_column = column_hash[attr.name]
+
+          v = value
+          if self.class.respond_to?(:delta_attributes) && self.class.delta_attributes.include?(attr.name)
+            if @changed_attributes.include?(attr.name)
+              v = value - @changed_attributes[attr.name]
+            end
+          end
+
+          [real_column, v]
+        }
+        bind_attrs = attributes_with_values.dup
+        bind_attrs.keys.each_with_index do |column, i|
+          real_column = db_columns_with_values[i].first
+          bind_attrs[column] = klass.connection.substitute_at(real_column, i)
+        end
+        stmt = klass.unscoped.where(klass.arel_table[klass.primary_key].eq(id_was || id)).arel.compile_update(bind_attrs)
+        klass.connection.update stmt, 'SQL', db_columns_with_values
+      end
+    end
+  end
+end

data/lib/delta_attributes4/railtie.rb

@@ -0,0 +1,9 @@
+class DeltaAttributesRailtie < Rails::Railtie
+
+  initializer 'delta_attributes.configure_rails_initialization' do
+    ActiveSupport.on_load(:active_record) do
+      require 'delta_attributes4/main.rb'
+    end
+  end
+
+end

data/lib/{delta_attributes → shared}/version.rb

@@ -1,3 +1,3 @@
 module DeltaAttributes
-  VERSION = "0.0.4"
+  VERSION = '1.0.2'
 end

metadata

@@ -1,49 +1,43 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: delta_attributes
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 1.0.2
 platform: ruby
-authors: 
-- Oleh (izbor) Novosad, Yuriy Lavryk, Arya
+authors:
+- Oleh Novosad, Yuriy Lavryk, Arya
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-21 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
   type: :runtime
-  version_requirements: *id001
-description: "\n    This gem makes updating specified number fields by ActiveRecord in unusual way.\n\n    Instead of generating sql script to update value in usual way like this:\n\n      UPDATE users\n      SET money = 10\n      WHERE id = 1;\n\n    It replaces it with\n\n      UPDATE users\n      SET money = money + delta\n      WHERE id = 1;\n\n    where delta is difference between old value and new value of that field.\n\n    This solves problem with simultaneous updating of the same field by different threads\n    (problem known as race condition).\n\n    Source code: https://github.com/izbor/delta_attributes\n  "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+description: "\n    This gem makes updating specified number fields by ActiveRecord
+  in unusual way.\n\n    Instead of generating sql script to update value in usual
+  way like this:\n\n      UPDATE users\n      SET money = 10\n      WHERE id = 1;\n\n
+  \   It replaces it with\n\n      UPDATE users\n      SET money = money + delta\n
+  \     WHERE id = 1;\n\n    where delta is difference between old value and new value
+  of that field.\n\n    This solves problem with simultaneous updating of the same
+  field by different threads\n    (problem known as race condition).\n\n    Source
+  code: https://github.com/izbor/delta_attributes\n  "
+email:
 - oleh.novosad@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -51,48 +45,41 @@ files:
 - Rakefile
 - delta_attributes.gemspec
 - lib/delta_attributes.rb
-- lib/delta_attributes/crud.rb
-- lib/delta_attributes/main.rb
-- lib/delta_attributes/mysql.rb
-- lib/delta_attributes/railtie.rb
-- lib/delta_attributes/to_sql.rb
-- lib/delta_attributes/update_manager.rb
-- lib/delta_attributes/update_statement.rb
-- lib/delta_attributes/version.rb
-- lib/delta_attributes/visitor.rb
-has_rdoc: true
-homepage: ""
-licenses: []
-
+- lib/delta_attributes3_2/crud.rb
+- lib/delta_attributes3_2/main.rb
+- lib/delta_attributes3_2/mysql.rb
+- lib/delta_attributes3_2/railtie.rb
+- lib/delta_attributes3_2/to_sql.rb
+- lib/delta_attributes3_2/update_manager.rb
+- lib/delta_attributes3_2/update_statement.rb
+- lib/delta_attributes3_2/visitor.rb
+- lib/delta_attributes4/bind_visitor.rb
+- lib/delta_attributes4/main.rb
+- lib/delta_attributes4/persistence.rb
+- lib/delta_attributes4/railtie.rb
+- lib/shared/version.rb
+homepage: https://github.com/izbor/delta_attributes
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.5.3
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: delta attributes
 test_files: []
-

data/lib/delta_attributes/railtie.rb

@@ -1,8 +0,0 @@
-
-class DeltaAttributesRailtie < Rails::Railtie
-
-  initializer "delta_attributes.configure_rails_initialization", {:after => 1} do
-     load "delta_attributes/main.rb"
-  end
-
-end