appengine-apis 0.0.5 → 0.0.6

data/Rakefile

@@ -1,4 +1,4 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+%w[rubygems rake rake/clean fileutils newgem rubigen hoe].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/appengine-apis'
 
 # set up pretty rdoc if possible
@@ -21,6 +21,7 @@ $hoe = Hoe.new('appengine-apis', AppEngine::VERSION) do |p|
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]
   ]
+  p.readme_file = 'README.rdoc'
   
   p.clean_globs |= %w[**/.DS_Store tmp *.log]
   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"

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.5'
+  VERSION = '0.0.6'
 end

data/lib/appengine-apis/local_boot.rb

@@ -18,6 +18,7 @@
 #
 # Helpers for installing stub apis in unit tests.
 
+puts 'local boot: ' + caller(0).inspect
 require 'appengine-apis/testing'
 AppEngine::Testing.boot
 

data/lib/appengine-apis/sdk.rb

@@ -16,101 +16,5 @@
 # limitations under the License.
 #
 
-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
-          return Java.ComGoogleApphostingApi.ApiProxy
-        end
-      end
-      
-      # Tries to load the ApiProxyLocalFactory class.
-      def load_local_apiproxy_factory
-        with_jars(%w{lib shared appengine-local-runtime-shared.jar},
-                  %w{lib impl appengine-api-stubs.jar},
-                  %w{lib impl appengine-local-runtime.jar}
-                  ) do
-          return Java.ComGoogleAppengineToolsDevelopment.ApiProxyLocalFactory
-        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
-          yield
-        rescue NameError => ex
-          if failed
-            raise ex
-          else
-            failed = true
-            jars.each do |jar|
-              $CLASSPATH << sdk_path(*jar)
-            end
-            retry
-          end
-        end
-      end
-      
-      # Tries to find the Google App Engine SDK for Java.
-      #
-      # Looks for appcfg.sh in these directories (in order):
-      # - ENV['APPENGINE_JAVA_SDK']/bin
-      # - each directory in ENV['PATH']
-      # - '/usr/local/appengine-java-sdk/bin'
-      # - 'c:\appengine-java-sdk\bin'
-      #
-      # Returns File.join(sdk_directory, *pieces)
-      #
-      def sdk_path(*pieces)
-        unless @sdk_path
-          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)
-              end
-              base_path = exec_paths.shift
-            end
-            raise "Unable to locate the Google App Engine SDK for Java."
-          end
-        end
-        File.join(@sdk_path, *pieces)
-      end
-    end
-  end
-end
+$stderr.puts '"appengine-apis/sdk" is deprecated. Use "appengine-sdk"'
+require 'appengine-sdk'

data/lib/appengine-apis/testing.rb

@@ -109,7 +109,13 @@ module AppEngine
       end
       
       def factory  # :nodoc:
-        @factory ||= AppEngine::SDK.load_local_apiproxy_factory.new
+        puts caller(0).inspect
+        @factory = begin
+          Java.ComGoogleAppengineToolsDevelopment.ApiProxyLocalFactory.new
+        rescue
+          require 'appengine-sdk'
+          AppEngine::SDK.load_local_apiproxy_factory.new
+        end
       end
       
       # The application directory, or '.' if not set.
@@ -178,6 +184,10 @@ module AppEngine
       #   require 'appengine-apis/local_boot'
       # 
       def boot(app_dir=nil)
+        if AppEngine::ApiProxy.current_environment &&
+            AppEngine::ApiProxy.delegate
+          return
+        end
         app_dir ||= ENV['APPLICATION_ROOT'] || '.'
         unless AppEngine::ApiProxy.current_environment
           env = install_test_env
@@ -193,12 +203,11 @@ module AppEngine
       # Looks for app.yaml or WEB-INF/appengine-web.xml in +app_dir+
       # and parses the application id.
       def get_app_id(app_dir)
+        require 'appengine-rack'
+        app_id = AppEngine::Rack.app.id
+        return app_id if app_id
         aeweb_path = File.join(app_dir, 'WEB-INF', 'appengine-web.xml')
-        app_yaml_path = File.join(app_dir, 'app.yaml')
-        if File.exist?(app_yaml_path)
-          app_yaml = YAML.load(File.open(app_yaml_path))
-          return app_yaml['application']
-        elsif File.exist?(aeweb_path)
+        if File.exist?(aeweb_path)
           require 'rexml/document'
           aeweb = REXML::Document.new(File.new(aeweb_path))
           return aeweb.root.elements['application'].text

data/lib/appengine-apis/urlfetch.rb

@@ -172,38 +172,37 @@ module AppEngine
     end
 
     
-    # A subclass of Net::HTTP that makes requests using Google App Engine's
-    # URLFetch Service.
-    #
-    # To replace the standard implementation throughout your app you can do:
-    #   require 'appengine-apis/urlfetch'
-    #   Net::HTTP = AppEngine::URLFetch::HTTP
-    class HTTP < Net::HTTP
-      alias connect on_connect
-
-      def request(req, body=nil, &block)
-        begin
-          proto = use_ssl? ? 'https' : 'http'
-          url = "#{proto}://#{addr_port}#{req.path}"
-          options = {
-              :payload => body,
-              :follow_redirects => false,
-              :allow_truncated => true,
-              :method => req.method,
-              :headers => req
-              }
-          res = URLFetch.fetch(url, options)
-        end while res.kind_of?(Net::HTTPContinue)
-        res.reading_body(nil, req.response_body_permitted?) {
-          yield res if block_given?
-        }
-        return res
-      end
-    end
+    # Deprecated alias for Net::HTTP, for backwards compatibility.
+    HTTP = Net::HTTP
   end
 end
 
 module Net  # :nodoc:
+  # Monkey patch Net::HTTP to makes requests using Google App Engine's
+  # URLFetch Service.
+  class HTTP
+    alias connect on_connect
+
+    def request(req, body=nil, &block)
+      begin
+        proto = use_ssl? ? 'https' : 'http'
+        url = "#{proto}://#{addr_port}#{req.path}"
+        options = {
+            :payload => body,
+            :follow_redirects => false,
+            :allow_truncated => true,
+            :method => req.method,
+            :headers => req
+            }
+        res = AppEngine::URLFetch.fetch(url, options)
+      end while res.kind_of?(Net::HTTPContinue)
+      res.reading_body(nil, req.response_body_permitted?) {
+        yield res if block_given?
+      }
+      return res
+    end    
+  end
+  
   class HTTPResponse  # :nodoc:
     alias stream_check_without_urlfetch stream_check
   

data/spec/urlfetch_spec.rb

@@ -104,7 +104,7 @@ describe AppEngine::URLFetch do
   # TODO can't read fetch options, so there's no way to tell if they're set
 end
 
-describe AppEngine::URLFetch::HTTP do
+describe Net::HTTP do
   HTTPRequest = com.google.appengine.api.urlfetch.HTTPRequest
   
   before :each do
@@ -129,13 +129,13 @@ describe AppEngine::URLFetch::HTTP do
     fetch_and_return(200) do |req|
       req.url.to_string.should == @url
     end
-    AppEngine::URLFetch::HTTP.get URI.parse(@url)
+    Net::HTTP.get URI.parse(@url)
   end
   
   
   it "should read body" do
     fetch_and_return(200, 'foo')
-    AppEngine::URLFetch::HTTP.get(URI.parse(@url)).should == 'foo'
+    Net::HTTP.get(URI.parse(@url)).should == 'foo'
   end
   
   it "should support https" do
@@ -145,7 +145,7 @@ describe AppEngine::URLFetch::HTTP do
     end
     
     uri = URI.parse(@url)
-    http = AppEngine::URLFetch::HTTP.new(uri.host, uri.port)
+    http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
     http.get(uri.path).body.should == 'secure'
   end

metadata

@@ -1,42 +1,68 @@
 --- !ruby/object:Gem::Specification 
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+name: appengine-apis
+version: !ruby/object:Gem::Version 
+  version: 0.0.6
+platform: ruby
+authors: 
+- Ryan Brown
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-07-27 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: newgem
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.11.0
+    version: 
+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.
 email: 
 - ribrdb@gmail.com
-cert_chain: []
+executables: []
+
+extensions: []
 
-summary: APIs and utilities for using JRuby on Google App Engine
-post_install_message: 
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.rdoc
-homepage: http://code.google.com/p/appengine-jruby
-signing_key: 
-name: appengine-apis
-rdoc_options: 
-- --main
-- README.rdoc
-rubyforge_project: appengine-jruby
-autorequire: 
-licenses: []
-
-executables: []
-
-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
 - Manifest.txt
@@ -68,47 +94,34 @@ files:
 - spec/urlfetch_spec.rb
 - spec/users_spec.rb
 - tasks/rspec.rake
+has_rdoc: true
+homepage: http://code.google.com/p/appengine-jruby
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --main
+- README.rdoc
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-extensions: []
-
-rubygems_version: 1.3.3
 requirements: []
 
-authors: 
-- Ryan Brown
-date: 2009-07-20 07:00:00 +00:00
-platform: ruby
+rubyforge_project: appengine-jruby
+rubygems_version: 1.3.5
+signing_key: 
+specification_version: 3
+summary: APIs and utilities for using JRuby on Google App Engine
 test_files: []
 
-version: !ruby/object:Gem::Version 
-  version: 0.0.5
-require_paths: 
-- lib
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
-  type: :development
-  version_requirement: 
-  name: newgem
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-  type: :development
-  version_requirement: 
-  name: hoe
-bindir: bin
-has_rdoc: true