active_tsv 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aace3a8490ac510480e630683114815b46ce0a8
-  data.tar.gz: 5e3c803aa0ce4e2df7b7cadc95e4bb9d07b57270
+  metadata.gz: 583d8e8209374ac577bd0837daba375f490e39de
+  data.tar.gz: 22f74200fc7f26da338a2c16f061dd83449aa406
 SHA512:
-  metadata.gz: 5ed85bc2c763103d1f036910a1fe8c6a7effc47838b8666d0ce06c1d8b93b931cebd918b735627206714a0cdcf7294f54e24ab93953f615ab1cfa600b2399185
-  data.tar.gz: e6b13eff65621c3ce3f995e80c94ca00ad0c5280667f82daaa0285821d06d564a7aa180b822fed07e2107bcf42fcaa321202442981c61edadf1f59c7a38c753c
+  metadata.gz: b6e48455014b19f9ce07a0aa54f1b11ba52329dda243ef9e8d9b0ccbc6f68d2ca642e731c4e5c40041373ae10e73282713d7a9e408b8ff105802652777d83e8c
+  data.tar.gz: 17eddd9dd791b10c7234350ae809bde5391ece5ee95e868ee1fb3b7f6788ac27ee2eff41b26f551e1b32e65974a4b8db7152c1751b2b1a4edcec93ccdeca461e

data/README.md

@@ -15,11 +15,30 @@ id	name	age
 3	bar	30
 ```
 
+data/nicknames.tsv
+
+```tsv
+id	user_id	nickname
+1	1	yuki
+2	1	kuri
+3	1	k
+4	2	f
+```
+
 ```ruby
 require 'active_tsv'
 
 class User < ActiveTsv::Base
-  self.table_path = "data/users.tsv"
+  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
+
+class Nickname < ActiveTsv::Base
+  self.table_path = "data/nicknames.tsv"
+  belongs_to :user
 end
 
 User.all
@@ -45,6 +64,9 @@ User.where(age: 30).last
 User.where(age: 30).where(name: "ksss").first
 #=> #<User id: "1", name: "ksss", age: "30">
 
+User.where(id: [1, 2]).to_a
+#=> [#<User id: "1", name: "ksss", age: "30">, #<User id: "2", name: "foo", age: "29">]
+
 User.where.not(name: "ksss").first
 #=> #<User id: "2", name: "foo", age: "29">
 
@@ -56,6 +78,12 @@ User.order(:name).to_a
 
 User.order(name: :desc).to_a
 => [#<User id: "1", name: "ksss", age: "30">, #<User id: "2", name: "foo", age: "29">, #<User id: "3", name: "bar", age: "30">]
+
+User.first.nicknames
+#=> #<ActiveTsv::Relation [#<Nickname id: "1", user_id: "1", nickname: "yuki">, #<Nickname id: "2", user_id: "1", nickname: "kuri">, #<Nickname id: "3", user_id: "1", nickname: "k">]>
+
+Nickname.last.user
+#=> #<User id: "2", name: "foo", age: "29">
 ```
 
 Also Supported **CSV**.

data/active_tsv.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{_test.rb}) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rgot"

data/data/books.tsv

@@ -0,0 +1,4 @@
+id	title
+1	Good book
+2	Greate book
+3	Perfect book

data/data/nicknames.tsv

@@ -0,0 +1,5 @@
+id	user_id	nickname
+1	1	yuki
+2	1	kuri
+3	1	k
+4	2	f

data/data/passwords.tsv

@@ -0,0 +1,4 @@
+id	user_id	password
+1	1	abcdefg
+2	2	hijklmn
+3	3	opqrstu

data/data/user_books.tsv

@@ -0,0 +1,5 @@
+id	user_id	book_id
+1	1	1
+2	1	2
+3	1	3
+4	2	2

data/lib/active_tsv/base.rb

@@ -7,9 +7,11 @@ module ActiveTsv
   #   end
   class Base
     SEPARATER = "\t"
+    DEFAULT_PRIMARY_KEY = "id"
 
     class << self
       include Querying
+      include Reflection
 
       attr_reader :table_path
 
@@ -42,12 +44,37 @@ module ActiveTsv
       end
 
       def open(&block)
-        CSV.open(table_path, col_sep: self::SEPARATER, &block)
+        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)
+      end
+
+      def primary_key
+        @primary_key ||= DEFAULT_PRIMARY_KEY
+      end
+
+      attr_writer :primary_key
+
+      def encoding
+        @encoding ||= Encoding::UTF_8
+      end
+
+      def encoding=(enc)
+        case enc
+        when String
+          @encoding = Encoding.find(enc)
+        when Encoding
+          @encoding = enc
+        else
+          raise ArgumentError, "#{enc.class} dose not support"
+        end
+      end
     end
 
     def initialize(attrs = {})
@@ -66,19 +93,19 @@ module ActiveTsv
     end
 
     def [](key)
-      __send__ key
+      @attrs[key.to_sym]
     end
 
     def []=(key, value)
-      __send__ "#{key}=", value
+      @attrs[key.to_sym] = value
     end
 
-    def to_h
+    def attributes
       @attrs.dup
     end
 
     def ==(other)
-      super || other.instance_of?(self.class) && to_h == other.to_h
+      super || other.instance_of?(self.class) && @attrs == other.attributes
     end
     alias eql? ==
   end

data/lib/active_tsv/condition.rb

@@ -1,3 +1,9 @@
 module ActiveTsv
-  Condition = Struct.new(:method_name, :values)
+  class Condition < Struct.new(:values)
+    class Equal < Condition
+    end
+
+    class NotEqual < Condition
+    end
+  end
 end

data/lib/active_tsv/errors.rb

@@ -0,0 +1,5 @@
+module ActiveTsv
+  ActiveTsvError = Class.new(StandardError)
+  RecordNotFound = Class.new(ActiveTsvError)
+  StatementInvalid = Class.new(ActiveTsvError)
+end

data/lib/active_tsv/ordering.rb

@@ -1,15 +1,35 @@
+# frozen_string_literal: true
+
 module ActiveTsv
-  Ordering = Struct.new(:column)
+  class Ordering < Struct.new(:column)
+    VALID_DIRECTIONS = [:asc, :desc, :ASC, :DESC, "asc", "desc", "ASC", "DESC"]
+
+    class Ascending < Ordering
+      def to_i
+        1
+      end
+
+      def ascending?
+        true
+      end
 
-  class Ascending < Ordering
-    def to_i
-      1
+      def descending?
+        false
+      end
     end
-  end
 
-  class Descending < Ordering
-    def to_i
-      -1
+    class Descending < Ordering
+      def to_i
+        -1
+      end
+
+      def ascending?
+        false
+      end
+
+      def descending?
+        true
+      end
     end
   end
 end

data/lib/active_tsv/querying.rb

@@ -1,8 +1,8 @@
 module ActiveTsv
   module Querying
-    METHODS = %i(first last take where count order group pluck)
+    METHODS = %i(find first last take where count order group pluck minimum maximum)
     METHODS.each do |m|
-      module_eval <<-DEFINE_METHOD, __FILE__, __LINE__
+      module_eval <<-DEFINE_METHOD, __FILE__, __LINE__ + 1
         def #{m}(*args, &block)
           all.#{m}(*args, &block)
         end

data/lib/active_tsv/reflection.rb

@@ -0,0 +1,41 @@
+module ActiveTsv
+  module Reflection
+    def has_many(name, through: nil)
+      if through
+        class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}
+            #{name.to_s.classify}.where(
+              #{name.to_s.classify}.primary_key => #{through}.pluck(:#{name.to_s.singularize.underscore}_id)
+            )
+          end
+        CODE
+      else
+        class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}
+            #{name.to_s.singularize.classify}.where(
+              #{self.name.underscore}_id: self[self.class.primary_key]
+            )
+          end
+        CODE
+      end
+    end
+
+    def has_one(name)
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}
+          #{name.to_s.singularize.classify}.where(
+            #{self.name.underscore}_id: self[self.class.primary_key]
+          ).first
+        end
+      CODE
+    end
+
+    def belongs_to(name)
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}
+          #{name.to_s.classify}.where(self.class.primary_key => self["#{name}_id"]).first
+        end
+      CODE
+    end
+  end
+end

data/lib/active_tsv/relation.rb

@@ -5,7 +5,6 @@ module ActiveTsv
     include Enumerable
 
     BUF_SIZE = 1024
-    VALID_DIRECTIONS = [:asc, :desc, :ASC, :DESC, "asc", "desc", "ASC", "DESC"]
 
     attr_reader :model
     attr_accessor :where_values
@@ -31,10 +30,30 @@ module ActiveTsv
         group_values == other.group_values
     end
 
+    def find(*ids)
+      case ids.length
+      when 0
+        raise ActiveTsv::RecordNotFound, "Couldn't find #{@model} without an ID"
+      when 1
+        id = ids.first
+        record = where(@model.primary_key => id).first
+        unless record
+          raise ActiveTsv::RecordNotFound, "Couldn't find #{@model} with '#{@model.primary_key}'=#{id}"
+        end
+        record
+      else
+        records = where(@model.primary_key => ids).to_a
+        unless ids.length == records.length
+          raise ActiveTsv::RecordNotFound, "Couldn't find all #{@model} with '#{@model.primary_key}': (#{ids.join(', ')}) (found #{records.length} results, but was looking for #{ids.length})"
+        end
+        records
+      end
+    end
+
     def where(where_value = nil)
       if where_value
         dup.tap do |r|
-          r.where_values << Condition.new(:==, where_value)
+          r.where_values << Condition::Equal.new(where_value)
         end
       else
         WhereChain.new(dup)
@@ -46,10 +65,10 @@ module ActiveTsv
       if fields.empty?
         to_value_a
       elsif fields.one?
-        field = fields.first
-        to_value_a.map { |v| v[key_to_value_index[field]] }
+        field = fields.first.to_sym
+        to_value_a.map! { |v| v[key_to_value_index[field]] }
       else
-        to_value_a.map { |v| fields.map { |field| v[key_to_value_index[field]] } }
+        to_value_a.map! { |v| fields.map { |field| v[key_to_value_index[field.to_sym]] } }
       end
     end
 
@@ -67,7 +86,7 @@ module ActiveTsv
 
     def last
       if @where_values.empty? && @order_values.empty?
-        last_value = File.open(@model.table_path) do |f|
+        last_value = File.open(@model.table_path, "r:#{@model.encoding}:UTF-8") do |f|
           f.seek(0, IO::SEEK_END)
           buf_size = [f.size, self.class::BUF_SIZE].min
           while true
@@ -83,7 +102,7 @@ module ActiveTsv
         end
         @model.new(CSV.new(last_value, col_sep: @model::SEPARATER).shift)
       else
-        to_a.last
+        @model.new(to_value_a.last)
       end
     end
 
@@ -92,7 +111,7 @@ module ActiveTsv
         if @order_values.empty?
           each_model.take(n)
         else
-          to_a.take(n)
+          to_value_a.take(n).map! { |i| @model.new(i) }
         end
       else
         first
@@ -132,27 +151,42 @@ module ActiveTsv
     end
 
     def to_a
-      to_value_a.map { |v| @model.new(v) }
+      to_value_a.map! { |v| @model.new(v) }
     end
 
     def inspect
-      a = to_a.take(11).map(&:inspect)
+      a = to_value_a.take(11).map! { |i| @model.new(i) }.map!(&:inspect)
       a[10] = '...' if a.length == 11
 
       "#<#{self.class.name} [#{a.join(', ')}]>"
     end
 
+    def maximum(column)
+      pluck(column).max
+    end
+
+    def minimum(column)
+      pluck(column).min
+    end
+
     private
 
     def to_value_a
       ret = each_value.to_a
-      key_to_value_index = @model.keys.each_with_index.to_h
       if @order_values.empty?.!
-        ret.sort! do |a, b|
-          @order_values.each.with_index(1) do |order_condition, index|
-            comp = a[key_to_value_index[order_condition.column]] <=> b[key_to_value_index[order_condition.column]]
-            break 0 if comp == 0 && index == @order_values.length
-            break comp * order_condition.to_i if comp != 0
+        key_to_value_index = @model.keys.each_with_index.to_h
+        if @order_values.one?
+          order_condition = @order_values.first
+          index = key_to_value_index[order_condition.column]
+          ret.sort_by! { |i| i[index] }
+          ret.reverse! if order_condition.descending?
+        else
+          ret.sort! do |a, b|
+            @order_values.each.with_index(1) do |order_condition, index|
+              comp = a[key_to_value_index[order_condition.column]] <=> b[key_to_value_index[order_condition.column]]
+              break 0 if comp == 0 && index == @order_values.length
+              break comp * order_condition.to_i if comp != 0
+            end
           end
         end
       end
@@ -166,11 +200,30 @@ module ActiveTsv
       @model.open do |csv|
         csv.gets
         csv.each do |value|
-          yield value if @where_values.all? { |cond|
-            cond.values.all? do |k, v|
-              value[key_to_value_index[k]].__send__(cond.method_name, v.to_s)
+          yield value if @where_values.all? do |cond|
+            case cond
+            when Condition::Equal
+              cond.values.all? do |k, v|
+                index = key_to_value_index[k.to_sym]
+                raise StatementInvalid, "no such column: #{k}" unless index
+                if v.respond_to?(:to_a)
+                  v.to_a.any? { |vv| value[index] == vv.to_s }
+                else
+                  value[index] == v.to_s
+                end
+              end
+            when Condition::NotEqual
+              cond.values.all? do |k, v|
+                index = key_to_value_index[k.to_sym]
+                raise StatementInvalid, "no such column: #{k}" unless index
+                if v.respond_to?(:to_a)
+                  !v.to_a.any? { |vv| value[index] == vv.to_s }
+                else
+                  !(value[index] == v.to_s)
+                end
+              end
             end
-          }
+          end
         end
       end
     end
@@ -185,17 +238,17 @@ module ActiveTsv
       columns.map { |column|
         case column
         when Symbol
-          Ascending.new(column)
+          Ordering::Ascending.new(column)
         when Hash
           column.map do |col, direction|
-            unless VALID_DIRECTIONS.include?(direction)
-              raise ArgumentError, %(Direction "#{direction}" is invalid. Valid directions are: #{VALID_DIRECTIONS})
+            unless Ordering::VALID_DIRECTIONS.include?(direction)
+              raise ArgumentError, %(Direction "#{direction}" is invalid. Valid directions are: #{Ordering::VALID_DIRECTIONS})
             end
             case direction.downcase.to_sym
             when :asc
-              Ascending.new(col)
+              Ordering::Ascending.new(col)
             when :desc
-              Descending.new(col)
+              Ordering::Descending.new(col)
             end
           end
         end

data/lib/active_tsv/version.rb

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

data/lib/active_tsv/where_chain.rb

@@ -6,7 +6,7 @@ module ActiveTsv
 
     def not(condition)
       @relation.dup.tap do |r|
-        r.where_values << Condition.new(:!=, condition)
+        r.where_values << Condition::NotEqual.new(condition)
       end
     end
   end

data/lib/active_tsv.rb

@@ -2,10 +2,14 @@
 
 require 'csv'
 
+require "active_support/inflector"
+
 require "active_tsv/querying"
+require "active_tsv/reflection"
 require "active_tsv/relation"
 require "active_tsv/where_chain"
 require "active_tsv/condition"
 require "active_tsv/ordering"
+require "active_tsv/errors"
 require "active_tsv/base"
 require "active_tsv/version"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: active_tsv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,15 +84,21 @@ files:
 - bin/setup
 - data/benchmark.png
 - data/benchmark.rb
+- data/books.tsv
 - data/names.tsv
+- data/nicknames.tsv
+- data/passwords.tsv
+- data/user_books.tsv
 - data/users.csv
 - data/users.tsv
 - lib/active_csv.rb
 - lib/active_tsv.rb
 - lib/active_tsv/base.rb
 - lib/active_tsv/condition.rb
+- lib/active_tsv/errors.rb
 - lib/active_tsv/ordering.rb
 - lib/active_tsv/querying.rb
+- lib/active_tsv/reflection.rb
 - lib/active_tsv/relation.rb
 - lib/active_tsv/version.rb
 - lib/active_tsv/where_chain.rb
@@ -102,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A Class of Active record pattern for TSV/CSV