chartable 0.0.0.1 → 0.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 542726255882a8805df4e6f6fdd0417234dea2841340b1e0c703729c40c9355f
-  data.tar.gz: 38f0a30b7f1dc584968a268a8eed9c042788aedd285b98b2fc6b336ef43b27b4
+  metadata.gz: 7366c67606157ae0f28e3cda5bd591858a662fb4d1ac27dca22d3e26e1155a3b
+  data.tar.gz: 63db758f26ae8057f200727a2fb735e8cb675a28f01d751bd31a8dcd3bc16aba
 SHA512:
-  metadata.gz: 3364382cc913e5e98ed6bc7aae962cfd261639241fceb709e9f5e583a32f2e913a99d9921cafb2234034ff80eb027e1025988e2877e7b86362eb0c48aeb1bb71
-  data.tar.gz: f95d5ae606a9cde926d3242bb7cf2d46736fe80260285e3e57b5d078fee8fba6f0a7cf5e5abea56d318906625e2668394b71f47770dc6c4716c557bb97ce1da7
+  metadata.gz: 8ccdf6bf85dd948d187caa1cd4d4455bd30c7c2c1831e872896802ef909ca1d572ff3db9e212781d2335e1b2a2d4d9e29f2b847bf08f342a0069292bfa09496e
+  data.tar.gz: 0fba6005933df7394b20ea0c69c3a27611acb00e863f793a3910c5b8eaea24496e0896eae700080b99f8e9ac7fcd376958d094ef6d8fc0476830c2aa41026358

data/lib/chartable/queries/daily.rb

@@ -6,7 +6,19 @@ module Chartable
       #
       # @return [Hash]
       def self.call(scope, on:)
-        scope.group("DATE_FORMAT(#{on}, '%M %d, %Y')").size
+        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
+        else
+          scope.group("DATE_FORMAT(#{on}, '%M %d, %Y')").size
+        end
       end
     end
   end

data/lib/chartable/queries/monthly.rb

@@ -3,10 +3,20 @@ module Chartable
     class Monthly
       # It returns analytics data for the monthly period.
       # Example output: `{"November 2018" => 1, "October 2018" => 1}`
+      # SQLite does not support DATE_FORMAT function so a little hack is needed
       #
       # @return [Hash]
       def self.call(scope, on:)
-        scope.group("DATE_FORMAT(#{on},'%M %Y')").size
+        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
+        else
+          scope.group("DATE_FORMAT(#{on},'%M %Y')").size
+        end
       end
     end
   end

data/lib/chartable/queries/quarterly.rb

@@ -6,7 +6,24 @@ module Chartable
       #
       # @return [Hash]
       def self.call(scope, on:)
-        scope.group("CONCAT('Q', QUARTER(#{on}), DATE_FORMAT(#{on},' %Y'))").size
+        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
+        else
+          scope.group("CONCAT('Q', QUARTER(#{on}), DATE_FORMAT(#{on},' %Y'))").size
+        end
       end
     end
   end

data/lib/chartable/queries/weekly.rb

@@ -2,11 +2,17 @@ module Chartable
   module Queries
     class Weekly
       # It returns analytics data for the weekly period.
-      # Example output: `{"01/28/18 - 02/03/18" => 1, "02/11/18 - 02/17/18" => 1}`
+      # Example output: `{"01/28/2018 - 02/03/2018" => 1, "02/11/2018 - 02/17/2018" => 1}`
       #
       # @return [Hash]
       def self.call(scope, on:)
-        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
+        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
+        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
+        end
       end
     end
   end

data/lib/chartable/queries/yearly.rb

@@ -6,7 +6,13 @@ module Chartable
       #
       # @return [Hash]
       def self.call(scope, on:)
-        scope.group("YEAR(#{on})").size
+        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
+        else
+          scope.group("YEAR(#{on})").size
+        end
       end
     end
   end

data/lib/chartable/range_query.rb

@@ -13,12 +13,13 @@ module Chartable
 
       return scope if from_date.nil? && to_date.nil?
 
-      if from_date.nil?
-        scope.where("DATE(#{on}) <= ?", to_date.to_date)
-      elsif to_date.nil?
-        scope.where("DATE(#{on}) >= ?", from_date.to_date)
-      else
-        scope.where("DATE(#{on}) >= ? AND DATE(#{on}) <= ?", from_date.to_date, to_date.to_date)
+      case
+        when from_date.nil?
+          scope.where("DATE(#{on}) <= ?", to_date.to_date)
+        when to_date.nil?
+          scope.where("DATE(#{on}) >= ?", from_date.to_date)
+        else
+          scope.where("DATE(#{on}) >= ? AND DATE(#{on}) <= ?", from_date.to_date, to_date.to_date)
       end
     end
   end

data/lib/chartable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chartable
 version: !ruby/object:Gem::Version
-  version: 0.0.0.1
+  version: 0.0.0.2
 platform: ruby
 authors:
 - Paweł Dąbrowski