nyaplot 0.1.1 → 0.1.2

data/lib/nyaplot/base.rb

@@ -41,6 +41,7 @@ module Nyaplot
           define_method(symbol) {|val=nil|
             return @properties[symbol] if val.nil?
             @properties[symbol] = val
+            return self
           }
         end
       end
@@ -61,6 +62,7 @@ module Nyaplot
           define_method(symbol) {|val=nil|
             return @properties[name][symbol] if val.nil?
             @properties[name][symbol] = val
+            return self
           }
         end
       end

data/lib/nyaplot/color.rb

@@ -51,6 +51,12 @@ module Nyaplot
 
   # The html interface to access Colorset
   class Color
+    include Enumerable
+
+    def each(&bl)
+      @source.each(&bl)
+    end
+
     def initialize(arr)
       @source = arr
     end
@@ -73,5 +79,19 @@ module Nyaplot
     def to_json(*args)
       @source.to_json
     end
+
+    def method_missing(meth, *args, &block)
+      if [:size, :length, :[]].include?(meth)
+        @source.send(meth, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to?(meth)
+      return true if [:size, :length, :[]].include?(meth)
+      super
+    end
+
   end
 end

data/lib/nyaplot/data.rb

@@ -170,38 +170,29 @@ module Nyaplot
       @rows[0].keys
     end
 
-    def method_missing(name, *args)
+    def method_missing(name, *args, &block)
       if md = name.match(/(.+)\=/)
         self.insert_column(name[/(.+)\=/].delete("="), args[0])
         return
-      else
+      elsif column_labels.include?(name)
         return self.column(name)
+      else
+        super(name, *args, &block)
       end
     end
   end
 
   class Series
     include Enumerable
+    def each(&block)
+      @arr.each(&block)
+    end
 
     def initialize(label, arr)
       @arr = arr
       @label = label
     end
 
-    def each
-      @arr.each do |item|
-        yield item
-      end
-    end
-
-    def min
-      @arr.min
-    end
-
-    def max
-      @arr.max
-    end
-
     def to_html(threshold=15)
       html = '<table><tr><th>' + label.to_s + '</th></tr>>'
       @arr.each_with_index do |el,i|
@@ -223,5 +214,19 @@ module Nyaplot
     def label
       @label
     end
+
+    def method_missing(meth, *args, &block)
+      if @arr.respond_to?(meth)
+        @arr.send(meth, *args, &block)
+      else
+        super(meth, *args, &block)
+      end
+    end
+
+    def respond_to?(meth)
+      return true if @arr.respond_to?(meth)
+      super(meth)
+    end
+
   end
 end

data/lib/nyaplot/diagram.rb

@@ -49,7 +49,9 @@ module Nyaplot
       #   @return [Numeric] the width of each bar. The specified value should be in the range 0 to 1.
       # @!attribute color
       #   @return [Array<String>] array of color codes
-      define_group_properties(:options, [:value, :x, :y, :width, :color])
+      # @!attribute legend
+      #   @return [Bool] decide if the diagram prepare legend
+      define_group_properties(:options, [:value, :x, :y, :width, :color, :legend])
 
       # calcurate xrange and yrange from recieved data
       def process_data(df, labels)
@@ -88,7 +90,9 @@ module Nyaplot
       #   @return [String] color code
       # @!attribute stroke_width
       #   @return [Numeric] the width of stroke
-      define_group_properties(:options, [:title, :value, :bin_num, :width, :color, :stroke_color, :stroke_width])
+      # @!attribute legend
+      #   @return [Bool] decide if the diagram prepare legend
+      define_group_properties(:options, [:title, :value, :bin_num, :width, :color, :stroke_color, :stroke_width, :legend])
 
       def process_data(df, labels)
         label = labels[0]
@@ -162,7 +166,9 @@ module Nyaplot
       #   @return [Numeric] the width of stroke
       # @!attribute tooltip_contents
       #   @return [Array<Symbol>] column labels to display in tool-tip box
-      define_group_properties(:options, [:title, :x, :y, :fill_by, :shape_by, :size_by, :color, :shape, :size, :stroke_color, :stroke_width, :tooltip_contents])
+      # @!attribute legend
+      #   @return [Bool] decide if the diagram prepare legend
+      define_group_properties(:options, [:title, :x, :y, :fill_by, :shape_by, :size_by, :color, :shape, :size, :stroke_color, :stroke_width, :tooltip_contents, :legend])
 
       def process_data(df, labels)
         label_x = labels[0]
@@ -230,7 +236,9 @@ module Nyaplot
       #   @return [String] the color code
       # @!attribute stroke_width
       #   @return [Numeric] the width of stroke
-      define_group_properties(:options, [:title, :x, :y, :color, :stroke_width])
+      # @!attribute legend
+      #   @return [Bool] decide if the diagram prepare legend
+      define_group_properties(:options, [:title, :x, :y, :color, :stroke_width, :legend])
 
       def process_data(df, labels)
         label_x = labels[0]

data/lib/nyaplot/monkeys.rb

@@ -0,0 +1,53 @@
+class Array
+  # Find the numeric mean. nils are ignored.
+  def mean
+    ary = self.to_a.compact
+    if defined?(NMatrix) # Prefer the C version.
+      ary.to_nm.mean[0]
+    else                 # Fall back to Ruby.
+      ary.inject(0) { |x,i| x + i } / ary.size.to_f
+    end
+  end
+
+
+  # Find the single median or the mean of medians. nils are ignored.
+  def median
+    ary = self.to_a.compact.sort.uniq
+    return nil if ary.empty?
+    if ary.size % 2 == 1 # Even number of entries
+      ary[(ary.size-1) / 2]
+    else            # Odd number of entries
+      idx = (ary.size-1) / 2
+      (ary[idx] + ary[idx+1]) / 2.0
+    end
+  end
+
+
+  # Note: Not guaranteed to be the fastest way to find the modes, but I didn't see this function
+  # as a bottleneck worth a ton of effort. --JW
+  def modes
+    ary = self.sort.compact
+    return nil if ary.empty?
+    h = {}
+    ary.each do |k|
+      if h.has_key?(k)
+        h[k] += 1
+      else
+        h[k] = 1
+      end
+    end
+
+    return nil if h.keys.empty?
+
+    max_key = h.keys.first
+
+    h.each_pair do |k,count|
+      next if count.nil? || h[max_key].nil?
+
+      max_key = k if count > h[max_key]
+    end
+
+    mode_count = h[max_key]
+    h.select { |k,v| v == mode_count }.keys.sort
+  end
+end

data/lib/nyaplot/plot.rb

@@ -37,12 +37,15 @@ module Nyaplot
     define_properties(:diagrams, :filter)
     define_group_properties(:options, [:width, :height, :margin, :xrange, :yrange, :x_label, :y_label, :bg_color, :grid_color, :legend, :legend_width, :legend_options, :zoom, :rotate_x_label, :rotate_y_label])
 
-    def initialize
+    def initialize(&block)
       init_properties
       set_property(:diagrams, [])
       set_property(:options, {})
       set_property(:width, nil)
       set_property(:legend, nil)
+      set_property(:zoom, nil)
+
+      yield if block_given?
     end
 
     # Add diagram with Array
@@ -102,7 +105,7 @@ module Nyaplot
       return if diagrams.length == 0
 
       # set default values when not specified by users
-      zoom(true) if diagrams.all?{|d| d.zoom?}
+      zoom(true) if zoom.nil? && diagrams.all?{|d| d.zoom?}
 
       if width.nil?
         if legend == true

data/lib/nyaplot/version.rb

@@ -1,3 +1,3 @@
 module Nyaplot
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/nyaplot.gemspec

@@ -8,15 +8,47 @@ Gem::Specification.new do |spec|
   spec.version       = Nyaplot::VERSION
   spec.authors       = ["Naoki Nishida"]
   spec.email         = ["domitry@gmail.com"]
-  spec.summary       = %q{interactive plots generator for Ruby users}
-  spec.description   = %q{interactive plots generator for Ruby users. Visit the GitHub repository to get more information.}
+  spec.summary       = %q{Nyaplot is an interactive plots generator based on Web technology like SVG, WebGL, and JavaScript.}
+  spec.description   = %q{Nyaplot is an Interactive plots generator based on Web technology like SVG, WebGL, and JavaScript. It enables us to create interactive plots interactively on IRuby notebook, a web-based Ruby environment. Nyaplot is totally web-based gem and plots can be embedded into Rails or Sinatra seemlesly. Supported charts include basic 2D plot, 3D plot, Map plot and plot for Biology. See nbviewer (http://nbviewer.ipython.org/github/domitry/nyaplot/blob/master/examples/notebook/Index.ipynb) to overview what plots can be done with nyaplot and how to create them.}
   spec.homepage      = "https://www.github.com/domitry/nyaplot"
   spec.license       = "MIT"
+  spec.post_install_message = <<-EOF
+************************************************************************
+Welcome to Nyaplot
+
+ ___/|
+ \o.O| 
+ (___)
+   U
+
+Thank you for installing Nyaplot gem.
+
+We strongly recommend you to install IRuby, an interactive
+Ruby environment on web browser at the same time.
+
+$ gem install iruby
+
+If you wonder how to use Nyaplot, see /path/to/nyaplot/examples/notebook
+and run `iruby notebook` in the directory.
+You can find these notebook on your browser:
+http://nbviewer.ipython.org/github/domitry/nyaplot/blob/master/examples/notebook/Index.ipynb
+
+You can also use nyaplot without IRuby like /path/to/nyaplot/examples/rb
+or on your browser:
+https://github.com/domitry/nyaplot/tree/master/examples/rb
+
+Feel free to raise Issue or Pull-request on GitHub.
+Most pull-request might be accepted unless it is broken or too destructive.
+
+Enjoy Nyaplot!
+************************************************************************
+EOF
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 1.9"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/spec/nyaplot/core_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe Nyaplot do
-  context ".init_iruby" do
-    it "should raise error if IRuby is not loaded." do
-      expect{Nyaplot.init_iruby}.to raise_error(RuntimeError)
-    end
-  end
 
   # Tell the name of new JS extension library to Nyaplotjs
   context ".add_extension" do

data/spec/nyaplot/data_spec.rb

@@ -139,35 +139,41 @@ describe Nyaplot::Series do
     @series = df.a
   end
 
-  context ".each" do
-    it "should excute recieved block" do
+  context "#each" do
+    it "should execute received block" do
       sum = 0
       @series.each {|val| sum+=val}
       expect(sum).to eq(40)
     end
   end
 
-  context ".min" do
-    it "should calcurate minimam value" do
+  context "#min" do
+    it "should calculate minimum value" do
       expect(@series.min).to eq(10)
     end
   end
 
-  context ".max" do
-    it "should calcurate maximam value" do
+  context "#max" do
+    it "should calculate maximum value" do
       expect(@series.max).to eq(30)
     end
   end
 
-  context ".to_a" do
+  context "#to_a" do
     it "should return Array" do
       expect(@series.to_a).to eq([10,30])
     end
   end
 
-  context ".label" do
+  context "#label" do
     it "should return String" do
       expect(@series.label).to eq(:a)
     end
   end
+
+  context "#size" do
+    it "should delegate to the internal array storage" do
+      expect(@series.size).to eq(@series.to_a.size)
+    end
+  end
 end

data/spec/nyaplot/frame_spec.rb

@@ -15,10 +15,9 @@ describe Nyaplot::Frame do
     end
   end
 
-  context ".export_html" do
+  context ".generate_body" do
     it "should return correct html" do
-      html = @frame.export_html
-
+      html = @frame.generate_body
       if_brackets_is_same_number = [[/<html(.*?)>/,"</html>"],[/<script(.*?)>/,"</script>"],[/<body(.*?)>/,"</body>"]].all? do |pair|
         html.scan(pair[0]).length == html.scan(pair[1]).length
       end

data/spec/nyaplot/monkeys_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Array do
+  context "#mean" do
+    it "should calculate the mean of its entries" do
+      expect([1,2,3,4,5].mean).to eq 3.0
+    end
+  end
+
+  context "#median" do
+    it "should calculate the median of an odd number of entries" do
+      expect([1,2,3,4,5].median).to eq 3
+    end
+
+    it "should calculate the median of an even number of entries" do
+      expect([1,2,3,4,5,6].median).to eq 3.5
+    end
+  end
+
+  context "#modes" do
+    it "should find the only mode (where only one exists)" do
+      expect([1,3,2,3,4,5].modes.size).to  eq 1
+      expect([1,3,2,3,4,5].modes.first).to eq 3
+    end
+
+    it "should find both modes (where two exist) in sorted order" do
+      expect([3,3,1,3,1,2,1,4,4].modes.size).to eq 2
+      expect([3,3,1,3,1,2,1,4,4].modes).to eq([1,3])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyaplot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Naoki Nishida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,8 +66,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: interactive plots generator for Ruby users. Visit the GitHub repository
-  to get more information.
+description: Nyaplot is an Interactive plots generator based on Web technology like
+  SVG, WebGL, and JavaScript. It enables us to create interactive plots interactively
+  on IRuby notebook, a web-based Ruby environment. Nyaplot is totally web-based gem
+  and plots can be embedded into Rails or Sinatra seemlesly. Supported charts include
+  basic 2D plot, 3D plot, Map plot and plot for Biology. See nbviewer (http://nbviewer.ipython.org/github/domitry/nyaplot/blob/master/examples/notebook/Index.ipynb)
+  to overview what plots can be done with nyaplot and how to create them.
 email:
 - domitry@gmail.com
 executables: []
@@ -685,6 +689,7 @@ files:
 - lib/nyaplot/database.rb
 - lib/nyaplot/diagram.rb
 - lib/nyaplot/frame.rb
+- lib/nyaplot/monkeys.rb
 - lib/nyaplot/plot.rb
 - lib/nyaplot/templates/init.js.erb
 - lib/nyaplot/templates/iruby.erb
@@ -706,6 +711,7 @@ files:
 - spec/nyaplot/diagram_spec.rb
 - spec/nyaplot/frame_spec.rb
 - spec/nyaplot/matrix_test.csv
+- spec/nyaplot/monkeys_spec.rb
 - spec/nyaplot/plot_spec.rb
 - spec/nyaplot3d_spec.rb
 - spec/nyaplot_spec.rb
@@ -714,7 +720,16 @@ homepage: https://www.github.com/domitry/nyaplot
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "************************************************************************\nWelcome
+  to Nyaplot\n\n ___/|\n o.O| \n (___)\n   U\n\nThank you for installing Nyaplot gem.\n\nWe
+  strongly recommend you to install IRuby, an interactive\nRuby environment on web
+  browser at the same time.\n\n$ gem install iruby\n\nIf you wonder how to use Nyaplot,
+  see /path/to/nyaplot/examples/notebook\nand run `iruby notebook` in the directory.\nYou
+  can find these notebook on your browser:\nhttp://nbviewer.ipython.org/github/domitry/nyaplot/blob/master/examples/notebook/Index.ipynb\n\nYou
+  can also use nyaplot without IRuby like /path/to/nyaplot/examples/rb\nor on your
+  browser:\nhttps://github.com/domitry/nyaplot/tree/master/examples/rb\n\nFeel free
+  to raise Issue or Pull-request on GitHub.\nMost pull-request might be accepted unless
+  it is broken or too destructive.\n\nEnjoy Nyaplot!\n************************************************************************\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -722,7 +737,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -733,7 +748,8 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: interactive plots generator for Ruby users
+summary: Nyaplot is an interactive plots generator based on Web technology like SVG,
+  WebGL, and JavaScript.
 test_files:
 - spec/bionya_spec.rb
 - spec/mapnya_spec.rb
@@ -745,6 +761,7 @@ test_files:
 - spec/nyaplot/diagram_spec.rb
 - spec/nyaplot/frame_spec.rb
 - spec/nyaplot/matrix_test.csv
+- spec/nyaplot/monkeys_spec.rb
 - spec/nyaplot/plot_spec.rb
 - spec/nyaplot3d_spec.rb
 - spec/nyaplot_spec.rb