Whole rewrite

Author: domitry

lib/nyaplot.rb

@@ -1,14 +1,6 @@
 require_relative 'nyaplot/version'
+require_relative 'nyaplot/data'
+require_relative 'nyaplot/color'
 require_relative 'nyaplot/monkeys'
-require_relative 'nyaplot/base'
-require_relative 'nyaplot/position'
-require_relative 'nyaplot/scale'
-require_relative 'nyaplot/sheet'
 require_relative 'nyaplot/core'
-require_relative 'nyaplot/data'
-require_relative 'nyaplot/glyph'
 require_relative 'nyaplot/plot'
-require_relative 'nyaplot/pane'
-require_relative 'nyaplot/color'
-require_relative 'nyaplot/stage2d'
-require_relative 'nyaplot/interactive'

lib/nyaplot/base.rb

@@ -0,0 +1,49 @@
+require_relative './charts/bar'
+
+module Nyaplot
+  module ChartMethods
+    def bar(**opts)
+      if @df.nil?
+        data = @df
+      else
+        if opts[:data].nil?
+          data = opts[:data]
+        elsif opts[:df].nil?
+          data = opts[:df]
+        else
+          raise ""
+        end
+      end
+
+      opts = {
+        data: data,
+        xscale: @xscale,
+        yscale: @yscale,
+        position: @position,
+      }.merge(opts)
+      
+      chart = Bar.new(opts)
+      @deps.concat(chart.deps)
+      @glyphs.concat(chart.glyphs)
+      self
+    end
+
+    ## short-cut methods for adding primitives
+    def add_annotation()
+      add_text
+      add_arrow
+    end
+
+    def add_rect()
+    end
+
+    def add_circle()
+    end
+
+    def add_text()
+    end
+
+    def add_arrow()
+    end
+  end
+end

lib/nyaplot/chart_method.rb

@@ -0,0 +1,29 @@
+module Nyaplot
+  module Charts
+    class Bar
+      allow :ordinal, :linear
+      need :data, :x, :y, :xscale, :yscale
+      
+      ## data: {ylabel: [1,2,3], xlabel: [:a, :b. :c]} or equal dataframe
+      def create(**opts)
+        data = opts[:data]
+        ad Layers::Data.new({data: data})
+        
+        data[opts[:x]].each_with_index do |str, i|
+          pos = create_ordinal_position(opts[:xscale], opts[:yscale], str)
+          args = {
+            data: data,
+            x1: -0.8,
+            x2: 0.8,
+            y1: 0,
+            y2: data[opts[:y]][i],
+            position: ad(create_ordinal_position(opts[:xscale], opts[:yscale], str))
+          }
+          ag Layers::Rect.new(args)
+        end
+
+        @ydomain = [0, data[opts[:y]].max]
+      end
+    end
+  end
+end

lib/nyaplot/charts/bar.rb

@@ -0,0 +1,55 @@
+module Nyaplot
+  module Charts
+    class ChartBase
+      class << self
+        def allow(x, y)
+          @@allow_x = x
+          @@allow_y = y
+        end
+
+        def need(*args)
+          @@needs = args
+        end
+      end
+
+      attr_reader :glyphs, :deps
+      def initialize(**opts)
+        @glyphs = []
+        @deps = []
+
+        @@needs.each do |sym|
+          raise "lack argument" if opts[sym].nil?
+        end
+        
+        create(**opts)
+      end
+
+      def create
+        ## over-write this
+      end
+
+      private
+      def add_dependency(layer)
+        @deps.push(layer)
+        layer
+      end
+      alias :add_dependency :ad
+
+      private
+      def add_glyph(glyph)
+        @glyphs.push(glyph)
+        glyph
+      end
+      alias :add_glyph :ag
+
+      private
+      def create_ordinal_position(xscale, yscale, label, xy=:x)
+        scale = xy==:x ? xscale : yscale
+        d2c = ad Layers::D2c.new({scale: scale, label: label})
+        arg = {x: xscale, y: yscale}
+        arg[xy] = d2c
+        ad Layers::Position2d.new(arg)
+      end
+    end
+  end
+end

lib/nyaplot/charts/base.rb

@@ -0,0 +1,4 @@
+module Nyaplot
+  module Charts
+  end
+end

lib/nyaplot/charts/box.rb

@@ -1,57 +1,6 @@
 require 'erb'
 
 module Nyaplot
-
-  @@dep_libraries = {d3:'http://d3js.org/d3.v3.min'}
-  @@additional_libraries = {}
-  @@extension_lists = []
-
-  def self.extension_lists
-    @@extension_lists
-  end
-
-  # Tell JavaScript back-end library to load some extension libraries
-  # @param [String] name The name of JavaScript extension library to load
-  def self.add_extension(name)
-    @@extension_lists.push(name)
-  end
-
-  # Load extension library to IRuby notebook after Nyaplotjs is loaded
-  def self.add_dependency(name, url)
-    @@dep_libraries[name]=url;
-  end
-
-  # Load extension library to IRuby notebook before Nyaplotjs is loaded
-  def self.add_additional_library(name, url)
-    @@additional_libraries[name]=url
-  end
-
-  # generate initializing code
-  def self.generate_init_code
-    path = File.expand_path("../templates/init.js.erb", __FILE__)
-    template = File.read(path)
-    dep_libraries = @@dep_libraries
-    additional_libraries = @@additional_libraries
-    js = ERB.new(template).result(binding)
-    js
-  end
-
-  def self.start_debug(port=9996)
-    require 'webrick'
-    path = File.expand_path("../../../nyaplotjs/release", __FILE__)
-    `ruby -e httpd #{path} -p #{port}`
-
-    js = self.generate_init_code
-    js.gsub!("http.+nyaplot.js", "http://localhost:" + port.to_s + "/nyaplot.js")
-    IRuby.display(IRuby.javascript(js))
-  end
-
-  # Enable to show plots on IRuby notebook
-  def self.init_iruby
-    js = self.generate_init_code
-    IRuby.display(IRuby.javascript(js))
-  end
-
   # Create multi-column layout
   # @example
   #   include Nyaplot
@@ -80,10 +29,4 @@ def rows(*plots)
     plot.pane = Pane.rows(*panes)
     plot
   end
-
-  if $DEBUG_NYAPLOT == true
-    start_debug
-  else
-    init_iruby if defined? IRuby
-  end
 end

lib/nyaplot/charts/line.rb

@@ -4,11 +4,6 @@
 require 'csv'
 
 module Nyaplot
-  begin
-    require "mikon"
-  rescue
-  end
-
   if defined? Mikon
     class DataFrame
       include Nyaplot::Base