dateslices 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3efa5cfa855a50c696f0d04409b2ed0187920eea
-  data.tar.gz: 26c2e49f84cb16c2c3dcd2a2a1f5924e0f134f21
+  metadata.gz: c16dd2641e86c2165c15b1cd0344a106c1fe52b0
+  data.tar.gz: 48f5de4c75a9bcf1571371e47c462ec8d1e2a84c
 SHA512:
-  metadata.gz: 854d8b6e033cf34ce2a673fcc2a5eb4b1968bb2869fb77b9a4d3038fd8f31968fe2d7684c56e4a83b10669cb99c53c0a2b0abad20014f7c65529b6b13f4a1ac0
-  data.tar.gz: 0ec27b6e51699b05d77facf95b1dfa280c2bdc6021dba6711450789571d808efda8f81efef6d75c98df0eeac2cd475b7046e0fa55aea5ff2a668edf63502919c
+  metadata.gz: 96e2b2c4d504fd46d1ef70b9d8f3f857b5a53bdb8bacc98395a19dd23b15a07696d72d6dda814f3a2e4a8d09265c553816bf7dd569c9be1b0300056e40e0155d
+  data.tar.gz: 72b054a038755a9459091715a4aaec631b1063fc564b5389159831ae15c8c619de054487f15dd46f77855650ab7eeae90adcfd6de2ffd7a4edd11c12ba13b1c7

data/README.md

@@ -5,16 +5,19 @@ This project rocks and uses MIT-LICENSE.
 This project is based upon [groupdate](https://github.com/ankane/groupdate) and follows a similar API.
 
 The differences between the groupdate and dateslices are:
-- dateslices supports sqlite3.
+- dateslices supports sqlite3in addition to PostgreSQL & MySQL.
 - dateslices has much less functionality.
 - dateslices ignores timezones.
 - dateslices is rails 4 only.
 - dateslices uses rspecs for tests.
-- dateslices doesn't have hour_of_day since it doesn't deal with timezones
-
 
 The reason that I wrote this is that I use sqlite in development, and wanted to make sure that I could test things locally.  I didn't understand the test suite of groupdate, so I ended up rewriting it.
 
+## Walkthrough
+
+A walkthrough of how this code is written is available on [my blog](http://willschenk.com/dateslice-writing-rails-extensions/)
+
+Usage instructions below.
 
 ## Example Usage
 
@@ -47,14 +50,18 @@ These methods take three optional arguments:
 - group_by_hour
 - group_by_day
 - group_by_week
-- group_by_day_of_week
 - group_by_month
 - group_by_year
 
+- group_by_hour_of_day
+- group_by_day_of_week
+- group_by_day_of_month
+- group_by_month_of_year
+
 ## Configuration
 
-The output format now defaults to a Chartkick compatible hash of dates and values.
-If you wish to use the dateslice format, please add `Dateslices.output_format = :dateslice` to an initializer.
+The output format defaults to a Chartkick compatible hash of dates and values.
+If you wish to use the dateslices format, please add `Dateslices.output_format = :dateslices` to an initializer.
 
 ## Tests
 

data/lib/dateslices.rb

@@ -2,7 +2,7 @@ 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 ]
+  FIELDS = [:second, :minute, :hour, :day, :week, :month, :year, :hour_of_day, :day_of_week, :day_of_month, :month_of_year ]
   METHODS = FIELDS.map{|v| :"group_by_#{v}" }
 
   mattr_accessor :output_format

data/lib/dateslices/mysql.rb

@@ -3,8 +3,14 @@ module Dateslices
 
     def self.time_filter(column, field)
       case field
+        when :hour_of_day
+          "(EXTRACT(HOUR from #{column}))"
         when :day_of_week
           "(DAYOFWEEK(#{column}) - 1)"
+        when :day_of_month
+          "DAYOFMONTH(#{column})"
+        when :month_of_year
+          "MONTH(#{column})"
         when :second
           "DATE_FORMAT(#{column}, '%Y-%m-%d %H:%i:%S UTC')"
         when :minute

data/lib/dateslices/postgresql.rb

@@ -3,8 +3,14 @@ module Dateslices
 
     def self.time_filter(column, field)
       case field
+        when :hour_of_day
+          "EXTRACT(HOUR from #{column})"
         when :day_of_week
           "EXTRACT(DOW from #{column})"
+        when :day_of_month
+          "EXTRACT(DAY from #{column})"
+        when :month_of_year
+          "EXTRACT(MONTH from #{column})"
         when :week # Postgres weeks start on monday
           "(DATE_TRUNC( 'week', #{column} + INTERVAL '1 day' ) - INTERVAL '1 day')"
         else

data/lib/dateslices/scopes.rb

@@ -30,25 +30,22 @@ module Dateslices
         slices = select( sql.join(', ')).where.not(column => nil).group('date_slice').order('date_slice')
 
         if Dateslices.output_format == :groupdate
-
-          slices.collect! do |c|
-            slice = c['date_slice']
-            slice = slice.is_a?(Float) ? slice.to_i.to_s : slice.to_s
-            [slice, c['count']]
+          slices = slices.collect do |c|
+            [slice(c), c['count']]
           end
 
           Hash[slices]
         else
-
           slices.collect do |c|
-            slice = c['date_slice']
-            slice = slice.is_a?(Float) ? slice.to_i.to_s : slice.to_s
-            { date_slice: slice, aggregation.to_sym => c['count'] }
+            { date_slice: slice(c), aggregation.to_sym => c['count'] }
           end
-
         end
+      end 
+    end
 
-      end
+    def slice(c)
+      slice = c['date_slice']
+      slice.is_a?(Float) ? slice.to_i.to_s : slice.to_s
     end
 
   end

data/lib/dateslices/sqlite.rb

@@ -17,8 +17,14 @@ module Dateslices
           "strftime( \"%Y-%m-01 00:00:00 UTC\", #{column} )"
         when :year
           "strftime( \"%Y-01-01 00:00:00 UTC\", #{column} )"
+        when :hour_of_day
+          "strftime( \"%H\", #{column} )"
         when :day_of_week
           "strftime( \"%w\", #{column} )"
+        when :day_of_month
+          "strftime( \"%d\", #{column} )"
+        when :month_of_year
+          "strftime( \"%m\", #{column} )"
         else
           throw "Unknown time filter #{field}"
       end

data/lib/dateslices/version.rb

@@ -1,3 +1,3 @@
 module Dateslices
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: dateslices
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Will Schenk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-autotest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Rails 4 ActiveRecord plugin that adds group_by_day, group_by_month,
@@ -136,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Rails 4 ActiveRecord plugin that adds group_by_day, group_by_month, etc.