dm-appengine 0.0.3 → 0.0.4

data/Rakefile

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

data/lib/appengine_adapter.rb

@@ -62,13 +62,13 @@ module DataMapper
           properties = model.properties(repository.name)
           
           kind = self.kind(model)
-          keys = model.key(repository.name)
+          keys = properties.key
           raise "Multiple keys in #{resource.inspect}" if keys.size > 1
           if keys.size == 1
-            key = attributes.delete(keys[0].name)
+            key = attributes.delete(keys.first.name)
             key = key.to_s if key
           end
-          if key && !(key == 0 || keys[0].serial?)
+          if key && !(key == 0 || keys.first.serial?)
             entity = Datastore::Entity.new(kind, key)
           else
             entity = Datastore::Entity.new(kind)
@@ -85,8 +85,8 @@ module DataMapper
         Datastore.put(entities)
         resources.zip(entities) do |resource, entity|
           key = entity.key
-          if identity_field = resource.model.identity_field(name)
-            identity_field.set!(resource, key.get_name || key.get_id)
+          if serial = resource.model.serial(name)
+            serial.set!(resource, key.get_id)
           end
           resource.instance_variable_set :@__entity__, entity
         end
@@ -273,7 +273,7 @@ module DataMapper
         end
       
         def parse_comparison(op)
-          property = op.property
+          property = op.subject
           value = op.value
           if @maybe_get
             if property.key?
@@ -299,8 +299,8 @@ module DataMapper
             if filter_op.nil?
               raise ArgumentError, "#{op.class} is not a supported comparison"
             end
-            name = property_name(op.property)
-            value = property_value(op.property, op.value)
+            name = property_name(op.subject)
+            value = property_value(op.subject, op.value)
             @query.filter(name, filter_op, value)
           end
         end
@@ -341,7 +341,7 @@ module DataMapper
         end
       
         def run
-          key_prop = @model.key(@adapter_name)[0].field
+          key_prop = @model.key(@adapter_name).first.field
           entities = get_entities
           hashes = entities.map do |entity|
             entity_to_hash(key_prop, entity)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-appengine
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,7 +9,7 @@ autorequire: dm-appengine
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency