activetokyocabinet 0.2.0 → 0.2.1

data/README

@@ -80,7 +80,7 @@ see http://gemcutter.org/gems/activetokyocabinet
     # - Include `ID' in search condition
     # see http://activetokyocabi.rubyforge.org/svn/trunk/lib/active_tokyocabinet/sqlparser.y
 
-== Expanded operator
+=== Expanded operator
 
     # see http://1978th.net/tokyotyrant/rubydoc/classes/TokyoTyrant/RDBQRY.html
     
@@ -125,7 +125,7 @@ see http://gemcutter.org/gems/activetokyocabinet
     emp = Emp.find(:all, :conditions => ['ename ftsex ?', 'MIKU || RIN'])
     emp = Emp.find(:all, :conditions => ['ename ftsex ?', 'HATSUNE && MIKU'])
 
-== Low layer API
+=== Low layer API
 
     Emp.tdbopen do |tdb|
       pkey = tdb.genuid
@@ -138,11 +138,39 @@ see http://gemcutter.org/gems/activetokyocabinet
     end
     # proc method return empty array.
 
-== Set index
+=== Set index
 
     # see http://1978th.net/tokyotyrant/rubydoc/classes/TokyoTyrant/RDBTBL.html#M000007
     
     Emp.setindex(:age, :decimal)
 
+== Example
+=== database.yml
+
+    # TokyoCabinet
+    development:
+      adapter:  tokyocabinet
+      database: db/casket/
+                # save to `$RAILS_ROOT/db/casket/*.tct'.
+
+    # TokyoTyrant
+    development:
+      adapter: tokyotyrant
+      database:
+        emps:  { host: localhost, port: 1978 }
+        depts: { host: localhost, port: 1979 }
+
+== Schema free
+
+    class Book < ActiveRecord::Base
+      include ActiveTokyoCabinet::TDB
+      schema_free :timestamp => true
+    end
+    
+    Book.create(:title => 'photo book', :author => 'Tanaka Takeshi', :price => 200)
+    Book.create(:title => 'note book', :price => 50)
+    
+    books = Book.find(:all, :conditions => ['author = ?', 'Tanaka Takeshi'])
+
 == Related article
 * http://d.hatena.ne.jp/winebarrel/20100106/p1

data/lib/active_tokyocabinet/sqlparser.tab.rb

@@ -44,9 +44,9 @@ def scan
       yield :NUMBER, tok.to_i
     elsif (tok = @ss.scan /[,\(\)\*]/)
       yield tok, tok
-    elsif (tok = @ss.scan /(?:[a-z_][\w]+\.)*ID\b/i)
+    elsif (tok = @ss.scan /(?:[a-z_]\w+\.|[a-z]\.)*ID\b/i)
       yield :ID, tok
-    elsif (tok = @ss.scan /(?:[a-z_][\w]+\.)*[a-z_][\w]+/i)
+    elsif (tok = @ss.scan /(?:[a-z_]\w+\.|[a-z]\.)*(?:[a-z_]\w+|[a-z])/i)
       yield :IDENTIFIER, tok
     else
       raise Racc::ParseError, ('parse error on value "%s"' % @ss.rest.inspect)

data/lib/active_tokyocabinet/sqlparser.y

@@ -232,9 +232,9 @@ def scan
       yield :NUMBER, tok.to_i
     elsif (tok = @ss.scan /[,\(\)\*]/)
       yield tok, tok
-    elsif (tok = @ss.scan /(?:[a-z_][\w]+\.)*ID\b/i)
+    elsif (tok = @ss.scan /(?:[a-z_]\w+\.|[a-z]\.)*ID\b/i)
       yield :ID, tok
-    elsif (tok = @ss.scan /(?:[a-z_][\w]+\.)*[a-z_][\w]+/i)
+    elsif (tok = @ss.scan /(?:[a-z_]\w+\.|[a-z]\.)*(?:[a-z_]\w+|[a-z])/i)
       yield :IDENTIFIER, tok
     else
       raise Racc::ParseError, ('parse error on value "%s"' % @ss.rest.inspect)

data/lib/active_tokyocabinet/tdb.rb

@@ -1,9 +1,89 @@
 module ActiveTokyoCabinet
   module TDB
     def self.included(mod)
+      mod.instance_eval %{
+        def schema_free(options = {})
+          raise 'invalid definition: schema is already defined' if @__schema_defined
+          @__schema_free_defined = true
+
+          primary_key = ActiveRecord::ConnectionAdapters::Column.new('id', nil)
+          primary_key.primary = true
+          @columns = [primary_key]
+
+          class_eval <<-EOS
+            @@__with_timestamp = \#{options[:timestamp].inspect}
+
+            alias :__respond_to? :respond_to?
+
+            def attributes_with_quotes(include_primary_key = true, include_readonly_attributes = true, attribute_names = @attributes.keys)
+              quoted = {}
+              connection = self.class.connection
+
+              __attributes = (attributes || {}).merge(@__attributes || {})
+              __attributes.delete('id')
+
+              if @@__with_timestamp == :on
+                %w(created_at updated_at).each {|i| __attributes.delete(i) }
+              elsif @@__with_timestamp
+                %w(created_on updated_on).each {|i| __attributes.delete(i) }
+              else
+                %w(created_on updated_on created_at updated_at).each do |i|
+                  __attributes.delete(i)
+                end
+              end
+
+              __attributes.each do |name, value|
+                quoted[name] = connection.quote(value)
+              end
+
+              quoted
+            end
+
+            def respond_to?(name, priv = false); true; end
+
+            def method_missing(name, *args, &block)
+              @__attributes ||= {}
+              name = name.to_s
+
+              if __respond_to?(name)
+                super
+              elsif name =~ /\\\\A(.+)=\\\\Z/ and args.length == 1
+                @__attributes[$1] = args[0]
+              elsif name =~ /[^=]\\\\Z/ and args.length == 0
+                @__attributes[$1]
+              else
+                raise NoMethodError, "undefined method `\\\#{name}' for \#{name}"
+                super
+              end
+            end
+          EOS
+        end
+      }
+
+      mod.instance_eval %{
+        def tdbopen(readonly = false)
+          self.connection.tdbopen(self.table_name, readonly) {|tdb| yield(tdb) }
+        end
+
+        def setindex(name, type)
+          self.connection.setindex(self.table_name, name, type)
+        end
+
+        def proc(*args, &block)
+          if block and (options = args.last) and options.kind_of?(Hash)
+            options[:activetokyocabinet_proc] = block
+          end
+
+          self.find(*args)
+        end
+      }
+
       {:string => :to_s, :int => :to_i, :float => :to_f}.each do |type, conv|
         mod.instance_eval %{
           def #{type}(name)
+            raise 'invalid definition: schema_free is already defined' if @__schema_free_defined
+            @__schema_defined = true
+
             unless @columns
               primary_key = ActiveRecord::ConnectionAdapters::Column.new('id', nil)
               primary_key.primary = true
@@ -13,22 +93,6 @@ module ActiveTokyoCabinet
             @columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, nil)
             class_eval "def \#{name}; v = self[:\#{name}]; (v.nil? || v.empty?) ? nil : v.#{conv}; end"
           end
-
-          def tdbopen(readonly = false)
-            self.connection.tdbopen(self.table_name, readonly) {|tdb| yield(tdb) }
-          end
-
-          def setindex(name, type)
-            self.connection.setindex(self.table_name, name, type)
-          end
-
-          def proc(*args, &block)
-            if block and (options = args.last) and options.kind_of?(Hash)
-              options[:activetokyocabinet_proc] = block
-            end
-
-            self.find(*args)
-          end
         }
       end
     end

data/spec/models/book.rb

@@ -0,0 +1,4 @@
+class Book < ActiveRecord::Base
+  include ActiveTokyoCabinet::TDB
+  schema_free
+end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'active_record'
 require 'active_tokyocabinet/tdb'
 require "#{$wd}/models/employee"
 require "#{$wd}/models/department"
+require "#{$wd}/models/book"
 
 ActiveRecord::Base.logger = Logger.new($stderr)
 ActiveRecord::Base.logger.level = Logger::INFO
@@ -188,6 +189,7 @@ module ActiveTokyoCabinetSpec
       def clean
         FileUtils.rm_f "#{$wd}/employees.tct"
         FileUtils.rm_f "#{$wd}/departments.tct"
+        FileUtils.rm_f "#{$wd}/books.tct"
       end
     end # class << self
   end # module TokyoCabinetSpec
@@ -202,6 +204,7 @@ module ActiveTokyoCabinetSpec
           :database => {
             :employees   => {:host => 'localhost', :port => 1978},
             :departments => {:host => 'localhost', :port => 1979},
+            :books       => {:host => 'localhost', :port => 1980},
           }
         )
       end
@@ -213,6 +216,7 @@ module ActiveTokyoCabinetSpec
 
         `ttserver -port 1978 -dmn -pid "#{$wd}/employees.pid" "#{$wd}/employees.tct"`
         `ttserver -port 1979 -dmn -pid "#{$wd}/departments.pid" "#{$wd}/departments.tct"`
+        `ttserver -port 1980 -dmn -pid "#{$wd}/books.pid" "#{$wd}/books.tct"`
         sleep 3
       end
 

data/spec/tokyocabinet_spec.rb

@@ -507,6 +507,75 @@ describe 'tokyocabinet:' do
     Department.count.should == 0
   end
 
+  it "schema free" do
+    Book.create(:foo => 'bar', :zoo => 'baz', :n => 100)
+    Book.create!(:hoge => 'fuga', :n => 200)
+
+    book = Book.new
+    book.xxx = 'XXX'
+    book.yyy = 'YYY'
+    book.zzz = 'ZZZ'
+    book.n = 300
+    book.save!
+
+    Book.count.should == 3
+
+    book = Book.find(2)
+    book.foo.should be_nil
+    book.hoge.should == 'fuga'
+    book.n.should == '200'
+
+    book.n = 250
+    book.save
+
+    books = Book.find(:all, :conditions => ['hoge = ?', 'fuga'])
+    books.length.should == 1
+    books[0].xxx.should be_nil
+    books[0].hoge.should == 'fuga'
+    books[0].n.should == '250'
+
+    books = Book.find(:all, :conditions => ['n >= ?', 200])
+    books.length.should == 2
+    books = books.sort_by {|i| i.id }
+ 
+    books[0].id.should == 2
+    books[0].hoge.should == 'fuga'
+    books[0].n.should == '250'
+
+    books[1].id.should == 3
+    books[1].xxx.should == 'XXX'
+    books[1].yyy.should == 'YYY'
+    books[1].zzz.should == 'ZZZ'
+    books[1].n.should == '300'
+
+    Book.update_all("xxx = 'xxx'", ['n > ?', 100])
+
+    books = Book.find(:all)
+    books.length.should == 3
+    books = books.sort_by {|i| i.id }
+
+    books[0].id.should == 1
+    books[0].xxx.should be_nil
+
+    books[1].id.should == 2
+    books[1].xxx.should == 'xxx'
+
+    books[2].id.should == 3
+    books[2].xxx.should == 'xxx'
+
+    Book.find(2).destroy
+
+    books = Book.find(:all)
+    books.length.should == 2
+    books = books.sort_by {|i| i.id }
+
+    books[0].id.should == 1
+    books[1].id.should == 3
+
+    Book.delete_all
+    Book.count.should == 0
+  end
+
   after do
     TokyoCabinetSpec.clean
   end

data/spec/tokyotyrant_spec.rb

@@ -507,6 +507,75 @@ describe 'tokyotyrant:' do
     Department.count.should == 0
   end
 
+  it "schema free" do
+    Book.create(:foo => 'bar', :zoo => 'baz', :n => 100)
+    Book.create!(:hoge => 'fuga', :n => 200)
+
+    book = Book.new
+    book.xxx = 'XXX'
+    book.yyy = 'YYY'
+    book.zzz = 'ZZZ'
+    book.n = 300
+    book.save!
+
+    Book.count.should == 3
+
+    book = Book.find(2)
+    book.foo.should be_nil
+    book.hoge.should == 'fuga'
+    book.n.should == '200'
+
+    book.n = 250
+    book.save
+
+    books = Book.find(:all, :conditions => ['hoge = ?', 'fuga'])
+    books.length.should == 1
+    books[0].xxx.should be_nil
+    books[0].hoge.should == 'fuga'
+    books[0].n.should == '250'
+
+    books = Book.find(:all, :conditions => ['n >= ?', 200])
+    books.length.should == 2
+    books = books.sort_by {|i| i.id }
+ 
+    books[0].id.should == 2
+    books[0].hoge.should == 'fuga'
+    books[0].n.should == '250'
+
+    books[1].id.should == 3
+    books[1].xxx.should == 'XXX'
+    books[1].yyy.should == 'YYY'
+    books[1].zzz.should == 'ZZZ'
+    books[1].n.should == '300'
+
+    Book.update_all("xxx = 'xxx'", ['n > ?', 100])
+
+    books = Book.find(:all)
+    books.length.should == 3
+    books = books.sort_by {|i| i.id }
+
+    books[0].id.should == 1
+    books[0].xxx.should be_nil
+
+    books[1].id.should == 2
+    books[1].xxx.should == 'xxx'
+
+    books[2].id.should == 3
+    books[2].xxx.should == 'xxx'
+
+    Book.find(2).destroy
+
+    books = Book.find(:all)
+    books.length.should == 2
+    books = books.sort_by {|i| i.id }
+
+    books[0].id.should == 1
+    books[1].id.should == 3
+
+    Book.delete_all
+    Book.count.should == 0
+  end
+
   after do
      TokyoTyrantSpec.clean
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activetokyocabinet
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 +09:00
+date: 2010-03-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - spec/tokyotyrant_spec.rb
 - spec/models/department.rb
 - spec/models/employee.rb
+- spec/models/book.rb
 - spec/spec_helper.rb
 - spec/tokyocabinet_spec.rb
 - spec/tcspec2ttspec.sh