activetokyocabinet 0.1.1 → 0.1.2

data/README

@@ -27,7 +27,7 @@ see http://gemcutter.org/gems/activetokyocabinet
       adapter: tokyocabinet
       database: path_of_database_directory
                                # ~~~~~~~~~
-    # TokyoCabinet
+    # TokyoTyrant
     development:
       adapter: tokyotyrant
       database:
@@ -83,3 +83,6 @@ see http://gemcutter.org/gems/activetokyocabinet
         render :text => 'hello'
       end
     end
+
+== Related article
+* http://d.hatena.ne.jp/winebarrel/20100106/p1

data/lib/active_record/connection_adapters/abstract_tokyocabinet_adapter.rb

@@ -28,7 +28,10 @@ module ActiveRecord
               next if rcols.nil?
 
               unless select_list.nil? or select_list.empty?
-                rcols = select_list.each {|k| r[k] = rcols[k] }
+                rcols = select_list.each do |k|
+                  k = k.split('.').last
+                  r[k] = rcols[k]
+                end
               end
 
               rcols['id'] = rkey
@@ -57,6 +60,7 @@ module ActiveRecord
             cols = {}
 
             keys.zip(vals).each do |k, v|
+              k.split('.').last
               cols[k] = v.to_s
             end
 
@@ -82,6 +86,7 @@ module ActiveRecord
               rcols = tdb.get(rkey)
 
               set_clause_list.each do |k, v|
+                k.split('.').last
                 rcols[k] = v.to_s
               end
 
@@ -105,9 +110,6 @@ module ActiveRecord
           parsed_sql = ActiveTokyoCabinet::SQLParser.new(sql).parse
 
           tdbopen(parsed_sql) do |tdb|
-            rkeys(tdb, parsed_sql)
-            set_clause_list = parsed_sql[:set_clause_list]
-
             rkeys(tdb, parsed_sql).each do |rkey|
               rownum += 1
 
@@ -134,6 +136,7 @@ module ActiveRecord
 
         condition.each do |cond|
           name, op, expr = cond.values_at(:name, :op, :expr)
+          name = name.split('.').last
           op = @query_klass.const_get(op)
           expr = expr.kind_of?(Array) ? expr.join(' ') : expr.to_s
           qry.addcond(name, op, expr)

data/lib/active_record/connection_adapters/tokyocabinet_adapter.rb

@@ -4,8 +4,8 @@ require 'tokyocabinet'
 module ActiveRecord
   class Base
     def self.tokyocabinet_connection(config)
-      unless config[:database]
-        raise ArgumentError, "No database file specified. Missing argument: database"
+      unless config[:database].kind_of?(String)
+        raise ArgumentError, "Incorrect argument: database"
       end
 
       if Object.const_defined?(:RAILS_ROOT)

data/lib/active_record/connection_adapters/tokyotyrant_adapter.rb

@@ -4,8 +4,8 @@ require 'tokyotyrant'
 module ActiveRecord
   class Base
     def self.tokyotyrant_connection(config)
-      unless config[:database]
-        raise ArgumentError, "No database file specified. Missing argument: database"
+      unless config[:database].kind_of?(Hash)
+        raise ArgumentError, "Incorrect argument: database"
       end
 
       ConnectionAdapters::TokyoTyrantAdapter.new({}, logger, config)
@@ -19,7 +19,11 @@ module ActiveRecord
         @database = {}
 
         config.fetch(:database).map do |table_name, attribute|
-          @database[table_name] = {
+          attribute.keys.each do |k|
+            attribute[k.to_s] = attribute[k]
+          end
+
+          @database[table_name.to_s] = {
             :host => attribute.fetch('host').to_s,
             :port => attribute.fetch('port', 0).to_i,
             :timeout => attribute.fetch('timeout', 0).to_i,
@@ -44,6 +48,10 @@ module ActiveRecord
       def tdbopen(parsed_sql)
         table_name = parsed_sql[:table]
 
+        unless table_exists?(table_name)
+          raise "Table does not exist: #{table_name}"
+        end
+
         unless (tdb = @connection[table_name])
           host, port, timeout = @database.fetch(table_name).values_at(:host, :port, :timeout)
           tdb = TokyoTyrant::RDBTBL::new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activetokyocabinet
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +09:00
+date: 2010-01-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency