charty 0.1.5.dev → 0.2.0

data/lib/charty/table_adapters/active_record_adapter.rb

@@ -0,0 +1,55 @@
+module Charty
+  module TableAdapters
+    class ActiveRecordAdapter
+      TableAdapters.register(:active_record, self)
+
+      include Enumerable
+
+      def self.supported?(data)
+        defined?(ActiveRecord::Relation) && data.is_a?(ActiveRecord::Relation)
+      end
+
+      def initialize(data)
+        @data = check_type(ActiveRecord::Relation, data, :data)
+        @column_names = @data.column_names.freeze
+        @columns = nil
+      end
+
+      attr_reader :column_names
+
+      def [](row, column)
+        fetch_records unless @columns
+        if row
+          @columns[resolve_column_index(column)][row]
+        else
+          @columns[resolve_column_index(column)]
+        end
+      end
+
+      private def resolve_column_index(column)
+        case column
+        when String, Symbol
+          index = column_names.index(column.to_s)
+          unless index
+            raise IndexError, "invalid column name: #{column.inspect}"
+          end
+          index
+        when Integer
+          column
+        else
+          message = "column must be String or Integer: #{column.inspect}"
+          raise ArgumentError, message
+        end
+      end
+
+      private def fetch_records
+        @columns = @data.pluck(*column_names).transpose
+      end
+
+      private def check_type(type, data, name)
+        return data if data.is_a?(type)
+        raise TypeError, "#{name} must be a #{type}"
+      end
+    end
+  end
+end

data/lib/charty/table_adapters/daru_adapter.rb

@@ -0,0 +1,34 @@
+module Charty
+  module TableAdapters
+    class DaruAdapter
+      TableAdapters.register(:daru, self)
+
+      include Enumerable
+
+      def self.supported?(data)
+        defined?(Daru::DataFrame) && data.is_a?(Daru::DataFrame)
+      end
+
+      def initialize(data)
+        @data = check_type(Daru::DataFrame, data, :data)
+      end
+
+      def column_names
+        @data.vectors.to_a
+      end
+
+      def [](row, column)
+        if row
+          @data[column][row]
+        else
+          @data[column]
+        end
+      end
+
+      private def check_type(type, data, name)
+        return data if data.is_a?(type)
+        raise TypeError, "#{name} must be a #{type}"
+      end
+    end
+  end
+end

data/lib/charty/table_adapters/datasets_adapter.rb

@@ -0,0 +1,41 @@
+module Charty
+  module TableAdapters
+    class DatasetsAdapter
+      TableAdapters.register(:datasets, self)
+
+      include Enumerable
+
+      def self.supported?(data)
+        defined?(Datasets::Dataset) &&
+          data.is_a?(Datasets::Dataset)
+      end
+
+      def initialize(dataset)
+        @table = dataset.to_table
+        @records = []
+      end
+
+      def column_names
+        @table.column_names
+      end
+
+      def each(&block)
+        return to_enum(__method__) unless block_given?
+
+        @table.each_record(&block)
+      end
+
+      # @param [Integer] row  Row index
+      # @param [Symbol,String,Integer] column Column index
+      def [](row, column)
+        if row
+          record = @table.find_record(row)
+          return nil if record.nil?
+          record[column]
+        else
+          @table[column]
+        end
+      end
+    end
+  end
+end

data/lib/charty/table_adapters/hash_adapter.rb

@@ -0,0 +1,108 @@
+require 'date'
+require 'forwardable'
+
+module Charty
+  module TableAdapters
+    class HashAdapter
+      TableAdapters.register(:hash, self)
+
+      extend Forwardable
+      include Enumerable
+
+      def self.supported?(data)
+        case data
+        when []
+          true
+        when Array
+          case data[0]
+          when Numeric, String, Time, Date
+            true
+          when Hash
+            data.all? {|el| el.is_a? Hash }
+          when method(:array?)
+            data.all?(&method(:array?))
+          end
+        when Hash
+          true
+        end
+      end
+
+      def self.array?(data)
+        case data
+        when Array,
+             ->(x) { defined?(Numo::NArray) && x.is_a?(Numo::NArray) },
+             ->(x) { defined?(Daru::Vector) && x.is_a?(Daru::Vector) },
+             ->(x) { defined?(NMatrix) && x.is_a?(NMatrix) }
+          true
+        else
+          false
+        end
+      end
+
+      def initialize(data, columns: nil)
+        case data
+        when Hash
+          @data = data
+        when Array
+          case data[0]
+          when Numeric, String, Time, Date
+            data = data.map {|x| [x] }
+            @data = make_data_from_records(data, columns)
+          when Hash
+            # TODO
+          when self.class.method(:array?)
+            unsupported_data_format unless data.all?(&self.class.method(:array?))
+            @data = make_data_from_records(data, columns)
+          else
+            unsupported_data_format
+          end
+        else
+          unsupported_data_format
+        end
+      end
+
+      def_delegator :@data, :keys, :column_names
+
+      def [](row, column)
+        if row
+          @data[column][row]
+        else
+          @data[column]
+        end
+      end
+
+      def each
+        i, n = 0, shape[0]
+        while i < n
+          record = @data.map {|k, v| v[i] }
+          yield record
+          i += 1
+        end
+      end
+
+      private def make_data_from_records(data, columns)
+        n_rows = data.length
+        n_columns = data.map(&:size).max
+        columns = generate_column_names(n_columns, columns)
+        columns.map.with_index { |key, j|
+          values = n_rows.times.map {|i| data[i][j] }
+          [key, values]
+        }.to_h
+      end
+
+      private def generate_column_names(n_columns, columns)
+        # FIXME: this is the same as NArrayAdapter#generate_column_names
+        columns ||= []
+        if columns.length >= n_columns
+          columns[0, n_columns]
+        else
+          columns + columns.length.upto(n_columns - 1).map {|i| "X#{i}" }
+        end
+      end
+
+      private def unsupported_data_format
+        raise ArgumentError, "Unsupported data format"
+      end
+    end
+  end
+end

data/lib/charty/table_adapters/narray_adapter.rb

@@ -0,0 +1,57 @@
+module Charty
+  module TableAdapters
+    class NArrayAdapter
+      TableAdapters.register(:narray, self)
+
+      def self.supported?(data)
+        defined?(Numo::NArray) && data.is_a?(Numo::NArray) && data.ndim <= 2
+      end
+
+      def initialize(data, columns: nil)
+        case data.ndim
+        when 1
+          data = data.reshape(data.length, 1)
+        when 2
+          # do nothing
+        else
+          raise ArgumentError, "Unsupported data format"
+        end
+        @data = data
+        @column_names = generate_column_names(data.shape[1], columns)
+      end
+
+      attr_reader :column_names
+
+      def [](row, column)
+        if row
+          @data[row, resolve_column_index(column)]
+        else
+          @data[true, resolve_column_index(column)]
+        end
+      end
+
+      private def resolve_column_index(column)
+        case column
+        when String, Symbol
+          index = column_names.index(column.to_s)
+          return index if index
+          raise IndexError, "invalid column name: #{column}"
+        when Integer
+          column
+        else
+          message = "column must be String or Integer: #{column.inspect}"
+          raise ArgumentError, message
+        end
+      end
+
+      private def generate_column_names(n_columns, columns)
+        columns ||= []
+        if columns.length >= n_columns
+          columns[0, n_columns]
+        else
+          columns + columns.length.upto(n_columns - 1).map {|i| "X#{i}" }
+        end
+      end
+    end
+  end
+end

data/lib/charty/table_adapters/nmatrix_adapter.rb

@@ -0,0 +1,57 @@
+module Charty
+  module TableAdapters
+    class NMatrixAdapter
+      TableAdapters.register(:nmatrix, self)
+
+      def self.supported?(data)
+        defined?(NMatrix) && data.is_a?(NMatrix) && data.shape.length <= 2
+      end
+
+      def initialize(data, columns: nil)
+        case data.shape.length
+        when 1
+          data = data.reshape(data.size, 1)
+        when 2
+          # do nothing
+        else
+          raise ArgumentError, "Unsupported data format"
+        end
+        @data = data
+        @column_names = generate_column_names(data.shape[1], columns)
+      end
+
+      attr_reader :column_names
+
+      def [](row, column)
+        if row
+          @data[row, resolve_column_index(column)]
+        else
+          @data[:*, resolve_column_index(column)].reshape([@data.shape[0]])
+        end
+      end
+
+      private def resolve_column_index(column)
+        case column
+        when String, Symbol
+          index = column_names.index(column.to_s)
+          return index if index
+          raise IndexError, "invalid column name: #{column}"
+        when Integer
+          column
+        else
+          message = "column must be String or Integer: #{column.inspect}"
+          raise ArgumentError, message
+        end
+      end
+
+      private def generate_column_names(n_columns, columns)
+        columns ||= []
+        if columns.length >= n_columns
+          columns[0, n_columns]
+        else
+          columns + columns.length.upto(n_columns - 1).map {|i| "X#{i}" }
+        end
+      end
+    end
+  end
+end

data/lib/charty/version.rb

@@ -1,5 +1,5 @@
 module Charty
-  VERSION = "0.1.5-dev"
+  VERSION = "0.2.0"
 
   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.5.dev
+  version: 0.2.0
 platform: ruby
 authors:
 - youchan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: numo-narray
+  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'
+- !ruby/object:Gem::Dependency
+  name: nmatrix
+  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'
+- !ruby/object:Gem::Dependency
+  name: red-datasets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+- !ruby/object:Gem::Dependency
+  name: daru
+  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'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
 - !ruby/object:Gem::Dependency
   name: matplotlib
   requirement: !ruby/object:Gem::Requirement
@@ -94,23 +178,30 @@ files:
 - examples/iris_dataset.ipynb
 - examples/nmatrix.ipynb
 - examples/numo-narray.ipynb
+- examples/sample_bokeh.ipynb
 - examples/sample_google_chart.ipynb
 - examples/sample_gruff.ipynb
+- examples/sample_images/bar_bokeh.html
 - examples/sample_images/bar_gruff.png
 - examples/sample_images/bar_pyplot.png
 - examples/sample_images/bar_rubyplot.png
+- examples/sample_images/barh_bokeh.html
 - examples/sample_images/barh_gruff.png
 - examples/sample_images/barh_pyplot.png
+- examples/sample_images/box_plot_bokeh.html
 - examples/sample_images/box_plot_pyplot.png
 - examples/sample_images/bubble_pyplot.png
 - examples/sample_images/bubble_rubyplot.png
+- examples/sample_images/curve_bokeh.html
 - examples/sample_images/curve_gruff.png
 - examples/sample_images/curve_pyplot.png
 - examples/sample_images/curve_rubyplot.png
+- examples/sample_images/curve_with_function_bokeh.html
 - examples/sample_images/curve_with_function_pyplot.png
 - examples/sample_images/curve_with_function_rubyplot.png
 - examples/sample_images/error_bar_pyplot.png
 - examples/sample_images/hist_pyplot.png
+- examples/sample_images/scatter_bokeh.html
 - examples/sample_images/scatter_gruff.png
 - examples/sample_images/scatter_pyplot.png
 - examples/sample_images/scatter_rubyplot.png
@@ -120,16 +211,24 @@ files:
 - examples/sample_rubyplot.ipynb
 - images/design_concept.png
 - lib/charty.rb
+- lib/charty/backends.rb
 - lib/charty/backends/bokeh.rb
 - lib/charty/backends/google_chart.rb
 - lib/charty/backends/gruff.rb
+- lib/charty/backends/plotly.rb
 - lib/charty/backends/pyplot.rb
 - lib/charty/backends/rubyplot.rb
 - lib/charty/layout.rb
 - lib/charty/linspace.rb
 - lib/charty/plotter.rb
-- lib/charty/plotter_adapter.rb
 - lib/charty/table.rb
+- lib/charty/table_adapters.rb
+- lib/charty/table_adapters/active_record_adapter.rb
+- lib/charty/table_adapters/daru_adapter.rb
+- lib/charty/table_adapters/datasets_adapter.rb
+- lib/charty/table_adapters/hash_adapter.rb
+- lib/charty/table_adapters/narray_adapter.rb
+- lib/charty/table_adapters/nmatrix_adapter.rb
 - lib/charty/version.rb
 homepage: https://github.com/red-data-tools/charty
 licenses:
@@ -146,9 +245,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: