activetokyocabinet 0.1.2 → 0.1.3

data/lib/active_record/connection_adapters/abstract_tokyocabinet_adapter.rb

@@ -34,7 +34,7 @@ module ActiveRecord
                 end
               end
 
-              rcols['id'] = rkey
+              rcols['id'] = rkey.to_i
               rows << rcols
             end
           end

data/lib/active_tokyocabinet/sqlparser.tab.rb

@@ -107,8 +107,8 @@ def tcordertype(type)
   case type.upcase
   when 'ASC', 'STRASC'
     :QOSTRASC
-  when 'DESC', 'STRASC'
-    :QOSTRASC
+  when 'DESC', 'STRDESC'
+    :QOSTRDESC
   when 'NUMASC'
     :QONUMASC
   when 'NUMDESC'

data/lib/active_tokyocabinet/sqlparser.y

@@ -288,8 +288,8 @@ def tcordertype(type)
   case type.upcase
   when 'ASC', 'STRASC'
     :QOSTRASC
-  when 'DESC', 'STRASC'
-    :QOSTRASC
+  when 'DESC', 'STRDESC'
+    :QOSTRDESC
   when 'NUMASC'
     :QONUMASC
   when 'NUMDESC'

data/lib/active_tokyocabinet/tdb.rb

@@ -1,20 +1,20 @@
-module ActiveTokyoCabinet
-  module TDB
-    def self.included(mod)
-      {:string => :to_s, :int => :to_i, :float => :to_s}.each do |type, conv|
-        mod.instance_eval %{
-          def #{type}(name)
-            unless @columns
-              primary_key = ActiveRecord::ConnectionAdapters::Column.new('id', nil)
-              primary_key.primary = true
-              @columns = [primary_key]
-            end
-
-            @columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, nil)
-            class_eval "def \#{name}; v = self[:\#{name}]; v && v.#{conv}; end"
-          end
-        }
-      end
-    end
-  end
-end
+module ActiveTokyoCabinet
+  module TDB
+    def self.included(mod)
+      {:string => :to_s, :int => :to_i, :float => :to_f}.each do |type, conv|
+        mod.instance_eval %{
+          def #{type}(name)
+            unless @columns
+              primary_key = ActiveRecord::ConnectionAdapters::Column.new('id', nil)
+              primary_key.primary = true
+              @columns = [primary_key]
+            end
+
+            @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
+        }
+      end
+    end
+  end
+end

data/spec/activetokyocabinet_spec.rb

@@ -0,0 +1,260 @@
+$wd = File.dirname(File.expand_path(__FILE__))
+ENV['RUBYLIB'] = "#{$wd}/../lib"
+
+require 'spec_helper'
+include SpecHelper
+include ActiveTokyoCabinetSpec
+
+describe 'tokyocabinet:' do
+  before do
+    TokyoCabinetSpec.establish_connection
+    TokyoCabinetSpec.create_tables
+    TokyoCabinetSpec.setup_employee
+    TokyoCabinetSpec.setup_department
+  end
+
+  it "employees length > 0" do
+    employees = Employee.find(:all)
+    employees.length.should == employee_data.length
+  end
+
+  it "employees has a one data (ename = 'SMITH')" do
+    employees = Employee.find(:all, :conditions => ['ename = ?', 'SMITH'])
+    employees.length.should == 1
+    data = employee_data.find {|i| i[EMP_ENAME] == 'SMITH' }
+    validate_employee(data, employees[0])
+  end
+
+  it "employees has a one data (empno = 7521)" do
+    employees = Employee.find(:all, :conditions => ['empno = ?', 7521])
+    employees.length.should == 1
+    data = employee_data.find {|i| i[EMP_EMPNO] == 7521 }
+    validate_employee(data, employees[0])
+  end
+
+  it "employees has no data (ename = 'SMITH' and job = 'SALESMAN')" do
+    employees = Employee.find(:all, :conditions => ['ename = ? and job = ?', 'SMITH', 'SALESMAN'])
+    employees.should be_empty
+  end
+
+  it "employees a one data (ename = 'TURNER' and job = 'SALESMAN')" do
+    employees = Employee.find(:all, :conditions => ['ename = ? and job = ?', 'TURNER', 'SALESMAN'])
+    employees.length.should == 1
+    data = employee_data.find {|i| i[EMP_ENAME] == 'TURNER' and i[EMP_JOB] == 'SALESMAN' }
+    validate_employee(data, employees[0])
+  end
+
+  it "employees a one data ({:ename => 'TURNER', :job => 'SALESMAN'})" do
+    employees = Employee.find(:all, :conditions => {:ename => 'TURNER', :job => 'SALESMAN'})
+    employees.length.should == 1
+    data = employee_data.find {|i| i[EMP_ENAME] == 'TURNER' and i[EMP_JOB] == 'SALESMAN' }
+    validate_employee(data, employees[0])
+  end
+
+  it "employees has any data" do
+    employee_data.each_with_index do |data, i|
+      employee_id = i + 1
+      employee = Employee.find(employee_id)
+
+      employee.should_not be_nil
+      employee.id.should == employee_id
+      validate_employee(data, employee)
+    end
+  end
+
+  it "employees has any data (job = 'SALESMAN')" do
+    employees = Employee.find(:all, :conditions => ['job = ?', 'SALESMAN'])
+
+    employees.each do |employee|
+      data = employee_data[employee.id - 1]
+
+      data.should_not be_nil
+      data[EMP_JOB].should == 'SALESMAN'
+      validate_employee(data, employee)
+    end
+  end
+
+  it "employees has any data (id=1,2,3)" do
+    employees = Employee.find([1, 2, 3])
+    employees.length.should == 3
+
+    employee_data[0..2].each_with_index do |data, i|
+      empno, ename, job, mgr, hiredate, sal, comm, deptno = data
+      employee_id = i + 1
+      employee = employees.find {|i| i.id == employee_id }
+
+      employee.should_not be_nil
+      employee.id.should == employee_id
+      validate_employee(data, employee)
+    end
+  end
+
+  it "employees has any data (order by ename desc limit 3)" do
+    employees = Employee.find(:all, :order => 'ename desc', :limit => 3)
+    employees.length.should == 3
+
+    employee_data.sort_by {|i| i[EMP_ENAME] || '' }.reverse[0..2].each do |data|
+      employee = employees.find {|i| i.id == data.id }
+      employee.should_not be_nil
+      validate_employee(data, employee)
+    end
+  end
+
+  it "employees has any data (order by ename desc limit 4 offset 5)" do
+    employees = Employee.find(:all, :order => 'ename desc', :limit => 4, :offset => 5)
+    employees.length.should == 4
+
+    employee_data.sort_by {|i| i[EMP_ENAME] || '' }.reverse[5..8].each do |data|
+      employee = employees.find {|i| i.id == data.id }
+      employee.should_not be_nil
+      validate_employee(data, employee)
+    end
+  end
+
+  it "employees has any data ([])" do
+    employee_data.each_with_index do |data, i|
+      empno, ename, job, mgr, hiredate, sal, comm, deptno = data
+      employee_id = i + 1
+      employee = Employee.find(employee_id)
+
+      employee.should_not be_nil
+      employee[:id].should       == employee_id
+      employee[:empno].should    == empno.to_s
+      employee[:ename].should    == ename.to_s
+      employee[:job].should      == job.to_s
+      employee[:mgr].should      == mgr.to_s
+      employee[:hiredate].should == hiredate.to_s
+      employee[:sal].should      == sal.to_s
+      employee[:comm].should     == comm.to_s
+      employee[:deptno].should   == deptno.to_s
+    end
+  end
+
+  # -------------------------------------------------------------------
+
+  it "departments length > 0" do
+    departments = Department.find(:all)
+    departments.length.should == department_data.length
+  end
+
+  it "departments has a one data (dname = 'SALES')" do
+    departments = Department.find(:all, :conditions => ['dname = ?', 'SALES'])
+    departments.length.should == 1
+    data = department_data.find {|i| i[DEPT_DNAME] == 'SALES' }
+    validate_department(data, departments[0])
+  end
+
+  it "departments has a one data (deptno = 20)" do
+    departments = Department.find(:all, :conditions => ['deptno = ?', 20])
+    departments.length.should == 1
+    data = department_data.find {|i| i[DEPT_DEPTNO] == 20 }
+    validate_department(data, departments[0])
+  end
+
+  it "departments has no data (deptno = 20 and loc = 'BOSTON')" do
+    departments = Department.find(:all, :conditions => ['deptno = ? and loc = ?', 20, 'BOSTON'])
+    departments.should be_empty
+  end
+
+  it "departments has a one data (deptno = 40 and loc = 'BOSTON')" do
+    departments = Department.find(:all, :conditions => ['deptno = ? and loc = ?', 40, 'BOSTON'])
+    departments.length.should == 1
+    data = department_data.find {|i| i[DEPT_DEPTNO] == 40 and i[DEPT_LOC] == 'BOSTON' }
+    validate_department(data, departments[0])
+  end
+
+  it "departments has a one data ({:deptno => 40. :loc => 'BOSTON'})" do
+    departments = Department.find(:all, :conditions => {:deptno => 40, :loc => 'BOSTON'})
+    departments.length.should == 1
+    data = department_data.find {|i| i[DEPT_DEPTNO] == 40 and i[DEPT_LOC] == 'BOSTON' }
+    validate_department(data, departments[0])
+  end
+
+  it "departments has any data" do
+    department_data.each_with_index do |data, i|
+      department_id = i + 1
+      department = Department.find(department_id)
+
+      department.should_not be_nil
+      department.id.should == department_id
+      validate_department(data, department)
+    end
+  end
+
+  it "departments has any data ([])" do
+    department_data.each_with_index do |data, i|
+      deptno, dname, loc = data
+      department_id = i + 1
+      department = Department.find(department_id)
+
+      department.should_not be_nil
+      department[:id].should     == department_id
+      department[:deptno].should == deptno.to_s
+      department[:dname].should  == dname.to_s
+      department[:loc].should    == loc.to_s
+    end
+  end
+
+  it "department has any data (loc in ('NEW YORK', 'CHICAGO'))" do
+    departments = Department.find(:all, :conditions => ['loc in (?)', ['NEW YORK', 'CHICAGO']])
+
+    departments.each do |department|
+      data = department_data[department.id - 1]
+
+      data.should_not be_nil
+      validate_department(data, department)
+    end
+  end
+
+  it "department has any data ({:loc => ['NEW YORK', 'CHICAGO']})" do
+    departments = Department.find(:all, :conditions => {:loc =>  ['NEW YORK', 'CHICAGO']})
+
+    departments.each do |department|
+      data = department_data[department.id - 1]
+
+      data.should_not be_nil
+      ['NEW YORK', 'CHICAGO'].should include(data[DEPT_LOC])
+      validate_department(data, department)
+    end
+  end
+
+  it "departments has any data (id=1,2,3)" do
+    departments = Department.find([1, 2, 3])
+    departments.length.should == 3
+
+    department_data[0..2].each_with_index do |data, i|
+      deptno, dname, loc = data
+      department_id = i + 1
+      department = departments.find {|i| i.id == department_id }
+
+      department.should_not be_nil
+      validate_department(data, department)
+    end
+  end
+
+  it "departments has any data (order by deptno numdesc limit 65535 offset 1)" do
+    departments = Department.find(:all, :order => 'deptno numdesc', :limit => 65535, :offset => 1)
+    departments.length.should == department_data.length - 1
+
+    department_data.sort_by {|i| i[DEPT_DEPTNO] || 0 }.reverse[1..-1].each do |data|
+      department = departments.find {|i| i.id == data.id }
+      department.should_not be_nil
+      validate_department(data, department)
+    end
+  end
+
+  it "departments has any data (order by deptno numasc)" do
+    departments = Department.find(:all, :order => 'deptno numasc')
+    departments.length.should == department_data.length
+
+    department_data.sort_by {|i| i[DEPT_DEPTNO] || 0 }.each do |data|
+      department = departments.find {|i| i.id == data.id }
+      department.should_not be_nil
+      validate_department(data, department)
+    end
+  end
+
+  after do
+    TokyoCabinetSpec.clean
+  end
+end

data/spec/models/department.rb

@@ -0,0 +1,7 @@
+class Department < ActiveRecord::Base
+  include ActiveTokyoCabinet::TDB
+
+  int    :deptno
+  string :dname
+  string :loc
+end

data/spec/models/employee.rb

@@ -0,0 +1,12 @@
+class Employee < ActiveRecord::Base
+  include ActiveTokyoCabinet::TDB
+
+  int    :empno
+  string :ename
+  string :job
+  int    :mgr
+  string :hiredate
+  float  :sal
+  float  :comm
+  int    :deptno
+end

data/spec/spec_helper.rb

@@ -0,0 +1,196 @@
+require 'rubygems'
+require 'fileutils'
+require 'logger'
+require 'pp'
+require 'tokyocabinet'
+require 'tokyotyrant'
+require 'active_record'
+require 'active_tokyocabinet/tdb'
+require "#{$wd}/models/employee"
+require "#{$wd}/models/department"
+
+ActiveRecord::Base.logger = Logger.new($stderr)
+ActiveRecord::Base.logger.level = Logger::INFO
+
+module SpecHelper
+  EMP_EMPNO    = 0
+  EMP_ENAME    = 1
+  EMP_JOB      = 2
+  EMP_MGR      = 3
+  EMP_HIREDATE = 4
+  EMP_SAL      = 5
+  EMP_COMM     = 6
+  EMP_DEPTNO   = 7
+
+  DEPT_DEPTNO = 0
+  DEPT_DNAME  = 1
+  DEPT_LOC    = 2
+
+  def show_sql
+    begin
+      ActiveRecord::Base.logger.level = Logger::DEBUG
+      yield
+    ensure
+      ActiveRecord::Base.logger.level = Logger::INFO
+    end
+  end
+
+  def desc(klass, out = $stdout)
+    if klass.kind_of?(Array)
+      rows = klass
+    else
+      rows = klass.find(:all)
+    end
+
+    if rows.empty?
+      out.puts "Empty set"
+      return
+    end
+
+    if klass.kind_of?(Array)
+      klass = rows.first.class
+    end
+
+    cols = {}
+
+    klass.instance_variable_get(:@columns).each do |col|
+      cols[col.name] = col.name.to_s.length
+    end
+
+    rows.each do |row|
+      row.attributes.each do |col, val|
+        val = val.to_s
+        cols[col] = val.length if val.length > cols[col]
+      end
+    end
+
+    id_len = cols.delete('id')
+    cols = cols.map {|k, v| [k, v] }
+    cols.unshift ['id', id_len]
+
+    line = cols.map {|col, len| '+' + '-' * (len + 2) }.join + '+'
+    head = cols.map {|col, len| "| %-*s " % [len, col] }.join + '|'
+
+    body = rows.map do |row|
+      cols.map {|col, len| "| %-*s " % [len, row[col]] }.join + '|'
+    end
+
+    out.puts <<EOS
+#{line}
+#{head}
+#{line}
+#{body.join "\n"}
+#{line}
+EOS
+  end
+
+  def employee_data
+    data = [
+      [7369, 'SMITH' , 'CLERK'    , 7902, '17-DEC-1980',  800.0,    nil,  20],
+      [7499, 'ALLEN' , 'SALESMAN' , 7698, '20-FEB-1981', 1600.0,  300.0,  30],
+      [7521, 'WARD'  , 'SALESMAN' , 7698, '22-FEB-1981', 1250.0,  500.0,  30],
+      [7566, 'JONES' , 'MANAGER'  , 7839, '2-APR-1981' , 2975.0,    nil,  20],
+      [7654, 'MARTIN', 'SALESMAN' , 7698, '28-SEP-1981', 1250.0, 1400.0,  30],
+      [7698, 'BLAKE' , 'MANAGER'  , 7839, '1-MAY-1981' , 2850.0,    nil,  30],
+      [7782, 'CLARK' , 'MANAGER'  , 7839, '9-JUN-1981' , 2450.0,    nil,  10],
+      [7788, 'SCOTT' , 'ANALYST'  , 7566, '09-DEC-1982', 3000.0,    nil,  20],
+      [7839, 'KING'  , 'PRESIDENT',  nil, '17-NOV-1981', 5000.0,    nil,  10],
+      [7844, 'TURNER', 'SALESMAN' , 7698, '8-SEP-1981' , 1500.0,    0.0,  30],
+      [7876, 'ADAMS' , 'CLERK'    , 7788, '12-JAN-1983', 1100.0,    nil,  20],
+      [7900, 'JAMES' , 'CLERK'    , 7698, '3-DEC-1981' ,  950.0,    nil,  30],
+      [7902, 'FORD'  , 'ANALYST'  , 7566, '3-DEC-1981' , 3000.0,    nil,  20],
+      [7934, 'MILLER', 'CLERK'    , 7782, '23-JAN-1982', 1300.0,    nil,  10],
+      [ nil, nil     , nil        ,  nil,  nil         ,    nil,    nil, nil],
+    ]
+
+    data.each_with_index do |i, n|
+      i.instance_eval "def id; #{n + 1}; end"
+    end
+
+    return data
+  end
+
+  def department_data
+    data = [
+      [ 10, 'ACCOUNTING', 'NEW YORK'],
+      [ 20, 'RESEARCH'  , 'DALLAS'  ],
+      [ 30, 'SALES'     , 'CHICAGO' ],
+      [ 40, 'OPERATIONS', 'BOSTON'  ],
+      [nil, nil         ,  nil      ],
+    ]
+
+    data.each_with_index do |i, n|
+      i.instance_eval "def id; #{n + 1}; end"
+    end
+
+    return data
+  end
+
+  def validate_employee(expected, employee)
+    employee.empno.should    == expected[EMP_EMPNO]
+    employee.ename.should    == expected[EMP_ENAME]
+    employee.job.should      == expected[EMP_JOB]
+    employee.mgr.should      == expected[EMP_MGR]
+    employee.hiredate.should == expected[EMP_HIREDATE]
+    employee.sal.should      == expected[EMP_SAL]
+    employee.comm.should     == expected[EMP_COMM]
+    employee.deptno.should   == expected[EMP_DEPTNO]
+  end
+
+  def validate_department(expected, department)
+    department.deptno.should == expected[DEPT_DEPTNO]
+    department.dname.should  == expected[DEPT_DNAME]
+    department.loc.should    == expected[DEPT_LOC]
+  end
+end # SpecHelper
+
+module ActiveTokyoCabinetSpec
+  module Base
+    def create_row(klass, vals)
+      cols = klass.instance_variable_get(:@columns).map {|col| col.name.to_sym }
+      cols.delete(:id)
+      row = {}
+      cols.zip(vals).each {|col, val| row[col] = val }
+      klass.create!(row)
+    end
+
+    def setup_employee
+      establish_connection
+      employee_data.each {|row| create_row(Employee, row) }
+    end
+
+    def setup_department
+      establish_connection
+      department_data.each {|row| create_row(Department, row) }
+    end
+  end # module Base
+end # module ActiveTokyoCabinetSpec
+
+module ActiveTokyoCabinetSpec
+  module TokyoCabinetSpec
+    extend ActiveTokyoCabinetSpec::Base
+
+    class << self
+      def establish_connection
+        ActiveRecord::Base.establish_connection(
+          :adapter  => 'tokyocabinet',
+          :database => $wd
+        )
+      end
+
+      def tctmgr_create(path)
+        `tctmgr create #{path}`
+      end
+
+      def create_tables
+        tctmgr_create "#{$wd}/employees.tct"
+        tctmgr_create "#{$wd}/departments.tct"
+      end
+
+      def clean
+        FileUtils.rm_f "#{$wd}/employees.tct"
+        FileUtils.rm_f "#{$wd}/departments.tct"
+      end
+    end # class << self
+  end # module TokyoCabinetSpec
+end # module ActiveTokyoCabinetSpec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activetokyocabinet
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +09:00
+date: 2010-01-10 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +37,10 @@ files:
 - lib/active_tokyocabinet/tdb.rb
 - lib/active_tokyocabinet/sqlparser.y
 - lib/active_tokyocabinet/sqlparser.tab.rb
+- spec/activetokyocabinet_spec.rb
+- spec/models/department.rb
+- spec/models/employee.rb
+- spec/spec_helper.rb
 - README
 has_rdoc: true
 homepage: http://activetokyocabi.rubyforge.org/