dm-appengine 0.0.9 → 0.1.0

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "dm-appengine"
-GEM_VERSION = "0.0.9"
+GEM_VERSION = "0.1.0"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
 SUMMARY = "A DataMapper adapter for Google App Engine"
 
@@ -21,8 +21,9 @@ spec = Gem::Specification.new do |s|
   s.email = ["ribrdb@google.com", "ninja@slaphack.com"]
   s.homepage = HOMEPAGE
   
-  s.add_dependency("appengine-apis", ["~> 0.0.14"])
-  s.add_dependency("dm-core", ["0.10.2"])
+  s.add_dependency("appengine-apis", ["~> 0.0.17"])
+  s.add_dependency("dm-core", ["~> 1.0"])
+  s.add_dependency("lexidecimal", ["~> 0.0"])
   
   s.require_path = 'lib'
   s.autorequire = GEM

data/lib/appengine_adapter.rb

@@ -21,10 +21,11 @@ autoload :Date, 'date'
 autoload :DateTime, 'date'
 require 'rubygems'
 require 'time'
+require 'lexidecimal'
 
 require 'appengine-apis/datastore'
 require 'dm-core'
-require 'dm-appengine/types'
+require 'dm-appengine/properties'
 
 module DataMapper
   autoload(:AppEngineResource, 'dm-appengine/appengine_resource')
@@ -68,11 +69,11 @@ module DataMapper
             property = properties[name]
             key = convert_value(property, attributes.delete(name))
           end
-          if key.nil? || keys.first.serial? || key==0
+          if keys.first.serial? && (key.nil? || key == 0)
             entity = Datastore::Entity.new(kind)
           elsif key.kind_of?(AppEngine::Datastore::Key)
             entity = Datastore::Entity.new(key)
-          elsif key.kind_of?(Hash) && property.type == Types::Key
+          elsif key.kind_of?(Hash) && property.kind_of?(Property::Key)
             # AppEngine::Datastore::Key should already have filtered this.
             # Since it didn't, we know it's a serial object with a parent.
             entity = Datastore::Entity.new(kind, key[:parent])
@@ -91,12 +92,21 @@ module DataMapper
         Datastore.put(entities)
         resources.zip(entities) do |resource, entity|
           key = entity.key
-          if id = resource.model.serial(name)
-            id.set!(resource, key.get_id)
-          elsif id = resource.model.key(name).find{|k|k.type == Types::Key}
+          if id = resource.model.key(name).find{|k|k.kind_of? Property::Key}
             id.set!(resource, key)
+          elsif id = resource.model.serial(name)
+            # Order matters. Only sets to numeric id if it's a serial non-key.
+            id.set!(resource, key.get_id)
+          end
+          resource.instance_variable_set(:@__entity__, entity)
+          
+          # TODO: We shouldn't be messing with keys like this.
+          # On the other hand, should keys be assuming they don't change?
+          # How does serial even work when dealing with true autoincrements?
+          # I guess it's just not valid?
+          if resource.instance_variable_defined?(:@_key)
+            resource.send(:remove_instance_variable, :@_key)
           end
-          resource.instance_variable_set :@__entity__, entity
         end
         return created
       end
@@ -120,15 +130,15 @@ module DataMapper
       end
 
       def convert_value(property, value)
-        value = property.value(value)
-        if property.type == DataMapper::Types::Text && value
+        value = property.dump(value)
+        if property.kind_of?(Property::Text) && value
           AppEngine::Datastore::Text.new(value)
+        elsif property.kind_of?(Property::Decimal) && value
+          Lexidecimal.decimal_to_string(value)
         else
           case value
           when Date, DateTime
             Time.parse(value.to_s)
-          when BigDecimal
-            value.to_s
           when Class
             value.name
           else
@@ -249,7 +259,7 @@ module DataMapper
           unless property.key?
             raise ArgumentError, "#{property_name(property)} is not the key"
           end
-          Types::Key.typecast(value, property)
+          Property::Key.typecast_to_primitive(property, value)
         end
       
         def parse_or(or_op)
@@ -318,7 +328,7 @@ module DataMapper
         
           if op.kind_of?(InclusionComparison)
             parse_inclusion(op)
-          elsif property.type == Types::AncestorKey
+          elsif property.kind_of?(Property::AncestorKey)
             @query.ancestor = value
           else
             if negated
@@ -393,7 +403,8 @@ module DataMapper
           hashes = entities.map do |entity|
             entity_to_hash(key_prop, entity)
           end
-          resources = @model.load(hashes, @dm_query)
+          hashes.compact!
+          resources = hashes.empty? ? hashes : @model.load(hashes, @dm_query)
           resources.zip(entities) do |resource, entity|
             resource.instance_variable_set :@__entity__, entity
           end
@@ -408,15 +419,21 @@ module DataMapper
           @dm_query.fields.each do |property|
             name = property.field
             if property.key?
-              if property.serial?
-                hash[name] = key.get_id
-              elsif property.type == String
-                hash[name] = key.get_name
+              hash[name] = if property.kind_of? Property::Key
+                key
+              elsif property.serial?
+                key.get_id
+              elsif property.kind_of? Property::String
+                key.get_name
               else
-                hash[name] = key
+                key
               end
             else
-              hash[name] = property.typecast(entity.get_property(name))
+              value = entity.get_property(name)
+              if property.kind_of?(Property::Decimal) && value
+                value = Lexidecimal.string_to_decimal(entity.get_property(name))
+              end
+              hash[name] = value
             end
           end
           hash

data/lib/dm-appengine/is_entity.rb

@@ -75,14 +75,14 @@ module DataMapper
         end
         
         def ancestor_property(name)
-          property name, Types::AncestorKey
+          property name, Property::AncestorKey
           # We don't want to ever set this. It's just for queries.
           undef_method name
           undef_method :"#{name}="
         end
         
         def primary_key(name)
-          property name, DataMapper::Types::Key, :key => true
+          property name, Property::Key, :key => true
         end
         
         def parent_property(name)
@@ -104,7 +104,7 @@ module DataMapper
           variable = :"@#{name}"
           
           if add_id_property
-            property key_getter, Types::Key
+            property key_getter, Property::Key
           end
           
           define_method(name) do

data/lib/dm-appengine/properties.rb

@@ -0,0 +1,21 @@
+module DataMapper
+  class Property
+    prefix = 'dm-appengine/properties'
+    
+    class_mapping = [
+      ['key', [:AncestorKey, :Key]],
+      ['native', [:AppEngineNative, :IMHandle, :GeoPt, :User]],
+      ['string', [:AppEngineStringType, :Blob, :ByteString, :Link, :Email,
+                  :Category, :PhoneNumber, :PostalAddress]],
+      ['rating', [:Rating]],
+      ['list', [:List]]
+    ]
+    
+    class_mapping.each do |name, classes|
+      path = "#{prefix}/#{name}"
+      classes.each do |klass|
+        autoload(klass, path)
+      end
+    end
+  end
+end

data/lib/dm-appengine/properties/key.rb

@@ -0,0 +1,92 @@
+module DataMapper
+  class Property
+    class Key < Object
+      primitive AppEngine::Datastore::Key
+      include PassThroughLoadDump
+      
+      def dump(value)
+        typecast(value)
+      end
+      def load(value)
+        value
+      end
+      
+      def typecast(value)
+        if value.nil?
+          value
+        else
+          super
+        end
+      end
+      
+      def self.typecast_to_primitive(property, value)
+        case value
+          when ::AppEngine::Datastore::Key, ::NilClass
+            value
+          when ::Integer, ::String
+            AppEngine::Datastore::Key.from_path(kind(property), value)
+          when ::Symbol
+            AppEngine::Datastore::Key.from_path(kind(property), value.to_s)
+          when ::Hash
+            parent = self.typecast_to_primitive(property, value[:parent])
+            id = value[:id]
+            name = value[:name]
+            if id
+              id_or_name = id.to_i
+            elsif name
+              id_or_name = name.to_s
+            end
+            if parent
+              id_or_name ||= 0
+              parent.getChild(kind(property), id_or_name)
+            else
+              self.typecast_to_primitive(property, property.typecast(id_or_name))
+            end
+          else
+            raise ArgumentError, "Unsupported key value #{value.inspect} (a #{value.class})"
+        end
+      end
+      
+      def self.kind(property)
+        property.model.repository.adapter.kind(property.model)
+      end
+      
+      def typecast_to_primitive(value)
+        self.class.typecast_to_primitive(self, value)
+      end
+      
+      accept_options :serial
+      
+      # THIS IS A HACK.
+      # I'm not sure the best way to do this. The key is not technically required at
+      # object creation time, but should be seen as required after that.
+      def initialize(model, name, options = {}, type = nil)
+        super
+        @serial = options.fetch(:serial, @key)
+      end
+      
+      VALID_KEY_OPTS = Set.new([:id, :name, :parent]).freeze
+      
+      def valid?(value, negated = false)
+        if value.kind_of? Hash
+          return false unless value.keys.all?{|k| VALID_KEY_OPTS.include? k}
+          !(value[:id] && value[:name])
+        else
+          super
+        end
+      end
+    end
+    
+    # Hack to allow a property defined as AppEngine::Datastore::Key to work.
+    # This is needed for associations -- child_key tries to define it as
+    # the primitive of the parent key type. It then takes that type name and
+    # tries to resolve it in DM::Property, so we catch it here.
+    module Java
+      module ComGoogleAppengineApiDatastore
+      end
+    end
+    Java::ComGoogleAppengineApiDatastore::Key = Key
+    
+    class AncestorKey < Key; end
+  end
+end

data/lib/dm-appengine/properties/list.rb

@@ -0,0 +1,15 @@
+module DataMapper
+  class Property
+    class List < Object
+      primitive ::Object
+      
+      def dump(value)
+        value
+      end
+      
+      def load(value)
+        value
+      end
+    end
+  end
+end

data/lib/dm-appengine/properties/native.rb

@@ -0,0 +1,16 @@
+module DataMapper
+  class Property
+    class AppEngineNative < Property
+      primitive ::Object
+      
+      def dump(value)
+        value
+      end
+      
+      def load(value)
+        value
+      end
+    end
+    IMHandle = GeoPt = User = AppEngineNative
+  end
+end

data/lib/dm-appengine/properties/rating.rb

@@ -0,0 +1,13 @@
+module DataMapper
+  class Property
+    class Rating < Integer
+      def self.dump(value, property)
+        AppEngine::Datastore::Rating.new(typecast(value)) if value
+      end
+      
+      def self.load(value, property)
+        value.rating if value
+      end
+    end
+  end
+end

data/lib/dm-appengine/properties/string.rb

@@ -0,0 +1,70 @@
+module DataMapper
+  class Property
+    class AppEngineStringType < String
+      def self.dump(value, property)
+        if value.nil?
+          nil
+        else
+          typecast(value)
+        end
+      end
+      
+      def self.load(value, property)
+        value
+      end
+      
+      def typecast_to_primitive(value)
+        primitive.new(value) if value
+      end
+      
+      #Overriding the default string length.
+      def initialize(model, name, options = {}, type = nil)
+        super
+        @length = @options.fetch(:length, self.class.length)
+      end
+      
+      def self.inherited klass
+        klass.extend ClassMethods
+      end
+      
+      module ClassMethods
+        attr_accessor :length
+      end
+    end
+    
+    class Blob < AppEngineStringType
+      primitive AppEngine::Datastore::Blob
+      self.length = 1024 * 1024
+    end
+    
+    class ByteString < AppEngineStringType
+      primitive AppEngine::Datastore::ByteString
+      self.length = 500
+    end
+    
+    class Link < AppEngineStringType
+      primitive AppEngine::Datastore::Link
+      self.length = 2038
+    end
+    
+    class Email < AppEngineStringType
+      primitive AppEngine::Datastore::Email
+      self.length = 500
+    end
+    
+    class Category < AppEngineStringType
+      primitive AppEngine::Datastore::Category
+      self.length = 500
+    end
+    
+    class PhoneNumber < AppEngineStringType
+      primitive AppEngine::Datastore::PhoneNumber
+      self.length = 500
+    end
+    
+    class PostalAddress < AppEngineStringType
+      primitive AppEngine::Datastore::PostalAddress
+      self.length = 500
+    end
+  end
+end

data/spec/dm-appengine_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 
 require File.dirname(__FILE__) + '/spec_helper'
-require 'dm-core/spec/adapter_shared_spec'
+require 'dm-core/spec/shared/adapter_spec'
 
 class TextTest
   include DataMapper::Resource
@@ -32,7 +32,7 @@ class TypeTest
   property :time, Time
   property :date, Date
   property :datetime, DateTime
-  property :bigd, BigDecimal
+  property :decimal, Decimal
   property :flower, Object
   property :klass, Class
   property :list, List
@@ -69,9 +69,23 @@ class KeyTest
   property :string, String
 end
 
+class Person
+  include DataMapper::AppEngineResource
+  
+  property :name, String
+  property :type, Discriminator
+end
+
+class Male < Person; end
+class Father < Male; end
+class Son < Male;    end
+
+class Woman < Person;   end
+class Mother < Woman;   end
+class Daughter < Woman; end
+
 describe DataMapper::Adapters::AppEngineAdapter do
   before :all do
-    AppEngine::Testing.install_test_env
     AppEngine::Testing.install_test_datastore
   end
 
@@ -160,12 +174,12 @@ describe DataMapper::Adapters::AppEngineAdapter do
       a.datetime.should == date
     end
     
-    it 'should support BigDecimal' do
+    it 'should support Decimal' do
       one = BigDecimal.new('1.0')
-      a = TypeTest.new(:name => 'bigd', :bigd => one)
+      a = TypeTest.new(:name => 'bigd', :decimal => one)
       a.save
       a.reload
-      a.bigd.should == one
+      a.decimal.should == one
     end
     
     it 'should support Object' do
@@ -188,7 +202,7 @@ describe DataMapper::Adapters::AppEngineAdapter do
       a = TypeTest.new(:name => 'list', :list => [1, 2, 3])
       a.save
       a.reload
-      a.list.should == [1, 2, 3]
+      a.list.to_a.should == [1, 2, 3]
       TypeTest.all(:list => 2).should == [a]
     end
     
@@ -407,15 +421,47 @@ describe DataMapper::Adapters::AppEngineAdapter do
       parent = KeyTest.create(:string => 'foo')
       key = parent.appengine_key
       key.should be_kind_of AppEngine::Datastore::Key
-      key.should_not_receive :getChild
       
-      child = KeyTest.create(:appengine_key => {:parent => key})
+      child = KeyTest.new(:appengine_key => {:parent => key})
       child_key = child.appengine_key
       child_key.should be_kind_of AppEngine::Datastore::Key
       child_key.parent.should == key
+      child_key.inspect.should =~ /no-id-yet/
+      
+      child.save
       
       child_key.id.should_not be_nil
       child_key.id.should be > 0
     end
   end
+
+  it 'should allow children to be created' do
+    Daughter.create(:name => 'Jill')
+  end
+  
+  describe 'with a parent and child' do
+    before :each do
+      @daughter = Daughter.create :name => 'Jill'
+      @mother = Mother.create :name => 'Mom'
+      @person = Person.create :name => 'nobody'
+    end
+    
+    it 'Should be possible to find the daughter under the daughter class' do
+      Daughter.first.name.should == 'Jill'
+      Daughter.first(:name => 'Jill').should_not be_nil
+    end
+    
+    it 'Should be possible to find the daughter under the parent class' do
+      Woman.first(:name => 'Jill').should_not be_nil
+    end
+    
+    it 'Should not be possible to find the daughter under a sibling class' do
+      Mother.first(:name => 'Jill').should be_nil
+    end
+    
+    it 'Should not be possible to find parent classes under the child class' do
+      Person.first(:name => 'nobody').should_not be_nil
+      Daughter.first(:name => 'nobody').should be_nil
+    end
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-appengine
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ryan Brown
@@ -15,37 +16,55 @@ autorequire: dm-appengine
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -07:00
+date: 2010-06-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: appengine-apis
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 0
         - 0
-        - 14
-        version: 0.0.14
+        - 17
+        version: 0.0.17
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 10
-        - 2
-        version: 0.10.2
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: lexidecimal
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 0
+        version: "0.0"
+  type: :runtime
+  version_requirements: *id003
 description: A DataMapper adapter for Google App Engine
 email: 
 - ribrdb@google.com
@@ -65,9 +84,14 @@ files:
 - spec/dm-is-entity_spec.rb
 - spec/spec_helper.rb
 - lib/appengine_adapter.rb
+- lib/dm-appengine/properties/rating.rb
+- lib/dm-appengine/properties/list.rb
+- lib/dm-appengine/properties/string.rb
+- lib/dm-appengine/properties/key.rb
+- lib/dm-appengine/properties/native.rb
+- lib/dm-appengine/properties.rb
 - lib/dm-appengine/appengine_resource.rb
 - lib/dm-appengine/is_entity.rb
-- lib/dm-appengine/types.rb
 has_rdoc: true
 homepage: http://code.google.com/p/appengine-jruby
 licenses: []
@@ -78,23 +102,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A DataMapper adapter for Google App Engine

data/lib/dm-appengine/types.rb

@@ -1,202 +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 types for App Engine
-
-require 'dm-core/type' unless defined? DataMapper::Type::PROPERTY_OPTIONS
-require 'dm-core/property' unless defined? DataMapper::Property::PRIMITIVES
-
-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 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::Rating.new(value) if value
-      end
-      
-      def self.load(value, property)
-        value.rating if value
-      end
-    end
-    
-    IMHandle = GeoPt = User = AppEngineNativeType
-    
-    class Key < Type
-      primitive AppEngine::Datastore::Key
-      
-      def self.dump(value, property)
-        property.typecast(value)
-      end
-      
-      def self.load(value, property)
-        value
-      end
-      
-      def self.typecast(value, property)
-        case value
-        when AppEngine::Datastore::Key, NilClass
-          value
-        when Integer, String
-          AppEngine::Datastore::Key.from_path(kind(property), value)
-        when Symbol
-          AppEngine::Datastore::Key.from_path(kind(property), value.to_s)
-        when Hash
-          parent = property.typecast(value[:parent])
-          id = value[:id]
-          name = value[:name]
-          if id
-            id_or_name = id.to_i
-          elsif name
-            id_or_name = name.to_s
-          end
-          if parent
-            if id_or_name || (!property.key?)
-              parent.getChild(kind(property), id_or_name)
-            else
-              # TODO: is it sane to not typecast this?
-              value
-            end
-          else
-            property.typecast(id_or_name)
-          end
-        else
-          raise ArgumentError, "Unsupported key value #{value.inspect} (a #{value.class})"
-        end
-      end
-      
-      def self.kind(property)
-        property.model.repository.adapter.kind(property.model)
-      end
-    end
-    
-    # Hacks for primitive types.
-    # AppEngine::Datastore::Key truly IS a primitive,
-    # as far as AppEngine is concerned.
-    original_primitives = Property::PRIMITIVES
-    Property::PRIMITIVES = (original_primitives.dup << AppEngine::Datastore::Key).freeze
-    
-    # Hack to allow a property defined as AppEngine::Datastore::Key to work.
-    # This is needed for associations -- child_key tries to define it as
-    # the primitive of the parent key type. It then takes that type name and
-    # tries to resolve it in DM::Types, so we catch it here.
-    module Java
-      module ComGoogleAppengineApiDatastore
-      end
-    end
-    Java::ComGoogleAppengineApiDatastore::Key = Key
-    
-    # Should NOT be used directly!
-    # Also, should be sharing these better...
-    class AncestorKey < Type
-      primitive AppEngine::Datastore::Key
-      def self.dump(value, property)
-        property.typecast(value)
-      end
-      
-      def self.load(value, property)
-        value
-      end
-      
-      def self.typecast(value, property)
-        Key.typecast(value, property)
-      end
-    end
-    
-    # TODO store user as email and id?
-  end
-end