garru-g_viz 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1 +1,2 @@
+v0.0.2 this version is usable.  Introduced graph.add_(graph_name) semantic sugar.
 v0.0.1 making this a gem

data/Manifest

@@ -1,6 +1,8 @@
 CHANGELOG
 lib/g_viz/g_viz.rb
+lib/g_viz/graph.rb
 lib/g_viz/templates/visualization.erb
+lib/g_viz.rb
 Manifest
 Rakefile
 README

data/g_viz.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{g_viz}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gary Tsang"]
   s.date = %q{2009-05-04}
   s.description = %q{Ruby Scribe Client. Package and Wrapper for generated ruby interfaces}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/g_viz/g_viz.rb", "lib/g_viz/templates/visualization.erb", "README"]
-  s.files = ["CHANGELOG", "lib/g_viz/g_viz.rb", "lib/g_viz/templates/visualization.erb", "Manifest", "Rakefile", "README", "spec/g_viz/fixtures/annotated_timeline.rb", "spec/g_viz/g_viz_spec.rb", "spec/g_viz/templates/rendered_annotated_timeline.html", "spec/test_helper.rb", "g_viz.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/g_viz/g_viz.rb", "lib/g_viz/graph.rb", "lib/g_viz/templates/visualization.erb", "lib/g_viz.rb", "README"]
+  s.files = ["CHANGELOG", "lib/g_viz/g_viz.rb", "lib/g_viz/graph.rb", "lib/g_viz/templates/visualization.erb", "lib/g_viz.rb", "Manifest", "Rakefile", "README", "spec/g_viz/fixtures/annotated_timeline.rb", "spec/g_viz/g_viz_spec.rb", "spec/g_viz/templates/rendered_annotated_timeline.html", "spec/test_helper.rb", "g_viz.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/garru/GViz}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "G_viz", "--main", "README"]

data/lib/g_viz/g_viz.rb

@@ -1,148 +1,37 @@
-require 'set'
-require 'date'
-require 'erb'
-require 'json'
-class GViz
-  @@viz_package_names = Set.new
-  @@config = {}
-  @@graphs = []
-  @@template_name = File.join(File.dirname(__FILE__), 'templates', 'visualization.erb')  
-  class << self
-    
-    # <script type='text/javascript' src='http://www.google.com/jsapi<%= @api_key %>'></script>
-    # <script type='text/javascript'>
-    #   google.load('visualization', '1', {'packages':[<%= @@viz_package_names.map{|p|p.downcase}.join(',') %>]});
-    #   google.setOnLoadCallback(drawChart);
-    #   function drawChart() {    
-    #     <% @graphs.each do |graph| %>
-    #       var <%= graph.data_name%> = new google.visualization.DataTable();
-    # 
-    #       <% graph.columns.each do |column| %>
-    #         <%= graph.data_name%>.addColumn('<%= column[0] %>', '<%= column[1] %>')
-    #       <% end %>
-    # 
-    #       <%= graph.data_name%>.addRows(<%= graph.size %>)
-    # 
-    #       <% graph.rows.each_with_index do |row, i| %>
-    #         <% row.each_with_index do |value, j| %>
-    #           <%= graph.data_name%>.setValue(<%= i %>, <%= j %>, value)
-    #         <% end %> 
-    #       <% end %>
-    #     <% end %>
-    #     var chart_<%= graph.data_name%> = new google.visualization.<%=graph.chart_type%>(document.getElementById('<%=graph.chart_id%>'));
-    #     chart.draw(data, <%=graph.options%>);
-    #   }
-    # </script>
-    
+require File.join(File.dirname(__FILE__), 'graph')  
+
+module GViz
+  class Base
+  
+    def initialize(config = {})
+      @viz_package_names = Set.new
+      @config = config
+      @graphs = []
+      @template_name = File.join(File.dirname(__FILE__), 'templates', 'visualization.erb')
+    end
+
     def output
       b = binding
-      rhtml = ERB.new(IO.read(@@template_name), 0, "-")
+      rhtml = ERB.new(IO.read(@template_name), 0, "-")
       @output = rhtml.result(b) 
       return @output
     end
 
     def add_graph(type, data, mapping, options= {})
-      @@viz_package_names.add(type)
-      new_graph = new(type, data, mapping, @@graphs.size, options)
-      @@graphs << new_graph
+      @viz_package_names.add(type)
+      new_graph = GViz::Graph.new(type, data, mapping, @graphs.size, options)
+      @graphs << new_graph
       return new_graph.chart_id
     end
-        
-    def google_data_type(value)
-      if value.is_a?(Numeric)
-        data_type = 'numeric'
-      elsif value.is_a?(Date)
-        data_type = 'date'
-      elsif value.is_a?(DateTime) || value.is_a?(Time)
-        data_type = 'datetime'
-      elsif value.respond_to?(:to_s)
-        if !value.match(/[^0-9.]/)
-          data_type = 'numeric'
-        else
-          if (a = Date._parse(value)).size >= 3 
-            if a.size >= 5
-              data_type = 'datetime'
-            else
-              data_type = 'date'
-            end
-          else
-              data_type = 'string'
-          end
-        end
-      end
-      data_type
-    end
-  
-    def ruby_to_js(type, value)
-      return nil if value.nil?
-      if type == 'string'
-        value = "'#{value}'"
-      elsif type == 'date'
-        temp_d = Date.parse(value.to_s)
-        value = "new Date(#{temp_d.year}, #{temp_d.month - 1}, #{temp_d.day})"
-      elsif type == 'datetime'
-        temp_d DateTime.parse(value.to_s)
-        value = "new Date(#{temp_d.year}, #{temp_d.month - 1}, #{temp_d.day}, #{temp_d.hour}, #{temp_d.min}, #{temp_d.sec})"
-      end
-      return value
-    end
-  end
-  
-  attr_reader :type, :options
-  
-  def initialize(type, data, map, id = 0, options = {})
-    @type = type
-    @map = map
-    @data = data
-    @data_type = {}
-    @options = options
-    @id = id
-    import_data_types
-  end
-  
-  def import_data_types
-    not_all_data_types_found = true
-    find_data_types = @map.dup
-  
-    @data.each do |x|
-      break if find_data_types.size == 0
-      find_data_types.each do |k, v|
-        if x.key?(k)
-          @data_type[k] = self.class.google_data_type(x[k]) 
-          find_data_types.delete([k,v])
-        end
-      end
-    end
     
-    # if there is no data that responds to a mapped value, remove that mapping
-    @map -= find_data_types 
-    
-  end
-  
-  
-  def columns
-    data = @map.map do |k, v|
-      [@data_type[k], v]
-    end
-  end
-  
-  def size
-    @data.size
-  end
-  
-  def rows
-    @data.map do |value|
-      @map.map do |k, v|
-        self.class.ruby_to_js(@data_type[k], value[k])
+    def method_missing(name, *args)
+      puts name
+      if name.to_s.match(/add_/)
+        type = name.to_s.gsub(/add_/){""}.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+        return add_graph(type, *args)
+      else
+        raise NoMethodError.new("Undefined method #{name} for #{self.inspect}")
       end
     end
   end
-  
-  def chart_id
-    return @type.downcase + @id.to_s
-  end
-  
-  def data_name
-    "data_#{@id}"
-  end
 end

data/lib/g_viz/graph.rb

@@ -0,0 +1,101 @@
+module GViz
+  class Graph
+    attr_reader :type, :options
+
+    def initialize(type, data, map, id = 0, options = {})
+      @type = type
+      @map = map
+      @data = data
+      @data_type = {}
+      @options = options
+      @id = id
+      import_data_types
+    end
+
+    def import_data_types
+      not_all_data_types_found = true
+      find_data_types = @map.dup
+
+      @data.each do |x|
+        break if find_data_types.size == 0
+        find_data_types.each do |k, v|
+          if x[k]
+            @data_type[k] = self.class.google_data_type(x[k]) 
+            find_data_types.delete([k,v])
+          end
+        end
+      end
+
+      # if there is no data that responds to a mapped value, remove that mapping
+      @map -= find_data_types  
+    end
+
+    def columns
+      data = @map.map do |k, v|
+        [@data_type[k], v]
+      end
+    end
+
+    def size
+      @data.size
+    end
+
+    def rows
+      @data.map do |value|
+        @map.map do |k, v|
+          self.class.ruby_to_js(@data_type[k], value[k])
+        end
+      end
+    end
+
+    def chart_id
+      return @type.downcase + @id.to_s
+    end
+
+    def data_name
+      "data_#{@id}"
+    end
+    
+    class << self    
+      def google_data_type(value)
+        if value.is_a?(Numeric)
+          data_type = 'number'
+        elsif value.is_a?(Date)
+          data_type = 'date'
+        elsif value.is_a?(DateTime) || value.is_a?(Time)
+          data_type = 'datetime'
+        elsif value.respond_to?(:to_s)
+          if !value.match(/[^0-9.]/)
+            data_type = 'number'
+          else
+            if (a = Date._parse(value)).size >= 3 
+              if a.size >= 5
+                data_type = 'datetime'
+              else
+                data_type = 'date'
+              end
+            else
+                data_type = 'string'
+            end
+          end
+        end
+        data_type
+      end
+
+      def ruby_to_js(type, value)
+        return nil if value.nil?
+        if type == 'string'
+          value = "'#{value}'"
+        elsif type == 'date'
+          temp_d = Date.parse(value.to_s)
+          value = "new Date(#{temp_d.year}, #{temp_d.month - 1}, #{temp_d.day})"
+        elsif type == 'datetime'
+          temp_d = DateTime.parse(value.to_s)
+          value = "new Date(#{temp_d.year}, #{temp_d.month - 1}, #{temp_d.day}, #{temp_d.hour}, #{temp_d.min}, #{temp_d.sec})"
+        end
+        return value
+      end
+    end
+  
+  end
+end

data/lib/g_viz/templates/visualization.erb

@@ -1,9 +1,9 @@
 <script type='text/javascript' src='http://www.google.com/jsapi<%= @api_key %>'></script>
 <script type='text/javascript'>
-  google.load('visualization', '1', {'packages':[<%= @@viz_package_names.map{|p|"'" + p.downcase + "'"}.join(',') -%>]});
+  google.load('visualization', '1', {'packages':[<%= @viz_package_names.map{|p|"'" + p.downcase + "'"}.join(',') -%>]});
   google.setOnLoadCallback(drawChart);
   function drawChart() {    
-    <%- @@graphs.each do |graph| -%>
+    <%- @graphs.each do |graph| -%>
       var <%= graph.data_name%> = new google.visualization.DataTable();
     <%- graph.columns.each do |column| -%>
       <%= graph.data_name%>.addColumn('<%= column[0] %>', '<%= column[1] %>')
@@ -18,7 +18,7 @@
           end
         end -%>
       var chart_<%= graph.data_name %> = new google.visualization.<%= graph.type %>(document.getElementById('<%= graph.chart_id %>'));
-      chart.draw(<%= graph.data_name%>, <%=graph.options.to_json%>);
+      chart_<%= graph.data_name %>.draw(<%= graph.data_name%>, <%=graph.options.to_json%>);
     <%- end -%>
   }
 </script>

data/lib/g_viz.rb

@@ -0,0 +1,5 @@
+require 'set'
+require 'date'
+require 'erb'
+require 'json'
+require File.join([File.dirname(__FILE__), 'g_viz', 'g_viz'])

data/spec/g_viz/g_viz_spec.rb

@@ -16,44 +16,38 @@ describe GViz do
           {:date => Date.parse("2008-02-05"), :sold_pencils => 41476, :sold_pens => 66467, :title1 => 'Bought Pens',:text2 => 'Bought 200k pens'},
           {:date => Date.parse("2008-02-06"), :sold_pencils => 33322, :sold_pens => 39463, :title1 => 'Bought Pens',:text2 => 'Bought 200k pens'}
         ]
-        GViz.add_graph('AnnotatedTimeline', @data, @mapping)
-        output = GViz.output
+        g = GViz::Base.new
+        g.add_graph('AnnotatedTimeline', @data, @mapping)
+        output = g.output
         puts output
         output.should == TestHelper.template('rendered_annotated_timeline')
       end
     end
-    
-    describe 'graph' do
-      @games = [{:name => "Gary", :games_won => "2", :birthday => "2008-02-01"},
-               {:name => "John", :games_won => "4", :birthday => Date.parse("2009-01-01 11:11")},
-               {:name => "A", :games_won => "2", :birthday => "Jun 14 1982"}]
-      GViz.add_graph('MotionGraph', @games, [[:name, "Name"], [:games_won, "# Games"]])
-    end
   end
   
   describe 'implementation details - class methods' do
     describe 'google_data_type' do
       it "should classify ruby data types to google visualization data types" do
-        GViz.google_data_type(Time.now).should == 'datetime'
-        GViz.google_data_type(Date.new).should == 'date'
-        GViz.google_data_type("June 23 1982").should == 'date'
-        GViz.google_data_type("June 23 1982 12:23").should == 'datetime'
-        GViz.google_data_type("12312412").should == 'numeric'
-        GViz.google_data_type("12312412.1234").should == 'numeric'
-        GViz.google_data_type(1234123).should == 'numeric'
-        GViz.google_data_type(1234123.1234).should == 'numeric'
-        GViz.google_data_type("a123124123").should == 'string'
+        GViz::Graph.google_data_type(Time.now).should == 'datetime'
+        GViz::Graph.google_data_type(Date.new).should == 'date'
+        GViz::Graph.google_data_type("June 23 1982").should == 'date'
+        GViz::Graph.google_data_type("June 23 1982 12:23").should == 'datetime'
+        GViz::Graph.google_data_type("12312412").should == 'numeric'
+        GViz::Graph.google_data_type("12312412.1234").should == 'numeric'
+        GViz::Graph.google_data_type(1234123).should == 'numeric'
+        GViz::Graph.google_data_type(1234123.1234).should == 'numeric'
+        GViz::Graph.google_data_type("a123124123").should == 'string'
         # should this really happen?  documenting it because i need to think if this is ok.
-        GViz.google_data_type("a12312412").should == 'date'
+        GViz::Graph.google_data_type("a12312412").should == 'date'
       end
     end
 
     describe 'ruby_to_js' do
       it "should return the js string representation of that data " do
-        GViz.ruby_to_js('numeric', 12341234).should == 12341234 
-        GViz.ruby_to_js('string', 12341234).should == "'12341234'"
-        GViz.ruby_to_js('date', "June 23 1982").should == "new Date(1982, 5, 23)"
-        GViz.ruby_to_js('date', Date.parse("June 23 1982")).should == "new Date(1982, 5, 23)"
+        GViz::Graph.ruby_to_js('numeric', 12341234).should == 12341234 
+        GViz::Graph.ruby_to_js('string', 12341234).should == "'12341234'"
+        GViz::Graph.ruby_to_js('date', "June 23 1982").should == "new Date(1982, 5, 23)"
+        GViz::Graph.ruby_to_js('date', Date.parse("June 23 1982")).should == "new Date(1982, 5, 23)"
       end
     end
   end
@@ -68,7 +62,7 @@ describe GViz do
                ["'John'", "4", "new Date(2009, 0, 1)"],
                ["'A'", "2", "new Date(1982, 5, 14)"]]
                
-      @gviz = GViz.send(:new, 'bar', @games, [[:name, "Name"], [:games_won, "Games Won"], [:birthday, 'Birthday']])
+      @gviz = GViz::Graph.new('bar', @games, [[:name, "Name"], [:games_won, "Games Won"], [:birthday, 'Birthday']])
     end
     
     describe 'columns' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: garru-g_viz
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Gary Tsang
@@ -22,12 +22,16 @@ extensions: []
 extra_rdoc_files: 
 - CHANGELOG
 - lib/g_viz/g_viz.rb
+- lib/g_viz/graph.rb
 - lib/g_viz/templates/visualization.erb
+- lib/g_viz.rb
 - README
 files: 
 - CHANGELOG
 - lib/g_viz/g_viz.rb
+- lib/g_viz/graph.rb
 - lib/g_viz/templates/visualization.erb
+- lib/g_viz.rb
 - Manifest
 - Rakefile
 - README