dbee 2.1.0.pre.alpha → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc518f50b6b9e95165347240882ca415194e6b641e68ff292d5b2a6d3937527
-  data.tar.gz: 954dbcdfac112f2098e7c1828d8c243369092526ee65179c9819ceaafddc70f7
+  metadata.gz: c8881fb69d8398471e0857f9b8e01a1452aaf6688a3a30aa38868b8254549e9c
+  data.tar.gz: ca28fbd217d3a8c7daa2c41e5d9ea7d24173ab1b57c48467c9700c5b4871c01e
 SHA512:
-  metadata.gz: 5731c83ec9b0ded7f36c6b07d16597f97337240bd65bbec7dc82a9ca7f4de4da0cac9063a6e9aa9cf8199e6f5c32e7ab0a2904684b64bebde9e996f9bceb8e41
-  data.tar.gz: c47a038d7fac640a620a13373460bbd8df05a35b209264de1b0fedd727eab072925d0f2cfa82a800ddd2362756f887b0cd227d1e1cd01c98a0334b1c3cd55cd0
+  metadata.gz: b1cdd0b920c5ee6c02829eebe6e9d2851401eb996f2573f8524eba027de10102e9c706de9468cfeec503ec2ecf28cce525f2511ef0952c9204bf49462bd262be
+  data.tar.gz: 6e6e2d772a318b8cc8960300b45ecb830bbde5973e567295eddff15f287ebf453e09df30de1d686d8a0ee157d590d4af0d48cd71e87012cc1d0606d952c2cac6

data/.rubocop.yml

@@ -1,15 +1,10 @@
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
 
 Layout/LineLength:
   Max: 100
 
-Lint/RaiseException:
-  Enabled: True
-
-Lint/StructNewOverride:
-  Enabled: True
-
 Metrics/AbcSize:
   Max: 16
 
@@ -27,12 +22,3 @@ Metrics/ClassLength:
 
 Metrics/MethodLength:
   Max: 25
-
-Style/HashEachMethods:
-  Enabled: True
-
-Style/HashTransformKeys:
-  Enabled: True
-
-Style/HashTransformValues:
-  Enabled: True

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-# 2.1.0 (TBD)
+# 2.1.0 (July 13th, 2020)
 
 ### Additions:
 

data/dbee.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('pry', '~>0')
   s.add_development_dependency('rake', '~> 13')
   s.add_development_dependency('rspec')
-  s.add_development_dependency('rubocop', '~>0.81.0')
+  s.add_development_dependency('rubocop', '~>0.88.0')
   s.add_development_dependency('simplecov', '~>0.17.0')
   s.add_development_dependency('simplecov-console', '~>0.7.0')
 end

data/lib/dbee/query.rb

@@ -23,13 +23,24 @@ module Dbee
 
     class NoFieldsError < StandardError; end
 
-    attr_reader :fields, :filters, :limit, :sorters
+    attr_reader :fields,
+                :filters,
+                :groupers,
+                :limit,
+                :sorters
 
-    def_delegator :fields,  :sort, :sorted_fields
-    def_delegator :filters, :sort, :sorted_filters
-    def_delegator :sorters, :sort, :sorted_sorters
+    def_delegator :fields,   :sort, :sorted_fields
+    def_delegator :filters,  :sort, :sorted_filters
+    def_delegator :sorters,  :sort, :sorted_sorters
+    def_delegator :groupers, :sort, :sorted_groupers
 
-    def initialize(fields:, filters: [], limit: nil, sorters: [])
+    def initialize(
+      fields:,
+      filters: [],
+      groupers: [],
+      limit: nil,
+      sorters: []
+    )
       @fields = Field.array(fields)
 
       # If no fields were passed into a query then we will have no data to return.
@@ -38,6 +49,7 @@ module Dbee
       raise NoFieldsError if @fields.empty?
 
       @filters  = Filters.array(filters).uniq
+      @groupers = Array(groupers).map { |k| KeyPath.get(k) }.uniq
       @limit    = limit.to_s.empty? ? nil : limit.to_i
       @sorters  = Sorters.array(sorters).uniq
 
@@ -46,10 +58,10 @@ module Dbee
 
     def ==(other)
       other.instance_of?(self.class) &&
+        other.limit == limit &&
         other.sorted_fields == sorted_fields &&
         other.sorted_filters == sorted_filters &&
-        other.sorted_sorters == sorted_sorters &&
-        other.limit == limit
+        other.sorted_sorters == sorted_sorters
     end
     alias eql? ==
 
@@ -60,7 +72,11 @@ module Dbee
     private
 
     def key_paths
-      (fields.map(&:key_path) + filters.map(&:key_path) + sorters.map(&:key_path))
+      (
+        fields.flat_map(&:key_paths) +
+        filters.map(&:key_path) +
+        sorters.map(&:key_path)
+      )
     end
   end
 end

data/lib/dbee/query/field.rb

@@ -71,6 +71,10 @@ module Dbee
       def <=>(other)
         "#{key_path}#{display}" <=> "#{other.key_path}#{other.display}"
       end
+
+      def key_paths
+        [key_path] + filters.map(&:key_path)
+      end
     end
   end
 end

data/lib/dbee/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Dbee
-  VERSION = '2.1.0-alpha'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbee
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre.alpha
+  version: 2.1.0
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_hashable
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 0.88.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 0.88.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -244,9 +244,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: