appengine-apis 0.0.3 → 0.0.4

data/Manifest.txt

@@ -1,6 +1,5 @@
 History.txt
 Manifest.txt
-PostInstall.txt
 README.rdoc
 Rakefile
 lib/appengine-apis.rb

data/Rakefile

@@ -6,7 +6,7 @@ begin
   gem 'rdoc'
   require 'sdoc'
   ENV['RDOCOPT'] = '-T lightblue'
-rescue
+rescue Exception
 end
 
 # Generate all the Rake tasks
@@ -14,7 +14,6 @@ end
 $hoe = Hoe.new('appengine-apis', AppEngine::VERSION) do |p|
   p.developer('Ryan Brown', 'ribrdb@gmail.com')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt' 
   p.rubyforge_name       = 'appengine-jruby'
   # p.extra_deps         = [
   #   ['activesupport','>= 2.0.2'],

data/lib/appengine-apis/datastore.rb

@@ -204,7 +204,7 @@ module Datastore
   # aren't safe to occur multiple times. However, this doesn't
   # include Put, Get, and Delete calls, of course.
   #
-  def transaction(retries=0)
+  def transaction(retries=3)
     while retries >= 0
       retries -= 1
       tx = begin_transaction
@@ -276,6 +276,12 @@ module Datastore
       
       ASCENDING = JQuery::SortDirection::ASCENDING
       DESCENDING = JQuery::SortDirection::DESCENDING
+      
+      OP_MAP = Hash.new { |hash, key| key }
+      OP_MAP.update('==' => EQUAL, '>' => GREATER_THAN,
+                    '>=' => GREATER_THAN_OR_EQUAL, '<' => LESS_THAN,
+                    '<=' => LESS_THAN_OR_EQUAL)
+      OP_MAP.freeze
     end
     include Constants
     
@@ -353,6 +359,8 @@ module Datastore
     #
     def filter(name, operator, value)
       name = name.to_s if name.kind_of? Symbol
+      operator = operator.to_s if operator.kind_of? Symbol
+      operator = OP_MAP[operator]
       value = Datastore.ruby_to_java(value)
       @query.add_filter(name, operator, value)
       clear_cache

data/lib/appengine-apis/datastore_types.rb

@@ -247,12 +247,7 @@ module AppEngine
       def get_property(name)
         name = name.to_s if name.kind_of? Symbol
         prop = Datastore.convert_exceptions { getProperty(name) }
-        ruby_type = SPECIAL_JAVA_TYPES[prop.class]
-        if ruby_type
-          ruby_type.new_from_java(prop)
-        else
-          prop
-        end
+        java_value_to_ruby(prop)
       end
       alias :[] :get_property
 
@@ -314,8 +309,10 @@ module AppEngine
       alias merge! update
       
       # Iterates over all the properties in this Entity.
-      def each(&proc)  # :yields: name, value
-        getProperties.each(&proc)
+      def each()  # :yields: name, value
+        getProperties.each do |name, value|
+          yield name, java_value_to_ruby(value)
+        end
       end
       
       def to_hash
@@ -325,6 +322,15 @@ module AppEngine
           hash
         end
       end
+      
+      def java_value_to_ruby(prop)
+        ruby_type = SPECIAL_JAVA_TYPES[prop.class]
+        if ruby_type
+          ruby_type.new_from_java(prop)
+        else
+          prop
+        end
+      end
     end
     
     SPECIAL_RUBY_TYPES = [Time, Text, Blob, ByteString, Link].freeze

data/lib/appengine-apis/sdk.rb

@@ -69,22 +69,25 @@ module AppEngine
       # Returns File.join(sdk_directory, *pieces)
       #
       def sdk_path(*pieces)
-        puts "sdk_path(#{pieces.join('/')})"
         unless @sdk_path
-          base_path = File.join(ENV['APPENGINE_JAVA_SDK'] || '', 'bin')
-          exec_paths = ENV['PATH'].split(File::PATH_SEPARATOR)
-          exec_paths << '/usr/local/appengine-java-sdk/bin'
-          exec_paths << 'c:\appengine-java-sdk\bin'
-          # TODO also check for reggae
+          begin
+            require 'reggae'
+            @sdk_path = AppEngine::Jars::Path
+          rescue Exception
+            base_path = File.join(ENV['APPENGINE_JAVA_SDK'] || '', 'bin')
+            exec_paths = ENV['PATH'].split(File::PATH_SEPARATOR)
+            exec_paths << '/usr/local/appengine-java-sdk/bin'
+            exec_paths << 'c:\appengine-java-sdk\bin'
           
-          while !exec_paths.empty?
-            if File.exist?(File.join(base_path, 'appcfg.sh'))
-              @sdk_path = File.dirname(base_path)
-              return File.join(@sdk_path, *pieces)
+            while !exec_paths.empty?
+              if File.exist?(File.join(base_path, 'appcfg.sh'))
+                @sdk_path = File.dirname(base_path)
+                return File.join(@sdk_path, *pieces)
+              end
+              base_path = exec_paths.shift
             end
-            base_path = exec_paths.shift
+            raise "Unable to locate the Google App Engine SDK for Java."
           end
-          raise "Unable to locate the Google App Engine SDK for Java."
         end
         File.join(@sdk_path, *pieces)
       end

data/lib/appengine-apis/testing.rb

@@ -126,8 +126,7 @@ module AppEngine
       #
       # You may call this multiple times to reset to a new in-memory datastore.
       def install_test_datastore
-        self.app_dir = '.' if app_dir.nil?
-        delegate = factory.create
+        delegate = install_api_stubs
         lds = Java.ComGoogleAppengineApiDatastoreDev.LocalDatastoreService
         
         delegate.set_property(
@@ -149,9 +148,15 @@ module AppEngine
       # instead of dev_appserver. In that case you will need to install
       # and configure a test environment for each request.
       def install_api_stubs
+        current_delegate = ApiProxy.delegate
+        current_delegate.stop if current_delegate.respond_to? :stop
+
         self.app_dir = '.' if app_dir.nil?
         delegate = factory.create
         ApiProxy::setDelegate(delegate)
+        at_exit do
+          delegate.stop
+        end
         delegate
       end
       

data/lib/appengine-apis/users.rb

@@ -78,16 +78,30 @@ module AppEngine
       alias == equals?
       alias to_s toString
       
-      if nil  # rdoc only
+      class << self
+        alias java_new new  # :nodoc:
+        
         # Creates a new User.
         #
         # Args:
         # - email: a non-nil email address.
-        # - auth_domain: a non-nil domain name into which this user has
+        # - auth_domain: an optinoal domain name into which this user has
         #   authenticated, or "gmail.com" for normal Google authentication.
-        def initialize(email, auth_domain)
+        def new(email, auth_domain=nil)
+          unless auth_domain
+            env = AppEngine::ApiProxy.current_environment
+            auth_domain = if env
+              env.getAuthDomain
+            else
+              'gmail.com'
+            end
+          end
+          
+          java_new(email, auth_domain)
         end
-        
+      end
+      
+      if nil  # rdoc only
         # Return this user's nickname. The nickname will be a unique, human
         # readable identifier for this user with respect to this application.
         # It will be an email address for some users, but not all.

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.3'
+  VERSION = '0.0.4'
 end

data/spec/datastore_spec.rb

@@ -35,6 +35,16 @@ describe AppEngine::Datastore do
     stored[:b].should == "b"
   end
   
+  it "should support Text" do
+    entity = Datastore::Entity.new("Test")
+    entity[:a] = Datastore::Text.new("a")
+    Datastore.put(entity)
+    stored = Datastore.get(entity.key)
+    stored[:a].should be_a(Datastore::Text)
+    stored[:a].should == "a"
+    stored.to_hash['a'].should == "a"
+  end
+  
   it "should put many" do
     a = Datastore::Entity.new("A")
     b = Datastore::Entity.new("B")
@@ -115,6 +125,13 @@ describe AppEngine::Datastore::Query do
         'name', Query::EQUAL, 'Bob').should == q
   end
   
+  it 'should support symbol ops' do
+    q = Query.new("Foo")
+    q.set_ancestor(@a.key).sort('name').filter(
+        'name', :==, 'aa')
+    q.fetch.to_a.should == [@aa]
+  end
+  
   it "should support ancestor" do
     a = @a.key
     q = Query.new("A", a)

data/spec/datastore_types_spec.rb

@@ -207,3 +207,11 @@ describe AppEngine::Datastore::Entity do
     @entity.to_hash.should == props
   end
 end
+
+describe AppEngine::Datastore::Text do
+  it "should support to_s" do
+    t = AppEngine::Datastore::Text.new("foo")
+    t.to_s.should == t
+  end
+end
+

data/spec/users_spec.rb

@@ -55,4 +55,15 @@ describe AppEngine::Users do
     login.should =~ /foobar/
     logout.should =~ /foobaz/
   end
+  
+  it 'should support new without auth domain' do
+    user = AppEngine::Users::User.new('foo@example.com')
+    user.auth_domain.should == 'gmail.com'
+  end
+  
+  
+  it 'should support new with auth domain' do
+    user = AppEngine::Users::User.new('foo@example.com', 'example.com')
+    user.auth_domain.should == 'example.com'
+  end
 end

metadata

@@ -10,11 +10,10 @@ email:
 cert_chain: []
 
 summary: APIs and utilities for using JRuby on Google App Engine
-post_install_message: PostInstall.txt
+post_install_message: 
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
 - README.rdoc
 homepage: http://code.google.com/p/appengine-jruby
 signing_key: 
@@ -38,7 +37,6 @@ default_executable:
 files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
 - README.rdoc
 - Rakefile
 - lib/appengine-apis.rb
@@ -80,12 +78,12 @@ requirements: []
 
 authors: 
 - Ryan Brown
-date: 2009-04-25 07:00:00 +00:00
+date: 2009-05-06 07:00:00 +00:00
 platform: ruby
 test_files: []
 
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 require_paths: 
 - lib
 dependencies: 

data/PostInstall.txt

@@ -1,12 +0,0 @@
-
-To use the local datastore you need to have the Google App Engine SDK for Java
-installed
-(http://code.google.com/appengine/docs/java/gettingstarted/installing.html).
-Then you need to add several jars to your classpath.
-
-For example:
-$ export SDK=`pwd`/appengine-java-sdk/lib
-$ export CLASSPATH=$SDK/shared/appengine-local-runtime-shared.jar:$SDK/impl/appengine-api-stubs.jar:$SDK/impl/appengine-api.jar:$SDK/impl/appengine-local-runtime.jar
-
-For more information on appengine-apis, see
-http://code.google.com/p/appengine-jruby