shanna-dm-tokyo-adapter 0.2.1 → 0.3.0

data/README.rdoc

@@ -44,7 +44,7 @@ Ruby::
   DataMapper.setup(:default,
     :adapter  => 'tokyo_tyrant',
     :host     => 'localhost',
-    :port     => '1978',
+    :port     => '1978'
   )
 
   # Define your DataMapper resource and start saving:

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name     = 'dm-tokyo-adapter'
-    gem.summary  = %Q{TODO}
+    gem.summary  = %Q{Tokyo Cabinet/Tyrant Table DataMapper Adapter.}
     gem.email    = 'shane.hanna@gmail.com'
     gem.homepage = 'http://github.com/shanna/dm-tokyo-adapter'
     gem.authors  = ['Shane Hanna']

data/VERSION.yml

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

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

@@ -18,31 +18,29 @@ module DataMapper
         def initialize(connection, query)
           assert_kind_of 'connection', connection, Rufus::Tokyo::Table
           assert_kind_of 'query', query, DataMapper::Query
-          @connection, @query, @native = connection, query, true
+          @connection, @query, @native = connection, query, []
         end
 
         #--
-        # TODO: Log when a query cannot be performed natively by TC.
-        # TODO: Use native sorting if there is only a single order condition.
         # TODO: connection[] if I have everything I need to fetch by the primary key.
         def read
           records = @connection.query do |statements|
             if @query.conditions.kind_of?(OrOperation)
-              @native = false
+              fail_native("Operation '#{@query.conditions.slug}'.")
             else
               @query.conditions.each do |condition|
                 condition_statement(statements, condition)
               end
             end
 
-            statements.no_pk
-            if @native
-              statements.limit(@query.limit) if @query.limit
-              # TODO: Native sorting when only one order field.
+            if native? && !@query.order.empty?
+              sort_statement(statements, @query.order)
             end
+
+            statements.limit(@query.limit) if native? && @query.limit
+            statements.no_pk
           end
 
-          # Typecast return values.
           records.each do |record|
             @query.fields.each do |property|
               field = property.field
@@ -50,9 +48,18 @@ module DataMapper
             end
           end
 
+          return records if native?
+          # TODO: Move log entry out to adapter sublcass and use #name?
+          DataMapper.logger.warn(
+            "TokyoAdapter: No native TableQuery support for conditions: #{@native.join(' ')}"
+          )
           @query.filter_records(records)
         end
 
+        def native?
+          @native.empty?
+        end
+
         private
           def condition_statement(statements, conditions, affirmative = true)
             case conditions
@@ -63,9 +70,9 @@ module DataMapper
 
           def operation_statement(statements, operation, affirmative = true)
             case operation
-              when OrOperation  then @native = false
               when NotOperation then condition_statement(statements, operation.first, !affirmative)
               when AndOperation then operation.each{|op| condition_statement(statements, op, affirmative)}
+              else fail_native("Operation '#{operation.slug}'.")
             end
           end
 
@@ -91,18 +98,32 @@ module DataMapper
               when LessThanComparison             then :lt
               when GreaterThanOrEqualToComparison then :gte
               when LessThanOrEqualToComparison    then :lte
+              else fail_native("Comparison #{comparison.slug}'.") && return
             end
 
-            unless operator
-              @native = false
-              return
-            end
             statements.add(comparison.property.field, operator, quote_value(value), affirmative)
           end
 
           def quote_value(value)
             "#{value}"
           end
+
+          def sort_statement(statements, conditions)
+            fail_native("Multiple (#{conditions.size}) order conditions.") if conditions.size > 1
+
+            sort_order = conditions.first
+            primitive  = sort_order.target.primitive
+            direction  = case sort_order.operator
+              when :asc  then primitive == Integer ? :numasc : :asc
+              when :desc then primitive == Integer ? :numdesc : :desc
+            end
+
+            statements.order_by(sort_order.target.field, direction)
+          end
+
+          def fail_native(why)
+            @native << why
+          end
       end # Query
     end # Tokyo
   end # Adapters

data/test/helper.rb

@@ -8,6 +8,7 @@ require 'dm-tokyo-adapter'
 class Test::Unit::TestCase
 end
 
+DataMapper::Logger.new(STDOUT, :debug) if $VERBOSE
 DataMapper.setup(:default, {
   :adapter  => 'tokyo_cabinet',
   :database => 'tc',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shanna-dm-tokyo-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Shane Hanna
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -07:00
+date: 2009-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,12 +32,10 @@ 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,7 +44,7 @@ files:
 - test/test_cabinet.rb
 - test/test_query.rb
 - test/test_tyrant.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/shanna/dm-tokyo-adapter
 post_install_message: 
 rdoc_options: 
@@ -70,10 +68,10 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: TODO
+specification_version: 3
+summary: Tokyo Cabinet/Tyrant Table DataMapper Adapter.
 test_files: 
-- test/test_cabinet.rb
-- test/test_tyrant.rb
 - test/helper.rb
+- test/test_cabinet.rb
 - test/test_query.rb
+- test/test_tyrant.rb

data/.gitignore

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

data/dm-tokyo-adapter.gemspec

@@ -1,56 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{dm-tokyo-adapter}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Shane Hanna"]
-  s.date = %q{2009-06-01}
-  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.has_rdoc = true
-  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.1}
-  s.summary = %q{TODO}
-  s.test_files = [
-    "test/test_cabinet.rb",
-     "test/test_tyrant.rb",
-     "test/helper.rb",
-     "test/test_query.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    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