calculate-all 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87793b642f35f1a0ac13c64ccc7b18f4dff5214f
-  data.tar.gz: 63106f78ba19a0e937389595464fe167cbd4fe78
+  metadata.gz: bcc98d3d676bc5db549074f9bd4f3e182f42ecb1
+  data.tar.gz: 0ec0592767487a7245339f4c4f7ac0c8a29c22c8
 SHA512:
-  metadata.gz: 195576395014c54049f6837ec4e44a4f72ace4b1e97ad4c4523bb85455c12efef59a3af9f5c0969cfb8bed01ce79e4c6c082f4bfc999dd1873682a32d413ebae
-  data.tar.gz: d94eb40b7d9e876d9c6c9d0fd3be3eb89132dd9c0d01ff2cb950d8887f1b17b9f952f978b568fbd1bd27b52fd418da8aebd0c72aec3133864bcd657ac20b0198
+  metadata.gz: ad855ac14b2c81caa8c849f0e9be8b28a8aeae0c87faf47e25a63e5b56739d63cc6c111211e170ec2b9757636d6c11b214ba937da5cd4caf05192f477ed34018
+  data.tar.gz: 2b3c94259c9d902722b31f203bb4620800fb863eea0fe12fb8561bb60dfc86177148704bb1b5de02ddd8b0d75290a46ed4b87843ddd2199229c2514579779685

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 0.1.1
+
+* groupdate compatibility
+* Use passed block to process values
+
+## 0.1.0
+
+* First version

data/README.md

@@ -14,7 +14,7 @@ results = YourModel.yourscopes.group(:grouping1).group(:grouping2)
     column3_median: 'percentile_cont(0.5) within group (order by column3 desc)')
 ```
 
-`#calculate_all` tries to mimic magic level of Active Record's `#group, `#count` and `#pluck`
+`#calculate_all` tries to mimic magic of Active Record's `#group`, `#count` and `#pluck`
 so result type depends on arguments and on groupings.
 
 ### Container
@@ -40,6 +40,45 @@ something like this:
 }
 ```
 
+### Conversion, formatting, value objects
+
+You can pass block to calculate_all. Rows will be passed to it and returned value will be used instead of
+row in result hash (or returned as is if there's no grouping)
+
+```ruby
+  Order.group(:country_id).calculate_all(:count, :avg_price) { |count:, avg_price:|
+    "#{count} orders, #{avg_price.to_i} dollars average"
+  }
+  # => {
+  #   1 => "5 orders, 120 dollars average",
+  #   2 => "10 orders, 200 dollars average"
+  # }
+
+  Order.group(:country_id).calculate_all(:avg_price) { |avg_price| avg_price.to_i }
+  # => {
+  #   1 => 120,
+  #   2 => 200
+  # }
+
+  Order.calculate_all(:count, :max_price, &OpenStruct.method(:new))
+  # => #<OpenStruct max_price=500, count=15>
+```
+
+## groupdate compatibility
+
+calculate-all should work with [groupdate](https://github.com/ankane/groupdate) too:
+
+```ruby
+  Model.group_by_year(:created_at, last: 5, default_value: {}).calculate_all(:price_min, :price_max)
+  => {
+    Sun, 01 Jan 2012 00:00:00 UTC +00:00=>{},
+    Tue, 01 Jan 2013 00:00:00 UTC +00:00=>{},
+    Wed, 01 Jan 2014 00:00:00 UTC +00:00=>{},
+    Thu, 01 Jan 2015 00:00:00 UTC +00:00=>{},
+    Fri, 01 Jan 2016 00:00:00 UTC +00:00=>{:price_min=>100, :price_max=>500}
+  }
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/calculate-all.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "groupdate"
 end

data/lib/calculate-all.rb

@@ -2,7 +2,7 @@ require "calculate-all/version"
 require "active_record"
 
 module CalculateAll
-  def calculate_all(*function_aliases, **functions)
+  def calculate_all(*function_aliases, **functions, &block)
     if function_aliases.size == 1 && functions == {}
       return_plain_values = true
     end
@@ -12,6 +12,11 @@ module CalculateAll
     if functions == {}
       raise ArgumentError, "provide at least one function to calculate"
     end
+    # groupdate compatibility
+    group_values = self.group_values
+    if !group_values.is_a?(Array) && group_values.respond_to?(:relation)
+      group_values = group_values.relation
+    end
     if functions.size == 1 && group_values.size == 0
       plain_rows = true
     end
@@ -26,6 +31,8 @@ module CalculateAll
         value = functions.keys.zip(row.last(functions.size)).to_h
       end
 
+      value = block.call(value) if block
+
       # Return unwrapped hash directly for scope without any .group()
       return value if group_values.empty?
 
@@ -74,5 +81,9 @@ module CalculateAll
   end
 end
 
-ActiveRecord::Relation.include CalculateAll
+# should be:
+#   ActiveRecord::Relation.include CalculateAll
+# including in module instead, for groupdate compatibility
+ActiveRecord::Calculations.include CalculateAll
+
 ActiveRecord::Base.extend CalculateAll::Querying

data/lib/calculate-all/version.rb

@@ -1,3 +1,3 @@
 module CalculateAll
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calculate-all
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - codesnik
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: groupdate
+  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: 'Extends Active Record with #calculate_all method'
 email:
 - aronaxis@gmail.com
@@ -103,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md