active_tsv 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20859e6d4107b8e9e3fb7b9ab8021f3b6e7513fa
-  data.tar.gz: fdbbeb75a1cc931b1e0f71a6ed52feaf2ebba8c6
+  metadata.gz: af77a62bc25c6e3e5b36a915debd71d55df551ac
+  data.tar.gz: a941cc26593c0ef2c5058e4d039a94bee1a4fcef
 SHA512:
-  metadata.gz: 7b54f0040676810d9a45c1e90bb1e4660ae839a47572b6ca2978564b34ff6b9d1000b4515c45552c84a9503310c054a5df97d05cdf4cb3896f51b99fff7437b3
-  data.tar.gz: f1834382d585677b4d3c4a5b1b4258064e3430984896d61e940d44aa6748829e1ae6f7d4f1fc3adef517c33cdcd13fc1d311aee527961aed191e7b1ead08de2b
+  metadata.gz: b6402289d3d87766384feb42444b15a148f1ead18c46a537490fc1266d518a234586b8b13b1318f166ac143450519c7753fbd06013bed16ed988c2c5e21349e0
+  data.tar.gz: fe61cb6f4067928d7a0d7e5222ffcd1ff39abc70c627cd396777831305bc51da61761e33378da07c9568f5d1f4aa588c20ac7aecb96627c877cdffb160e73f41

data/.travis.yml

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

data/README.md

@@ -1,5 +1,9 @@
 # ActiveTsv
 
+[![Build Status](https://travis-ci.org/ksss/active_tsv.svg?branch=master)](https://travis-ci.org/ksss/active_tsv)
+
+A Class of Active record pattern for TSV/CSV
+
 ## Usage
 
 ```tsv
@@ -14,16 +18,24 @@ class User < ActiveTsv::Base
   self.table_path = "data/users.tsv"
 end
 
-User.first #=> #<User {:id=>"1", :name=>"ksss", :age=>"30"}>
-User.last #=> #<User {:id=>"3", :name=>"bar", :age=>"30"}>
-User.where(age: 30).to_a #=> [#<User {:id=>"1", :name=>"ksss", :age=>"30"}>, #<User {:id=>"3", :name=>"bar", :age=>"30"}>]
-User.where(age: 30).last #=> #<User {:id=>"3", :name=>"bar", :age=>"30"}>
-User.where(age: 30).where(name: "ksss").first #=> #<User {:id=>"1", :name=>"ksss", :age=>"30"}>
+User.first
+#=> #<User {:id=>"1", :name=>"ksss", :age=>"30"}>
+User.last
+#=> #<User {:id=>"3", :name=>"bar", :age=>"30"}>
+User.where(age: 30).to_a
+#=> [#<User {:id=>"1", :name=>"ksss", :age=>"30"}>, #<User {:id=>"3", :name=>"bar", :age=>"30"}>]
+User.where(age: 30).last
+#=> #<User {:id=>"3", :name=>"bar", :age=>"30"}>
+User.where(age: 30).where(name: "ksss").first
+#=> #<User {:id=>"1", :name=>"ksss", :age=>"30"}>
+User.where.not(name: "ksss").first
+#=> #<User {:id=>"2", :name=>"foo", :age=>"29"}>
 ```
 
 Also Supported **CSV**.
 
 ```ruby
+require 'active_csv'
 class User < ActiveCsv::Base
   self.table_path = "data/users.csv"
 end

data/active_tsv.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["ksss"]
   spec.email         = ["co000ri@gmail.com"]
 
-  spec.summary       = "Class of Active record pattern for TSV/CSV"
-  spec.description   = "Class of Active record pattern for TSV/CSV"
+  spec.summary       = "A Class of Active record pattern for TSV/CSV"
+  spec.description   = "A Class of Active record pattern for TSV/CSV"
   spec.homepage      = "https://github.com/ksss/active_tsv"
   spec.license       = "MIT"
 

data/lib/active_tsv.rb

@@ -1,4 +1,9 @@
 # frozen_string_literal: true
 
-require "active_tsv/version"
+require 'csv'
+
 require "active_tsv/base"
+require "active_tsv/relation"
+require "active_tsv/where_chain"
+require "active_tsv/condition"
+require "active_tsv/version"

data/lib/active_tsv/base.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-require "active_tsv/relation"
-
 module ActiveTsv
   # @example
   #   class User < ActiveTsv::Base
@@ -39,9 +36,9 @@ module ActiveTsv
       end
 
       def each
-        open do |f|
-          f.gets
-          f.each do |i|
+        open do |csv|
+          csv.gets
+          csv.each do |i|
             yield new(keys.zip(i).to_h)
           end
         end
@@ -52,7 +49,7 @@ module ActiveTsv
       end
 
       def last
-        last_values = open { |f| f.to_a.last }
+        last_values = open { |csv| csv.to_a.last }
         new(keys.zip(last_values).to_h)
       end
 
@@ -61,23 +58,24 @@ module ActiveTsv
       end
 
       def keys
-        @keys ||= open { |f| f.gets }.map(&:to_sym)
+        @keys ||= open { |csv| csv.gets }.map(&:to_sym)
       end
 
-      def where(conditions)
-        Relation.new(self, conditions)
+      def where(condition = nil)
+        if condition
+          Relation.new(self, [Condition.new(:==, condition)])
+        else
+          WhereChain.new(self, [])
+        end
       end
     end
 
-    def initialize(values = {})
-      @attrs = case values
-      when Hash
-        values
-      else
-        raise ArgumentError, "#{values.class} is not supported value"
+    def initialize(attrs = {})
+      unless attrs.kind_of?(Hash)
+        raise ArgumentError, "#{attrs.class} is not supported value"
       end
 
-      self.class.keys.each { |k| __send__ "#{k}=", @attrs[k] }
+      @attrs = attrs
     end
 
     def inspect

data/lib/active_tsv/condition.rb

@@ -0,0 +1,3 @@
+module ActiveTsv
+  Condition = Struct.new(:method_name, :values)
+end

data/lib/active_tsv/relation.rb

@@ -7,8 +7,12 @@ module ActiveTsv
       @conditions = conditions
     end
 
-    def where(conditions)
-      self.class.new(@table, @conditions.merge(conditions))
+    def where(condition = nil)
+      if condition
+        self.class.new(@table, @conditions << Condition.new(:==, condition))
+      else
+        WhereChain.new(@table, @conditions)
+      end
     end
 
     def exist?
@@ -17,8 +21,10 @@ module ActiveTsv
 
     def first
       @table.find do |i|
-        @conditions.all? do |k, v|
-          i[k] == v.to_s
+        @conditions.all? do |cond|
+          cond.values.all? do |k, v|
+            i[k].__send__(cond.method_name, v.to_s)
+          end
         end
       end
     end
@@ -29,8 +35,10 @@ module ActiveTsv
 
     def to_a
       @table.select do |i|
-        @conditions.all? do |k, v|
-          i[k] == v.to_s
+        @conditions.all? do |cond|
+          cond.values.all? do |k, v|
+            i[k].__send__(cond.method_name, v.to_s)
+          end
         end
       end
     end

data/lib/active_tsv/version.rb

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

data/lib/active_tsv/where_chain.rb

@@ -0,0 +1,12 @@
+module ActiveTsv
+  class WhereChain
+    def initialize(table, conditions)
+      @table = table
+      @conditions = conditions
+    end
+
+    def not(condition)
+      Relation.new(@table, @conditions << Condition.new(:!=, condition))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_tsv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Class of Active record pattern for TSV/CSV
+description: A Class of Active record pattern for TSV/CSV
 email:
 - co000ri@gmail.com
 executables: []
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -73,8 +74,10 @@ files:
 - lib/active_csv.rb
 - lib/active_tsv.rb
 - lib/active_tsv/base.rb
+- lib/active_tsv/condition.rb
 - lib/active_tsv/relation.rb
 - lib/active_tsv/version.rb
+- lib/active_tsv/where_chain.rb
 homepage: https://github.com/ksss/active_tsv
 licenses:
 - MIT
@@ -98,5 +101,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Class of Active record pattern for TSV/CSV
+summary: A Class of Active record pattern for TSV/CSV
 test_files: []