grapher 0.0.1 → 0.0.2

data/app/helpers/grapher/application_helper.rb

@@ -6,21 +6,29 @@ module Grapher
     def initialize(time_units, options, block)
       @time_units = time_units
       @options = options
-
-      @strf = "%Y-%m-%d"
-      if @time_units.downcase == "hour"
-        @strf = "%Y-%m-%d %H:00"
-      elsif @time_units.downcase == "day"
+      @driver = ActiveRecord::Base.connection.instance_values["config"][:adapter]
+
+      if @driver =~ /postgre/
+        @strf = "YYYY-MM-DD"
+        if @time_units.downcase == "hour"
+          @strf = "%Y-%m-%d %H:00"
+        elsif @time_units.downcase == "month"
+          @strf = "YYYY-MM-1"
+        end
+      else
         @strf = "%Y-%m-%d"
-      elsif @time_units.downcase == "month"
-        @strf = "%Y-%m-1"
+        if @time_units.downcase == "hour"
+          @strf = "%Y-%m-%d %H:00"
+        elsif @time_units.downcase == "month"
+          @strf = "%Y-%m-1"
+        end
       end
 
       block.call(self)
     end
 
     def line(relation, options={})
-      driver = ActiveRecord::Base.connection.instance_values["config"][:adapter]
+
 
       @data ||= []
       @labels ||= []
@@ -28,11 +36,11 @@ module Grapher
       label = options[:label] || "Value"
       @labels << label
 
-      if driver =~ /mysql/
-        relation = relation.group("DATE_FORMAT(#{@column}, '#{@strf}')")
-      elsif driver =~ /postgre/
+      if @driver =~ /mysql/
         relation = relation.group("DATE_FORMAT(#{@column}, '#{@strf}')")
-      elsif driver =~ /sqlite/
+      elsif @driver =~ /postgre/
+        relation = relation.group("to_char(#{@column}, '#{@strf}')")
+      elsif @driver =~ /sqlite/
         relation = relation.group("STRFTIME('#{@strf}', #{@column})")
       end
 

data/lib/grapher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grapher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails