dateslices 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46eaf82482052a2062f8e18b6995d24c227c7df
-  data.tar.gz: ae3fd8f4cc8dde2995c7c407084057d874dc40d6
+  metadata.gz: b68aa17be20ba5b07f590ae06385ccf18b5a5c64
+  data.tar.gz: 15da28cf505321ef535b07a0a5e51859c9b19085
 SHA512:
-  metadata.gz: dca53556f5ac3f9a58e66cd7ffeb324034dc74d7fe14429899aabe2d2bbfaef5ae86472fe768d1198c0e2421815153cc38c521d81f0b2980074bca1348934ded
-  data.tar.gz: 6801b506c11d63a98118182c507c3760a7f0b5317205e09299969fb85224dcee7ed1f3e4a4e8ec70585d99053ee026de30fad537e1a5ba119f35678e611dcfc5
+  metadata.gz: df4ef7ce5e1bc900f25b55e92bf8ecaf843bc8869f5a6abcb35ef162267554b61d50f45cf1a9bdb516fa21bc112f9391956a35d2021c906ee3b4b6f9f186fc22
+  data.tar.gz: 987181e91f8152f6d6ba21b388f6330e42253188be26928158e3434d9cc31aa09cd8a8be63cd83c477028b142b3ae03f56f6ba7ba73a347e1e16b958eb974587

data/lib/dateslices.rb

@@ -1,7 +1,5 @@
-require "active_support/core_ext/module/attribute_accessors"
-require "active_support/time"
-# require "groupdate/version"
-# require "dateslices/magic"
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/time'
 
 module Dateslices
   FIELDS = [:second, :minute, :hour, :day, :week, :day_of_week, :month, :year ]
@@ -12,14 +10,15 @@ module Dateslices
   self.day_start = 0
 end
 
-# require "groupdate/enumerable"
-
 begin
-  require "active_record"
+  require 'active_record'
 rescue LoadError
   # do nothing
 end
 
+require 'dateslices/sqlite'
+require 'dateslices/postgresql'
+require 'dateslices/mysql'
 require 'dateslices/scopes'
 
 ActiveRecord::Base.send(:extend, Dateslices::Scopes)

data/lib/dateslices/mysql.rb

@@ -0,0 +1,28 @@
+module Dateslices
+  module Mysql
+
+    def self.time_filter(column, field)
+      case field
+        when :day_of_week
+          "(DAYOFWEEK(#{column}) - 1)"
+        when :second
+          "DATE_FORMAT(#{column}, '%Y-%m-%d %H:%i:%S UTC')"
+        when :minute
+          "DATE_FORMAT(#{column}, '%Y-%m-%d %H:%i:00 UTC')"
+        when :hour
+          "DATE_FORMAT(#{column}, '%Y-%m-%d %H:00:00 UTC')"
+        when :day
+          "DATE_FORMAT(#{column}, '%Y-%m-%d 00:00:00 UTC')"
+        when :month
+          "DATE_FORMAT(#{column}, '%Y-%m-01 00:00:00 UTC')"
+        when :year
+          "DATE_FORMAT(#{column}, '%Y-01-01 00:00:00 UTC')"
+        when :week # Sigh...
+          "DATE_FORMAT( date_sub( created_at, interval ((weekday( created_at ) + 1)%7) day ), '%Y-%m-%d 00:00:00 UTC')"
+        else
+          throw "Implement #{field}"
+      end
+    end
+
+  end
+end

data/lib/dateslices/postgresql.rb

@@ -0,0 +1,16 @@
+module Dateslices
+  module Postgresql
+
+    def self.time_filter(column, field)
+      case field
+        when :day_of_week
+          "EXTRACT(DOW from #{column})"
+        when :week # Postgres weeks start on monday
+          "(DATE_TRUNC( 'week', #{column} + INTERVAL '1 day' ) - INTERVAL '1 day')"
+        else
+          "DATE_TRUNC( '#{field.to_s}' , #{column} )"
+      end
+    end
+
+  end
+end

data/lib/dateslices/scopes.rb

@@ -1,79 +1,42 @@
 module Dateslices
   module Scopes
+
     Dateslices::FIELDS.each do |field|
       define_method :"group_by_#{field}" do |*args|
         args = args.dup
 
         column = args[0]
-        column = "created_at" if column.blank?
+        column = 'created_at' if column.blank?
+
+        aggregation = args[1]
+        aggregation = 'count' if aggregation.blank?
+
+        aggregation_column = args[2]
+        aggregation_column = "*" if aggregation_column.blank?
 
-        sql = ["count(*) as cnt"]
+        sql = ["#{aggregation}(#{aggregation_column}) as cnt"]
 
-        time_filter = ""
+        time_filter = ''
 
         case connection.adapter_name
         when 'SQLite'
-          time_filter = case field
-          when :second
-            "strftime( \"%Y-%m-%d %H:%M:%S UTC\", #{column} )"
-          when :minute
-            "strftime( \"%Y-%m-%d %H:%M:00 UTC\", #{column} )"
-          when :hour
-            "strftime( \"%Y-%m-%d %H:00:00 UTC\", #{column} )"
-          when :day
-            "strftime( \"%Y-%m-%d 00:00:00 UTC\", #{column} )"
-          when :week
-            "strftime('%Y-%m-%d 00:00:00 UTC', #{column}, '-6 days', 'weekday 0')"
-          when :month
-            "strftime( \"%Y-%m-01 00:00:00 UTC\", #{column} )"
-          when :year
-            "strftime( \"%Y-01-01 00:00:00 UTC\", #{column} )"
-          when :day_of_week
-            "strftime( \"%w\", #{column} )"
-          else
-            throw "Unknown time filter #{field}"
-          end
-        when "PostgreSQL", "PostGIS"
-          time_filter = case field
-          when :day_of_week
-            "EXTRACT(DOW from #{column})"
-          when :week # Postgres weeks start on monday
-            "(DATE_TRUNC( 'week', #{column} + INTERVAL '1 day' ) - INTERVAL '1 day')"
-          else
-            "DATE_TRUNC( '#{field.to_s}' , #{column} )"
-          end
-        when "MySQL"
-          time_filter = case field
-          when :day_of_week
-            "(DAYOFWEEK(#{column}) - 1)"
-          when :second
-            "DATE_FORMAT(#{column}, '%Y-%m-%d %H:%i:%S UTC')"
-          when :minute
-            "DATE_FORMAT(#{column}, '%Y-%m-%d %H:%i:00 UTC')"
-          when :hour
-            "DATE_FORMAT(#{column}, '%Y-%m-%d %H:00:00 UTC')"
-          when :day
-            "DATE_FORMAT(#{column}, '%Y-%m-%d 00:00:00 UTC')"
-          when :month
-            "DATE_FORMAT(#{column}, '%Y-%m-01 00:00:00 UTC')"
-          when :year
-            "DATE_FORMAT(#{column}, '%Y-01-01 00:00:00 UTC')"
-          when :week # Sigh...
-            "DATE_FORMAT( date_sub( created_at, interval ((weekday( created_at ) + 1)%7) day ), '%Y-%m-%d 00:00:00 UTC')"
-          else
-            throw "Implement #{field}"
-          end
+          time_filter = Dateslices::Sqlite.time_filter(column, field)
+        when 'PostgreSQL', 'PostGIS'
+          time_filter = Dateslices::Postgresql.time_filter(column, field)
+        when 'MySQL', 'Mysql2'
+          time_filter = Dateslices::Mysql.time_filter(column, field)
         else
           throw "Unknown database adaptor #{connection.adapter_name}"
         end
 
         sql << "#{time_filter} as date_slice"
 
-        select( sql.join( ", " )).group("date_slice").order("date_slice").collect do |c|
-          slice = c["date_slice"]
+        select( sql.join(', ')).where.not(column => nil).group('date_slice').order('date_slice').collect do |c|
+          slice = c['date_slice']
           slice = slice.to_i.to_s if slice.is_a? Float
           slice = slice.to_s if slice.is_a? Integer
-          { date_slice: slice, count: c["cnt"] }
+          slice = slice.to_s
+          { date_slice: slice, aggregation.to_sym => c["cnt"] }
         end
       end
     end

data/lib/dateslices/sqlite.rb

@@ -0,0 +1,28 @@
+module Dateslices
+  module Sqlite
+
+    def self.time_filter(column, field)
+      case field
+        when :second
+          "strftime( \"%Y-%m-%d %H:%M:%S UTC\", #{column} )"
+        when :minute
+          "strftime( \"%Y-%m-%d %H:%M:00 UTC\", #{column} )"
+        when :hour
+          "strftime( \"%Y-%m-%d %H:00:00 UTC\", #{column} )"
+        when :day
+          "strftime( \"%Y-%m-%d 00:00:00 UTC\", #{column} )"
+        when :week
+          "strftime('%Y-%m-%d 00:00:00 UTC', #{column}, '-6 days', 'weekday 0')"
+        when :month
+          "strftime( \"%Y-%m-01 00:00:00 UTC\", #{column} )"
+        when :year
+          "strftime( \"%Y-01-01 00:00:00 UTC\", #{column} )"
+        when :day_of_week
+          "strftime( \"%w\", #{column} )"
+        else
+          throw "Unknown time filter #{field}"
+      end
+    end
+
+  end
+end

data/lib/dateslices/version.rb

@@ -1,3 +1,3 @@
 module Dateslices
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dateslices
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Will Schenk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,10 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/dateslices.rb
+- lib/dateslices/mysql.rb
+- lib/dateslices/postgresql.rb
 - lib/dateslices/scopes.rb
+- lib/dateslices/sqlite.rb
 - lib/dateslices/version.rb
 - lib/tasks/dateslices_tasks.rake
 homepage: https://github.com/sublimeguile/dateslices