dm-appengine 0.0.4 → 0.0.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "dm-appengine"
-GEM_VERSION = "0.0.4"
+GEM_VERSION = "0.0.5"
 AUTHOR = "Ryan Brown"
 EMAIL = "ribrdb@gmail.com"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
@@ -24,12 +24,14 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
   
   s.add_dependency("appengine-apis", ["~> 0.0.3"])
-  s.add_dependency(%q<dm-core>, ["~> 0.10.0"])
+  s.add_dependency("dm-core", ["~> 0.10.0"])
+  s.add_dependency("addressable")
+  s.add_dependency("extlib")
   
   s.require_path = 'lib'
   s.autorequire = GEM
-  s.files = %w(LICENSE README.rdoc Rakefile lib/appengine_adapter.rb) +
-      Dir.glob("spec/**/*")
+  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("spec/**/*") + 
+      %w(lib/appengine_adapter.rb lib/dm-appengine/types.rb)
 end
 
 task :default => :spec
@@ -55,4 +57,4 @@ task :make_spec do
   File.open("#{GEM}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end

data/lib/appengine_adapter.rb

@@ -23,6 +23,7 @@ require 'time'
 
 require 'appengine-apis/datastore'
 require 'dm-core'
+require 'dm-appengine/types'
 
 module DataMapper
   module Adapters
@@ -85,8 +86,8 @@ module DataMapper
         Datastore.put(entities)
         resources.zip(entities) do |resource, entity|
           key = entity.key
-          if serial = resource.model.serial(name)
-            serial.set!(resource, key.get_id)
+          if id = resource.model.serial(name)
+            id.set!(resource, key.get_id)
           end
           resource.instance_variable_set :@__entity__, entity
         end
@@ -208,6 +209,8 @@ module DataMapper
       
         def parse_conditions(conditions)
           case conditions
+          when NullOperation then
+            return
           when NotOperation then
             raise NotImplementedError, "NOT operator is not supported"
           when AbstractComparison then
@@ -245,7 +248,7 @@ module DataMapper
               when OrOperation  then
                 parse_or(op)
               when EqualToComparison then
-                key = parse_key(op.property, op.value)
+                key = parse_key(op.subject, op.value)
                 @keys << key
               when InclusionComparison then
                 parse_key_inclusion(op)
@@ -258,7 +261,7 @@ module DataMapper
         def parse_key_inclusion(op)
           raise NotImplementedError unless op.value.kind_of? Array
           op.value.each do |value|
-            @keys << parse_key(op.property, value)
+            @keys << parse_key(op.subject, value)
           end
         end
       
@@ -271,8 +274,11 @@ module DataMapper
             parse_conditions(conditions)
           end
         end
-      
+
         def parse_comparison(op)
+          if op.subject.kind_of?(Associations::Relationship)
+            return foreign_key_conditions(op)
+          end
           property = op.subject
           value = op.value
           if @maybe_get
@@ -308,7 +314,7 @@ module DataMapper
         def parse_range(op)
           range = op.value
           raise NotImplementedError unless range.is_a? Range
-          name = property_name(op.property)
+          name = property_name(op.subject)
           begin_op = GREATER_THAN_OR_EQUAL
           end_op = if range.exclude_end?
             LESS_THAN

data/lib/dm-appengine/types.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/ruby1.8 -w
+#
+# Copyright:: Copyright 2009 Google Inc.
+# Original Author:: Ryan Brown (mailto:ribrdb@google.com)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Custom types for App Engine
+
+require 'dm-core/type'
+
+module DataMapper
+  module Types
+    class List < Type
+      primitive ::Object
+
+      def self.dump(value, property)
+        value
+      end
+      
+      def self.load(value, property)
+        value.to_a if value
+      end
+      
+      def self._type=(type)
+        @type = type
+      end
+    end
+    
+    class Blob < Type
+      primitive String
+      size 1024 * 1024
+
+      def self.dump(value, property)
+        AppEngine::Datastore::Blob.new(value) if value
+      end
+      
+      def self.load(value, property)
+        value
+      end
+    end
+  end
+end

data/spec/dm-appengine_spec.rb

@@ -35,6 +35,9 @@ class TypeTest
   property :bigd, BigDecimal
   property :flower, Object
   property :klass, Class
+  $stderr.puts "list: #{List.primitive.ancestors})"
+  property :list, List
+  property :blob, Blob
 end
 
 class Flower
@@ -162,5 +165,20 @@ describe DataMapper::Adapters::AppEngineAdapter do
       a.reload
       a.klass.should == Flower
     end
+    
+    it 'should support List' do
+      a = TypeTest.new(:name => 'list', :list => [1, 2, 3])
+      a.save
+      a.reload
+      a.list.should == [1, 2, 3]
+      TypeTest.all(:list => 2).should == [a]
+    end
+    
+    it 'should support Blob' do
+      a = TypeTest.new(:name => 'blob', :blob => '\0')
+      a.save
+      a.reload
+      a.blob.should == '\0'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-appengine
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,7 +9,7 @@ autorequire: dm-appengine
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,26 @@ dependencies:
       - !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: 
 description: A DataMapper adapter for Google App Engine
 email: ribrdb@gmail.com
 executables: []
@@ -45,9 +65,10 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/appengine_adapter.rb
 - spec/dm-appengine_spec.rb
 - spec/spec_helper.rb
+- lib/appengine_adapter.rb
+- lib/dm-appengine/types.rb
 has_rdoc: true
 homepage: http://code.google.com/p/appengine-jruby
 licenses: []