pandas 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ae8d45320fa67aa7d7ae6b131c777ec2cd88fb
-  data.tar.gz: 1cc5bffdfe6f376cc2bbd19c67354c70bec0dd8d
+  metadata.gz: eca4c00765b7d95dbfc98d051507dfb3d65e459d
+  data.tar.gz: e8dd5363b7a711aa3284120834cec25ecf04ff17
 SHA512:
-  metadata.gz: 9b2457bd1efb1b291ff11570dd69f3ee9b95b52e4a631993833c962fd83a216e9b08afd52a2a1a41028c541a895ae3678296cd60244d263d91d601a0a8b0966a
-  data.tar.gz: 403ec721bc39c1245b1c82f1255dad2ad8462218b4d48fe30a94fbdba838bff17b124b5e731037c438fdcbdd5806878a166a9cc3dc94c28e4fe4351c5f80ae22
+  metadata.gz: c7be111f377beb778b0a6ca2ef4418f2b91a116cfd19e598d8d54c889aa6561fdbc296086f9fa0836bdc3177db615b919ecfb2c95edbfdb838c671d0b31e693d
+  data.tar.gz: e381e982b8e8ff1c490809fea1d6fc97cd67a92186f3e1966b3784e8c43795dff735f9225593389e136c473ee0c357ac0ea54368aa6912dda9a82a84724347a7

data/CHANGES.md

@@ -1,5 +1,15 @@
 # The chenge history of Pandas wrapper for Ruby
 
+## 0.3.0
+
+* Fix the module path of `DatetimeIndex` to support pandas < 0.20
+
+  Fixes #5
+
+  *Daniel Baark*
+
+* Support to pass an AR model class to `read_sql_table` instead of both `table_name` and `conn`
+
 ## 0.2.0
 
 * Support a connection of ActiveRecord in `read_sql_table` and `read_sql_query`

data/lib/pandas.rb

@@ -24,7 +24,11 @@ module Pandas
   MultiIndex = self.core.indexing.MultiIndex
   MultiIndex.__send__ :register_python_type_mapping
 
-  DatetimeIndex = self.core.indexes.datetimes.DatetimeIndex
+  DatetimeIndex = if self.__version__ >= '0.20'
+                    self.core.indexes.datetimes.DatetimeIndex
+                  else
+                    self.tseries.index.DatetimeIndex
+                  end
   DatetimeIndex.__send__ :register_python_type_mapping
 
   Index = self.core.index.Index
@@ -38,7 +42,18 @@ module Pandas
 
   IO = self.io
 
-  def self.read_sql_table(table_name, conn, *args)
+  def self.read_sql_table(table_name, conn=nil, *args)
+    if conn.nil? && IO.is_activerecord_model?(table_name)
+      unless table_name.table_name
+        raise ArgumentError, "The given model does not have its table_name"
+      end
+      table_name, conn = table_name.table_name, table_name.connection
+    end
+
+    unless conn
+      raise ArgumentError, "wrong number of arguments (given 1, expected 2+)"
+    end
+
     if IO.is_activerecord_datasource?(conn)
       require 'pandas/io/active_record'
       return IO::Helpers.read_sql_table_from_active_record(table_name, conn, *args)

data/lib/pandas/io.rb

@@ -2,6 +2,12 @@ require 'pandas'
 
 module Pandas
   module IO
+    def self.is_activerecord_model?(obj)
+      return false unless defined?(::ActiveRecord)
+      return true if obj.is_a?(Class) && obj < ActiveRecord::Base
+      false
+    end
+
     def self.is_activerecord_datasource?(obj)
       return false unless defined?(::ActiveRecord)
       return true if obj.is_a?(::ActiveRecord::ConnectionAdapters::AbstractAdapter)

data/lib/pandas/version.rb

@@ -1 +1 @@
-PANDAS_VERSION = "0.2.0"
+PANDAS_VERSION = "0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandas
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pycall
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Pandas wrapper for Ruby