rgviz-rails 0.62 → 0.63

data/README.rdoc

@@ -118,9 +118,14 @@ You can also apply a query over an array of arrays that contains your "records"
 This is very useful if you need to present visualizations against data coming from a CSV file.
 
 === Current Limitations
+
 * The *format* clause works, but formatting is as in ruby (like "%.2f" for numbers, "foo %s bar" for strings, and "%Y-%m-%d" for dates, as specified by Time#strftime)
 * Only supports MySQL, PostgreSQL and SQLite adapters
 * These scalar functions are not supported for SQLite: *millisecond*, *quarter*
 * These scalar functions are not supported for MySQL: *millisecond*
 * The function *toDate* doesn't accept a number as its argument
 * The *tsv* output format is not supported
+
+=== Contributors
+
+* {Brad Seefeld}[https://github.com/bradseefeld]

data/lib/rgviz_rails/executor.rb

@@ -27,8 +27,8 @@ module Rgviz
 
     def execute(query, options = {})
       @query = query
-      @query = Parser.parse(@query, options) unless @query.kind_of?(Query)
-
+      @query = RgvizRails::Parser.parse(@query, options) unless @query.kind_of?(Query)
+      
       @table = Table.new
       @extra_conditions = options[:conditions]
 

data/lib/rgviz_rails/parser.rb

@@ -0,0 +1,23 @@
+module RgvizRails
+  class Parser < Rgviz::Parser
+    def self.parse(string, options = {})
+      new(string, options).parse
+    end
+    
+  protected
+  
+    def parse_time(time_string)
+      time = Time.parse(time_string)
+      
+      # Honor the user's time zone if possible. We add the offset instead of using
+      # Time.zone.parse because we do not want a TimeWithZone object. TimeWithZone is not
+      # formatted as UTC when its used in ActiveRecord. We want the UTC
+      # (or system time zone time) time for the given local time.
+      if Time.zone
+        time -= Time.zone.utc_offset.seconds
+      end
+      
+      time
+    end
+  end
+end

data/lib/rgviz_rails/view_helper.rb

@@ -87,7 +87,7 @@ module Rgviz
       url = url_for url unless custom_executor
 
       # Parse the query
-      query = Parser.parse query, :extensions => extensions
+      query = RgvizRails::Parser.parse query, :extensions => extensions
 
       # And replace the html_ and javascript_ magic names
       query.accept visitor

data/lib/rgviz_rails.rb

@@ -1,18 +1,8 @@
-require 'rgviz'
-require 'rgviz_rails/init.rb'
-require 'rgviz_rails/executor.rb'
-require 'rgviz_rails/js_renderer.rb'
-require 'rgviz_rails/tqx.rb'
-
-class Rgviz::Parser
-  def parse_time(string)
-    Time.zone.parse string
-  end
-
-  def parse_date(string)
-    parse_time(string).to_date
-  end
-end
+require "rgviz_rails/init"
+require "rgviz_rails/executor"
+require "rgviz_rails/js_renderer"
+require "rgviz_rails/tqx"
+require "rgviz_rails/parser"
 
 module RgvizRails
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgviz-rails
 version: !ruby/object:Gem::Version
-  version: '0.62'
+  version: '0.63'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgviz
-  requirement: &70194899475220 !ruby/object:Gem::Requirement
+  requirement: &70146916819240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.43'
   type: :runtime
   prerelease: false
-  version_requirements: *70194899475220
+  version_requirements: *70146916819240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70194899474740 !ruby/object:Gem::Requirement
+  requirement: &70146916818740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194899474740
+  version_requirements: *70146916818740
 description: 
 email: aborenszweig@manas.com.ar
 executables: []
@@ -43,6 +43,7 @@ files:
 - lib/rgviz_rails.rb
 - lib/rgviz_rails/executor.rb
 - lib/rgviz_rails/js_renderer.rb
+- lib/rgviz_rails/parser.rb
 - lib/rgviz_rails/tqx.rb
 - lib/rgviz_rails/view_helper.rb
 - lib/rgviz_rails/adapters/mysql_adapter.rb