arison 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 79eba19eaea1539c6d6a1d437a9a59f311c08a4f
-  data.tar.gz: 38371cddfcda719d3ff284a4b8b6281ad8ccf7de
+SHA256:
+  metadata.gz: 4272d33ba6b94a998e9be6b59c94bc5e0482bc89c62a8bb71b2cf6e2825da84c
+  data.tar.gz: 36743d9e04d0a5d0081dd59219781ecf4608eefa03e299e2ccbaa8c982a7b62d
 SHA512:
-  metadata.gz: 272af779e1eefdf097efe74d47c4c8238da3367aa92fe54e7be58279ed6a4c69450b7476fc3679774d2de82f03bddf03dbbe0423f53ba0bfd9118491b340a489
-  data.tar.gz: 68b7abc608ed41b0d43434ee1997dc384f4540dd008c47cef005ed073518376f35d7d39f94a16b0814ba291aa2072e92bb3673a2f9a0cfe88f5d8052ebe378ca
+  metadata.gz: 32c2c56c3920e98f44fcb7399c789a315721e2d0a54ce9d718b99b2aa619dd7e998347358b85022b822d63839291cec51643cd31eb6fd004ed184021b153210b
+  data.tar.gz: 94c205cc76eb3b736d74cbbfbbcffa26c04f684ec592321c025dea8e17b040b40fd5e3730375ba54bc4d9b6bc12152d6f45cbddf155d0000495933c317fa02b2

data/.gitignore

@@ -1,5 +1,6 @@
 Gemfile.lock
 doc/
+tmp/
 pkg/
 **/*.gem
 .yardoc/

data/.travis.yml

@@ -1,14 +1,12 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - ruby-head
+  - 2.2.6
+  - 2.3.3
+  - 2.4.2
 
 os:
   - linux
-  - osx
 
 gemfile:
   - Gemfile

data/arison.gemspec

@@ -5,8 +5,8 @@ require File.expand_path('../lib/arison/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "arison"
   gem.version       = Arison::VERSION
-  gem.summary       = %q{postgresql command line interface}
-  gem.description   = %q{postgresql command line interface}
+  gem.summary       = %q{activerecord-import by jsonl, command line interface}
+  gem.description   = %q{activerecord-import by jsonl, command line interface}
   gem.license       = "MIT"
   gem.authors       = ["Hiroshi Toyama"]
   gem.email         = "toyama0919@gmail.com"
@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'thor'
-  gem.add_dependency 'pg'
   gem.add_dependency 'activesupport'
   gem.add_dependency 'activerecord'
   gem.add_dependency 'activerecord-import'
 
+  gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'pry', '~> 0.10.1'
   gem.add_development_dependency 'rake', '~> 10.3.2'

data/lib/arison.rb

@@ -1,4 +1,14 @@
 require 'arison/version'
+require 'arison/constants'
+require 'arison/util'
 require 'arison/core'
 require 'arison/migration'
+require 'arison/connection'
 require 'arison/cli'
+
+module Arison
+  def self.import(table, data, config: DEFAULT_CONFIG_FILE_PATH, profile: DEFAULT_CONFIG_PROFILE)
+    con = Connection.new(config: config, profile: profile)
+    con.import(table, data)
+  end
+end

data/lib/arison/cli.rb

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 require "thor"
-require 'yaml'
 require 'json'
 require 'pp'
 
@@ -12,21 +11,23 @@ module Arison
     map '-f' => :query_file
     map '-b' => :import
 
-    class_option :profile, aliases: '-p', type: :string, default: 'default', desc: 'profile by .database.yml'
+    class_option :profile, aliases: '-p', type: :string, default: DEFAULT_CONFIG_PROFILE, desc: 'profile by .database.yml'
     class_option :pretty, aliases: '-P', type: :boolean, default: false, desc: 'pretty print'
-    class_option :config, aliases: '--config', type: :string, default: "#{ENV['HOME']}/.database.yml", desc: 'config file'
+    class_option :config, aliases: '--config', type: :string, default: DEFAULT_CONFIG_FILE_PATH, desc: 'config file'
     def initialize(args = [], options = {}, config = {})
       super(args, options, config)
       @global_options = config[:shell].base.options
-      @config = YAML.load_file(@global_options['config'])
-      profile = @config[@global_options['profile']]
-      @core = Core.new(profile)
+
+      if @global_options[:config] && File.exist?(@global_options[:config])
+        profile = Util.get_profile(@global_options[:config], @global_options[:profile])
+        @core = Core.new(profile)
+      end
     end
 
     desc 'query_inline', 'Sample task'
     option :query, aliases: '-q', type: :string, required: true, desc: 'query'
     def query_inline
-      puts_json @core.query(options['query'])
+      puts_json @core.query(options[:query])
     end
 
     desc 'query_file', 'query_file'
@@ -40,15 +41,18 @@ module Arison
     end
 
     desc 'columns', 'columns'
-    def columns(table_name)
-      puts_json @core.columns_with_table_name(table_name)
+    option :table, aliases: '-t', type: :string, desc: 'table'
+    def columns
+      puts_json @core.columns_with_table_name(options[:table])
     end
 
-    desc 'import', 'import'
-    def import(table)
-      data = @core.parse_json(STDIN.read)
-      @core.create_table(table, data)
-      @core.import(table, data)
+    desc 'import', 'import json data.'
+    option :table, aliases: '-t', type: :string, desc: 'table'
+    option :data, type: :hash, desc: 'buffer'
+    def import
+      data = (options[:data] ? options[:data] : nil) || Util.parse_json(STDIN.read)
+      data = [data] if data.class == Hash
+      @core.import(options[:table], data)
     end
 
     desc 'info', 'info'

data/lib/arison/connection.rb

@@ -0,0 +1,12 @@
+module Arison
+  class Connection
+    def initialize(config: DEFAULT_CONFIG_FILE_PATH, profile: DEFAULT_CONFIG_PROFILE)
+      profile = Util.get_profile(config, profile)
+      @core = Core.new(profile)
+    end
+
+    def import(table, data)
+      @core.import(table, data)
+    end
+  end
+end

data/lib/arison/constants.rb

@@ -0,0 +1,4 @@
+module Arison
+  DEFAULT_CONFIG_FILE_PATH = "#{ENV['HOME']}/.database.yml"
+  DEFAULT_CONFIG_PROFILE = "default"
+end

data/lib/arison/core.rb

@@ -34,6 +34,7 @@ module Arison
     end
 
     def import(table_name, data)
+      create_table(table_name, data)
       klass = get_class(table_name)
       limits = get_limit_hash(klass)
       instances = []
@@ -88,13 +89,13 @@ module Arison
 
     def get_add_column_dsl(table_name, column_name, record)
       dsl = %Q{
-      add_column "#{table_name}", "#{column_name}", :#{get_type(column_name, record['column_name'])}
+      add_column "#{table_name}", "#{column_name}", :#{Util.get_type(column_name, record['column_name'])}
       }
     end
 
     def create_table(table_name, data)
       first = data.class == Array ? data.first : data
-      if @connection.data_source_exists?(table_name)
+      if ActiveRecord::Base.connection.data_source_exists?(table_name.to_sym)
         add_column_live(table_name, data)
         return 
       end
@@ -103,18 +104,6 @@ module Arison
       add_column_live(table_name, data)
     end
 
-    def parse_json(buffer)
-      begin
-        data = JSON.parse(buffer)
-      rescue => e
-        data = []
-        buffer.lines.each do |line|
-          data << JSON.parse(line)
-        end
-      end
-      data
-    end
-
     def get_class(table_name)
       define_class(table_name)
       table_name.camelcase.constantize
@@ -132,41 +121,11 @@ module Arison
 
     def get_column_schema(hash)
       hash.map do |k, v|
-        type = get_type(k, v)
+        type = Util.get_type(k, v)
         %Q{t.#{type} "#{k}"} unless type.nil?
       end
     end
 
-    def get_type(k, v)
-      if v.nil?
-        %Q{string}
-      elsif k =~ /^id$/i
-        nil
-      elsif v.class == String
-        to_time_or_nil(v).nil? ? %Q{string} : %Q{datetime}
-      elsif v.class == TrueClass || v.class == FalseClass
-        %Q{boolean}
-      elsif v.class == Fixnum
-        %Q{integer}
-      elsif v.class == Float
-        %Q{float}
-      elsif v.class == Array || v.class == Hash
-        %Q{text}
-      elsif v.respond_to?(:strftime)
-        %Q{datetime}
-      end
-    end
-
-    def to_time_or_nil(value)
-      return nil if value.slice(0, 4) !~ /^[0-9][0-9][0-9][0-9]/
-      begin
-        time = value.to_time
-        time.to_i >= 0 ? time : nil
-      rescue => e
-        nil
-      end
-    end
-
     def get_limit_hash(klass)
       columns(klass).inject({}){ |result, column| 
         result[column['name']] = column['limit']

data/lib/arison/migration.rb

@@ -1,5 +1,5 @@
 module Arison
-  class Migration < ActiveRecord::Migration
+  class Migration < ActiveRecord::Migration[4.2]
     def self.run_dsl(dsl)
       eval dsl
     end

data/lib/arison/util.rb

@@ -0,0 +1,52 @@
+require 'yaml'
+
+module Arison
+  class Util
+    def self.get_profile(config_path, profile)
+      @config = YAML.load_file(config_path)
+      @config[profile]
+    end
+
+    def self.parse_json(buffer)
+      begin
+        data = JSON.parse(buffer)
+      rescue => e
+        data = []
+        buffer.lines.each do |line|
+          data << JSON.parse(line)
+        end
+      end
+      data
+    end
+
+    def self.get_type(k, v)
+      if v.nil?
+        %Q{string}
+      elsif k =~ /^id$/i
+        nil
+      elsif v.class == String
+        to_time_or_nil(v).nil? ? %Q{string} : %Q{datetime}
+      elsif v.class == TrueClass || v.class == FalseClass
+        %Q{boolean}
+      elsif v.class == Fixnum
+        %Q{integer}
+      elsif v.class == Float
+        %Q{float}
+      elsif v.class == Array || v.class == Hash
+        %Q{text}
+      elsif v.respond_to?(:strftime)
+        %Q{datetime}
+      end
+    end
+
+    def self.to_time_or_nil(value)
+      return nil if value.slice(0, 4) !~ /^[0-9][0-9][0-9][0-9]/
+      begin
+        time = value.to_time
+        time.to_i >= 0 ? time : nil
+      rescue => e
+        nil
+      end
+    end
+  end
+end

data/lib/arison/version.rb

@@ -1,4 +1,4 @@
 module Arison
   # arison version
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/cli_spec.rb

@@ -6,10 +6,6 @@ describe Arison::CLI do
   end
 
   it "should stdout sample" do
-    output = capture_stdout do
-      Arison::CLI.start(['sample'])
-    end
-    output.should == "This is your new task\n"
   end
 
   after do

data/spec/core_spec.rb

@@ -1,15 +1,65 @@
 require 'spec_helper'
 require 'arison'
+require 'fileutils'
 
 describe Arison::Core do
-  before do
-    @core = Core.new
+
+  before(:all) do
+    FileUtils.rm( 'tmp/core.db', {:force=>true} )
+    @core = get_core
   end
 
   it "core not nil" do
     @core.should_not nil
   end
 
-  after do
+  it "core import" do
+    data = [
+      { "column_1" => 1, "column_2" => "string_1", "column_3" => 0.1 },
+      { "column_1" => 2, "column_2" => "string_2" },
+    ]
+    get_core.import('test', data)
+  end
+
+  it "core query record 1" do
+    results = get_core.query('select * from test')
+    record = results.first
+    expect(record['id']).to eq(1)
+    expect(record['column_1']).to eq(1)
+    expect(record['column_2']).to eq("string_1")
+    expect(record['column_3']).to eq(0.1)
+  end
+
+  it "core query record 2" do
+    results = get_core.query('select * from test')
+    record = results[1]
+    expect(record['id']).to eq(2)
+    expect(record['column_1']).to eq(2)
+    expect(record['column_2']).to eq("string_2")
+    expect(record['column_3']).to eq(nil)
+  end
+
+  it "core columns" do
+    columns = get_core.columns_with_table_name("test")
+    expect(columns[0]['name']).to eq('id')
+    expect(columns[0]['sql_type_metadata']['type']).to eq('integer')
+
+    expect(columns[1]['name']).to eq('column_1')
+    expect(columns[1]['sql_type_metadata']['type']).to eq('integer')
+
+    expect(columns[2]['name']).to eq('column_2')
+    expect(columns[2]['sql_type_metadata']['type']).to eq('string')
+
+    expect(columns[3]['name']).to eq('column_3')
+    expect(columns[3]['sql_type_metadata']['type']).to eq('float')
+
+    expect(columns[4]['name']).to eq('created_at')
+    expect(columns[4]['sql_type_metadata']['type']).to eq('datetime')
+
+    expect(columns[5]['name']).to eq('updated_at')
+    expect(columns[5]['sql_type_metadata']['type']).to eq('datetime')
+  end
+
+  after(:all) do
   end
 end

data/spec/spec_helper.rb

@@ -22,3 +22,11 @@ ensure
   $stderr = STDERR
 end
 
+def get_core
+  profile = {
+    adapter: "sqlite3",
+    database: 'tmp/core.db',
+    timeout: 500
+  }
+  Core.new(profile)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arison
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -178,7 +178,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: postgresql command line interface
+description: activerecord-import by jsonl, command line interface
 email: toyama0919@gmail.com
 executables:
 - arison
@@ -199,8 +199,11 @@ files:
 - bin/arison
 - lib/arison.rb
 - lib/arison/cli.rb
+- lib/arison/connection.rb
+- lib/arison/constants.rb
 - lib/arison/core.rb
 - lib/arison/migration.rb
+- lib/arison/util.rb
 - lib/arison/version.rb
 - spec/arison_spec.rb
 - spec/cli_spec.rb
@@ -226,10 +229,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: postgresql command line interface
+summary: activerecord-import by jsonl, command line interface
 test_files:
 - spec/arison_spec.rb
 - spec/cli_spec.rb