shanna-dm-tokyo-adapter 0.3.1 → 0.3.2

data/.gitignore

@@ -0,0 +1,8 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+test/tc/*
+*~
+*.gem

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 1
+:patch: 2

data/dm-tokyo-adapter.gemspec

@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-tokyo-adapter}
+  s.version = "0.3.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Shane Hanna"]
+  s.date = %q{2009-08-09}
+  s.email = %q{shane.hanna@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "dm-tokyo-adapter.gemspec",
+     "lib/dm-tokyo-adapter.rb",
+     "lib/dm-tokyo-adapter/cabinet.rb",
+     "lib/dm-tokyo-adapter/query.rb",
+     "lib/dm-tokyo-adapter/tyrant.rb",
+     "test/helper.rb",
+     "test/test_cabinet.rb",
+     "test/test_query.rb",
+     "test/test_tyrant.rb"
+  ]
+  s.homepage = %q{http://github.com/shanna/dm-tokyo-adapter}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Tokyo Cabinet/Tyrant Table DataMapper Adapter.}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_cabinet.rb",
+     "test/test_query.rb",
+     "test/test_tyrant.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.0"])
+    else
+      s.add_dependency(%q<dm-core>, ["~> 0.10.0"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, ["~> 0.10.0"])
+  end
+end

data/lib/dm-tokyo-adapter/cabinet.rb

@@ -1,6 +1,6 @@
 require 'dm-core'
 require 'fileutils'
-require 'rufus-tokyo'
+require 'rufus/tokyo'
 
 module DataMapper
   module Adapters
@@ -21,10 +21,9 @@ module DataMapper
         def create(resources)
           resources.map do |resource|
             model          = resource.model
-            identity_field = model.identity_field
 
             with_connection(resource.model) do |connection|
-              initialize_identity_field(resource, connection.generate_unique_id) if identity_field
+              initialize_serial(resource, connection.generate_unique_id)
               connection[key(resource)] = attributes(resource, :field)
             end
           end.size

data/lib/dm-tokyo-adapter/query.rb

@@ -1,5 +1,5 @@
 require 'dm-core'
-require 'rufus-tokyo'
+require 'rufus/tokyo'
 
 module DataMapper
   module Adapters
@@ -77,8 +77,22 @@ module DataMapper
           end
 
           def comparison_statement(statements, comparison, affirmative = true)
-            value     = comparison.value
-            primitive = comparison.subject.primitive
+            subject   = comparison.subject
+            primitive = subject.primitive
+            value     = comparison.value.kind_of?(DataMapper::Resource) ?
+              comparison.value[comparison.value.class.serial.name] :
+              comparison.value
+
+            if subject.is_a?(DataMapper::Associations::ManyToOne::Relationship)
+              statements.add(subject.child_key.first.name, :numeq, quote_value(value), affirmative)
+              return
+            end
+
+            if subject.is_a?(DataMapper::Associations::OneToMany::Relationship)
+              value = comparison.value[subject.child_key.first.name]
+              statements.add(subject.target_key.first.name, :numeq, quote_value(value), affirmative)
+              return
+            end
 
             if value.kind_of?(Range) && value.exclude_end?
               operation = BooleanOperation.new(:and,

data/lib/dm-tokyo-adapter/tyrant.rb

@@ -1,4 +1,5 @@
 require 'dm-tokyo-adapter/cabinet'
+require 'rufus/tokyo/tyrant'
 
 module DataMapper
   module Adapters

data/test/helper.rb

@@ -20,10 +20,18 @@ class Test::Unit::TestCase
 
   # after :teardown do
   def teardown
-    descendants = DataMapper::Model.descendants.dup.to_a
+    descendants = DataMapper::Model.descendants.to_a
     while model = descendants.shift
-      descendants.concat(model.descendants) if model.respond_to?(:descendants)
-      Object.send(:remove_const, model.name.to_sym)
+      descendants.concat(model.descendants.to_a - [ model ])
+
+      parts = model.name.split('::')
+      constant_name = parts.pop.to_sym
+      base = parts.empty? ? Object : Object.full_const_get(parts.join('::'))
+
+      if base.const_defined?(constant_name)
+        base.send(:remove_const, constant_name)
+      end
+
       DataMapper::Model.descendants.delete(model)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shanna-dm-tokyo-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Shane Hanna
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-08-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,10 +32,12 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- dm-tokyo-adapter.gemspec
 - lib/dm-tokyo-adapter.rb
 - lib/dm-tokyo-adapter/cabinet.rb
 - lib/dm-tokyo-adapter/query.rb
@@ -46,6 +48,7 @@ files:
 - test/test_tyrant.rb
 has_rdoc: false
 homepage: http://github.com/shanna/dm-tokyo-adapter
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -66,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Tokyo Cabinet/Tyrant Table DataMapper Adapter.