appengine-apis 0.0.4 → 0.0.5

data/lib/appengine-apis.rb

@@ -19,5 +19,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module AppEngine
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/appengine-apis/datastore.rb

@@ -209,17 +209,23 @@ module Datastore
       retries -= 1
       tx = begin_transaction
       begin
-        result = yield
-        tx.commit
-        return result
+        convert_exceptions do
+          result = yield
+          tx.commit
+          return result
+        end
       rescue Rollback
-        tx.rollback
-        return nil
-      rescue TransactionFailed
+        convert_exceptions do
+          tx.rollback
+          return nil
+        end
+      rescue TransactionFailed => ex
         raise ex unless retries >= 0
       ensure
         begin
-          tx.rollback
+          convert_exceptions do
+            tx.rollback
+          end
         rescue java.lang.IllegalStateException
           # already commited/rolled back. ignore
         rescue java.util.NoSuchElementException
@@ -490,6 +496,22 @@ module Datastore
       options
     end
     
+    def inspect
+      output = "<Query("
+      query = java_query
+      output << query.kind if query.kind
+      output << ", " if query.ancestor && query.kind
+      output << query.ancestor.inspect if query.ancestor
+      output << ")"
+      query.filter_predicates.each do |pred|
+        output << " (#{pred.property_name.inspect} #{pred.operator.name} #{pred.value.inspect})"
+      end
+      query.sort_predicates.each do |pred|
+        output << " (ORDER BY #{pred.property_name.inspect} #{pred.direction.name})"
+      end
+      output
+    end
+    
     private
     def clear_cache
       @pquery = nil

data/lib/appengine-apis/datastore_types.rb

@@ -23,7 +23,7 @@ require 'java'
 
 class Time
   def to_java
-    java.util.Date.new(to_i * 1000)
+    java.util.Date.new(tv_sec * 1000 + tv_usec / 1000)
   end
 
   def self.new_from_java(date)

data/lib/appengine-apis/memcache.rb

@@ -21,7 +21,7 @@ require 'appengine-apis/datastore_types'
 module AppEngine
   
   # The Ruby API for the App Engine Memcache service. This offers a fast
-  # distrubted cache for commonly-used data. The cache is limited both in
+  # distributed cache for commonly-used data. The cache is limited both in
   # duration and also in total space, so objects stored in it may be discarded
   # at any time.
   # 

data/lib/appengine-apis/sdk.rb

@@ -19,11 +19,25 @@
 require 'java'
 
 module AppEngine
+
+  DEV_APPSERVER = 'com.google.appengine.tools.development.DevAppServerMain'
   
   # Helper methods to locate the App Engine SDK and add it to the class path.
   module SDK
     class << self
 
+      # Tries to load the Kickstart class.
+      def load_kickstart
+        tools = %w{lib appengine-tools-api.jar}
+        cp = java.lang.System.get_property('java.class.path')
+        jar = sdk_path(*tools)
+        sep = java.io.File::pathSeparator
+        java.lang.System.set_property('java.class.path', "#{jar}#{sep}#{cp}")
+        with_jars(tools) do
+          return Java.ComGoogleAppengineTools.KickStart
+        end
+      end
+
       # Tries to load the ApiProxy class.
       def load_apiproxy
         with_jars(%w{lib impl appengine-api.jar}) do
@@ -41,6 +55,12 @@ module AppEngine
         end
       end
       
+      def load_appcfg
+        with_jars(%w{lib appengine-tools-api.jar}) do
+          return Java.ComGoogleAppengineToolsAdmin.AppCfg
+        end
+      end
+      
       def with_jars(*jars)  # :nodoc:
         begin
           failed = false
@@ -93,4 +113,4 @@ module AppEngine
       end
     end
   end
-end
+end

data/lib/appengine-apis/testing.rb

@@ -37,13 +37,15 @@ module AppEngine
       
       attr_writer :appid, :version, :email, :admin
       attr_writer :auth_domain, :request_namespace, :default_namespace
+      attr_reader :attributes
       
       def initialize
         @appid = "test"
         @version = "1.0"
-        @auth_domain = @request_namespace = "gmail.com"
-        @default_namespace = ""
+        @auth_domain= "gmail.com"
+        @default_namespace = @request_namespace  = ""
         @email = ""
+        @attributes = java.util.HashMap.new
       end
       
       def getAppId
@@ -82,6 +84,10 @@ module AppEngine
         @default_namespace = s
       end
       
+      def getAttributes
+        @attributes
+      end
+      
       def inspect
         "#<TestEnv>"
       end

data/lib/appengine-apis/urlfetch.rb

@@ -139,7 +139,7 @@ module AppEngine
       end
       
       if payload
-        request.set_payload(payload.as_java_bytes)
+        request.set_payload(payload.to_java_bytes)
       end
       
       return request

data/spec/datastore_spec.rb

@@ -59,37 +59,33 @@ describe AppEngine::Datastore do
   end
 
   it "should support failed transactions" do
-    pending("Real local transactions") do
-      a = Datastore::Entity.new("A")
-      a[:a] = 0
-      Datastore.put(a)
-      p = lambda do
-        Datastore.transaction do
-          a2 = Datastore.get(a.key)
-          a[:a] += 1
-          Datastore.put(nil, a)
-          Datastore.put(a2)
-        end
+    a = Datastore::Entity.new("A")
+    a[:a] = 0
+    Datastore.put(a)
+    p = lambda do
+      Datastore.transaction do
+        a2 = Datastore.get(a.key)
+        a[:a] += 1
+        Datastore.put(nil, a)
+        Datastore.put(a2)
       end
-      p.should raise_error Datastore::TransactionFailed
     end
+    p.should raise_error Datastore::TransactionFailed
   end
 
   it "should retry transactions" do
-    pending("Real local transactions") do
-      a = Datastore::Entity.new("A")
-      a[:a] = 0
-      Datastore.put(a)
-      Datastore.transaction(3) do
-        a2 = Datastore.get(a.key)
-        a[:a] += 1
-        Datastore.put(nil, a) if a[:a] < 3
-        a2[:a] = "2: #{a2[:a]}"
-        Datastore.put(a2)
-      end
-  
-      Datastore.get(a.key)[:a].should == '2: 2'
+    a = Datastore::Entity.new("A")
+    a[:a] = 0
+    Datastore.put(a)
+    Datastore.transaction(3) do
+      a2 = Datastore.get(a.key)
+      a[:a] += 1
+      Datastore.put(nil, a) if a[:a] < 3
+      a2[:a] = "2: #{a2[:a]}"
+      Datastore.put(a2)
     end
+
+    Datastore.get(a.key)[:a].should == '2: 2'
   end
   
   it "should close transactions" do
@@ -126,7 +122,7 @@ describe AppEngine::Datastore::Query do
   end
   
   it 'should support symbol ops' do
-    q = Query.new("Foo")
+    q = Query.new("A")
     q.set_ancestor(@a.key).sort('name').filter(
         'name', :==, 'aa')
     q.fetch.to_a.should == [@aa]

data/spec/datastore_types_spec.rb

@@ -25,20 +25,16 @@ describe AppEngine::Datastore::Key do
     a1.should == a2
     a2.should.eql? a1
     a1.hash.should == a2.hash
-    pending("Key.compareTo") do
-      (a1 <=> a2).should == 0
-    end
+    (a1 <=> a2).should == 0
   end
 
   it "should support <=>" do
-    pending("Key.compareTo") do
-      a1 = Key.from_path("A", 1)
-      a2 = Key.from_path("A", 2)
-      a1.should < a2
-      a2.should > a1
-      (a1 <=> a2).should == -1
-      (a2 <=> a1).should == 1
-    end
+    a1 = Key.from_path("A", 1)
+    a2 = Key.from_path("A", 2)
+    a1.should < a2
+    a2.should > a1
+    (a1 <=> a2).should == -1
+    (a2 <=> a1).should == 1
   end
   
   it "should create from id" do

data/spec/memcache_spec.rb

@@ -308,10 +308,8 @@ describe AppEngine::Memcache do
       @cache.get(:a).should == 4
       @cache.decr(:a, 4).should == 0
       @cache.get(:a).should == 0
-      pending 'local decrement wrapping' do
-        @cache.decr(:a, 6).should == 0
-        @cache.get(:a).should == 0
-      end
+      @cache.decr(:a, 6).should == 0
+      @cache.get(:a).should == 0
     end
   end
   

metadata

@@ -21,18 +21,21 @@ name: appengine-apis
 rdoc_options: 
 - --main
 - README.rdoc
-autorequire: 
 rubyforge_project: appengine-jruby
+autorequire: 
+licenses: []
+
 executables: []
 
-description: 'APIs and utilities for using JRuby on Google App Engine.  To load the
-  API stubs in IRB simply require ''rubygems'' require ''appengine-apis/local_boot''  This
-  will configure access to the same Datastore as running  $ dev_appserver.sh .  See
-  these classes for an overview of each API: - AppEngine::Logger - AppEngine::Testing
-  - AppEngine::Users - AppEngine::Mail - AppEngine::Memcache - AppEngine::URLFetch
-  - AppEngine::Datastore  Unless you''re implementing your own ORM, you probably want
-  to use the DataMapper API instead of the lower level AppEngine::Datastore API.'
-specification_version: 2
+description: "APIs and utilities for using JRuby on Google App Engine.\n\nTo load \
+  the API stubs in IRB simply\n  require 'rubygems'\n  require 'appengine-apis/local_boot'\n\
+  \nThis will configure access to the same Datastore as running\n\n  $ dev_appserver.sh \
+  .\n\nSee these classes for an overview of each API:\n- AppEngine::Logger\n- AppEngine::Testing\n\
+  - AppEngine::Users\n- AppEngine::Mail\n- AppEngine::Memcache\n- AppEngine::URLFetch\n\
+  - AppEngine::Datastore\n\nUnless you're implementing your own ORM, you probably \
+  want to use the\nDataMapper API instead of the lower level AppEngine::Datastore \
+  API."
+specification_version: 3
 default_executable: 
 files: 
 - History.txt
@@ -73,17 +76,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 extensions: []
 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 requirements: []
 
 authors: 
 - Ryan Brown
-date: 2009-05-06 07:00:00 +00:00
+date: 2009-07-20 07:00:00 +00:00
 platform: ruby
 test_files: []
 
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 require_paths: 
 - lib
 dependencies: