dm-appengine 0.0.5 → 0.0.6

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "dm-appengine"
-GEM_VERSION = "0.0.5"
+GEM_VERSION = "0.0.6"
 AUTHOR = "Ryan Brown"
 EMAIL = "ribrdb@gmail.com"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
@@ -23,10 +23,8 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   
-  s.add_dependency("appengine-apis", ["~> 0.0.3"])
-  s.add_dependency("dm-core", ["~> 0.10.0"])
-  s.add_dependency("addressable")
-  s.add_dependency("extlib")
+  s.add_dependency("appengine-apis", ["~> 0.0.12"])
+  s.add_dependency("dm-core", ["0.10.2"])
   
   s.require_path = 'lib'
   s.autorequire = GEM

data/lib/appengine_adapter.rb

@@ -150,6 +150,14 @@ module DataMapper
           LessThanComparison => LESS_THAN,
           LessThanOrEqualToComparison => LESS_THAN_OR_EQUAL,
           }.freeze
+        
+        @@NEGATED_OPERATORS = {
+          EqualToComparison => NOT_EQUAL,
+          GreaterThanComparison => LESS_THAN_OR_EQUAL,
+          GreaterThanOrEqualToComparison => LESS_THAN,
+          LessThanComparison => GREATER_THAN_OR_EQUAL,
+          LessThanOrEqualToComparison => GREATER_THAN,
+        }.freeze
       
         def initialize(query, kind, adapter)
           @model = query.model
@@ -212,7 +220,13 @@ module DataMapper
           when NullOperation then
             return
           when NotOperation then
-            raise NotImplementedError, "NOT operator is not supported"
+            if OrOperation === conditions.operand
+              parse_and(conditions.operand)
+            elsif AbstractComparison === conditions.operand
+              parse_comparison(conditions.operand)
+            else
+              raise NotImplementedError, "NOT operator is not supported with #{conditions.operand.class.name}"
+            end
           when AbstractComparison then
             parse_comparison(conditions)
           when OrOperation  then
@@ -226,7 +240,7 @@ module DataMapper
 
         def parse_key(property, value)
           unless property.key?
-            raise ArgumentError, "#{property_name(property, true)} is not the key"
+            raise ArgumentError, "#{property_name(property)} is not the key"
           end
           case value
           when Integer, String
@@ -234,7 +248,7 @@ module DataMapper
           when Symbol
             Datastore::Key.from_path(@kind, value.to_s)
           else
-            raise ArgumentError "Unsupported key value #{value.inspect} (a #{value.class})"
+            raise ArgumentError, "Unsupported key value #{value.inspect} (a #{value.class})"
           end
         end
       
@@ -276,13 +290,17 @@ module DataMapper
         end
 
         def parse_comparison(op)
-          if op.subject.kind_of?(Associations::Relationship)
-            return foreign_key_conditions(op)
+          if op.respond_to?(:relationship?) && op.relationship?
+            return parse_conditions(op.foreign_key_mapping)
+          elsif (respond_to?(:foreign_key_conditions) &&
+                 op.subject.kind_of?(Associations::Relationship))
+            return parse_conditions(foreign_key_conditions(op))
           end
           property = op.subject
           value = op.value
+          negated = op.negated?
           if @maybe_get
-            if property.key?
+            if property.key? && !negated
               case op
               when EqualToComparison 
                 @keys << parse_key(property, value)
@@ -298,10 +316,14 @@ module DataMapper
             end
           end
         
-          if op.kind_of? InclusionComparison
-            parse_range(op)
+          if op.kind_of?(InclusionComparison)
+            parse_inclusion(op)
           else
-            filter_op = @@OPERATORS[op.class]
+            if negated
+              filter_op = @@NEGATED_OPERATORS[op.class]
+            else
+              filter_op = @@OPERATORS[op.class]
+            end
             if filter_op.nil?
               raise ArgumentError, "#{op.class} is not a supported comparison"
             end
@@ -311,9 +333,26 @@ module DataMapper
           end
         end
       
+        def parse_inclusion(op)
+          if Range === op.value
+            parse_range(op)
+          else
+            name = property_name(op.subject)
+            values = op.value.map {|x| property_value(op.subject, x)}
+            if op.negated?
+              values.each do |value|
+                @query.filter(name, NOT_EQUAL, value)
+              end
+            else
+              @query.filter(name, IN, java.util.ArrayList.new(values))
+            end
+          end
+        end
+      
         def parse_range(op)
           range = op.value
           raise NotImplementedError unless range.is_a? Range
+          raise NotImplementedError if op.negated?
           name = property_name(op.subject)
           begin_op = GREATER_THAN_OR_EQUAL
           end_op = if range.exclude_end?

data/lib/dm-appengine/types.rb

@@ -17,7 +17,7 @@
 #
 # Custom types for App Engine
 
-require 'dm-core/type'
+require 'dm-core/type' unless defined? DataMapper::Type::PROPERTY_OPTIONS
 
 module DataMapper
   module Types
@@ -37,17 +37,84 @@ module DataMapper
       end
     end
     
-    class Blob < Type
+    class AppEngineStringType < Type
+      def self.dump(value, property)
+        self::DATASTORE_TYPE.new(value) if value
+      end
+      
+      def self.load(value, property)
+        value
+      end
+    end
+    
+    class AppEngineNativeType < Type
+      primitive ::Object
+      
+      def self.dump(value, property)
+        value
+      end
+      
+      def self.load(value, property)
+        value
+      end
+    end
+    
+    class Blob < AppEngineStringType
       primitive String
+      DATASTORE_TYPE = AppEngine::Datastore::Blob
       size 1024 * 1024
-
+    end
+    
+    class ByteString < AppEngineStringType
+      primitive String
+      DATASTORE_TYPE = AppEngine::Datastore::ByteString
+      size 500
+    end
+    
+    class Link < AppEngineStringType
+      primitive String
+      DATASTORE_TYPE = AppEngine::Datastore::Link
+      size 2038
+    end
+    
+    class Email < AppEngineStringType
+      primitive String
+      DATASTORE_TYPE = AppEngine::Datastore::Email
+      size 500
+    end
+    
+    class Category < AppEngineStringType
+      primitive String
+      DATASTORE_TYPE = AppEngine::Datastore::Category
+      size 500
+    end
+    
+    class PhoneNumber < AppEngineStringType
+      primitive String
+      DATASTORE_TYPE = AppEngine::Datastore::PhoneNumber
+      size 500
+    end
+    
+    class PostalAddress < AppEngineStringType
+      primitive String
+      DATASTORE_TYPE = AppEngine::Datastore::PostalAddress
+      size 500
+    end
+    
+    class Rating < Type
+      primitive ::Object
+      
       def self.dump(value, property)
-        AppEngine::Datastore::Blob.new(value) if value
+        AppEngine::Datastore::Rating.new(value) if value
       end
       
       def self.load(value, property)
-        value
+        value.rating if value
       end
     end
+    
+    IMHandle = GeoPt = Key = User = AppEngineNativeType
+    
+    # TODO store user as email and id?
   end
-end
+end

data/spec/dm-appengine_spec.rb

@@ -35,9 +35,18 @@ class TypeTest
   property :bigd, BigDecimal
   property :flower, Object
   property :klass, Class
-  $stderr.puts "list: #{List.primitive.ancestors})"
   property :list, List
   property :blob, Blob
+  property :bstring, ByteString
+  property :link, Link
+  property :email, Email
+  property :category, Category
+  property :phone, PhoneNumber
+  property :address, PostalAddress
+  property :rating, Rating
+  property :im, IMHandle
+  property :point, GeoPt
+  property :user, User
 end
 
 class Flower
@@ -180,5 +189,78 @@ describe DataMapper::Adapters::AppEngineAdapter do
       a.reload
       a.blob.should == '\0'
     end
+    
+    it 'should support ByteString' do
+      a = TypeTest.new(:name => 'bstring', :bstring => '\0')
+      a.save
+      a.reload
+      a.bstring.should == '\0'
+    end
+    
+    it 'should support Link' do
+      link = "http://example.com/" + "0" * 1000
+      a = TypeTest.new(:name => 'link', :link => link)
+      a.save
+      a.reload
+      a.link.should == link
+    end
+    
+    it 'should support Email' do
+      a = TypeTest.new(:name => 'email', :email => 'ribrdb@example.com')
+      a.save
+      a.reload
+      a.email.should == 'ribrdb@example.com'
+    end
+    
+    it 'should support Category' do
+      a = TypeTest.new(:name => 'category', :category => 'tests')
+      a.save
+      a.reload
+      a.category.should == 'tests'      
+    end
+
+    it "should support PhoneNumbers" do
+      number = '555-1212'
+      a = TypeTest.new(:name => 'phone', :phone => number)
+      a.save
+      a.reload
+      a.phone.should == number
+    end
+
+    it "should support PostalAddress" do
+      address = '345 Spear St'
+      a = TypeTest.new(:name => 'address', :address => address)
+      a.save
+      a.reload
+      a.address.should == address
+    end
+
+    it "should support Rating" do
+      rating = 34
+      a = TypeTest.new(:name => 'rating', :rating => rating)
+      a.save
+      a.reload
+      a.rating.should == 34
+    end
+
+    it "should support IMHandle" do
+      im = AppEngine::Datastore::IMHandle.new(:xmpp, 'batman@google.com')
+      a = TypeTest.new(:name => 'im', :im => im)
+      a.save
+      a.reload
+      a.im.should == im
+    end
+
+    it "should support GeoPt" do
+      latitude = 32.4
+      longitude = 72.2
+      point = AppEngine::Datastore::GeoPt.new(latitude, longitude)
+      a = TypeTest.new(:name => 'point', :point => point)
+      a.save
+      a.reload
+      a.point.should == point
+      a.point.latitude.should be_close(latitude, 0.1)
+      a.point.longitude.should be_close(longitude, 0.1)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -21,10 +21,11 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
 require 'appengine-sdk'
 AppEngine::SDK.load_apiproxy
+AppEngine::SDK.load_labs
 require 'dm-core'
 
 ADAPTERS = ['default']
 PRIMARY = {'default' => "appengine://memory"}
 
 DataMapper::Logger.new(STDERR, :debug)
-DataMapper.setup(:default, 'appengine://memory')
+DataMapper.setup(:default, 'appengine://memory')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-appengine
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,7 +9,7 @@ autorequire: dm-appengine
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -07:00
+date: 2009-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.3
+        version: 0.0.12
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
@@ -28,29 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: addressable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.10.2
     version: 
 description: A DataMapper adapter for Google App Engine
 email: ribrdb@gmail.com