chartable 0.0.0.2 → 0.0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7366c67606157ae0f28e3cda5bd591858a662fb4d1ac27dca22d3e26e1155a3b
-  data.tar.gz: 63db758f26ae8057f200727a2fb735e8cb675a28f01d751bd31a8dcd3bc16aba
+  metadata.gz: e69c2973a90eafdeb2ff247ad5653aff3f3b7e5c6d8149d122c92c8f117fc95f
+  data.tar.gz: dcc4ac8c3356dbc9f31fb779445c2c532e49acac783d112ad1cb91d79b0dd158
 SHA512:
-  metadata.gz: 8ccdf6bf85dd948d187caa1cd4d4455bd30c7c2c1831e872896802ef909ca1d572ff3db9e212781d2335e1b2a2d4d9e29f2b847bf08f342a0069292bfa09496e
-  data.tar.gz: 0fba6005933df7394b20ea0c69c3a27611acb00e863f793a3910c5b8eaea24496e0896eae700080b99f8e9ac7fcd376958d094ef6d8fc0476830c2aa41026358
+  metadata.gz: 4c974ab80c5a3c70cc15657a94e60102acb9dc4f3f438a27a7104d389ff1680596276220f406a97fa78a328f118b1e114ad48c7ad2f9bec409c8452273fbd2a2
+  data.tar.gz: 79c08ed35789e123fe4d908d9065eb5c9ca9a59e5cee63efdd913477bc612097b7a794cf36d1a49b0434b69ddbbbe1bb45537ced9a9984b56f5edddb74cf4153

data/lib/chartable/active_record_extension.rb

@@ -9,10 +9,16 @@ module Chartable
       # It returns analytics hash created from the given criteria
       #
       # @return [Hash]
-      def analytics(period, from: nil, to: nil, on: 'created_at')
+      def analytics(period, from: nil, to: nil, on: 'created_at', order: 'asc')
+        query_order = if order.to_s.downcase == 'desc'
+          'desc'
+        else
+          'asc'
+        end
+
         period_query = Chartable::PeriodQuery.build(period)
         scope = Chartable::RangeQuery.call(self, on: on, from: from, to: to)
-        period_query.call(scope, on: on)
+        period_query.call(scope, on: on, order: query_order)
       end
     end
   end

data/lib/chartable/queries/daily.rb

@@ -5,19 +5,11 @@ module Chartable
       # Example output: `{"October 09, 2018" => 1, "October 10, 2018" => 1}`
       #
       # @return [Hash]
-      def self.call(scope, on:)
-        if ActiveRecord::Base.connection.class.to_s.match(/sqlite/i)
-          scope.group("strftime('%m %d, %Y', #{on})").size.transform_keys do |key|
-            data = key.split(" ")
-            month_number = data.shift
-            month_name = Date::MONTHNAMES[month_number.to_i]
-            data.unshift(month_name)
-            data.join(" ")
-          end
-        elsif ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
-          scope.group("to_char(#{on},'FMMonth DD, YYYY')").size
+      def self.call(scope, on:, order:)
+        if ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
+          scope.group(Arel.sql("to_char(#{on},'FMMonth DD, YYYY')")).order(Arel.sql("to_char(#{on},'FMMonth DD, YYYY') #{order}")).size
         else
-          scope.group("DATE_FORMAT(#{on}, '%M %d, %Y')").size
+          scope.group(Arel.sql("DATE_FORMAT(#{on}, '%M %d, %Y')")).order(Arel.sql("DATE_FORMAT(#{on}, '%M %d, %Y') #{order}")).size
         end
       end
     end

data/lib/chartable/queries/monthly.rb

@@ -6,16 +6,11 @@ module Chartable
       # SQLite does not support DATE_FORMAT function so a little hack is needed
       #
       # @return [Hash]
-      def self.call(scope, on:)
-        if ActiveRecord::Base.connection.class.to_s.match(/sqlite/i)
-          scope.group("strftime('%m %Y', #{on})").size.transform_keys do |key|
-            month_number = key.match(/^[0-9]{2}(?= )/).to_s
-            key.gsub(month_number, Date::MONTHNAMES[month_number.to_i])
-          end
-        elsif ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
-          scope.group("to_char(#{on},'FMMonth YYYY')").size
+      def self.call(scope, on:, order:)
+        if ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
+          scope.group(Arel.sql("#{on}, to_char(#{on},'FMMonth YYYY')")).order(Arel.sql("#{on} #{order}")).size
         else
-          scope.group("DATE_FORMAT(#{on},'%M %Y')").size
+          scope.group(Arel.sql("#{on}, DATE_FORMAT(#{on},'%M %Y')")).order(Arel.sql("#{on} #{order}")).size
         end
       end
     end

data/lib/chartable/queries/quarterly.rb

@@ -5,24 +5,11 @@ module Chartable
       # Example output: `{"Q1 2018" => 1, "Q2 2018" => 1}`
       #
       # @return [Hash]
-      def self.call(scope, on:)
-        if ActiveRecord::Base.connection.class.to_s.match(/sqlite/i)
-          scope.group("strftime('%m %Y', #{on})").size.transform_keys do |key|
-            month_number = key.match(/^[0-9]{2}(?= )/).to_s
-            quarter = case month_number.to_i
-              when 1..3 then 1
-              when 4..6 then 2
-              when 7..9 then 3
-              else
-                4
-              end
-
-            key.gsub(month_number, "Q#{quarter}")
-          end
-        elsif ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
-          scope.group("concat('Q', to_char(#{on},'Q YYYY'))").size
+      def self.call(scope, on:, order:)
+        if ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
+          scope.group(Arel.sql("concat('Q', to_char(#{on},'Q YYYY'))")).order(Arel.sql("concat('Q', to_char(#{on},'Q YYYY')) #{order}")).size
         else
-          scope.group("CONCAT('Q', QUARTER(#{on}), DATE_FORMAT(#{on},' %Y'))").size
+          scope.group(Arel.sql("CONCAT('Q', QUARTER(#{on}), DATE_FORMAT(#{on},' %Y'))")).order(Arel.sql("CONCAT('Q', QUARTER(#{on}), DATE_FORMAT(#{on},' %Y')) #{order}")).size
         end
       end
     end

data/lib/chartable/queries/weekly.rb

@@ -5,13 +5,15 @@ module Chartable
       # Example output: `{"01/28/2018 - 02/03/2018" => 1, "02/11/2018 - 02/17/2018" => 1}`
       #
       # @return [Hash]
-      def self.call(scope, on:)
-        if ActiveRecord::Base.connection.class.to_s.match(/sqlite/i)
-          scope.group("strftime('%m/%d/%Y', date(#{on}, 'weekday 0', '-7 days')) || ' - ' || strftime('%m/%d/%Y', date(#{on}, 'weekday 0', '-1 days'))").size
-        elsif ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
-          scope.group("concat(to_char(date_trunc('week', #{on}) + '-1 day', 'MM/DD/YYYY'), ' - ', to_char(date_trunc('week', #{on}) + '5 days', 'MM/DD/YYYY'))").size
+      def self.call(scope, on:, order:)
+        if ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
+          scope
+            .group(Arel.sql("concat(to_char(date_trunc('week', #{on}) + '-1 day', 'MM/DD/YYYY'), ' - ', to_char(date_trunc('week', #{on}) + '5 days', 'MM/DD/YYYY'))"))
+            .order(Arel.sql("concat(to_char(date_trunc('week', #{on}) + '-1 day', 'MM/DD/YYYY'), ' - ', to_char(date_trunc('week', #{on}) + '5 days', 'MM/DD/YYYY')) #{order}")).size
         else
-          scope.group("CONCAT(DATE_FORMAT(DATE(DATE_ADD(#{on}, INTERVAL(1-DAYOFWEEK(#{on})) DAY)), '%m/%d/%Y'), ' - ', DATE_FORMAT(DATE(DATE_ADD(#{on}, INTERVAL(7-DAYOFWEEK(#{on})) DAY)),'%m/%d/%Y'))").size
+          scope
+            .group(Arel.sql("CONCAT(DATE_FORMAT(DATE(DATE_ADD(#{on}, INTERVAL(1-DAYOFWEEK(#{on})) DAY)), '%m/%d/%Y'), ' - ', DATE_FORMAT(DATE(DATE_ADD(#{on}, INTERVAL(7-DAYOFWEEK(#{on})) DAY)),'%m/%d/%Y'))"))
+            .order(Arel.sql("CONCAT(DATE_FORMAT(DATE(DATE_ADD(#{on}, INTERVAL(1-DAYOFWEEK(#{on})) DAY)), '%m/%d/%Y'), ' - ', DATE_FORMAT(DATE(DATE_ADD(#{on}, INTERVAL(7-DAYOFWEEK(#{on})) DAY)),'%m/%d/%Y')) #{order}")).size
         end
       end
     end

data/lib/chartable/queries/yearly.rb

@@ -5,13 +5,11 @@ module Chartable
       # Example output: `{ 2017 => 1, 2018 => 1 }`
       #
       # @return [Hash]
-      def self.call(scope, on:)
-        if ActiveRecord::Base.connection.class.to_s.match(/sqlite/i)
-          scope.group("cast(strftime('%Y', #{on}) as decimal)").size
-        elsif ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
-          scope.group("cast(to_char(#{on},'YYYY') as integer)").size
+      def self.call(scope, on:, order:)
+        if ActiveRecord::Base.connection.class.to_s.match(/postgresql/i)
+          scope.group(Arel.sql("cast(to_char(#{on},'YYYY') as integer)")).order(Arel.sql("cast(to_char(#{on},'YYYY') as integer) #{order}")).size
         else
-          scope.group("YEAR(#{on})").size
+          scope.group(Arel.sql("YEAR(#{on})")).order(Arel.sql("YEAR(#{on}) #{order}")).size
         end
       end
     end

data/lib/chartable/version.rb

@@ -6,7 +6,7 @@ module Chartable
     #
     # @return [String]
     def to_s
-      "0.0.0.2"
+      "0.0.0.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chartable
 version: !ruby/object:Gem::Version
-  version: 0.0.0.2
+  version: 0.0.0.3
 platform: ruby
 authors:
 - Paweł Dąbrowski
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A lightweight and database-level library to transform any Active Record query