dm-appengine 0.0.2 → 0.0.3

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "dm-appengine"
-GEM_VERSION = "0.0.2"
+GEM_VERSION = "0.0.3"
 AUTHOR = "Ryan Brown"
 EMAIL = "ribrdb@gmail.com"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
@@ -28,7 +28,8 @@ spec = Gem::Specification.new do |s|
   
   s.require_path = 'lib'
   s.autorequire = GEM
-  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README.rdoc Rakefile lib/appengine_adapter.rb) +
+      Dir.glob("spec/**/*")
 end
 
 task :default => :spec

data/lib/appengine_adapter.rb

@@ -21,8 +21,6 @@ require 'date'
 require 'rubygems'
 require 'time'
 
-gem 'appengine-apis', '~> 0.0.6'
-
 require 'appengine-apis/datastore'
 require 'dm-core'
 
@@ -359,13 +357,13 @@ module DataMapper
           # TODO: This is broken. We should be setting all properties
           return if entity.nil?
           key = entity.get_key
-          hash = entity.to_hash
+          hash = {}
           @dm_query.fields.each do |property|
             name = property.field
             if property.key?
               hash[name] = key.get_name || key.get_id
             else
-              hash[name] = property.typecast(hash[name])
+              hash[name] = property.typecast(entity.get_property(name))
             end
           end
           hash

data/spec/spec_helper.rb

@@ -19,7 +19,9 @@ $TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
-require 'dm-appengine'
+require 'appengine-sdk'
+AppEngine::SDK.load_apiproxy
+require 'dm-core'
 
 ADAPTERS = ['default']
 PRIMARY = {'default' => "appengine://memory"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-appengine
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,7 +9,7 @@ autorequire: dm-appengine
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,9 +46,6 @@ files:
 - README.rdoc
 - Rakefile
 - 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

data/lib/dm-appengine.rb-custom_resource

@@ -1,365 +0,0 @@
-#!/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.
-#
-# Datamapper adapter for Google App Engine
-
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) ||
-  $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'rubygems'
-gem 'appengine-apis', '~> 0.0.3'
-
-require 'appengine-apis/datastore'
-require 'dm-core'
-require 'dm-appengine/appengine_resource'
-
-module DataMapper
-  module Adapters
-    class AppEngineAdapter < AbstractAdapter
-      Datastore = AppEngine::Datastore
-
-      def initialize(name, uri_or_options)
-        super
-        if uri_or_options.kind_of? Hash
-          options = uri_or_options
-          if options['host'] == 'memory'
-            require 'appengine-apis/testing'
-            begin
-              AppEngine::ApiProxy.get_app_id
-            rescue NoMethodError
-              AppEngine::Testing::install_test_env
-            end
-            AppEngine::Testing::install_test_datastore
-          end
-        end
-        @resource_naming_convention = lambda do |value|
-          Extlib::Inflection.pluralize(Extlib::Inflection.camelize(value))
-        end
-      end
-
-      def kind(model)
-        model.storage_name(name)
-      end
-
-      def create(resources)
-        created = 0
-        entities = []
-        resources.each do |resource|
-          attributes = resource.attributes
-          
-          entity = create_entity(resource)
-          
-          attributes.each do |name, value|
-            unless name =~ /^__.+__$/
-              entity.set_property(name.to_s, value)
-            end
-          end
-          entities << entity
-          created += 1
-        end
-        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)
-          end
-          resource.instance_variable_set :@__entity__, entity
-        end
-        return created
-      end
-
-      def read(query)
-        query = QueryBuilder.new(query, kind(query.model), self)
-        query.run
-      end
-
-      def update(attributes, collection)
-        attributes = attributes_as_fields(attributes)
-        entities = collection.collect do |resource|
-          entity = resource.instance_variable_get :@__entity__
-          entity.update(attributes)
-        end
-
-        Datastore.put(entities)
-        entities.size
-      end
-
-      def delete(collection)
-        keys = collection.collect do |resource|
-          entity = resource.instance_variable_get :@__entity__
-          entity.key
-        end
-        Datastore.delete(keys)
-      end
-      
-      private
-      
-      def create_entity(resource)
-        kind = self.kind(resource.model)
-        parent, name = resource.appengine_key_components(resource.repository)
-        if name.kind_of? Integer
-          if name == 0
-            name = nil
-          else
-            raise ArgumentError, 'Numeric ids must be assigned by the Datastore'
-          end
-        end
-        if name
-          Datastore::Entity.new(kind, name, parent)
-        elsif parent
-          Datastore::Entity.new(kind, parent)
-        else
-          Datastore::Entity.new(kind)
-        end
-      end
-    
-      class QueryBuilder
-        import Datastore::JavaDatastore::FetchOptions
-        include Datastore::Query::Constants
-        @@OPERATORS = {
-          Conditions::EqualToComparison => EQUAL,
-          Conditions::GreaterThanComparison => GREATER_THAN,
-          Conditions::GreaterThanOrEqualToComparison => GREATER_THAN_OR_EQUAL,
-          Conditions::LessThanComparison => LESS_THAN,
-          Conditions::LessThanOrEqualToComparison => LESS_THAN_OR_EQUAL,
-          }.freeze
-      
-        def initialize(query, kind, adapter)
-          @model = query.model
-          @kind = kind
-          @limit = query.limit
-          @offset = query.offset
-          @maybe_get = true
-          @must_be_get = false
-          @keys = []
-          @dm_query = query
-          @adapter_name = adapter.name
-        
-          @query = Datastore::Query.new(kind)
-          parse_order(query.order)
-          parse_conditions(query.conditions)
-          raise NotImplementedError if @must_be_get && !@maybe_get
-        end
-      
-        def property_name(property, qualify=false)
-          if qualify
-            table_name = property.model.storage_name(name)
-            "#{table_name}.#{property.field}"
-          else
-            property.field
-          end
-        end
-      
-        def parse_order(order)
-          if order.size == 1 && order[0].direction != :desc
-            if order[0].property.key?
-              # omit the default key ordering.
-              # This lets inequality filters work
-              return
-            end
-          end
-          order.map do |order|
-            if order.direction == :desc
-              direction = DESCENDING
-            else
-              direction = ASCENDING
-            end
-            name = if order.property.key?
-              '__key__'
-            else
-              property_name(order.property)
-            end
-            @query.sort(name, direction)
-          end
-        end
-      
-        def parse_conditions(conditions)
-          case conditions
-          when Conditions::NotOperation then
-            raise NotImplementedError, "NOT operator is not supported"
-          when Conditions::AbstractComparison then
-            parse_comparison(conditions)
-          when Conditions::OrOperation  then
-            parse_or(conditions)
-          when Conditions::AndOperation then
-            parse_and(conditions)
-          else
-            raise ArgumentError, "invalid conditions #{conditions.class}: #{conditions.inspect}"
-          end
-        end
-
-        def parse_key(property, value)
-          unless property.key?
-            raise ArgumentError, "#{property_name(property, true)} is not the key"
-          end
-          case value
-          when Integer, String
-            Datastore::Key.from_path(@kind, value)
-          when Symbol
-            Datastore::Key.from_path(@kind, value.to_s)
-          else
-            raise ArgumentError "Unsupported key value #{value.inspect} (a #{value.class})"
-          end
-        end
-      
-        def parse_or(or_op)
-          if !@maybe_get
-            raise NotImplementedError, "OR only supported with key equality comparisons"
-          end
-          @must_be_get = true
-          or_op.operands.each do |op|
-            case op
-              when Conditions::OrOperation  then
-                parse_or(op)
-              when Conditions::EqualToComparison then
-                key = parse_key(op.property, op.value)
-                @keys << key
-              when Conditions::InclusionComparison then
-                parse_key_inclusion(op)
-              else
-                raise NotImplementedError, "Unsupported condition #{op.class} inside OR"
-            end
-          end
-        end
-      
-        def parse_key_inclusion(op)
-          raise NotImplementedError unless op.value.kind_of? Array
-          op.value.each do |value|
-            @keys << parse_key(op.property, value)
-          end
-        end
-      
-        def parse_and(op)
-          if @maybe_get && (@found_and || op.operands.size > 1)
-            @maybe_get = false
-          end
-          @found_and = true
-          op.operands.each do |conditions|
-            parse_conditions(conditions)
-          end
-        end
-      
-        def parse_comparison(op)
-          property = op.property
-          value = op.value
-          if @maybe_get
-            if property.key?
-              case op
-              when Conditions::EqualToComparison 
-                @keys << parse_key(property, value)
-              when Conditions::InclusionComparison
-                parse_key_inclusion(op)
-                @must_be_get = true
-                return
-              else
-                @maybe_get = false
-              end
-            elsif ['__ancestor__', '__parent__'].include? property.field
-              if value.java_kind_of? AppEngine::Datastore::Key
-                query.ancestor = value
-              else
-                query.ancestor = value.entity.key
-              end
-              return
-            else
-              @maybe_get = false
-            end
-          end
-        
-          if op.kind_of? Conditions::InclusionComparison
-            parse_range(op)
-          else
-            filter_op = @@OPERATORS[op.class]
-            if filter_op.nil?
-              raise ArgumentError, "#{op.class} is not a supported comparison"
-            end
-            @query.filter(property_name(op.property), filter_op, op.value)
-          end
-        end
-      
-        def parse_range(op)
-          range = op.value
-          raise NotImplementedError unless range.is_a? Range
-          name = property_name(op.property)
-          begin_op = GREATER_THAN_OR_EQUAL
-          end_op = if range.exclude_end?
-            LESS_THAN
-          else
-            LESS_THAN_OR_EQUAL
-          end
-          @query.filter(name, begin_op, range.begin)
-          @query.filter(name, end_op, range.end)
-        end
-      
-        def is_get?
-          @maybe_get && @keys.size > 0
-        end
-      
-        def get_entities
-          if is_get?
-            Datastore.get(@keys)
-          else
-            begin
-              chunk_size = FetchOptions::DEFAULT_CHUNK_SIZE
-              options = FetchOptions::Builder.with_chunk_size(
-                  chunk_size)
-              options.limit(@limit) if @limit
-              options.offset(@offset) if @offset
-              @query.iterator(options).collect {|e| e}
-            rescue java.lang.IllegalArgumentException => ex
-              raise ArgumentError, ex.message
-            end
-          end
-        end
-      
-        def run
-          key_prop = @model.key(@adapter_name)[0].field
-          get_entities.map do |entity|
-            entity_to_model(key_prop, entity)
-          end
-        end
-      
-        def entity_to_model(key_prop, entity)
-          # TODO: This is broken. We should be setting all properties
-          return if entity.nil?
-          props = entity.to_hash
-          props['__entity__'] = entity
-          props['__parent__'] = entity.key.parent
-
-          key = entity.get_key
-          id_or_name = key.get_name || key.get_id
-
-          @dm_query.fields.map do |property|
-            if property.key? && property.type == id_or_name.class
-              props[property.field] = id_or_name
-              break
-            end
-          end
-          props
-        end
-      
-        def keys
-          @keys
-        end
-      end
-    end
-    
-    # required naming scheme
-    AppengineAdapter = AppEngineAdapter
-  end
-end

data/lib/dm-appengine/appengine_resource.rb

@@ -1,34 +0,0 @@
-#!/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 Resource class for App Engine. Adds optimistic transaction support.
-
-module DataMapper
-  module AppEngineResource
-    
-    def self.included(mod)
-      mod.class_eval do
-        include DataMapper::Resource
-        
-        def transaction(retries=3, &block)
-          AppEngine::Datastore.transaction(retries, &block)
-        end
-      end
-    end
-    
-  end
-end

data/lib/dm-appengine/transactions.rb

@@ -1,26 +0,0 @@
-#!/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.
-#
-# Datamapper adapter for Google App Engine
-
-require 'appengine-apis/datastore'
-
-module AppEngine::Datastore
-  class DMTransaction
-    
-  end
-end