attribute-depends-calculator 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f26cc6d17eed91fc793b014e4bdf1fc3a58a8c77
-  data.tar.gz: bb121079814fbfccad2f3b8239504d3d2d8b152f
+  metadata.gz: 610ef3f54cde8fa3b3d074bf14072dd40e343215
+  data.tar.gz: d7f007351bf8cb3d93d58d5881f6ab701ca9719d
 SHA512:
-  metadata.gz: e2a04601664feb8771c9d2db48d9aa674675f78875a4c97e918a701af9d1074fe207a5dae6d1aa9257fad95696b5f227e77d396ea56d3105f949895e60128307
-  data.tar.gz: c104cdd193bf0b0d6519b8ce500eb2b8bb7be8b9b5d9521f54d26ba2aea743e1604fe2d17c7b7fe3e2e1b6467ea1186c2a0f47872eb4059d1beac20001b8a7d5
+  metadata.gz: f9349e547e3c5b87bf6445aaf7243effa2367ed1b2ff2ababddcc323c96d58959e3ccc00f7f18b6c3407735182489ca0bf2dc01337199afd43e203ca52d0929f
+  data.tar.gz: 2cee06a7cada6e7c99f39da8ae2de5a4157d5d510983ff0146cd54ae13a2286a717ef8ac25bef857d10b379d5db702be89de0863d2bff96c76c25714bc316eb0

data/.gitignore

@@ -10,3 +10,4 @@
 .ruby-version
 .idea/
 *.gem
+*.un~

data/.travis.yml

@@ -4,5 +4,14 @@ rvm:
   - 2.1.5
   - 2.2
   - 2.3.0
+gemfile:
+  - Gemfile
+  - Gemfile.rails40
+  - Gemfile.rails41
+matrix:
+  include:
+    - rvm: 2.3.0
+      gemfile: Gemfile.rails50
+
 script: xvfb-run rspec
 before_install: gem install bundler -v 1.11.2

data/Gemfile

@@ -1,12 +1,5 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in attribute-depends-calculator.gemspec
-gemspec
+eval_gemfile('Gemfile.global')
 
 group :test do
-  gem 'rails', '>=4.2.5'
-  gem 'sqlite3', '>=1.3.6'
-  gem 'rspec', '~> 2.11'
-  gem 'database_cleaner'
-  gem 'coveralls', require: false
+  gem 'rails', '4.2.7.1'
 end

data/Gemfile.global

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :test do
+  gem 'sqlite3', '>=1.3.6'
+  gem 'rspec', '~> 2.11'
+  gem 'database_cleaner'
+  gem 'coveralls', require: false
+end

data/Gemfile.rails40

@@ -0,0 +1,5 @@
+eval_gemfile('Gemfile.global')
+
+group :test do
+  gem 'rails', '4.0'
+end

data/Gemfile.rails41

@@ -0,0 +1,5 @@
+eval_gemfile('Gemfile.global')
+
+group :test do
+  gem 'rails', '4.1.5'
+end

data/Gemfile.rails50

@@ -0,0 +1,5 @@
+eval_gemfile('Gemfile.global')
+
+group :test do
+  gem 'rails', '5.0.0'
+end

data/README.md

@@ -3,6 +3,10 @@
 
 The scenario of the gem is when you have an attribute on model that value depends of a calculation of other model's attribute which attribute's model related. AttributeDependsCalculator will help you solve the case
 
+## Requirements
+1. Ruby **2.0+**
+2. Rails **4.0+**
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -41,7 +45,7 @@ order.reload.total_price
 ```
 As above show the price of order automatically update when whatever order_items changes
 
-## Advance
+## Advanced
 
 The options **operator** had two cateogries of value, the default value of the gem is expression **sum**
 
@@ -104,16 +108,23 @@ end
 ```
 
 
+**Proc**
+
+Proc can be passing in operator option, and the only one params is the active reload of the depended relate Model
+
+```ruby
+class Order < ActiveRecord::Base
+  ...
+  depend discount_price: {order_items: :price, operator: -> (items) { items.sum(:price) * discount } }
+end
+```
 
 
 
-## Contributing
 
-1. Fork it ( http://github.com/zmbacker/enum_help/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+
+## Contributing
+Bug reports and pull requests are welcome [on GitHub](https://github.com/falm/attribute-depends-calculator)
 
 ## License
 MIT © [Falm](https://github.com/falm)

data/attribute-depends-calculator.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.licenses      = ["MIT"]
 
+  spec.required_ruby_version = '>= 2.0'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rack', '~> 1.5'
 end

data/lib/attribute_depends_calculator/factory.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module AttributeDependsCalculator
   class Factory
 
@@ -5,9 +7,9 @@ module AttributeDependsCalculator
 
     attr_accessor :parameter
 
-    extend Forwardable
+    extend ::Forwardable
 
-    def_delegators :parameter, :depend_association_name, :depend_column, :expression
+    def_delegators :parameter, :depend_association_name, :depend_column, :expression, :proc?, :callback
 
     def initialize(klass, column, params)
       self.klass, self.column = klass, column
@@ -17,6 +19,7 @@ module AttributeDependsCalculator
 
     def perform
       define_calculator
+      define_operator_callback
       append_callbacks
     end
 
@@ -25,12 +28,28 @@ module AttributeDependsCalculator
     def define_calculator
       self.klass.class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{calculate_method_name}
-          total = self.#{depend_association_name}.#{expression}
+          total = #{calculate}
           update(:#{column} => total)
         end
       METHOD
     end
 
+    def calculate
+      if self.proc?
+        "self.#{column}_depends_callback(#{depend_association_name})"
+      else
+        "self.#{depend_association_name}.#{expression}"
+      end
+    end
+
+    def define_operator_callback
+      callback, column = self.callback, self.column
+      return if callback.nil?
+      self.klass.class_eval do
+        define_method "#{column}_depends_callback", &callback
+      end
+    end
+
     def calculate_method_name
       "calculate_and_update_#{column}"
     end

data/lib/attribute_depends_calculator/parameter.rb

@@ -1,7 +1,7 @@
 module AttributeDependsCalculator
   class Parameter
 
-    attr_accessor :params, :depend_association_name, :depend_column, :operator
+    attr_accessor :params, :depend_association_name, :depend_column, :operator, :expression
 
     OPERATORS = %i(+ *)
     METHODS = %i(sum average count minimum maximum)
@@ -15,21 +15,28 @@ module AttributeDependsCalculator
     def fetch
       self.depend_association_name = params.keys.first
       self.depend_column = params.values.first
-    end
-
-    def expression
       operator_filter
     end
 
     def operator_filter
-      if OPERATORS.include? operator
+      self.expression = if OPERATORS.include? operator
         "pluck(:#{depend_column}).compact.reduce(0, :#{operator})"
       elsif METHODS.include? operator
         "#{operator}(:#{depend_column})"
+      elsif operator.kind_of? Proc
+        @proc = operator
       else
         raise 'The operator of depends calculator are incorrect'
       end
     end
 
+    def proc?
+      !@proc.nil?
+    end
+
+    def callback
+      @proc
+    end
+
   end
 end

data/lib/attribute_depends_calculator/version.rb

@@ -1,4 +1,4 @@
 
 module AttributeDependsCalculator
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attribute-depends-calculator
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Jason Hou
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 description: auto calculate collect of depends attribute value and save when that
   changes
 email:
@@ -65,6 +51,10 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Gemfile.global
+- Gemfile.rails40
+- Gemfile.rails41
+- Gemfile.rails50
 - README.md
 - Rakefile
 - attribute-depends-calculator.gemspec
@@ -89,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -97,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: calculate depends attribute automatically