hash_pivot 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f2d44b5f76c95c2ad378d60440653827667b9801f5de25495ca8eed2508f68c
-  data.tar.gz: ad8545ca39c0209161d6633518ba4e598ed3cceb5a802abc37ac150a12675dda
+  metadata.gz: 871d8c1d4c6a26913eb825057ee2823b54e9919c5a8faceadc008064fd239243
+  data.tar.gz: 4a5c03ee17d1ab10a11873f5b56419de12fadeaa6a34695e8eb1d3fd48f0d93e
 SHA512:
-  metadata.gz: fa18ee0660da4d17ec5164b3d9bb0adcb19f538e98331a5c039788961e4ea9a28660c59f819b7a6cf8104e2acf67dc59ecc07f181ea244b1dc75eac2d58db0ff
-  data.tar.gz: 56b798dd12140e7fa1b77b2bf807a85eaac4f63792224a475b69f9e12b29f08d0d2bd1019cbc990c5e0cf171fad9877a71513abd9c0eb841e915febe9cb754cc
+  metadata.gz: b4c7fcd39a18b07f16c8b7facaeb42fdb76969d42879a0c663789458f007692233c9cdb4d4cb6d685d17877b8688e2f17f431c263c8578e1aad67f9b18d56f57
+  data.tar.gz: 9fa1e4cb4becd504a2832dcdf5d221709340a23e39ea9c35d917f797949b1768833675fc8e8874b848bce572f0fd84377d4699de6fdd7829e3153413c216421f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.3.1] - 2022-06-28
+
+- Refactoring code
+- Add document url
+
 ## [0.3.0] - 2022-06-26
 
 - Replace Column with label if Hash is given for pivot_kinds.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hash_pivot (0.3.0)
+    hash_pivot (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/hash_pivot.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/main/CHANGELOG.md"
+  spec.metadata['documentation_uri'] = 'https://rubydoc.info/gems/hash_pivot'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/hash_pivot/table.rb

@@ -6,19 +6,26 @@ require_relative './repository/struct_repository'
 
 module HashPivot
   class Table
+    # rubocop:disable Layout/LineLength
+
     # @param [Array<Hash>] data
+    # @param [Class<HashPivot::Repository::HashRepository,HashPivot::Repository::StructRepository,HashPivot::Repository::ActiveRecordRepository>] repository
     def initialize(data, repository: HashPivot::Repository::HashRepository)
       @data = data
       @repository = repository
     end
 
+    # rubocop:enable Layout/LineLength
+
     # @param [Array, Object] group
     # @param [Object] pivot_in
-    # @param [Array] pivot_kinds
+    # @param [Hash,nil] pivot_kinds
+    # @param [Proc] block
+    # @return [Array<Hash>]
     def pivot(group, pivot_in, pivot_kinds, &block)
       group = [group] unless group.is_a?(Array)
       @repository.hash_by_group(@data, group, pivot_in).each_with_object([]) do |(key, array), memo|
-        hash = pivot_with_sum(pivot_kinds, array, pivot_in, &block)
+        hash = transpose_with(pivot_kinds, array, pivot_in, &block)
 
         memo << key.merge(hash)
       end
@@ -26,43 +33,24 @@ module HashPivot
 
     private
 
-    # @param [Array,Hash] pivot_kinds
+    # @param [Hash,nil] pivot_kinds
     # @param [Array] array
     # @param [Object] pivot_in
     # @param [Proc] block
     # @return [Hash]
-    def pivot_with_sum(pivot_kinds, array, pivot_in, &block)
-      pivot_kinds ||= array.map { |h| h[pivot_in] }.uniq.compact
-      case pivot_kinds
-      when Array
-        pivot_with_sum_with_array_pivot_kinds(pivot_kinds, array, pivot_in, &block)
-      when Hash
-        pivot_with_sum_with_hash_pivot_kinds(pivot_kinds, array, pivot_in, &block)
-      end
-    end
-
-    # @param [Array,Hash] pivot_kinds
-    # @param [Array] array
-    # @param [Object] pivot_in
-    # @param [Proc] block
-    # @return [Hash]
-    def pivot_with_sum_with_array_pivot_kinds(pivot_kinds, array, pivot_in, &block)
-      pivot_kinds.each_with_object({}) do |pivot_kind, memo|
+    def transpose_with(pivot_kinds, array, pivot_in, &block)
+      pivot_kinds ||= calculated_pivot_kinds_from(array, pivot_in)
+      pivot_kinds.each_with_object({}) do |(pivot_kind, pivot_label), memo|
         pivoted_data = array.select { |h| h[pivot_in] == pivot_kind }
-        memo[pivot_kind] = block ? yield(pivoted_data) : pivoted_data
+        memo[pivot_label] = block ? yield(pivoted_data) : pivoted_data
       end
     end
 
-    # @param [Array,Hash] pivot_kinds
     # @param [Array] array
     # @param [Object] pivot_in
-    # @param [Proc] block
     # @return [Hash]
-    def pivot_with_sum_with_hash_pivot_kinds(pivot_kinds, array, pivot_in, &block)
-      pivot_kinds.each_with_object({}) do |(pivot_kind, pivot_label), memo|
-        pivoted_data = array.select { |h| h[pivot_in] == pivot_kind }
-        memo[pivot_label] = block ? yield(pivoted_data) : pivoted_data
-      end
+    def calculated_pivot_kinds_from(array, pivot_in)
+      array.map { |h| h[pivot_in] }.uniq.compact.each_with_object({}) { |kind, memo| memo[kind] = kind }
     end
   end
 end

data/lib/hash_pivot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HashPivot
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/hash_pivot.rb

@@ -4,12 +4,28 @@ require_relative 'hash_pivot/version'
 require_relative 'hash_pivot/table'
 require 'hash_pivot/error/not_implemented_error'
 module HashPivot
+  # rubocop:disable Layout/LineLength
+
   # @param [Array<Hash>] data
   # @param [Array] group
   # @param [Object] pivot_in
-  # @param [Array] pivot_kinds
+  # @param [Array,Hash,nil] pivot_header
   # @return [Hash]
-  def self.pivot(data, group, pivot_in, pivot_kinds, repository: HashPivot::Repository::HashRepository, &block)
+  # @param [Class<HashPivot::Repository::HashRepository,HashPivot::Repository::StructRepository,HashPivot::Repository::ActiveRecordRepository>] repository
+  # @param [Proc] block
+  def self.pivot(data, group, pivot_in, pivot_header, repository: HashPivot::Repository::HashRepository, &block)
+    pivot_kinds = if pivot_header.is_a?(Array)
+                    transform_to_hash(pivot_header)
+                  else
+                    pivot_header
+                  end
     Table.new(data, repository: repository).pivot(group, pivot_in, pivot_kinds, &block)
   end
+
+  # rubocop:enable Layout/LineLength
+
+  def self.transform_to_hash(array)
+    array.each_with_object({}) { |kind, memo| memo[kind] = kind }
+  end
+  private_class_method :transform_to_hash
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_pivot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - junara
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -183,6 +183,7 @@ metadata:
   homepage_uri: https://github.com/junara/hash_pivot
   source_code_uri: https://github.com/junara/hash_pivot
   changelog_uri: https://github.com/junara/hash_pivot/blob/main/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/hash_pivot
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []