RubyGems - SimpleOutput - Versions diffs - 1.1.3 → 1.2.1 - Mend

SimpleOutput 1.1.3 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f811fbd06a4da856b597e44dcbffd32b4a75091b
-  data.tar.gz: ecf8b08452983132ee44ba1ce9c90af5fd782e81
+  metadata.gz: b43102aa451e1122cb1729d25015153221fd980e
+  data.tar.gz: 6a478021615867f3befbe113bff398608fdd4729
 SHA512:
-  metadata.gz: 4fde526633c956c4b90dd33059d1e4d1e43144afc1e28bbabf0aa62d40a0ed6769f8227b91b14fa6b7aa4ba0d3799e6860bab1ebd2b5a6ba4b9938f0d046698e
-  data.tar.gz: c7c4e90392fbc4f6f93057457c79b07a202bb4b369e1c1a1c1b21540b66397074e3cadd1bfc0b93d60c7418d001f8460d018ad4fea97d10b503311bd4b79d2bc
+  metadata.gz: 25ff50585f15751ace4dcaf700bb815bd3705f3aa4abac0a031dd2784af615ba311d1260de751c7294eeaad3e6d0a940e6a442cf6dc05241f48741d2b1b5adb5
+  data.tar.gz: b8f667f40aca309a04aecdda8e33259b62dce092bc8805ab46d6ea936de88454db1c4213caae166fa0749a01c2cc978a8168fb4552d410cf50ccabebf190d31d

data/lib/simplechartkick.rb CHANGED Viewed

@@ -28,7 +28,6 @@ class SimpleChartkick < SimpleOutput::SimpleOutputPlugin
     @html = "<html>\n<title>\n#{title}\n</title>\n<script src='http://www.google.com/jsapi'></script>\n
                 <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js'></script>
                 <script src='#{chartkick_path}'></script>\n<body>\n"
   end
   def check_title(name, options)
@@ -132,32 +131,30 @@ class SimpleChartkick < SimpleOutput::SimpleOutputPlugin
     self.chart_div("AreaChart", data)
   end
-   def getMultiSeriesHashes
-      data_hash = {}
-        @x.each_pair do |(key, x_series)|
-          data_hash[key] = []
-          y_series = @y[key]
-          x_series.each_with_index do |x_data, index|
-             y_data = y_series[index]
-             series_key = @series_names[key][index]
-             data_hash[key] << {'name' => series_key}
-             data_hash[key].last['data'] = {}
-             x_data.each_with_index do |x_point, index|
-                y_point = y_data[index]
-                data_hash[key].last['data'][x_point] = y_point
-             end
-          end
-       end
-       return data_hash
+  def get_multiseries_hashes
+    data_hash = {}
+    @x.each_pair do |(key, x_series)|
+      data_hash[key] = []
+      y_series = @y[key]
+      x_series.each_with_index do |x_data, index|
+        y_data = y_series[index]
+        series_key = @series_names[key][index]
+        data_hash[key] << {'name' => series_key}
+        data_hash[key].last['data'] = {}
+        x_data.each_with_index do |x_point, index|
+          y_point = y_data[index]
+          data_hash[key].last['data'][x_point] = y_point
+        end
+      end
     end
+    return data_hash
+  end
   def save
     @chart_id = 0
     @js_block = ""
-    self.getMultiSeriesHashes.each_pair do |(chart_name, chart_series)|
+    self.get_multiseries_hashes.each_pair do |(chart_name, chart_series)|
       if !@metadata.has_key?(chart_name)
         @metadata[chart_name] = {'chart_type' => 'LineChart', 'bincount' => 10}
       end
@@ -207,4 +204,4 @@ class SimpleChartkick < SimpleOutput::SimpleOutputPlugin
     end
   end
-end
+end

data/lib/simplecsv.rb CHANGED Viewed

@@ -58,7 +58,7 @@ class SimpleCSV < SimpleOutput::SimpleOutputPlugin
   end
   def save()
-    data = self.getDataAsXY()
+    data = self.get_data_as_xy()
     data.each do |set_name, series|
       CSV.open("#{@filename}_#{set_name}.csv", "wb") do |csv|
         xlabel = @metadata[set_name]['xlabel']

data/lib/simplelog.rb CHANGED Viewed

@@ -18,7 +18,7 @@ require 'time'
 class SimpleLog < SimpleOutput::SimpleOutputPlugin
    #Only supports annotation
    def initialize(name = "log", format="txt")
-      filename = name + self.getTimestamp() + "." + format
+      filename = name + self.get_timestamp() + "." + format
       @file = File.new(filename, "w")
       @series_names = {}
       @data_id = 0
@@ -36,54 +36,54 @@ class SimpleLog < SimpleOutput::SimpleOutputPlugin
       end
-   def setXData(data, name, options={})
+   def set_x_Data(data, name, options={})
    end
-   def setYData(data, name, options={})
+   def set_y_data(data, name, options={})
    end
-   def newData( x=[], y=[],name=nil, options={})
+   def new_data( x=[], y=[],name=nil, options={})
    end
    #Interface Functions ===================================
-   def appendXY( x=[], y=[],name=nil, options={})
+   def append_xy( x=[], y=[],name=nil, options={})
       log_name(name)
       log_var(x, "Appending X Data")
       log_var(y, "Appending Y Data")
    end
-   def setXY(x=[], y=[], name=nil, options={})
+   def set_xy(x=[], y=[], name=nil, options={})
       log_name(name)
       log_var(x, "Setting X Data")
       log_var(y, "Setting Y Data")
    end
-   def appendPoints(points =[], name=nil, options={})
+   def append_points(points =[], name=nil, options={})
       log_name(name)
       log_var(points, "Appending (points)")
    end
-   def setPoints(points = [], name=nil, options={})
+   def set_points(points = [], name=nil, options={})
       log_name(name)
       log_var(points, "Setting (points)")
    end
-   def appendHash(hash = {}, name=nil, options={})
+   def append_hash(hash = {}, name=nil, options={})
       log_name(name)
       log_var(hash, "Appending (hash)")
    end
-   def setHash(hash ={}, name=nil, options={})
+   def set_hash(hash ={}, name=nil, options={})
       log_name(name)
       log_var(hash, "Setting (hash)")
    end
-   def setOptions(name=nil, options = {})
+   def set_options(name=nil, options = {})
       log_var(option, "Options")
    end
@@ -95,9 +95,9 @@ class SimpleLog < SimpleOutput::SimpleOutputPlugin
    def log(content, name = nil)
       if name != nil
-         logtext = self.getTimestamp() + " #{name}: #{content}"
+         logtext = self.get_timestamp() + " #{name}: #{content}"
       else
-         logtext = self.getTimestamp() + " #{content}"
+         logtext = self.get_timestamp() + " #{content}"
       end
       puts logtext
       @file.syswrite("#{logtext}\n")
@@ -147,19 +147,19 @@ class SimpleLog < SimpleOutput::SimpleOutputPlugin
-   def getTimestamp()
+   def get_timestamp()
       Time.now.strftime("%Y-%m-%d-%H%M%S")
    end
-   def getDataAsPoints
+   def get_data_as_points
       [[0,0]]
    end
-   def getDataAsXY
+   def get_data_as_xy
       [[0],[0]]
    end
-   def getSeriesHashes
+   def get_series_hashes
       {0 => 0}
    end

data/lib/simpleoutput.rb CHANGED Viewed

@@ -14,9 +14,6 @@ SimpleOutput
    See the License for the specific language governing permissions and
    limitations under the License.
 =end
 module SimpleOutput
    class SimpleOutputPlugin
@@ -83,28 +80,28 @@ module SimpleOutput
          (!@x.has_key?(name)) || (!@y.has_key?(name))
       end
-      def setXData(data, name, options={})
+      def set_x_data(data, name, options={})
         @x[name] = []
         @x[name] << data
         self.set_x_callback(data, name, options)
       end
-      def setYData(data, name, options={})
+      def set_y_data(data, name, options={})
          @y[name] = []
          @y[name] << data
          self.set_y_callback(data, name, options)
       end
-      def newData( x=[], y=[],name=nil, options={})
+      def new_data( x=[], y=[],name=nil, options={})
          name = self.advance_series(name)
-         self.setXData(x, name, options)
-         self.setYData(y, name, options)
+         self.set_x_data(x, name, options)
+         self.set_y_data(y, name, options)
          self.append_series_name(name,options)
          self.options_callback(options)
       end
       #Interface Functions ===================================
-      def appendXY( x=[], y=[],name=nil, options={})
+      def append_xy( x=[], y=[],name=nil, options={})
          name = translate_name(name)
          if !self.new_data_check(name)
             @x[name] << x
@@ -113,69 +110,43 @@ module SimpleOutput
             self.options_callback(options)
             self.append_callback(x,y,name,options)
          else
-            self.newData(x,y,name,options)
+            self.new_data(x,y,name,options)
          end
       end
-      def setXY(x=[], y=[], name=nil, options={})
-         self.newData(x,y,name,options)
+      def set_xy(x=[], y=[], name=nil, options={})
+         self.new_data(x,y,name,options)
       end
-      def appendPoints(points =[], name=nil, options={})
+      def append_points(points =[], name=nil, options={})
          x = []
          y = []
          points.each do |point|
             x << point[0]
             y << point[1]
          end
-         self.appendXY(x,y,name,options)
+         self.append_xy(x,y,name,options)
       end
-      def setPoints(points = [], name=nil, options={})
+      def set_points(points = [], name=nil, options={})
          x = []
          y = []
          points.each do |point|
             x << point[0]
             y << point[1]
          end
-         self.setXY(x,y,name, options)
+         self.set_xy(x,y,name, options)
       end
-      def appendHash(hash = {}, name=nil, options={})
+      def append_hash(hash = {}, name=nil, options={})
          name = translate_name(name)
-         x = []
-         y = []
-         hash.each_with_index do |(key, value), index|
-            if key.is_a? Numeric
-               x << key
-            else
-               x << index
-            end
-            if value.is_a? Numeric
-               y << value
-            else
-               y << 0
-            end
-         end
-         self.appendXY(x,y,name,options)
+         x, y = self.hash_to_xy(hash)
+         self.append_xy(x,y,name,options)
       end
-      def setHash(hash ={}, name=nil, options={})
-         x = []
-         y = []
-         hash.each_with_index do |(key, value), index|
-            if key.is_a? Numeric
-               x << key
-            else
-               x << index
-            end
-            if value.is_a? Numeric
-               y << value
-            else
-               y << 0
-            end
-         end
-         self.setXY(x,y,name,options)
+      def set_hash(hash ={}, name=nil, options={})
+         x, y = self.hash_to_xy(hash)
+         self.set_xy(x,y,name,options)
       end
       def annotate(annotation, name=nil, options = {})
@@ -184,12 +155,12 @@ module SimpleOutput
          self.options_callback(options)
       end
-      def setOptions(name=nil, options = {})
+      def set_options(name=nil, options = {})
          self.options_callback(options)
       end
       #Internal Helpers
-      def getDataAsPoints
+      def get_data_as_points
          series_data = {}
          @x.each_pair do |(key, x_series)|
             #For each series of data
@@ -209,7 +180,7 @@ module SimpleOutput
          return series_data
       end
-      def getDataAsXY
+      def get_data_as_xy
          series_data = {}
          @x.each_pair do |(key, x_series)|
             y_series = @y[key]
@@ -222,7 +193,7 @@ module SimpleOutput
          return series_data
       end
-      def getSeriesHashes
+      def get_series_hashes
          data_hash = {}
          @x.each_pair do |(key, x_series)|
@@ -248,6 +219,25 @@ module SimpleOutput
       end
+      protected
+      def hash_to_xy(hash)
+         x = []
+         y = []
+         hash.each_with_index do |(key, value), index|
+            if key.is_a? Numeric
+               x << key
+            else
+               x << index
+            end
+            if value.is_a? Numeric
+               y << value
+            else
+               y << 0
+            end
+         end
+         return x, y
+      end
    end
    class SimpleOutputEngine
@@ -257,7 +247,7 @@ module SimpleOutput
          @data_id = 0
       end
-      def addPlugin(plugin)
+      def add_plugin(plugin)
          @plugins << plugin
       end
@@ -265,50 +255,50 @@ module SimpleOutput
       #Hash [name] = y
       # array [x,y ]
       #Interface Functions
-      def appendXY( x=[], y=[],name=nil, options={})
-         @plugins.each {|plugin| plugin.appendXY(x.clone,y.clone,name, options)}
+      def append_xy( x=[], y=[],name=nil, options={})
+         @plugins.each {|plugin| plugin.append_xy(x.clone,y.clone,name, options)}
       end
-      def appendXYarray(data=[], name=nil, options={})
-         @plugins.each {|plugin| plugin.appendXY(data[0].clone,data[1].clone,name, options)}
+      def append_xy_array(data=[], name=nil, options={})
+         @plugins.each {|plugin| plugin.append_xy(data[0].clone,data[1].clone,name, options)}
       end
-      def setXYarray(data = [], name=nil, options={})
-         @plugins.each {|plugin| plugin.setXY(data[0].clone,data[1].clone, name, options)}
+      def set_xy_array(data = [], name=nil, options={})
+         @plugins.each {|plugin| plugin.set_xy(data[0].clone,data[1].clone, name, options)}
       end
-      def setXY(x=[], y=[], name=nil, options={})
-         @plugins.each {|plugin| plugin.setXY(x.clone,y.clone,name, options)}
+      def set_xy(x=[], y=[], name=nil, options={})
+         @plugins.each {|plugin| plugin.set_xy(x.clone,y.clone,name, options)}
       end
-      def appendPoints(points =[], name=nil, options={})
-         @plugins.each {|plugin| plugin.appendPoints(points.clone,name, options)}
+      def append_points(points =[], name=nil, options={})
+         @plugins.each {|plugin| plugin.append_points(points.clone,name, options)}
       end
-      def setPoints(points = [], name=nil, options={})
-         @plugins.each {|plugin| plugin.setPoints(points.clone,name, options)}
+      def set_points(points = [], name=nil, options={})
+         @plugins.each {|plugin| plugin.set_points(points.clone,name, options)}
       end
-      def appendHash(hash = {}, name=nil, options={})
-         @plugins.each {|plugin| plugin.appendHash(hash.clone,name, options)}
+      def append_hash(hash = {}, name=nil, options={})
+         @plugins.each {|plugin| plugin.append_hash(hash.clone,name, options)}
       end
-      def setHash(hash ={}, name=nil, options={})
-         @plugins.each {|plugin| plugin.setHash(hash.clone,name, options)}
+      def set_hash(hash ={}, name=nil, options={})
+         @plugins.each {|plugin| plugin.set_hash(hash.clone,name, options)}
       end
-      def setArray(data = [], name=nil, options={})
+      def set_array(data = [], name=nil, options={})
          x = []
          data.count.times {|i| x << i}
          y = data
-         self.setXY(x,y,name,options)
+         self.set_xy(x,y,name,options)
       end
-      def appendArray(data = [], name=nil, options={})
+      def append_array(data = [], name=nil, options={})
           x = []
          data.count.times {|i| x << i}
          y = data.clone
-         self.appendXY(x,y,name,options)
+         self.append_xy(x,y,name,options)
       end
       def annotate(annotation, name=nil, options={})
@@ -321,5 +311,4 @@ module SimpleOutput
    end
 end

data/lib/simpleplot.rb CHANGED Viewed

@@ -14,6 +14,7 @@ SimplePlot
   See the License for the specific language governing permissions and
   limitations under the License.
 =end
 class SimplePlot < SimpleOutput::SimpleOutputPlugin
   require 'gnuplot'
@@ -25,39 +26,7 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
   end
   def options_callback(options)
-    if options.has_key?('xsize')
-      @metadata[@current_name]['xsize'] = options['xsize']
-    end
-    if options.has_key?('ysize')
-      @metadata[@current_name]['ysize'] = options['ysize']
-    end
-    if options.has_key?('xlabel')
-      @metadata[@current_name]['xlabel'] = options['xlabel']
-    end
-    if options.has_key?('ylabel')
-      @metadata[@current_name]['ylabel'] = options['ylabel']
-    end
-    if options.has_key?('histogram')
-      @metadata[@current_name]['histogram'] = options['histogram']
-    end
-    if options.has_key?('xmin')
-      @metadata[@current_name]['xmin'] = options['xmin']
-    end
-    if options.has_key?('xmax')
-      @metadata[@current_name]['xmax'] = options['xmax']
-    end
-    if options.has_key?('ymin')
-      @metadata[@current_name]['ymin'] = options['ymin']
-    end
-    if options.has_key?('ymax')
-      @metadata[@current_name]['ymax'] = options['ymax']
-    end
-    if options.has_key?('bincount')
-      @metadata[@current_name]['bincount'] = options['bincount']
-    end
-    if options.has_key?('normalized')
-      @metadata[@current_name]['normalized'] = options['normalized']
-    end
+    @metadata[@current_name].merge! options
   end
   def check_title(name, options)
@@ -104,7 +73,7 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
   end
   def save()
-    data = self.getDataAsXY()
+    data = self.get_data_as_xy()
     data.each do |set_name, series|
       Gnuplot.open do |gp|
         Gnuplot::Plot.new(gp) do |plot|

metadata CHANGED Viewed

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: SimpleOutput
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.1
 platform: ruby
 authors:
 - Austen Higgins-Cassidy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gnuplot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
-description: A pluging based graphing and report rendering system with multiple simultanous
-  output systems supported
+description: Takes data and outputs it to multiple formats and media using a simple
+  plugin system
 email: plasmarobo@gmail.com
 executables: []
 extensions: []
@@ -74,12 +74,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -87,5 +87,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
-summary: A Simple Engine to output data
+summary: A Simple Engine to collect and then output data
 test_files: []