charty 0.1.2.dev → 0.1.3.dev

data/examples/nmatrix.ipynb

@@ -92,8 +92,8 @@
     }
    ],
    "source": [
-    "boxplot = charty.to_boxplot(:price, :sales)\n",
-    "boxplot.render('sample')"
+    "box_plot = charty.to_box_plot(:price, :sales)\n",
+    "box_plot.render('sample')"
    ]
   },
   {
@@ -180,8 +180,8 @@
     }
    ],
    "source": [
-    "errorbar = charty.to_errorbar(:price, :sales)\n",
-    "errorbar.render('sample')"
+    "error_bar = charty.to_error_bar(:price, :sales)\n",
+    "error_bar.render('sample')"
    ]
   },
   {

data/examples/numo-narray.ipynb

@@ -2,20 +2,9 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "[:inline, \"module://matplotlib.backends.backend_inline\"]"
-      ]
-     },
-     "execution_count": 10,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "require 'charty'\n",
     "\n",
@@ -95,8 +84,8 @@
     }
    ],
    "source": [
-    "boxplot = charty.to_boxplot(:price, :sales)\n",
-    "boxplot.render('sample')"
+    "box_plot = charty.to_box_plot(:price, :sales)\n",
+    "box_plot.render('sample')"
    ]
   },
   {
@@ -183,8 +172,8 @@
     }
    ],
    "source": [
-    "errorbar = charty.to_errorbar(:price, :sales)\n",
-    "errorbar.render('sample')"
+    "error_bar = charty.to_error_bar(:price, :sales)\n",
+    "error_bar.render('sample')"
    ]
   },
   {

data/examples/sample_matplotlib.ipynb

@@ -157,14 +157,14 @@
     }
    ],
    "source": [
-    "boxplot = charty.boxplot do\n",
+    "box_plot = charty.box_plot do\n",
     "  data [[60,70,80,70,50], [100,40,20,80,70], [30, 10]]\n",
     "  range x: 0..10, y: 1..100\n",
     "  xlabel 'foo'\n",
     "  ylabel 'bar'\n",
     "  title 'box plot'\n",
     "end\n",
-    "boxplot.render(\"sample_images/boxplot_matplot.png\")"
+    "box_plot.render(\"sample_images/box_plot_matplot.png\")"
    ]
   },
   {
@@ -206,7 +206,7 @@
     {
      "data": {
       "text/plain": [
-       "#<Charty::Layout:0x00007fb2f4713870 @frontend=#<Charty::Matplot:0x00007fb2f4a2c048 @plot=<module 'matplotlib.pyplot' from '/usr/local/opt/python/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages/matplotlib/pyplot.py'>, @series=[#<struct Charty::Series xs=0..10, ys=#<Enumerator: 0..1:step(0.1)>, zs=nil, xerr=nil, yerr=nil, label=\"sample1\">, #<struct Charty::Series xs=0..5, ys=#<Enumerator: 0..1:step(0.2)>, zs=nil, xerr=nil, yerr=nil, label=\"sample2\">, #<struct Charty::Series xs=[0, 1, 2, 3, 4], ys=[0, -0.1, -0.5, -0.5, 0.1], zs=nil, xerr=nil, yerr=nil, label=nil>]>, @layout=#<Charty::ArrayLayout:0x00007fb2f4713848 @array=[], @direction=:horizontal>>"
+       "#<Charty::Layout:0x00007f89d6291870 @frontend=#<Charty::Matplot:0x00007f89d713e580 @plot=<module 'matplotlib.pyplot' from '/usr/local/opt/python/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages/matplotlib/pyplot.py'>, @series=[#<struct Charty::Series xs=0..10, ys=#<Enumerator: 0..1:step(0.1)>, zs=nil, xerr=nil, yerr=nil, label=\"sample1\">, #<struct Charty::Series xs=0..5, ys=#<Enumerator: 0..1:step(0.2)>, zs=nil, xerr=nil, yerr=nil, label=\"sample2\">, #<struct Charty::Series xs=[0, 1, 2, 3, 4], ys=[0, -0.1, -0.5, -0.5, 0.1], zs=nil, xerr=nil, yerr=nil, label=nil>]>, @layout=#<Charty::ArrayLayout:0x00007f89d62917f8 @array=[], @direction=:horizontal>>"
       ]
      },
      "execution_count": 8,
@@ -281,7 +281,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
@@ -291,13 +291,13 @@
        "<Figure size 640x480 with 1 Axes>"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 13,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "errorbar = charty.errorbar do\n",
+    "error_bar = charty.error_bar do\n",
     "  series [1,2,3,4], [1,4,9,16], xerr: [0.5,1.0,1.5,0.3], yerr: [0.6,0.2,0.8,0.1], label: 'label1'\n",
     "  series [1,2,3,4], [16,9,4,1], label: 'label2'\n",
     "  series [1,2,3,4,5,6,7,8], [14,14,14,14,14,14,14,14], label: 'label2', xerr: [0.5,1.0,1.5,0.3, 1.1, 1.2, 1.3, 1.4]\n",
@@ -305,12 +305,12 @@
     "  xlabel 'x label'  \n",
     "  title 'errorbar'\n",
     "end\n",
-    "errorbar.render(\"sample_images/errorbar_matplot.png\")"
+    "error_bar.render(\"sample_images/error_bar_matplot.png\")"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
@@ -320,7 +320,7 @@
        "<Figure size 640x480 with 1 Axes>"
       ]
      },
-     "execution_count": 12,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -340,7 +340,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
@@ -350,7 +350,7 @@
        "<Figure size 640x480 with 1 Axes>"
       ]
      },
-     "execution_count": 13,
+     "execution_count": 15,
      "metadata": {},
      "output_type": "execute_result"
     }

data/examples/sample_rubyplot.ipynb

@@ -138,14 +138,14 @@
     }
    ],
    "source": [
-    "boxplot = charty.boxplot do\n",
+    "box_plot = charty.box_plot do\n",
     "  data [[60,70,80,70,50], [100,40,20,80,70], [30, 10]]\n",
     "  range x: 0..10, y: 1..100\n",
     "  xlabel 'foo'\n",
     "  ylabel 'bar'\n",
     "  title 'box plot'\n",
     "end\n",
-    "boxplot.render(\"sample_images/boxplot_rubyplot.png\")"
+    "box_plot.render(\"sample_images/box_plot_rubyplot.png\")"
    ]
   },
   {

data/lib/charty/gruff.rb

@@ -17,7 +17,8 @@ module Charty
       raise NotImplementedError
     end
 
-    def render(context, filename)
+    def render(context, filename="")
+      FileUtils.mkdir_p(File.dirname(filename))
       plot(@plot, context).write(filename)
     end
 
@@ -44,7 +45,7 @@ module Charty
       when :barh
         # TODO: To implement
         raise NotImplementedError
-      when :boxplot
+      when :box_plot
         # refs. https://github.com/topfunky/gruff/issues/155
         raise NotImplementedError
       when :bubble
@@ -67,7 +68,7 @@ module Charty
           p.data(data.label, data.xs.to_a, data.ys.to_a)
         end
         p
-      when :errorbar
+      when :error_bar
         # refs. https://github.com/topfunky/gruff/issues/163
         raise NotImplementedError
       when :hist

data/lib/charty/matplot.rb

@@ -31,7 +31,10 @@ module Charty
 
     def render(context, filename)
       plot(@plot, context)
-      @plot.savefig(filename) if filename
+      if filename
+        FileUtils.mkdir_p(File.dirname(filename))
+        @plot.savefig(filename)
+      end
       @plot.show
     end
 
@@ -61,7 +64,7 @@ module Charty
         context.series.each do |data|
           plot.barh(data.xs.to_a.map(&:to_s), data.ys.to_a)
         end
-      when :boxplot
+      when :box_plot
         plot.boxplot(context.data.to_a)
       when :bubble
         context.series.each do |data|
@@ -76,7 +79,7 @@ module Charty
           plot.scatter(data.xs.to_a, data.ys.to_a, label: data.label)
         end
         plot.legend()
-      when :errorbar
+      when :error_bar
         context.series.each do |data|
           plot.errorbar(
             data.xs.to_a,

data/lib/charty/plotter.rb

@@ -11,6 +11,9 @@ module Charty
       when :rubyplot
         require_relative "rubyplot"
         Charty::Rubyplot.new
+      when :chartjs
+        require_relative "chartjs"
+        Charty::Chartjs.new
       else
         raise NotImplementedError
       end
@@ -46,11 +49,11 @@ module Charty
       end
     end
 
-    def to_boxplot(x, y, **args, &block)
+    def to_box_plot(x, y, **args, &block)
       serieses = table.to_a(x, y)
       xrange = 0..serieses.size
       yrange = (serieses.flatten.min - 1)..(serieses.flatten.max + 1)
-      boxplot = boxplot do
+      box_plot = box_plot do
         data serieses
         range x: xrange, y: yrange
         xlabel x
@@ -94,12 +97,12 @@ module Charty
       end
     end
 
-    def to_errorbar(x, y, **args, &block)
+    def to_error_bar(x, y, **args, &block)
       # TODO: It is not yet decided how to include data including xerror and yerror.
       seriesx, seriesy = *table.to_a(x, y)
       xrange = (seriesx.min)..(seriesx.max)
       yrange = (seriesy.min)..(seriesy.max)
-      errorbar = errorbar do
+      error_bar = error_bar do
         series seriesx, seriesy
         range x: xrange, y: yrange
         xlabel x
@@ -129,8 +132,8 @@ module Charty
       context.apply(@frontend)
     end
 
-    def boxplot(**args, &block)
-      context = RenderContext.new :boxplot, **args, &block
+    def box_plot(**args, &block)
+      context = RenderContext.new :box_plot, **args, &block
       context.apply(@frontend)
     end
 
@@ -149,8 +152,8 @@ module Charty
       context.apply(@frontend)
     end
 
-    def errorbar(**args, &block)
-      context = RenderContext.new :errorbar, **args, &block
+    def error_bar(**args, &block)
+      context = RenderContext.new :error_bar, **args, &block
       context.apply(@frontend)
     end
 

data/lib/charty/rubyplot.rb

@@ -24,7 +24,8 @@ module Charty
       @plot.show
     end
 
-    def render(context, filename)
+    def render(context, filename="")
+      FileUtils.mkdir_p(File.dirname(filename))
       plot(@plot, context).write(filename)
     end
 
@@ -55,7 +56,7 @@ module Charty
         figure
       when :barh
         raise NotImplementedError
-      when :boxplot
+      when :box_plot
         raise NotImplementedError
       when :bubble
         context.series.each do |data|
@@ -81,7 +82,7 @@ module Charty
           end
         end
         figure
-      when :errorbar
+      when :error_bar
         # refs. https://github.com/SciRuby/rubyplot/issues/26
         raise NotImplementedError
       when :hist

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.1.2-dev"
+  VERSION = "0.1.3-dev"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charty
 version: !ruby/object:Gem::Version
-  version: 0.1.2.dev
+  version: 0.1.3.dev
 platform: ruby
 authors:
 - youchan
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -40,6 +40,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: matplotlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Visualizing your data in a simple way.
 email:
 - youchan01@gmail.com
@@ -52,7 +66,6 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 youchan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.