charty 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2270c7054d2f6b67ad811f47402572809750095449f158924227492956ea1aa4
-  data.tar.gz: 57e049a2e3d9175858f6b559402cffbea1ad6416904fabf44f6e3c52afe39656
+  metadata.gz: b2b78866e47f947e7cad0c06c3f53418ff07fa6fccce7941b53eb63f70cb8db0
+  data.tar.gz: 39c01144436ceee129c4d938ca8607b15c17292205f4f22da936442f89b2b2ca
 SHA512:
-  metadata.gz: ef52d5aa6c5060b05659b813bcd986fc18db097185288689f8add5414e775b9a4b43243794cc48d96831bd8fd636fce923fa9762a3fde5d10f47772ac1232025
-  data.tar.gz: 17fb1554b608d582cec734bbf1095ce69e578e160863a7cf817630723b95fa7a8fae5c13997268b300cf96ff5f0c7f830abd7d7691e684b4ce2b674891a83f50
+  metadata.gz: 3e83c4308b434b0e3b43e7ed083eefe249b46c3333be00501adee2bd299d4a6e34a78fa2c913f77876cf4ba1448468b553256cd68e22e8a0fe90b5d85b6daaec
+  data.tar.gz: e95895415c62bf352b6bdde4be7d04b7d12278a74a6e1e927376c99b2afc30a81c223e77c3f14848873d2f822233aa7557c4119471eba372af80d61db21756ba

data/Dockerfile.dev

@@ -1,2 +1,10 @@
-ARG BASE_IMAGE_TAG=c9ca70040856
+ARG BASE_IMAGE_TAG=e1a22a2
 FROM rubydata/minimal-notebook:$BASE_IMAGE_TAG
+
+USER root
+RUN mkdir -p /charty && \
+    chown ${NB_USER}:users /charty
+
+USER ${NB_USER}
+
+WORKDIR /charty

data/README.md

@@ -43,14 +43,14 @@ sudo python3 -m pip install -U pip matplotlib
 e.g.
 
 ```
-$ docker build -f ./Dockerfile.dev -t charty-dev:0.1 .
-$ docker run --rm -v ${PWD}:/charty -w /charty charty-dev:0.1 bundle install --path vendor/bundle
-$ docker run -it -v ${PWD}:/charty -w /charty charty-dev:0.1 ./bin/console
+$ docker build -f ./Dockerfile.dev -t charty-dev:latest .
+$ docker run --rm -v $(pwd):/charty charty-dev:latest bundle install
+$ docker run --rm -it -v $(pwd):/charty charty-dev:latest ./bin/console
 irb(main):001:0> Charty::VERSION
-=> "0.1.4-dev"
+=> "0.2.2"
 
 # When using jupyter notebook
-$ docker run -it -v ${PWD}:/charty -w /charty -p 8888:8888 charty-dev:0.1
+$ docker run --rm -it -v $(pwd):/charty -p 8888:8888 charty-dev:latest
 ```
 
 ## Usage

data/charty.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "red-colors"
+  spec.add_dependency "red-palette", ">= 0.2.0"
   spec.add_development_dependency "bundler", ">= 1.16"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"

data/examples/palette.rb

@@ -2,7 +2,7 @@
 
 require "charty"
 
-Charty::Palette.default = ARGV[0] if ARGV[0]
+Palette.default = ARGV[0] if ARGV[0]
 
 charty = Charty::Plotter.new(:pyplot)
 figure = charty.bar do

data/lib/charty.rb

@@ -1,6 +1,7 @@
 require_relative "charty/version"
 
 require "colors"
+require "palette"
 
 require_relative "charty/backends"
 require_relative "charty/backend_methods"
@@ -9,7 +10,6 @@ require_relative "charty/layout"
 require_relative "charty/linspace"
 require_relative "charty/plotters"
 require_relative "charty/plot_methods"
-require_relative "charty/palette"
 require_relative "charty/table_adapters"
 require_relative "charty/table"
 require_relative "charty/statistics"

data/lib/charty/backends.rb

@@ -77,3 +77,4 @@ require "charty/backends/gruff"
 require "charty/backends/plotly"
 require "charty/backends/pyplot"
 require "charty/backends/rubyplot"
+require "charty/backends/unicode_plot"

data/lib/charty/backends/pyplot.rb

@@ -73,7 +73,7 @@ module Charty
           ax.ylabel(context.ylabel) if context.ylabel
         end
 
-        palette = Charty::Palette.default
+        palette = Palette.default
         colors = palette.colors.map {|c| c.to_rgb.to_hex_string }.cycle
         case context.method
         when :bar

data/lib/charty/backends/unicode_plot.rb

@@ -0,0 +1,79 @@
+require 'stringio'
+
+module Charty
+  module Backends
+    class UnicodePlot
+      Backends.register(:unicode_plot, self)
+
+      class << self
+        def prepare
+          require 'unicode_plot'
+        end
+      end
+
+      def begin_figure
+        @figure = nil
+        @layout = {}
+      end
+
+      def bar(bar_pos, values, color: nil)
+        @figure = {
+          type: :bar,
+          bar_pos: bar_pos,
+          values: values
+        }
+      end
+
+      def box_plot(plot_data, positions, color:, gray:)
+        @figure = { type: :box, data: plot_data }
+      end
+
+      def set_xlabel(label)
+        @layout[:xlabel] = label
+      end
+
+      def set_ylabel(label)
+        @layout[:ylabel] = label
+      end
+
+      def set_xticks(values)
+        @layout[:xticks] = values
+      end
+
+      def set_xtick_labels(values)
+        @layout[:xtick_labels] = values
+      end
+
+      def set_xlim(min, max)
+        @layout[:xlim] = [min, max]
+      end
+
+      def disable_xaxis_grid
+        # do nothing
+      end
+
+      def show
+        case @figure[:type]
+        when :bar
+          plot = ::UnicodePlot.barplot(@layout[:xtick_labels], @figure[:values], xlabel: @layout[:xlabel])
+        when :box
+          plot = ::UnicodePlot.boxplot(@layout[:xtick_labels], @figure[:data], xlabel: @layout[:xlabel])
+        end
+        sio = StringIO.new
+        class << sio
+          def tty?; true; end
+        end
+        plot.render(sio)
+        sio.string
+      end
+
+      private
+
+      def show_bar(sio, figure, i)
+      end
+
+      def show_box(sio, figure, i)
+      end
+    end
+  end
+end

data/lib/charty/plotters/abstract_plotter.rb

@@ -40,12 +40,12 @@ module Charty
 
       def palette=(palette)
         @palette = case palette
-                   when nil, Charty::Palette, Symbol, String
+                   when nil, Palette, Symbol, String
                      palette
                    else
                      raise ArgumentError,
                        "invalid type for palette (given #{palette.class}, " +
-                       "expected Charty::Palette, Symbol, or String)"
+                       "expected Palette, Symbol, or String)"
                    end
       end
 

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charty
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - youchan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: red-colors
@@ -26,6 +26,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: red-palette
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -235,9 +249,9 @@ files:
 - lib/charty/backends/plotly.rb
 - lib/charty/backends/pyplot.rb
 - lib/charty/backends/rubyplot.rb
+- lib/charty/backends/unicode_plot.rb
 - lib/charty/layout.rb
 - lib/charty/linspace.rb
-- lib/charty/palette.rb
 - lib/charty/plot_methods.rb
 - lib/charty/plotter.rb
 - lib/charty/plotters.rb
@@ -274,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Visualizing your data in a simple way.

data/lib/charty/palette.rb

@@ -1,235 +0,0 @@
-require "numo/narray"
-
-module Charty
-  class Palette
-    SEABORN_PALETTES = {
-      "deep" => ["#4C72B0", "#DD8452", "#55A868", "#C44E52", "#8172B3",
-                 "#937860", "#DA8BC3", "#8C8C8C", "#CCB974", "#64B5CD"].freeze,
-      "deep6" => ["#4C72B0", "#55A868", "#C44E52",
-                  "#8172B3", "#CCB974", "#64B5CD"].freeze,
-      "muted" => ["#4878D0", "#EE854A", "#6ACC64", "#D65F5F", "#956CB4",
-                  "#8C613C", "#DC7EC0", "#797979", "#D5BB67", "#82C6E2"].freeze,
-      "muted6" => ["#4878D0", "#6ACC64", "#D65F5F",
-                   "#956CB4", "#D5BB67", "#82C6E2"].freeze,
-      "pastel" => ["#A1C9F4", "#FFB482", "#8DE5A1", "#FF9F9B", "#D0BBFF",
-                   "#DEBB9B", "#FAB0E4", "#CFCFCF", "#FFFEA3", "#B9F2F0"].freeze,
-      "pastel6" => ["#A1C9F4", "#8DE5A1", "#FF9F9B",
-                    "#D0BBFF", "#FFFEA3", "#B9F2F0"].freeze,
-      "bright" => ["#023EFF", "#FF7C00", "#1AC938", "#E8000B", "#8B2BE2",
-                   "#9F4800", "#F14CC1", "#A3A3A3", "#FFC400", "#00D7FF"].freeze,
-      "bright6" => ["#023EFF", "#1AC938", "#E8000B",
-                    "#8B2BE2", "#FFC400", "#00D7FF"].freeze,
-      "dark" => ["#001C7F", "#B1400D", "#12711C", "#8C0800", "#591E71",
-                 "#592F0D", "#A23582", "#3C3C3C", "#B8850A", "#006374"].freeze,
-      "dark6" => ["#001C7F", "#12711C", "#8C0800",
-                  "#591E71", "#B8850A", "#006374"].freeze,
-      "colorblind" => ["#0173B2", "#DE8F05", "#029E73", "#D55E00", "#CC78BC",
-                       "#CA9161", "#FBAFE4", "#949494", "#ECE133", "#56B4E9"].freeze,
-      "colorblind6" => ["#0173B2", "#029E73", "#D55E00",
-                        "#CC78BC", "#ECE133", "#56B4E9"].freeze
-    }.freeze
-
-    MPL_QUAL_PALS = {
-      "tab10" => 10,
-      "tab20" => 20,
-      "tab20b" => 20,
-      "tab20c" => 20,
-      "Set1" => 9,
-      "Set2" => 8,
-      "Set3" => 12,
-      "Accent" => 8,
-      "Paired" => 12,
-      "Pastel1" => 9,
-      "Pastel2" => 8,
-      "Dark2" => 8,
-    }.freeze
-
-    QUAL_PALETTE_SIZES = MPL_QUAL_PALS.dup
-    SEABORN_PALETTES.each do |k, v|
-      QUAL_PALETTE_SIZES[k] = v.length
-    end
-    QUAL_PALETTE_SIZES.freeze
-
-    def self.seaborn_colors(name)
-      SEABORN_PALETTES[name].map do |hex_string|
-        Colors::RGB.parse(hex_string)
-      end
-    end
-
-    # Get a set of evenly spaced colors in HSL hue space.
-    #
-    # @param n_colors [Integer]
-    #   The number of colors in the palette
-    # @param h [Numeric]
-    #   The hue value of the first color in degree
-    # @param s [Numeric]
-    #   The saturation value of the first color (between 0 and 1)
-    # @param l [Numeric]
-    #   The lightness value of the first color (between 0 and 1)
-    #
-    # @return [Array<Colors::HSL>]
-    #   The array of colors
-    def self.hsl_colors(n_colors=6, h: 3.6r, s: 0.65r, l: 0.6r)
-      hues = Numo::DFloat.linspace(0, 1, n_colors + 1)[0...-1]
-      hues.inplace + (h/360r).to_f
-      hues.inplace % 1
-      hues.inplace - Numo::Int32.cast(hues)
-      (0...n_colors).map {|i| Colors::HSL.new(hues[i]*360r, s, l) }
-    end
-
-    # Get a set of evenly spaced colors in HUSL hue space.
-    #
-    # @param n_colors [Integer]
-    #   The number of colors in the palette
-    # @param h [Numeric]
-    #   The hue value of the first color in degree
-    # @param s [Numeric]
-    #   The saturation value of the first color (between 0 and 1)
-    # @param l [Numeric]
-    #   The lightness value of the first color (between 0 and 1)
-    #
-    # @return [Array<Colors::HSL>]
-    #   The array of colors
-    def self.husl_colors(n_colors=6, h: 3.6r, s: 0.9r, l: 0.65r)
-      hues = Numo::DFloat.linspace(0, 1, n_colors + 1)[0...-1]
-      hues.inplace + (h/360r).to_f
-      hues.inplace % 1
-      hues.inplace * 359
-      (0...n_colors).map {|i| Colors::HUSL.new(hues[i], s, l) }
-    end
-
-    def self.cubehelix_colors(n_colors, start=0, rot=0.4r, gamma=1.0r, hue=0.8r,
-                               light=0.85r, dark=0.15r, reverse=false, as_cmap: false)
-      raise NotImplementedError,
-            "Cubehelix palette has not been implemented"
-    end
-
-    def self.matplotlib_colors(name, n_colors=6)
-      raise NotImplementedError,
-            "Matplotlib's colormap emulation has not been implemented"
-    end
-
-    # Return a list of colors defining a color palette
-    #
-    # @param palette [nil, String, Palette]
-    #   Name of palette or nil to return current palette.
-    #   If a Palette is given, input colors are used but
-    #   possibly cycled and desaturated.
-    # @param n_colors [Integer, nil]
-    #   Number of colors in the palette.
-    #   If `nil`, the default will depend on how `palette` is specified.
-    #   Named palettes default to 6 colors, but grabbing the current palette
-    #   or passing in a list of colors will not change the number of colors
-    #   unless this is specified.  Asking for more colors than exist in the
-    #   palette cause it to cycle.
-    # @param desaturate_factor [Float, nil]
-    #   Propotion to desaturate each color by.
-    #
-    # @return [Palette]
-    #   Color palette.  Behaves like a list.
-    def initialize(palette=nil, n_colors=nil, desaturate_factor: nil)
-      case
-      when palette.nil?
-        @name = nil
-        palette = Colors::ColorDate::DEFAULT_COLOR_CYCLE
-        n_colors ||= palette.length
-      else
-        palette = normalize_palette_name(palette)
-        case palette
-        when String
-          @name = palette
-          # Use all colors in a qualitative palette or 6 of another kind
-          n_colors ||= QUAL_PALETTE_SIZES.fetch(palette, 6)
-          case @name
-          when SEABORN_PALETTES.method(:has_key?)
-            palette = self.class.seaborn_colors(@name)
-          when "hls", "HLS", "hsl", "HSL"
-            palette = self.class.hsl_colors(n_colors)
-          when "husl", "HUSL"
-            palette = self.class.husl_colors(n_colors)
-          when /\Ach:/
-            # Cubehelix palette with params specified in string
-            args, kwargs = parse_cubehelix_args(palette)
-            palette = self.class.cubehelix_colors(n_colors, *args, **kwargs)
-          else
-            begin
-              palette = self.class.matplotlib_colors(palette, n_colors)
-            rescue ArgumentError
-              raise ArgumentError,
-                    "#{palette} is not a valid palette name"
-            end
-          end
-        else
-          n_colors ||= palette.length
-        end
-      end
-      if desaturate_factor
-        palette = palette.map {|c| Colors.desaturate(c, desaturate_factor) }
-      end
-
-      # Always return as many colors as we asked for
-      @colors = palette.cycle.take(n_colors).freeze
-      @desaturate_factor = desaturate_factor
-    end
-
-    attr_reader :name, :colors, :desaturate_factor
-
-    def n_colors
-      @colors.length
-    end
-
-    # Two palettes are equal if they have the same colors, even if they have
-    # the different names and different desaturate factors.
-    def ==(other)
-      case other
-      when Palette
-        colors == other.colors
-      else
-        super
-      end
-    end
-
-    def [](i)
-      @palette[i % n_colors]
-    end
-
-    def to_ary
-      @palette.dup
-    end
-
-    private def normalize_palette_name(palette)
-      case palette
-      when String
-        palette
-      when Symbol
-        palette.to_s
-      else
-        palette.to_str
-      end
-    rescue NoMethodError, TypeError
-      palette
-    end
-
-    class << self
-      attr_reader :default
-
-      def default=(args)
-        @default = case args
-                   when Palette
-                     args
-                   when Array
-                     case args[0]
-                     when Array
-                       Palette.new(*args)
-                     else
-                       Palette.new(args)
-                     end
-                   else
-                     Palette.new(args)
-                   end
-      end
-    end
-
-    self.default = Palette.new("deep").freeze
-  end
-end