groovy 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2e7655a8fefa2f17295105acb6ba387f275eb158c0babed04675d566f736766
-  data.tar.gz: 5a9b94a767f58b033a11044d3b7992911a6cde0ad068955c76d85bdd2c0464b9
+  metadata.gz: 2569117dfa3663d6c60ed950be2972c58116e7eaf6d21f5c6640cb91642fee4f
+  data.tar.gz: 33e1651825dd626dab979e9c504d5de1b7d8162363d42cbeca43873e370cad04
 SHA512:
-  metadata.gz: 2c8813e0920559c6422f8129ca40e51c42a6db26efc65c9f2d9a1d47d8f5f6d5638f9677f970a38d36a180c93cf610b99b7adc372579eaff92ae4d8bd9aa41ae
-  data.tar.gz: d12ed329507b8a5c191308e198a5434f8226fd24bf4f25c8b2b8d64a832c05df39ff9946dddd53b7da5df11c2d14bc9ab97e4dcf84d67e60c9c2811d0c0122b6
+  metadata.gz: 66b311fe79a3f9c8467ddbe9f863a2fd731b9c7dd9df2dbeb49fc1b8d62f4b7b506b2e0ca1f05c6ad7766ede89df0a26cb4a8eae8f96097ff613ab17cadde593
+  data.tar.gz: c1dbb4f84dfdb79d870a0e498acbc63d7e1268f5cfd1f0951fd16cc7d890b68a6d3679e903eb703b8de4a44b6765070594df0eb53b8cfbeb7ac9fb1499f5dd3f

data/lib/groovy/model.rb

@@ -187,16 +187,6 @@ module Groovy
         query
       end
 
-      def first(num = 1)
-        arr = limit(num)
-        num == 1 ? arr.first : arr
-      end
-
-      def last(num = 1)
-        arr = all.sort_by(_id: :desc).limit(num)
-        num == 1 ? arr.first : arr
-      end
-
       def query
         query_class.new(self, table)
       end
@@ -208,7 +198,7 @@ module Groovy
         end
       end
 
-      [:select, :find_each, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
+      [:first, :last, :select, :find_each, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
         define_method scope_method do |*args, &block|
           query.public_send(scope_method, *args, &block)
         end

data/lib/groovy/query.rb

@@ -3,6 +3,7 @@ module Groovy
   class Query
 
     include Enumerable
+
     AND = '+'.freeze
     NOT = '-'.freeze
     PER_PAGE = 50.freeze
@@ -138,12 +139,12 @@ module Groovy
     end
 
     def limit(num)
-      @sorting[:limit] = num
+      sorting[:limit] = num
       self
     end
 
     def offset(num)
-      @sorting[:offset] = num
+      sorting[:offset] = num
       self
     end
 
@@ -155,8 +156,8 @@ module Groovy
 
     # sort_by(title: :asc)
     def sort_by(hash)
-      if hash.is_a?(String) || hash.is_a?(Symbol) # e.g. 'title.desc' or :title (asc by default)
-        param, dir = hash.to_s.split('.')
+      if hash.is_a?(String) || hash.is_a?(Symbol) # e.g. 'title.desc', 'title desc' or :title (asc by default)
+        param, dir = hash.to_s.split(/\s|\./)
         hash = {}
         hash[param] = dir || 'asc'
       end
@@ -207,23 +208,30 @@ module Groovy
       @total_entries
     end
 
-    def last(count = 1)
-      if count > 1
-        records[(size-count)..-1]
-      else
-        records[size-1]
+    def first(num = 1)
+      limit(num)
+      num == 1 ? records.first : records
+    end
+
+    def last(num = 1)
+      if sorting[:by]
+        get_last(num)
+      else # no sorting, so
+        sort_by(_id: :desc).limit(num)
+        # if last(2) or more, then re-sort by ascending ID
+        num == 1 ? records.first : records.sort { |a,b| a.id <=> b.id }
       end
     end
 
     def in_batches(of: 1000, from: nil, &block)
-      @sorting[:limit] = of
-      @sorting[:offset] = from || 0
+      sorting[:limit] = of
+      sorting[:offset] = from || 0
 
       while results.any?
         yield to_a
         break if results.size < of
 
-        @sorting[:offset] += of
+        sorting[:offset] += of
         @records = @results = nil # reset
       end
     end
@@ -237,6 +245,14 @@ module Groovy
     private
     attr_reader :model, :table, :options, :select_block
 
+    def get_last(count = 1)
+      if count > 1
+        records[(size-count)..-1]
+      else
+        records[size-1]
+      end
+    end
+
     def add_param(param)
       raise "Select block already given!" if select_block
       raise "Duplicate param: #{param}" if parameters.include?(param)
@@ -265,7 +281,7 @@ module Groovy
 
       @total_entries = set.size
 
-      debug "Sorting with #{sort_key_and_order}, #{sorting.inspect}"
+      debug "Sorting with #{sort_key_and_order} (options: #{sorting.inspect})"
       set = set.sort(sort_key_and_order, {
         limit: sorting[:limit],
         offset: sorting[:offset], # [sorting[:offset], @total_entries].min

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.4.5'.freeze
+  VERSION = '0.4.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga