dbplot 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/dbplot

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift(File.instance_eval { expand_path(join(dirname(__FILE__), '..', "lib")) })
-
-require 'dbplot'
-require 'dbplot/runner'
+require File.expand_path('lib/dbplot')
+require File.expand_path('lib/dbplot/runner')
  
 DbPlot::Runner.start

data/dbplot.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dbplot}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacob Rothstein"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2010-02-17}
   s.default_executable = %q{dbplot}
   s.description = %q{ruby glue between sql and r (ggplot2)}
   s.email = %q{github@jacobrothstein.com}
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "dbplot.gemspec",
      "lib/dbplot.rb",
      "lib/dbplot/runner.rb",
+     "lib/dbplot/template.r.erb",
      "test/dbplot_test.rb",
      "test/test_helper.rb"
   ]
@@ -55,3 +56,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<enumerable-proxy>, [">= 0"])
   end
 end
+

data/lib/dbplot/runner.rb

@@ -14,6 +14,11 @@ class DbPlot
             on("-p", "--password PASSWORD", "MySQL Password") {|p| d.settings[:password] = p }
             on("-d", "--database DATABASE", "MySQL Database") {|db| d.settings[:database] = db }
             on("-q", "--query QUERY", "dbplot query") {|q| d.string = q.gsub(/;?$/, ";") }
+            on("--width WIDTH", "pdf width") {|w| d.settings[:width] = w}
+            on("--height HEIGHT", "pdf height") {|w| d.settings[:height] = h}
+            on("--template TEMPLATE_FILE", "use alternate template") do |t|
+              d.settings[:template_file] = t
+            end
             on("--version", "Print version info and exit") {puts DbPlot.version;exit}
             on "--dry-run", "Print but do not execute. Implies -v." do |dry|
               d.debug = d.settings[:dry_run] = true

data/lib/dbplot/template.r.erb

@@ -0,0 +1,11 @@
+require(ggplot2);
+require(RMySQL);
+
+con <- dbConnect(MySQL(), user="<%=@settings[:username]%>",
+    password="<%=@settings[:password]%>", dbname="<%=@settings[:database]%>",
+    host="<%=@settings[:host]%>");
+  
+pdf('<%=@file%>', width = <%=@settings[:width]%>, height = <%=@settings[:height]%>);
+qplot(<%=@qplot.join(", ")%>, data=dbGetQuery(con, "<%=@query%>"));
+dev.off()
+

data/lib/dbplot.rb

@@ -2,99 +2,63 @@ require 'rubygems'
 require 'mysql'
 require 'enumerable_proxy'
 require 'readline'
+require 'erb'
 
 class DbPlot
   attr_accessor :settings, :debug, :data, :string
 
   def self.version
-    "DbPlot v" + File.instance_eval { read(expand_path(join(dirname(__FILE__), '..', "VERSION"))) }
+    "DbPlot v" + version_string
   end
-
-  def initialize(options = {})
-    @settings = {
+    
+  def settings
+    @settings ||= {
       :host => 'localhost',
       :username => 'root',
       :password => 'password',
-      :database => ''
+      :database => '',
+      :width => 5,
+      :height => 5
     }
-    
-    %w(host database username password).map.to_sym.each do |setting|
+  end
+
+  def initialize(options = {})
+    %w(host database username password).proxy(:map).to_sym.each do |setting|
       settings[setting] = options[setting] if options[setting]
     end
   end
   
+  def template_file
+    settings[:template_file] || File.instance_eval {expand_path(join(dirname(__FILE__), 'dbplot', 'template.r.erb'))}
+  end
+  
   def execute
     return unless complete?
     
-    column_string = @needed_columns.map do |col, col_alias|
-      "#{col}#{" AS #{col_alias}" if col_alias}"
-    end.join(", ")
+    @query = %{SELECT #{select_string} FROM #{@table}}
     
-    @query = %{SELECT #{column_string} FROM #{@table}}
+    template = ERB.new(File.read(template_file)).result(binding)
     
-    template = %{
-      require(ggplot2);
-      require(RMySQL);
-      
-      con <- dbConnect(MySQL(), user="#{settings[:username]}",
-          password="#{settings[:password]}", dbname="#{settings[:database]}",
-          host="#{settings[:host]}");
-        
-        data <- dbGetQuery(con, "#{@query}")
-        
-        pdf('#{@file}', width = 11, height = 8.5);
-        
-        qplot(#{@qplot.join(", ")}, data=data);
-        
-        dev.off()
-      }
     puts template if debug
+    
     unless settings[:dry_run]
       `echo \"#{template.gsub('"', '\\"')}\" | r --no-save #{"2>&1 > /dev/null" unless debug}`
     end
     @string = nil
   end
-  
-  def parse
-    name_regex = /[a-z_]+/
-    
-    if string =~ /plot (#{name_regex})(?: as (#{name_regex}))? vs (#{name_regex})(?: as (#{name_regex}))? from (#{name_regex})/i
-      @ordinate, @ordinate_alias, @abscissa, @abscissa_alias, @table = $1, $2, $3, $4, $5
 
-      @file = "out.pdf"
-      
-      @needed_columns = {@ordinate => @ordinate_alias, @abscissa => @abscissa_alias}
-      
-      @qplot = [
-        @abscissa_alias || @abscissa,
-        @ordinate_alias || @ordinate
-      ]
-      
-      if string =~ /into ([a-z._]+.pdf)/
-        @file = $1
-      end
-      
-      if string =~ /color by (#{name_regex})(?: as (#{name_regex}))?/i
-        @needed_columns[$1] = $2
-        @qplot << "colour = #{$2 || $1}"
-      end
-      
-      if string =~ /facet by (#{name_regex})(?: as (#{name_regex}))?(?: vs (#{name_regex})(?: as (#{name_regex}))?)?/i
-        @needed_columns[$1] = $2
-        if $3
-          @needed_columns[$3] = $4
-          @qplot << "facets = #{$2 || $1}~#{$4 || $3}"
-        else
-          @qplot << "facets = ~#{$2 || $1}"
-        end
-      end
-      
+  def parse
+    if legal_expression?
+      set_defaults
+      set_file
+      set_color_by
+      set_facet_by
     else
       puts "\ncould not parse: \"#{string}\"\n\n"
       @string = nil
     end
     
-    return self
+    self
   end
 
   def parse_line(string)
@@ -106,14 +70,77 @@ class DbPlot
   end
 
   def complete?
-    @string =~ /;/
+    @string =~ /;\s*$/
+  end
+  
+
+  def prompt
+    @string.nil? ? 'dbplot> ' : '     -> '
+  end
+
+
+  private
+  
+  def select_string
+    @needed_columns.map do |col, col_alias|
+      "#{col}#{" AS #{col_alias}" if col_alias}"
+    end.join(", ")
+  end
+  
+  def legal_expression?
+    name_regex = /[a-z_]+/
+    
+    if string =~ /plot (#{name_regex})(?: as (#{name_regex}))? vs (#{name_regex})(?: as (#{name_regex}))? from (#{name_regex})/i
+      @ordinate, @ordinate_alias, @abscissa, @abscissa_alias, @table = $1, $2, $3, $4, $5
+      true
+    end
+  end
+  
+  def set_file
+    if string =~ /into ([a-z._]+.pdf)/
+      @file = $1
+    else
+      @file = "out.pdf"
+    end
+  end
+  
+  def set_defaults
+    @needed_columns = {@ordinate => @ordinate_alias, @abscissa => @abscissa_alias}
+    
+    @qplot = [
+      @abscissa_alias || @abscissa,
+      @ordinate_alias || @ordinate
+    ]
+  end
+  
+  def set_color_by
+    name_regex = /[a-z_]+/
+  
+    if string =~ /color by (#{name_regex})(?: as (#{name_regex}))?/i
+      @needed_columns[$1] = $2
+      @qplot << "colour = #{$2 || $1}"
+    end
+  end
+  
+  def set_facet_by
+    name_regex = /[a-z_]+/
+    
+    if string =~ /facet by (#{name_regex})(?: as (#{name_regex}))?(?: vs (#{name_regex})(?: as (#{name_regex}))?)?/i
+      @needed_columns[$1] = $2
+      if $3
+        @needed_columns[$3] = $4
+        @qplot << "facets = #{$2 || $1}~#{$4 || $3}"
+      else
+        @qplot << "facets = ~#{$2 || $1}"
+      end
+    end
   end
   
   def strip_comments
     @string.gsub /#.+$/, ''
   end
   
-  def prompt
-    @string.nil? ? 'dbplot> ' : '     -> '
+  def self.version_string
+    File.instance_eval { read(expand_path(join(dirname(__FILE__), '..', "VERSION"))) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dbplot
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jacob Rothstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2010-02-17 00:00:00 -08:00
 default_executable: dbplot
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
 - dbplot.gemspec
 - lib/dbplot.rb
 - lib/dbplot/runner.rb
+- lib/dbplot/template.r.erb
 - test/dbplot_test.rb
 - test/test_helper.rb
 has_rdoc: true