dm-appengine 0.0.1 → 0.0.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "dm-appengine"
-GEM_VERSION = "0.0.1"
+GEM_VERSION = "0.0.2"
 AUTHOR = "Ryan Brown"
 EMAIL = "ribrdb@gmail.com"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"

data/lib/{dm-appengine.rb → appengine_adapter.rb}

@@ -17,10 +17,12 @@
 #
 # Datamapper adapter for Google App Engine
 
+require 'date'
 require 'rubygems'
-gem 'appengine-apis', '~> 0.0.3'
+require 'time'
+
+gem 'appengine-apis', '~> 0.0.6'
 
-require 'appengine-apis/local_boot'
 require 'appengine-apis/datastore'
 require 'dm-core'
 
@@ -112,10 +114,20 @@ module DataMapper
       end
 
       def convert_value(property, value)
+        value = property.value(value)
         if property.type == DataMapper::Types::Text && value
           AppEngine::Datastore::Text.new(value)
         else
-          value
+          case value
+          when Date, DateTime
+            Time.parse(value.to_s)
+          when BigDecimal
+            value.to_s
+          when Class
+            value.name
+          else
+            value
+          end
         end
       end
 
@@ -130,12 +142,14 @@ module DataMapper
       class QueryBuilder
         import Datastore::JavaDatastore::FetchOptions
         include Datastore::Query::Constants
+        include DataMapper::Query::Conditions
+        
         @@OPERATORS = {
-          Conditions::EqualToComparison => EQUAL,
-          Conditions::GreaterThanComparison => GREATER_THAN,
-          Conditions::GreaterThanOrEqualToComparison => GREATER_THAN_OR_EQUAL,
-          Conditions::LessThanComparison => LESS_THAN,
-          Conditions::LessThanOrEqualToComparison => LESS_THAN_OR_EQUAL,
+          EqualToComparison => EQUAL,
+          GreaterThanComparison => GREATER_THAN,
+          GreaterThanOrEqualToComparison => GREATER_THAN_OR_EQUAL,
+          LessThanComparison => LESS_THAN,
+          LessThanOrEqualToComparison => LESS_THAN_OR_EQUAL,
           }.freeze
       
         def initialize(query, kind, adapter)
@@ -172,24 +186,23 @@ module DataMapper
         end
       
         def parse_order(order)
-          if order.size == 1 && order[0].direction != :desc
-            if order[0].property.key?
+          if order.size == 1 && order[0].operator != :desc
+            if order[0].target.key?
               # omit the default key ordering.
               # This lets inequality filters work
               return
             end
           end
-          debugger
           order.map do |order|
-            if order.direction == :desc
+            if order.operator == :desc
               direction = DESCENDING
             else
               direction = ASCENDING
             end
-            name = if order.property.key?
+            name = if order.target.key?
               '__key__'
             else
-              property_name(order.property)
+              property_name(order.target)
             end
             @query.sort(name, direction)
           end
@@ -197,13 +210,13 @@ module DataMapper
       
         def parse_conditions(conditions)
           case conditions
-          when Conditions::NotOperation then
+          when NotOperation then
             raise NotImplementedError, "NOT operator is not supported"
-          when Conditions::AbstractComparison then
+          when AbstractComparison then
             parse_comparison(conditions)
-          when Conditions::OrOperation  then
+          when OrOperation  then
             parse_or(conditions)
-          when Conditions::AndOperation then
+          when AndOperation then
             parse_and(conditions)
           else
             raise ArgumentError, "invalid conditions #{conditions.class}: #{conditions.inspect}"
@@ -229,14 +242,14 @@ module DataMapper
             raise NotImplementedError, "OR only supported with key equality comparisons"
           end
           @must_be_get = true
-          or_op.operands.each do |op|
+          or_op.each do |op|
             case op
-              when Conditions::OrOperation  then
+              when OrOperation  then
                 parse_or(op)
-              when Conditions::EqualToComparison then
+              when EqualToComparison then
                 key = parse_key(op.property, op.value)
                 @keys << key
-              when Conditions::InclusionComparison then
+              when InclusionComparison then
                 parse_key_inclusion(op)
               else
                 raise NotImplementedError, "Unsupported condition #{op.class} inside OR"
@@ -256,7 +269,7 @@ module DataMapper
             @maybe_get = false
           end
           @found_and = true
-          op.operands.each do |conditions|
+          op.each do |conditions|
             parse_conditions(conditions)
           end
         end
@@ -267,9 +280,9 @@ module DataMapper
           if @maybe_get
             if property.key?
               case op
-              when Conditions::EqualToComparison 
+              when EqualToComparison 
                 @keys << parse_key(property, value)
-              when Conditions::InclusionComparison
+              when InclusionComparison
                 parse_key_inclusion(op)
                 @must_be_get = true
                 return
@@ -281,7 +294,7 @@ module DataMapper
             end
           end
         
-          if op.kind_of? Conditions::InclusionComparison
+          if op.kind_of? InclusionComparison
             parse_range(op)
           else
             filter_op = @@OPERATORS[op.class]
@@ -348,8 +361,11 @@ module DataMapper
           key = entity.get_key
           hash = entity.to_hash
           @dm_query.fields.each do |property|
+            name = property.field
             if property.key?
-              hash[property.field] = key.get_name || key.get_id
+              hash[name] = key.get_name || key.get_id
+            else
+              hash[name] = property.typecast(hash[name])
             end
           end
           hash

data/spec/dm-appengine_spec.rb

@@ -25,6 +25,22 @@ class TextTest
   property :text, Text
 end
 
+class TypeTest
+  include DataMapper::Resource
+  
+  property :name, String, :key => true
+  property :time, Time
+  property :date, Date
+  property :datetime, DateTime
+  property :bigd, BigDecimal
+  property :flower, Object
+  property :klass, Class
+end
+
+class Flower
+  attr_accessor :color
+end
+
 class FooBar
   include DataMapper::Resource
   
@@ -97,4 +113,54 @@ describe DataMapper::Adapters::AppEngineAdapter do
       b.string.should == 'c'
     end
   end
+  
+  describe 'types' do
+    it 'should support Date' do
+      date = Date.parse('2007/12/23')
+      a = TypeTest.new(:name => 'date', :date => date)
+      a.save
+      a.reload
+      a.date.should == date
+    end
+    
+    it 'should support Time' do
+      time = Time.at(Time.now.to_i)  # Datastore store ms precision, not usec
+      a = TypeTest.new(:name => 'time', :time => time)
+      a.save
+      a.reload
+      a.time.should == time
+    end
+    
+    it 'should support DateTime' do
+      date = DateTime.parse('2007-12-23')
+      a = TypeTest.new(:name => 'datetime', :datetime => date)
+      a.save
+      a.reload
+      a.datetime.should == date
+    end
+    
+    it 'should support BigDecimal' do
+      one = BigDecimal.new('1.0')
+      a = TypeTest.new(:name => 'bigd', :bigd => one)
+      a.save
+      a.reload
+      a.bigd.should == one
+    end
+    
+    it 'should support Object' do
+      flower = Flower.new
+      flower.color = 'red'
+      a = TypeTest.new(:name => 'color', :flower => flower)
+      a.save
+      a.reload
+      a.flower.color.should == flower.color
+    end
+    
+    it 'should support Class' do
+      a = TypeTest.new(:name => 'class', :klass => Flower)
+      a.save
+      a.reload
+      a.klass.should == Flower
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -24,5 +24,5 @@ require 'dm-appengine'
 ADAPTERS = ['default']
 PRIMARY = {'default' => "appengine://memory"}
 
-DataMapper::Logger.new(nil, :debug)
+DataMapper::Logger.new(STDERR, :debug)
 DataMapper.setup(:default, 'appengine://memory')

metadata

@@ -1,82 +1,83 @@
 --- !ruby/object:Gem::Specification 
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-email: ribrdb@gmail.com
+name: dm-appengine
+version: !ruby/object:Gem::Version 
+  version: 0.0.2
+platform: ruby
+authors: 
+- Ryan Brown
+autorequire: dm-appengine
+bindir: bin
 cert_chain: []
 
-summary: A DataMapper adapter for Google App Engine
-post_install_message: 
+date: 2009-07-27 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: appengine-apis
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.10.0
+    version: 
+description: A DataMapper adapter for Google App Engine
+email: ribrdb@gmail.com
+executables: []
+
+extensions: []
+
 extra_rdoc_files: 
 - README.rdoc
 - LICENSE
-homepage: http://code.google.com/p/appengine-jruby
-signing_key: 
-name: dm-appengine
-rdoc_options: []
-
-autorequire: dm-appengine
-rubyforge_project: 
-executables: []
-
-description: A DataMapper adapter for Google App Engine
-specification_version: 2
-default_executable: 
 files: 
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/dm-appengine
-- lib/dm-appengine.rb
-- lib/dm-appengine.rb-custom_resource
+- lib/appengine_adapter.rb
 - lib/dm-appengine/appengine_resource.rb
 - lib/dm-appengine/transactions.rb
+- lib/dm-appengine.rb-custom_resource
 - spec/dm-appengine_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
+homepage: http://code.google.com/p/appengine-jruby
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-extensions: []
-
-rubygems_version: 1.3.1
 requirements: []
 
-authors: 
-- Ryan Brown
-date: 2009-05-06 07:00:00 +00:00
-platform: ruby
+rubyforge_project: 
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: A DataMapper adapter for Google App Engine
 test_files: []
 
-version: !ruby/object:Gem::Version 
-  version: 0.0.1
-require_paths: 
-- lib
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.0.3
-    version: 
-  type: :runtime
-  version_requirement: 
-  name: appengine-apis
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
-  type: :runtime
-  version_requirement: 
-  name: dm-core
-bindir: bin
-has_rdoc: true