active_tsv 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583d8e8209374ac577bd0837daba375f490e39de
-  data.tar.gz: 22f74200fc7f26da338a2c16f061dd83449aa406
+  metadata.gz: a1e82adf6d31ab6578a3e5b5f290682135ab9a3b
+  data.tar.gz: 877883f7b97bb19854e17b801f2b71c054caf50b
 SHA512:
-  metadata.gz: b6e48455014b19f9ce07a0aa54f1b11ba52329dda243ef9e8d9b0ccbc6f68d2ca642e731c4e5c40041373ae10e73282713d7a9e408b8ff105802652777d83e8c
-  data.tar.gz: 17eddd9dd791b10c7234350ae809bde5391ece5ee95e868ee1fb3b7f6788ac27ee2eff41b26f551e1b32e65974a4b8db7152c1751b2b1a4edcec93ccdeca461e
+  metadata.gz: 2a7e77ed3e9fc8f04924549bed9327913dc66c381ef863437d107745246fbefe1dae9c6a80a2c86b73866e37a2022a99684bb6a256baa8f2bdf517e695fce613
+  data.tar.gz: 03a7633a7bec5da34353e40a7fba5719c12bada29217a1b5686ed9de47a33e594a38dff57904ef6ad3d784db1ef011d32dd7b61404fd09fdc9dfe4cae5858546

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
 notifications:
   email: false

data/README.md

@@ -32,7 +32,6 @@ class User < ActiveTsv::Base
   self.table_path = "data/users.tsv"    # required
   # self.encoding = Encoding::Shift_JIS # optional
   # self.primary_key = "uid"            # optional
-  # self.keys = %w(id name age)         # optional
   has_many :nicknames
 end
 

data/data/benchmark.rb

@@ -25,9 +25,9 @@ module ActiveHashTsv
       def load_path(path)
         data = []
         CSV.open(path, col_sep: self::SEPARATER) do |csv|
-          keys = csv.gets.map(&:to_sym)
+          column_names = csv.gets.map(&:to_sym)
           while line = csv.gets
-            data << keys.zip(line).to_h
+            data << column_names.zip(line).to_h
           end
         end
         data

data/lib/active_tsv/base.rb

@@ -20,16 +20,16 @@ module ActiveTsv
       end
 
       def reload(path)
-        if @keys
-          keys.each do |k|
+        if @column_names
+          column_names.each do |k|
             remove_method(k)
             remove_method("#{k}=")
           end
         end
 
-        @keys = nil
+        @column_names = nil
         @table_path = path
-        keys.each do |k|
+        column_names.each do |k|
           define_method(k) { @attrs[k] }
           define_method("#{k}=") { |v| @attrs[k] = v }
         end
@@ -47,12 +47,8 @@ module ActiveTsv
         CSV.open(table_path, "r:#{encoding}:UTF-8", col_sep: self::SEPARATER, &block)
       end
 
-      def keys
-        @keys ||= open { |csv| csv.gets }.map(&:to_sym)
-      end
-
-      def keys=(headers)
-        @keys = headers.map(&:to_sym)
+      def column_names
+        @column_names ||= open { |csv| csv.gets }
       end
 
       def primary_key
@@ -82,7 +78,7 @@ module ActiveTsv
       when Hash
         @attrs = attrs
       when Array
-        @attrs = self.class.keys.zip(attrs).to_h
+        @attrs = self.class.column_names.zip(attrs).to_h
       else
         raise ArgumentError, "#{attrs.class} is not supported value"
       end
@@ -93,11 +89,11 @@ module ActiveTsv
     end
 
     def [](key)
-      @attrs[key.to_sym]
+      @attrs[key.to_s]
     end
 
     def []=(key, value)
-      @attrs[key.to_sym] = value
+      @attrs[key.to_s] = value
     end
 
     def attributes

data/lib/active_tsv/relation.rb

@@ -61,14 +61,14 @@ module ActiveTsv
     end
 
     def pluck(*fields)
-      key_to_value_index = @model.keys.each_with_index.to_h
+      key_to_value_index = @model.column_names.each_with_index.to_h
       if fields.empty?
         to_value_a
       elsif fields.one?
-        field = fields.first.to_sym
-        to_value_a.map! { |v| v[key_to_value_index[field]] }
+        to_value_a.map! { |v| v[key_to_value_index[fields.first.to_s]] }
       else
-        to_value_a.map! { |v| fields.map { |field| v[key_to_value_index[field.to_sym]] } }
+        indexes = fields.map(&:to_s).map! { |field| key_to_value_index[field] }
+        to_value_a.map! { |v| v.values_at(*indexes) }
       end
     end
 
@@ -174,7 +174,7 @@ module ActiveTsv
     def to_value_a
       ret = each_value.to_a
       if @order_values.empty?.!
-        key_to_value_index = @model.keys.each_with_index.to_h
+        key_to_value_index = @model.column_names.each_with_index.to_h
         if @order_values.one?
           order_condition = @order_values.first
           index = key_to_value_index[order_condition.column]
@@ -196,7 +196,7 @@ module ActiveTsv
     def each_value
       return to_enum(__method__) unless block_given?
 
-      key_to_value_index = @model.keys.each_with_index.to_h
+      key_to_value_index = @model.column_names.each_with_index.to_h
       @model.open do |csv|
         csv.gets
         csv.each do |value|
@@ -204,7 +204,7 @@ module ActiveTsv
             case cond
             when Condition::Equal
               cond.values.all? do |k, v|
-                index = key_to_value_index[k.to_sym]
+                index = key_to_value_index[k.to_s]
                 raise StatementInvalid, "no such column: #{k}" unless index
                 if v.respond_to?(:to_a)
                   v.to_a.any? { |vv| value[index] == vv.to_s }
@@ -214,7 +214,7 @@ module ActiveTsv
               end
             when Condition::NotEqual
               cond.values.all? do |k, v|
-                index = key_to_value_index[k.to_sym]
+                index = key_to_value_index[k.to_s]
                 raise StatementInvalid, "no such column: #{k}" unless index
                 if v.respond_to?(:to_a)
                   !v.to_a.any? { |vv| value[index] == vv.to_s }
@@ -237,20 +237,21 @@ module ActiveTsv
     def order_conditions(columns)
       columns.map { |column|
         case column
-        when Symbol
-          Ordering::Ascending.new(column)
+        when Symbol, String
+          Ordering::Ascending.new(column.to_s)
         when Hash
           column.map do |col, direction|
-            unless Ordering::VALID_DIRECTIONS.include?(direction)
+            case direction
+            when :asc, :ASC, "asc", "ASC"
+              Ordering::Ascending.new(col.to_s)
+            when :desc, :DESC, "desc", "DESC"
+              Ordering::Descending.new(col.to_s)
+            else
               raise ArgumentError, %(Direction "#{direction}" is invalid. Valid directions are: #{Ordering::VALID_DIRECTIONS})
             end
-            case direction.downcase.to_sym
-            when :asc
-              Ordering::Ascending.new(col)
-            when :desc
-              Ordering::Descending.new(col)
-            end
           end
+        else
+          raise TypeError, "Cannot visit #{column.class}"
         end
       }.flatten
     end

data/lib/active_tsv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveTsv
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_tsv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2017-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport