grada 2.2.2 → 3.0.0

data/lib/grada.rb

@@ -1,297 +1,3 @@
 $:.unshift File.expand_path('..', __FILE__)
 
-require_relative 'grada/gnuplot'
-
-class Grada
-  # Not valid the format of the object to construct the graph
-  #
-  class NotValidArrayError < RuntimeError; end
-  
-  # Not valid the content of the array you're passing to build the graph
-  #
-  class NotValidDataError < RuntimeError; end
-  
-  # Can't build the plot
-  #
-  class NoPlotDataError < RuntimeError; end
-  
-  attr_reader :x
-  attr_reader :y
-  
-  DEFAULT_OPTIONS = {width: 1920,
-                     height: 1080,
-                     title: "Graph",
-                     x_label: "X",
-                     y_label: "Y",
-                     with: 'lines',
-                     graph_type: :default}
-
-  #All styles you can specify for the plots
-  #
-  STYLES = [:linestyle, :linetype, :linewidth, :linecolor, :pointtype, :pointsize, :fill]
- 
-  #Graph offsets
-  #
-  LEFT   =  0.05
-  RIGHT  =  0.05
-  TOP    =  0.05
-  BOTTOM =  0.05
-  
-  # Hello GraDA
-  #
-  
-  def self.hi
-    puts "Hello GraDA"
-  end
-    
-  # Initialize object with the data you want to plot. 
-  # It can vary depending on the type of graph.
-  # The second argument is optional.
-  #
-  # Example:
-  #   >> radiation_levels_median_per_day = [0.001,0.01,1,10,1000]
-  #   >> radiation_days = [0,1,2,3,4]
-  #   >> grada = Grada.new(radiation_days, radiation_levels_median_per_day)
-  #   => #<Grada:0x007f962a8dc9b8 @x=[0, 1, 2, 3, 4], @y=[0.001, 0.01, 1, 10, 1000]>
-  # Arguments:
-  #   x: (Array)
-  #   y: (Array) *optional*
-  
-  def initialize(x, y = nil)
-    @x = validate(x)
-    @y = y.nil? ? y : validate(y)  
-  end
-  
-  # Displays a graph in a X11 window. 
-  # You can specify all the options that you need:
-  # *width* (Integer)
-  # *height* (Integer)
-  # *title* (Integer)
-  # *x_label* (String)
-  # *y_label* (String)
-  # *graph_type* (:histogram, :heatmap) default: :default
-  # *with* ('points', 'linespoints') default: 'lines'
-  #
-  # Also is important to know that you can interact with the graph:
-  # * Zoom in                 =>  right click and drag the mouse to cover the area you want 
-  #                               or 
-  #                               use the scroll wheel
-  # 
-  # * Zoom out                =>  press key 'a'
-  #                               or
-  #                               if you want to go back to a previous state of zoom press key 'p'
-  #
-  #  * Exit interactive mode  =>  press key 'q'
-  #                               or
-  #                               just close the window
-  #
-  #  * Save image             =>  working on it 
-  #
-  # Example:
-  #   >> grada.display
-  #   => ""
-  #   >> grada.display({ title: 'Atomic Device X', x_label: 'Day', y_label: 'smSv', with: 'points' })
-  #   => ""
-  # Arguments:
-  #   opts: (Hash) *optional*
-  
-  def display(opts = {})
-    @opts = DEFAULT_OPTIONS.merge(opts)
-    
-    if @opts[:graph_type] == :histogram
-      population_data?(@x)
-      return nil if @x.empty?
-      
-      plot_histogram do |plot|
-        plot.set "terminal x11 size #{@opts[:width]},#{@opts[:height]}"
-        plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
-      end
-    elsif @opts[:graph_type] == :heatmap
-      Matrix.columns(@x) rescue raise NoPlotDataError
-      @opts[:with] = 'image'
-      
-      plot_heat_map do |plot|
-        plot.set "terminal x11 size #{@opts[:width]},#{@opts[:height]}"
-        plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
-      end
-    else
-      raise NoPlotDataError if @y.nil?
-      
-      plot_and do |plot|
-        plot.set "terminal x11 size #{@opts[:width]},#{@opts[:height]}"
-        plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
-      end
-    end
-  end
-  
-  # Save the graph in a png file. 
-  # You can specify all the options that you need as _display_ but also need to specify the file root-name and extension.
-  # The possible extensions you can use for saving a file are:
-  #  *png*
-  #  *gif*
-  #  *jpeg*
-  #  *svg* => default
-  #
-  # Example:
-  #   >> grada.save({ filename: 'secret/radiation_levels/ffa/zonex/devicex/radiation_level_malaga', ext: 'png' ,title: 'Atomic Device X', x_label: 'Day', y_label: 'smSv', with: 'points' }) 
-  #   => ""
-  # Arguments:
-  #   opts: (Hash) *optional*
-  
-  def save(opts = {})
-    @opts = DEFAULT_OPTIONS.merge(opts)
-    
-    return nil if @opts[:filename].nil?
-
-    ext = @opts[:ext] || 'svg'
-    
-    if @opts[:graph_type] == :histogram
-      population_data?(@x)
-      return nil if @x.empty?
-      
-      plot_histogram do |plot|
-        plot.output "#{@opts[:filename]}.#{ext}" 
-        plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
-        plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
-      end
-    elsif @opts[:graph_type] == :heatmap
-      Matrix.columns(@x) rescue raise NoPlotDataError
-      @opts[:with] = 'image'
-      
-      plot_heat_map do |plot|
-        plot.output "#{@opts[:filename]}.#{ext}" 
-        plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
-      end
-    else
-      raise NoPlotDataError if @y.nil?
-      
-      plot_and do |plot|
-        plot.output "#{@opts[:filename]}.#{ext}" 
-        plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
-        plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
-      end
-    end
-  end
-  
-  private
-  
-  def validate(l)
-    raise NotValidArrayError if ! l.is_a?(Array)
-  
-    l.each do |elem|
-      raise NotValidDataError if ! ( elem.is_a?(Float) || elem.is_a?(Integer) || elem.is_a?(Array) || elem.is_a?(Hash))
-    end
-  end
-  
-  def population_data?(l)
-    raise NotValidArrayError if ! l.is_a?(Array)
-  
-    l.each do |elem|
-      raise NotValidDataError if ! ( elem.is_a?(Float) || elem.is_a?(Integer))
-    end
-  end
-  
-  def multiple_data?(l)
-    if l.is_a?(Array)
-      l.each do |elem|
-        return false if !  elem.is_a?(Hash)
-      end
-  
-      return true
-    end
-    
-    false
-  end
-  
-  def plot_and(&block)
-    Gnuplot.open do
-      Gnuplot::Plot.construct do |plot|
-        block.call plot if block
-  
-        plot.title @opts[:title]
-        
-        plot.xlabel @opts[:x_label]
-        plot.ylabel @opts[:y_label]
-  
-        if multiple_data?(@y)
-          @y.each_with_index do |dic, index|
-            dic.each do |k, v|
-              if ! STYLES.include?(k.to_sym) && k.to_sym != :with
-                raise NoPlotDataError if ! v.nil? && @x.size != v.size
-            
-                style = Gnuplot::Style.new do |ds|
-                  ds.index = index
-                  STYLES.each do |style|
-                    ds.send("#{style}=", dic[style]) if dic[style]
-                  end
-                end.to_s
-
-                plot.data << Gnuplot::DataSet.new([@x,v]) do |ds|
-                  ds.with = dic[:with] || @opts[:with]
-                  ds.with += style
-                  ds.title = "#{k}"
-                end
-              end
-            end
-          end
-        else
-          raise NoPlotDataError if ! @y.nil? && @x.size != @y.size
-          
-          plot.data << Gnuplot::DataSet.new([@x,@y]) do |ds|
-            ds.with = @opts[:with] 
-          end
-        end
-      end
-    end
-  end
-  
-  def plot_histogram(&block)
-    Gnuplot.open do
-      Gnuplot::Plot.construct do |plot|
-        block.call plot if block 
-        
-        width = ( @x.max - @x.min ) / @x.size
-  
-        plot.title @opts[:title]
-        
-        plot.set "style data histogram"
-        plot.xlabel @opts[:x_label]
-        plot.ylabel "Frequency"
-        plot.set "style fill solid 0.5"
-        plot.set "xrange [#{@x.min}:#{@x.max}]"
-        plot.set "boxwidth #{ width * 0.1}"
-        plot.set "xtics #{@x.min},#{(@x.max-@x.min)/5},#{@x.max}"
-        plot.set "tics out nomirror"
-
-        plot.data << Gnuplot::DataSet.new(@x) do |ds|
-          ds.with = 'boxes'
-          ds.title = @opts[:x_label]
-          ds.using = '($1):(1.0)'
-          ds.smooth = 'freq'
-        end
-      end
-    end
-  end
-  
-  def plot_heat_map(&block)
-    Gnuplot.open do
-      Gnuplot::Plot.construct do |plot|
-        block.call plot if block
-        
-        plot.set "pm3d map"
-        plot.set "palette color"
-        plot.set "xrange [0:#{@x.size-1}]"
-        plot.set "yrange [0:#{@x.size-1}]"
-        plot.set "cbrange [#{@opts[:min]}:#{@opts[:max]}]"
-        plot.set "cblabel \"#{@opts[:x_label]}\""
-        plot.set "palette model RGB"
-        plot.set "palette define"
-       
-        plot.title @opts[:title]
-        plot.data << Gnuplot::DataSet.new(Matrix.columns(@x)) do |ds|
-          ds.with = @opts[:with] 
-        end
-      end
-    end
-  end
-end
+require 'grada/graph'

data/lib/grada/graph.rb

@@ -0,0 +1,200 @@
+require 'grada/types/default_base'
+require 'grada/types/gnuplot'
+require 'grada/types/histogram'
+require 'grada/types/default'
+require 'grada/types/heat_map'
+
+module Grada
+  class Graph
+    # Not valid the format of the object to construct the graph
+    #
+    class NotValidArrayError < RuntimeError; end
+    
+    # Not valid the content of the array you're passing to build the graph
+    #
+    class NotValidDataError < RuntimeError; end
+    
+    # Can't build the plot
+    #
+    class NoPlotDataError < RuntimeError; end
+    
+    attr_reader :x
+    attr_reader :y
+    
+    DEFAULT_OPTIONS = {width: 1920,
+                       height: 1080,
+                       title: "Graph",
+                       x_label: "X",
+                       y_label: "Y",
+                       with: 'lines',
+                       graph_type: :default}
+  
+    #Graph offsets
+    #
+    LEFT   =  0.05
+    RIGHT  =  0.05
+    TOP    =  0.05
+    BOTTOM =  0.05
+    
+    # Hello GraDA
+    #
+    
+    def self.hi
+      puts "Hello GraDA"
+    end
+      
+    # Initialize object with the data you want to plot. 
+    # It can vary depending on the type of graph.
+    # The second argument is optional.
+    #
+    # Example:
+    #   >> radiation_levels_median_per_day = [0.001,0.01,1,10,1000]
+    #   >> radiation_days = [0,1,2,3,4]
+    #   >> grada = Grada.new(radiation_days, radiation_levels_median_per_day)
+    #   => #<Grada:0x007f962a8dc9b8 @x=[0, 1, 2, 3, 4], @y=[0.001, 0.01, 1, 10, 1000]>
+    # Arguments:
+    #   x: (Array)
+    #   y: (Array) *optional*
+    
+    def initialize(x, y = nil)
+      @x = validate(x)
+      @y = y.nil? ? y : validate(y)  
+    end
+    
+    # Displays a graph in a X11 window. 
+    # You can specify all the options that you need:
+    # *width* (Integer)
+    # *height* (Integer)
+    # *title* (Integer)
+    # *x_label* (String)
+    # *y_label* (String)
+    # *graph_type* (:histogram, :heatmap) default: :default
+    # *with* ('points', 'linespoints') default: 'lines'
+    #
+    # Also is important to know that you can interact with the graph:
+    # * Zoom in                 =>  right click and drag the mouse to cover the area you want 
+    #                               or 
+    #                               use the scroll wheel
+    # 
+    # * Zoom out                =>  press key 'a'
+    #                               or
+    #                               if you want to go back to a previous state of zoom press key 'p'
+    #
+    #  * Exit interactive mode  =>  press key 'q'
+    #                               or
+    #                               just close the window
+    #
+    #  * Save image             =>  working on it 
+    #
+    # Example:
+    #   >> grada.display
+    #   => ""
+    #   >> grada.display({ title: 'Atomic Device X', x_label: 'Day', y_label: 'smSv', with: 'points' })
+    #   => ""
+    # Arguments:
+    #   opts: (Hash) *optional*
+    
+    def display(opts = {})
+      @opts = DEFAULT_OPTIONS.merge(opts)
+      
+      if @opts[:graph_type] == :histogram
+        population_data?(@x)
+        return nil if @x.empty?
+        
+        Histogram.plot(@x, @opts) do |plot|
+          plot.set "terminal x11 size #{@opts[:width]},#{@opts[:height]}"
+          plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
+        end
+      elsif @opts[:graph_type] == :heatmap
+        Matrix.columns(@x) rescue raise NoPlotDataError
+        @opts[:with] = 'image'
+        
+        HeatMap.plot(@x, @opts) do |plot|
+          plot.set "terminal x11 size #{@opts[:width]},#{@opts[:height]}"
+          plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
+        end
+      else
+        raise NoPlotDataError if @y.nil?
+        
+        Default.plot(@x, @y, @opts) do |plot|
+          plot.set "terminal x11 size #{@opts[:width]},#{@opts[:height]}"
+          plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
+        end
+      end
+    end
+    
+    # Save the graph in a png file. 
+    # You can specify all the options that you need as _display_ but also need to specify the file root-name and extension.
+    # The possible extensions you can use for saving a file are:
+    #  *png*
+    #  *gif*
+    #  *jpeg*
+    #  *html*           (not valid for heatmaps)
+    #  *svg* => default (not valid for heatmaps)
+    #
+    # Example:
+    #   >> grada.save({ filename: 'secret/radiation_levels/ffa/zonex/devicex/radiation_level_malaga', ext: 'png' ,title: 'Atomic Device X', x_label: 'Day', y_label: 'smSv', with: 'points' }) 
+    #   => ""
+    # Arguments:
+    #   opts: (Hash) *optional*
+    
+    def save(opts = {})
+      @opts = DEFAULT_OPTIONS.merge(opts)
+      
+      return nil if @opts[:filename].nil?
+  
+      ext = @opts[:ext] || 'svg'
+      
+      if @opts[:graph_type] == :histogram
+        population_data?(@x)
+        return nil if @x.empty?
+       
+        return Histogram.plot_html(@x, @opts) if ext == 'html'
+
+        Histogram.plot(@x, @opts) do |plot|
+          plot.output "#{@opts[:filename]}.#{ext}" 
+          plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
+          plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
+        end
+      elsif @opts[:graph_type] == :heatmap
+        Matrix.columns(@x) rescue raise NoPlotDataError
+        @opts[:with] = 'image'
+
+        ext = 'png' if ext == 'html' || ext == 'svg'
+        
+        HeatMap.plot(@x, @opts) do |plot|
+          plot.output "#{@opts[:filename]}.#{ext}" 
+          plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
+        end
+      else
+        raise NoPlotDataError if @y.nil?
+ 
+        return Default.plot_html(@x, @y, @opts) if ext == 'html' 
+
+        Default.plot(@x, @y, @opts) do |plot|
+          plot.output "#{@opts[:filename]}.#{ext}" 
+          plot.set "terminal #{ext} size #{@opts[:width]}, #{@opts[:height]} crop"
+          plot.set "offset graph #{LEFT},#{RIGHT},#{TOP},#{BOTTOM}"
+        end
+      end
+    end
+    
+    private
+    
+    def validate(l)
+      raise NotValidArrayError if ! l.is_a?(Array)
+    
+      l.each do |elem|
+        raise NotValidDataError if ! ( elem.is_a?(Float) || elem.is_a?(Integer) || elem.is_a?(Array) || elem.is_a?(Hash))
+      end
+    end
+    
+    def population_data?(l)
+      raise NotValidArrayError if ! l.is_a?(Array)
+    
+      l.each do |elem|
+        raise NotValidDataError if ! ( elem.is_a?(Float) || elem.is_a?(Integer))
+      end
+    end
+  end
+end

data/lib/grada/types/default.rb

@@ -0,0 +1,62 @@
+module Grada
+  class Default < DefaultBase
+    def self.plot(x, y, opts, &block)
+      Gnuplot.open do
+        Gnuplot::Plot.construct do |plot|
+          block.call plot if block
+    
+          plot.title opts[:title]
+          
+          plot.xlabel opts[:x_label]
+          plot.ylabel opts[:y_label]
+    
+          if multiple_data?(y)
+            y.each_with_index do |dic, index|
+              dic.each do |k, v|
+                if ! Grada::STYLES.include?(k.to_sym) && k.to_sym != :with
+                  raise NoPlotDataError if ! v.nil? && x.size != v.size
+              
+                  style = Gnuplot::Style.new do |ds|
+                    ds.index = index
+                    Grada::STYLES.each do |style|
+                      ds.send("#{style}=", dic[style]) if dic[style]
+                    end
+                  end.to_s
+  
+                  plot.data << Gnuplot::DataSet.new([x,v]) do |ds|
+                    ds.with = dic[:with] || opts[:with]
+                    ds.with += style
+                    ds.title = "#{k}"
+                  end
+                end
+              end
+            end
+          else
+            raise NoPlotDataError if ! y.nil? && x.size != y.size
+            
+            plot.data << Gnuplot::DataSet.new([x,y]) do |ds|
+              ds.with = opts[:with] 
+            end
+          end
+        end
+      end
+    end
+    
+    def self.plot_html(x, y, opts)
+      opts[:filename] = create_html_dir(opts[:filename])
+
+      create_grada_json(opts, x, y)
+
+      File.open("#{opts[:filename]}.html",'w') do |f|
+        f << html_head
+        f << "<body>\n"
+        f << "  <div class=grada_main>\n"
+        f << html_title(opts[:title])
+        f << html_graph
+        f << html_panel
+        f << "  </div>"
+        f << "</body>"
+      end
+    end 
+  end
+end

data/lib/grada/types/default_base.rb

@@ -0,0 +1,123 @@
+require 'json'
+
+module Grada
+  #All styles you can specify for the plots
+  #
+  STYLES = [:linestyle, :linetype, :linewidth, :linecolor, :pointtype, :pointsize, :fill]
+ 
+  class DefaultBase
+    
+    protected 
+    
+    JQUERY_JS = 'https://rawgithub.com/emfigo/flot/master/jquery.js'
+    FLOT_EXCANVAS_JS = 'https://rawgithub.com/emfigo/flot/master/excanvas.min.js'
+    FLOT_JS = 'https://rawgithub.com/emfigo/flot/master/jquery.flot.js'
+    FLOT_SELECTION_JS = 'https://rawgithub.com/emfigo/flot/master/jquery.flot.selection.js'
+    FLOT_SYMBOL_JS = 'https://rawgithub.com/emfigo/flot/master/jquery.flot.symbol.js'
+    FLOT_THRESHOLD_JS = 'https://rawgithub.com/emfigo/flot/master/jquery.flot.threshold.js'
+    GRADA_JS = 'https://rawgithub.com/emfigo/grada/master/assets/javascripts/grada.js'
+
+    TITLE_CSS = 'https://rawgithub.com/emfigo/grada/master/assets/stylesheets/grada_title.css'
+    BODY_CSS = 'https://rawgithub.com/emfigo/grada/master/assets/stylesheets/grada_body.css'
+    
+    def self.multiple_data?(l)
+      if l.is_a?(Array)
+        l.each do |elem|
+          return false if !  elem.is_a?(Hash)
+        end
+    
+        return true
+      end
+      
+      false
+    end
+   
+    def self.create_html_dir(path)
+      path.split("/").tap do |dirs| 
+        last_dir = dirs.pop
+        
+        dirs << "#{last_dir}_grada_html"
+        FileUtils.mkdir_p(dirs.join("/"))
+        dirs << last_dir 
+      end.join('/')
+    end
+
+    def self.create_grada_json(opts, x, y = nil)
+      filename = opts[:filename].split("/").tap do |file|
+        hidden_file = file.pop
+
+        file << ".grada_#{opts[:graph_type]}"
+      end.join("/")
+
+
+      File.open("#{filename}.json",'w') do |f|
+        f << generate_grada_json(opts, x, y)
+      end
+    end
+
+    def self.html_head
+      "<head>
+        <script src='#{JQUERY_JS}' type='text/javascript'></script>
+        <script src='#{FLOT_EXCANVAS_JS}' type='text/javascript'></script>
+        <script src='#{FLOT_JS}' type='text/javascript'></script>
+        <script src='#{FLOT_SELECTION_JS}' type='text/javascript'></script>
+        <script src='#{FLOT_SYMBOL_JS}' type='text/javascript'></script>
+        <script src='#{FLOT_THRESHOLD_JS}' type='text/javascript'></script>
+        <script src='#{GRADA_JS}' type='text/javascript'></script>
+        
+        <link href='#{TITLE_CSS}' rel='stylesheet' type='text/css' />
+        <link href='#{BODY_CSS}' rel='stylesheet' type='text/css' />
+      </head>\n"
+    end
+    
+    def self.html_title(title)
+      "    <div class='grada_title'>  
+              <h2>#{title}</h2>
+           </div>\n"
+    end
+    
+    def self.html_graph
+      "    <div class='grada_body'>  
+              <div id='grada_graph'></div>
+           </div>\n"
+    end
+
+    def self.html_panel
+      "    <div class='grada_panel'>
+              <span id='reset'>Reset Zoom</span>
+           </div>\n"
+    end
+
+    private
+
+    def self.compose_grada_json_data(x, y)
+      if y.nil?
+        x.sort.group_by{ |elem| elem }.map{ |k,v| { x: k, y: v.size } }
+      else
+        x.zip(y).map do |comp|
+          { x: comp.first, y: comp.last }
+        end
+      end
+    end
+    
+    def self.generate_grada_json(opts, x, y = nil)
+      json = []
+
+      if multiple_data?(y)
+        y.each do |dic|
+          dic.each do |k, v|
+            if ! Grada::STYLES.include?(k.to_sym) && k.to_sym != :with
+              raise NoPlotDataError if ! v.nil? && x.size != v.size
+
+              json << { data: compose_grada_json_data(x, v), label: "#{k}", style: dic[:with] || opts[:with] }
+            end
+          end
+        end
+      else
+        json << { data: compose_grada_json_data(x, y), label: opts[:title], style: opts[:with] }
+      end
+
+      JSON.pretty_generate(json)
+    end
+  end
+end

data/lib/grada/types/gnuplot.rb

@@ -0,0 +1,246 @@
+require 'matrix'
+require 'open3'
+
+module Grada
+  class NoGnuPlotExecutableFound < RuntimeError; end 
+
+  class Gnuplot
+    def self.candidate?(candidate)
+      return candidate if File::executable? candidate
+  
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |dir|
+        possible_candidate = File::join dir, candidate.strip
+  
+        return possible_candidate if File::executable? possible_candidate
+      end
+  
+      nil
+    end
+    
+    def self.find_exec(bin)
+      bin_list = RUBY_PLATFORM =~ /mswin|mingw/ ? [bin, "#{bin}.exe"] : [bin]
+  
+      bin_list.each do |c|
+        exec = candidate?(c)
+        return exec if exec
+      end
+  
+      nil
+    end
+    
+    def self.gnuplot
+      gnu_exec = find_exec( ENV['RB_GNUPLOT'] || 'gnuplot' )
+      raise Grada::NoGnuPlotExecutableFound unless gnu_exec
+      gnu_exec
+    end
+  
+    def self.open(persist = true, &block)
+      gnuplot_cmd = gnuplot
+  
+      commands = yield
+  
+      output = StringIO.new
+      Open3::popen3(gnuplot_cmd, '-persist') do |data_in, data_out, stderr, wait_th|
+        data_in << commands[:plot_settings]
+        data_in << commands[:plot_data]
+  
+        data_in.flush
+        sleep 1
+        
+        while true do
+          window = IO::popen('xprop -name "Gnuplot" WM_NAME 2>/dev/null').gets
+          break unless window
+          sleep 1
+        end
+        data_in.close
+        data_out.close
+        stderr.close
+  
+        output.write(wait_th.value.exitstatus)
+      end
+      
+      output.string
+    end
+  end
+  
+  class Gnuplot::Plot
+    attr_accessor :cmd, :data, :settings, :styles, :arbitrary_lines
+  
+    QUOTED_METHODS = [ "title", "output", "xlabel", "x2label", "ylabel", "y2label", "clabel", "cblabel", "zlabel" ]
+  
+    def initialize
+      @settings = []
+      @arbitrary_lines = []
+      @data = []
+      @styles = []
+    end
+  
+    def self.construct(&block)
+      plot = new
+      
+      block.call plot if block_given?
+      
+      { plot_settings: plot.to_gplot, plot_data:  plot.store_datasets }
+    end
+  
+    def method_missing(meth, *args)
+      set meth.id2name, *args
+    end
+  
+    def set ( var, value = "" )
+      value = "\"#{value}\"" if QUOTED_METHODS.include? var unless value =~ /^'.*'$/
+      @settings << [ :set, var, value ]
+    end
+  
+    def unset (var)
+      @settings << [ :unset, var ]
+    end
+  
+    def to_gplot(io = '')
+      @settings.each { |setting| io += setting.map(&:to_s).join(' ') + "\n" }
+      @styles.each{ |style| io += style.to_s + "\n" }
+      @arbitrary_lines.each{ |line| io += line + "\n" }
+  
+      io
+    end
+  
+    def store_datasets(io = '')
+      if @data.size > 0
+        io +=  'plot' + " #{ @data.map { |element| element.plot_args }.join(', ') } \n" 
+        io += @data.map { |ds| ds.to_gplot }.compact.join("\n") + "\n"
+      end
+      
+      io
+    end
+  end
+  
+  class Gnuplot::Style
+    attr_accessor :linestyle, :linetype, :linewidth, :linecolor, :pointtype, :pointsize, :fill, :index
+  
+    alias :ls :linestyle 
+    alias :lt :linetype
+    alias :lw :linewidth
+    alias :lc :linecolor
+    alias :pt :pointtype
+    alias :ps :pointsize
+    alias :fs :fill
+  
+    alias :ls= :linestyle= 
+    alias :lt= :linetype=
+    alias :lw= :linewidth=
+    alias :lc= :linecolor=
+    alias :pt= :pointtype=
+    alias :ps= :pointsize=
+    alias :fs= :fill=
+    
+    STYLES = [:ls, :lt, :lw, :lc, :pt, :ps, :fs]
+  
+   def self.increment_index
+     @index ||= 0
+     @index += 1
+   end
+  
+   def initialize
+     STYLES.each do |style|
+       send("#{style}=", nil)
+     end
+  
+     yield self if block_given?
+  
+   end
+  
+   def to_s
+     str = ' '
+  
+     STYLES.each do |style|
+       str += " #{style} #{send(style)}" if send(style) 
+     end
+  
+     str == ' ' ? '' : str
+   end
+  end
+  
+  class Gnuplot::DataSet
+    attr_accessor :title, :with, :using, :data, :linewidth, :linecolor, :matrix, :smooth, :axes, :index, :linestyle
+  
+    alias :ls :linestyle
+  
+    def initialize(data = nil)
+      @data = data
+      @linestyle = nil
+      @title = nil
+      @with = nil
+      @using = nil
+      @linewidth = nil
+      @linecolor = nil 
+      @matrix = nil
+      @smooth = nil
+      @axes = nil
+      @index = nil
+  
+      yield self if block_given?
+    end
+  
+    def notitle
+      '"No Title"'
+    end
+  
+    def plot_args(io = '')
+      io += @data.is_a?(String) ? @data : "'-'"
+      #io += " index #{@index}" if @index
+      io += " using #{@using}" if @using
+      io += " axes #{@axes}" if @axes
+      io += " title #{@title ? "\"#{@title}\"" : notitle}"
+      io += " matrix #{@matrix}" if @matrix
+      io += " smooth  #{@smooth}" if @smooth
+      io += " with #{@with}" if @with
+      io += " linecolor #{@linecolor}" if @linecolor
+      io += " line #{@index} linewidth #{@linewidth}" if @linewidth
+      io += " linestyle #{@linestyle.index}" if @linestyle
+      
+      io
+    end
+  
+    def to_gplot
+      return nil if @data.nil? || @data.is_a?(String)
+  
+      @data.to_gplot
+    end
+  end
+end
+  
+class Array
+  def to_gplot
+    if number_series?(self)
+      series_for_plot = ''
+      self.each { |elem| series_for_plot += "#{elem}\n" }
+      series_for_plot + 'e'
+    else
+      self[0].zip(self[1]).map{ |elem| elem.join(' ') }.join("\n") + "\ne\n"
+    end
+  end
+  
+  private 
+  
+  def number_series?(data)
+    data.each do |elem|
+      return false unless elem.is_a?(Numeric)
+    end
+
+    true
+  end
+end
+
+class Matrix
+  def to_gplot
+    matrix_for_plot = ''
+
+    (0...self.column_size).each do |j|
+      (0...self.row_size).each do |i|
+        matrix_for_plot += "#{i} #{j} #{self[j,i]}\n" if self[j,i]
+      end
+    end
+
+    matrix_for_plot
+  end
+end

data/lib/grada/types/heat_map.rb

@@ -0,0 +1,25 @@
+module Grada
+  class HeatMap
+    def self.plot(x, opts, &block)
+      Gnuplot.open do
+        Gnuplot::Plot.construct do |plot|
+          block.call plot if block
+          
+          plot.set "pm3d map"
+          plot.set "palette color"
+          plot.set "xrange [0:#{x.size-1}]"
+          plot.set "yrange [0:#{x.size-1}]"
+          plot.set "cbrange [#{opts[:min]}:#{opts[:max]}]"
+          plot.set "cblabel \"#{opts[:x_label]}\""
+          plot.set "palette model RGB"
+          plot.set "palette define"
+         
+          plot.title opts[:title]
+          plot.data << Gnuplot::DataSet.new(Matrix.columns(x)) do |ds|
+            ds.with = opts[:with] 
+          end
+        end
+      end
+    end
+  end
+end

data/lib/grada/types/histogram.rb

@@ -0,0 +1,48 @@
+module Grada
+  class Histogram < DefaultBase
+    def self.plot(x, opts, &block)
+      Gnuplot.open do
+        Gnuplot::Plot.construct do |plot|
+          block.call plot if block 
+          
+          width = ( x.max - x.min ) / x.size
+    
+          plot.title opts[:title]
+          
+          plot.set "style data histogram"
+          plot.xlabel opts[:x_label]
+          plot.ylabel "Frequency"
+          plot.set "style fill solid 0.5"
+          plot.set "xrange [#{x.min}:#{x.max}]"
+          plot.set "boxwidth #{ width * 0.1}"
+          plot.set "xtics #{x.min},#{(x.max-x.min)/5},#{x.max}"
+          plot.set "tics out nomirror"
+  
+          plot.data << Gnuplot::DataSet.new(x) do |ds|
+            ds.with = 'boxes'
+            ds.title = opts[:x_label]
+            ds.using = '($1):(1.0)'
+            ds.smooth = 'freq'
+          end
+        end
+      end 
+    end
+    
+    def self.plot_html(x, opts)
+      opts[:filename] = create_html_dir(opts[:filename])
+
+      create_grada_json(opts, x)
+
+      File.open("#{opts[:filename]}.html",'w') do |f|
+        f << html_head
+        f << "<body>\n"
+        f << "  <div class=grada_main>\n"
+        f << html_title(opts[:title])
+        f << html_graph
+        f << html_panel
+        f << "  </div>"
+        f << "</body>"
+      end
+    end 
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grada
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -50,7 +50,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/grada.rb
-- lib/grada/gnuplot.rb
+- lib/grada/graph.rb
+- lib/grada/types/default_base.rb
+- lib/grada/types/default.rb
+- lib/grada/types/gnuplot.rb
+- lib/grada/types/heat_map.rb
+- lib/grada/types/histogram.rb
 homepage: https://github.com/emfigo/grada
 licenses:
 - MIT

data/lib/grada/gnuplot.rb

@@ -1,244 +0,0 @@
-require 'matrix'
-require 'open3'
-
-class NoGnuPlotExecutableFound < RuntimeError; end 
-
-class Gnuplot
-  def self.candidate?(candidate)
-    return candidate if File::executable? candidate
-
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |dir|
-      possible_candidate = File::join dir, candidate.strip
-
-      return possible_candidate if File::executable? possible_candidate
-    end
-
-    nil
-  end
-  
-  def self.find_exec(bin)
-    bin_list = RUBY_PLATFORM =~ /mswin|mingw/ ? [bin, "#{bin}.exe"] : [bin]
-
-    bin_list.each do |c|
-      exec = candidate?(c)
-      return exec if exec
-    end
-
-    nil
-  end
-  
-  def self.gnuplot
-    gnu_exec = find_exec( ENV['RB_GNUPLOT'] || 'gnuplot' )
-    raise NoGnuPlotExecutableFound unless gnu_exec
-    gnu_exec
-  end
-
-  def self.open(persist = true, &block)
-    gnuplot_cmd = gnuplot
-
-    commands = yield
-
-    output = StringIO.new
-    Open3::popen3(gnuplot_cmd, '-persist') do |data_in, data_out, stderr, wait_th|
-      data_in << commands[:plot_settings]
-      data_in << commands[:plot_data]
-
-      data_in.flush
-      sleep 1
-      
-      while true do
-        window = IO::popen('xprop -name "Gnuplot" WM_NAME 2>/dev/null').gets
-        break unless window
-        sleep 1
-      end
-      data_in.close
-      data_out.close
-      stderr.close
-
-      output.write(wait_th.value.exitstatus)
-    end
-    
-    output.string
-  end
-end
-
-class Gnuplot::Plot
-  attr_accessor :cmd, :data, :settings, :styles, :arbitrary_lines
-
-  QUOTED_METHODS = [ "title", "output", "xlabel", "x2label", "ylabel", "y2label", "clabel", "cblabel", "zlabel" ]
-
-  def initialize
-    @settings = []
-    @arbitrary_lines = []
-    @data = []
-    @styles = []
-  end
-
-  def self.construct(&block)
-    plot = new
-    
-    block.call plot if block_given?
-    
-    { plot_settings: plot.to_gplot, plot_data:  plot.store_datasets }
-  end
-
-  def method_missing(meth, *args)
-    set meth.id2name, *args
-  end
-
-  def set ( var, value = "" )
-    value = "\"#{value}\"" if QUOTED_METHODS.include? var unless value =~ /^'.*'$/
-    @settings << [ :set, var, value ]
-  end
-
-  def unset (var)
-    @settings << [ :unset, var ]
-  end
-
-  def to_gplot(io = '')
-    @settings.each { |setting| io += setting.map(&:to_s).join(' ') + "\n" }
-    @styles.each{ |style| io += style.to_s + "\n" }
-    @arbitrary_lines.each{ |line| io += line + "\n" }
-
-    io
-  end
-
-  def store_datasets(io = '')
-    if @data.size > 0
-      io +=  'plot' + " #{ @data.map { |element| element.plot_args }.join(', ') } \n" 
-      io += @data.map { |ds| ds.to_gplot }.compact.join("\n") + "\n"
-    end
-    
-    io
-  end
-end
-
-class Gnuplot::Style
-  attr_accessor :linestyle, :linetype, :linewidth, :linecolor, :pointtype, :pointsize, :fill, :index
-
-  alias :ls :linestyle 
-  alias :lt :linetype
-  alias :lw :linewidth
-  alias :lc :linecolor
-  alias :pt :pointtype
-  alias :ps :pointsize
-  alias :fs :fill
-
-  alias :ls= :linestyle= 
-  alias :lt= :linetype=
-  alias :lw= :linewidth=
-  alias :lc= :linecolor=
-  alias :pt= :pointtype=
-  alias :ps= :pointsize=
-  alias :fs= :fill=
-  
-  STYLES = [:ls, :lt, :lw, :lc, :pt, :ps, :fs]
-
- def self.increment_index
-   @index ||= 0
-   @index += 1
- end
-
- def initialize
-   STYLES.each do |style|
-     send("#{style}=", nil)
-   end
-
-   yield self if block_given?
-
- end
-
- def to_s
-   str = ' '
-
-   STYLES.each do |style|
-     str += " #{style} #{send(style)}" if send(style) 
-   end
-
-   str == ' ' ? '' : str
- end
-end
-
-class Gnuplot::DataSet
-  attr_accessor :title, :with, :using, :data, :linewidth, :linecolor, :matrix, :smooth, :axes, :index, :linestyle
-
-  alias :ls :linestyle
-
-  def initialize(data = nil)
-    @data = data
-    @linestyle = nil
-    @title = nil
-    @with = nil
-    @using = nil
-    @linewidth = nil
-    @linecolor = nil 
-    @matrix = nil
-    @smooth = nil
-    @axes = nil
-    @index = nil
-
-    yield self if block_given?
-  end
-
-  def notitle
-    '"No Title"'
-  end
-
-  def plot_args(io = '')
-    io += @data.is_a?(String) ? @data : "'-'"
-    #io += " index #{@index}" if @index
-    io += " using #{@using}" if @using
-    io += " axes #{@axes}" if @axes
-    io += " title #{@title ? "\"#{@title}\"" : notitle}"
-    io += " matrix #{@matrix}" if @matrix
-    io += " smooth  #{@smooth}" if @smooth
-    io += " with #{@with}" if @with
-    io += " linecolor #{@linecolor}" if @linecolor
-    io += " line #{@index} linewidth #{@linewidth}" if @linewidth
-    io += " linestyle #{@linestyle.index}" if @linestyle
-    
-    io
-  end
-
-  def to_gplot
-    return nil if @data.nil? || @data.is_a?(String)
-
-    @data.to_gplot
-  end
-end
-
-class Array
-  def to_gplot
-    if number_series?(self)
-      series_for_plot = ''
-      self.each { |elem| series_for_plot += "#{elem}\n" }
-      series_for_plot + 'e'
-    else
-      self[0].zip(self[1]).map{ |elem| elem.join(' ') }.join("\n") + "\ne\n"
-    end
-  end
-  
-  private 
-  
-  def number_series?(data)
-    data.each do |elem|
-      return false unless elem.is_a?(Numeric)
-    end
-
-    true
-  end
-end
-
-class Matrix
-  def to_gplot
-    matrix_for_plot = ''
-
-    (0...self.column_size).each do |j|
-      (0...self.row_size).each do |i|
-        matrix_for_plot += "#{i} #{j} #{self[j,i]}\n" if self[j,i]
-      end
-    end
-
-    matrix_for_plot
-  end
-end