appengine-apis 0.0.12 → 0.0.13

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.12'
+  VERSION = '0.0.13'
 end

data/lib/appengine-apis/apiproxy.rb

@@ -23,16 +23,22 @@ module AppEngine
     import com.google.apphosting.api.ApiProxy
   
     class << ApiProxy
-      def get_app_id
+      def version
+        version_id = get_current_environment.getVersionId
+        version_id[0,version_id.rindex(".").to_i] # nil to 0
+      end 
+
+      def app_id
         get_current_environment.getAppId
       end
-  
-      def get_auth_domain
+      alias :get_app_id :app_id
+
+      def auth_domain
         get_current_environment.getAuthDomain
       end
+      alias :get_auth_domain :auth_domain
     
       alias :add_log_record :log
-    
       def log(level, message)
         message = (message || "").to_s.chomp
         return if message.nil? || message.empty?
@@ -40,6 +46,7 @@ module AppEngine
             level, java.lang.System.currentTimeMillis() * 1000, message.to_s)
         add_log_record(record)
       end
+
     end
   end
 end

data/lib/appengine-apis/labs/taskqueue.rb

@@ -112,7 +112,7 @@ module AppEngine
         # - queue: Name of the queue where this Task should be added. (optional)
         #
         def add(queue=nil)
-          queue = Queue.new(queue) unless Queue.kind_of? Queue
+          queue = Queue.new(queue) unless queue.kind_of? Queue
           @handle = queue.java_queue.add(_task)
           self
         end
@@ -263,4 +263,4 @@ module AppEngine
       end
     end
   end
-end
+end

data/lib/appengine-apis/memcache.rb

@@ -433,7 +433,7 @@ module AppEngine
     
     def memcache_key(obj)
       key = obj
-      key = key.to_s.to_java_string if key
+      key = java.lang.String.new(key.to_s) if key
       key
     end
 
@@ -450,10 +450,10 @@ module AppEngine
       else
         if obj.class == String
           # Convert plain strings to Java strings
-          obj.to_java_string
+          java.lang.String.new(obj)
         else
           bytes = Marshal.dump(obj).to_java_bytes
-          java.util.ArrayList.new([MARSHAL_MARKER.to_java_string, bytes])
+          java.util.ArrayList.new([java.lang.String.new(MARSHAL_MARKER), bytes])
         end
       end
     end
@@ -502,8 +502,8 @@ module AppEngine
       convert_exceptions do
         key = memcache_key(key)
         value = memcache_value(value)
-        expiriation = memcache_expiration(expiriation)
-        service.put(key, value, expiriation, mode)
+        expiration = memcache_expiration(expiration)
+        service.put(key, value, expiration, mode)
       end
     end
     
@@ -541,7 +541,7 @@ module AppEngine
         end
         @map[string_key] = key
         if string_key
-          string_key.to_java_string
+          java.lang.String.new(string_key)
         else
           string_key
         end
@@ -550,7 +550,7 @@ module AppEngine
       def java_keys
         @map.keys.collect do |key|
           if key
-            key.to_java_string
+            java.lang.String.new(key)
           else
             key
           end
@@ -577,4 +577,4 @@ module AppEngine
       end
     end
   end
-end
+end

data/lib/appengine-apis/runtime.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/ruby1.8 -w
+#
+# Copyright:: Copyright 2009 Google Inc.
+# Original Author:: John Woodell (mailto:woodie@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.
+
+module AppEngine
+  if defined? Java
+    import com.google.appengine.api.utils.SystemProperty
+
+    class Runtime
+      def self.environment
+        SystemProperty.environment.get.to_s.downcase
+      end
+     
+      def self.version
+        SystemProperty.version.get.to_s
+      end
+    end
+  end
+end

data/lib/appengine-apis/testing.rb

@@ -18,10 +18,8 @@
 #
 # Helpers for installing stub apis in unit tests.
 
-require 'appengine-apis/apiproxy'
-
 module AppEngine
-  
+
   # Local testing support for Google App Engine
   #
   # If you run your code on Google's servers or under dev_appserver,
@@ -31,187 +29,93 @@ module AppEngine
   # api stubs.
   module Testing
 
-    class TestEnv  # :nodoc:
-      include AppEngine::ApiProxy::Environment
-      
-      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= "gmail.com"
-        @default_namespace = @request_namespace  = ""
-        @email = ""
-        @attributes = java.util.HashMap.new
-      end
-      
-      def getAppId
-        @appid
-      end
-      
-      def getVersionId
-        @version
-      end
-      
-      def getEmail
-        @email
-      end
-      
-      def isLoggedIn
-        !(@email.nil? || @auth_domain.nil? || @email.empty?)
-      end
-      
-      def isAdmin
-        !!@admin
-      end
-      
-      def getAuthDomain
-        @auth_domain
-      end
-      
-      def getRequestNamespace
-        @request_namespace
-      end
-      
-      def getDefaultNamespace
-        @default_namespace
-      end
-      
-      def setDefaultNamespace(s)
-        @default_namespace = s
-      end
-      
-      def getAttributes
-        @attributes
-      end
-      
-      def inspect
-        "#<TestEnv>"
-      end
-    end
-    
+
     class << self
-      
-      # Install a test environment for the current thread.
-      #
-      # You must call this before making any api calls.
-      #
-      # Note that Google's production and local environments are
-      # single threaded. You may run into problems if you use multiple
-      # threads.
-      def install_test_env
-        env = TestEnv.new
-        ApiProxy::setEnvironmentForCurrentThread(env)
-        env
-      end
-      
-      def factory  # :nodoc:
-        @factory ||= begin
-          Java.ComGoogleAppengineToolsDevelopment.ApiProxyLocalFactory.new
-        rescue
-          require 'appengine-sdk'
-          AppEngine::SDK.load_local_apiproxy_factory.new
+      def delegate # :nodoc:
+        helper  # make sure everything's loaded
+        require 'appengine-apis/apiproxy'
+        AppEngine::ApiProxy.getDelegate
+      end
+      
+      # The LocalServiceTestHelper used by this class.
+      # Use this to set the logged in user, etc.
+      def helper
+        failed = false
+        @helper ||= begin
+          testing = Java::ComGoogleAppengineToolsDevelopmentTesting
+          @datastore_config = testing::LocalDatastoreServiceTestConfig.new
+          configs = [
+            @datastore_config,
+            testing::LocalBlobstoreServiceTestConfig.new,
+            testing::LocalImagesServiceTestConfig.new,
+            testing::LocalMailServiceTestConfig.new,
+            testing::LocalMemcacheServiceTestConfig.new,
+            testing::LocalTaskQueueTestConfig.new,
+            testing::LocalURLFetchServiceTestConfig.new,
+            testing::LocalUserServiceTestConfig.new,
+            testing::LocalXMPPServiceTestConfig.new,
+          ].to_java(testing::LocalServiceTestConfig)
+          testing::LocalServiceTestHelper.new(configs)
+        rescue => ex
+          if failed
+            raise ex
+          else
+            failed = true
+            require 'appengine-sdk'
+            AppEngine::SDK.load_local_test_helper
+            retry
+          end
         end
       end
-      
-      # The application directory, or '.' if not set.
-      # Composite index definitions are written to "#{app_dir}/WEB-INF/".
-      def app_dir
-        file = factory.getApplicationDirectory
-        file && file.path
-      end
 
-      # Sets the application directory. Should be called before
-      # creating stubs.
-      #
-      # Composite index definitions are written to "#{app_dir}/WEB-INF/".      
-      def app_dir=(dir)
-        factory.setApplicationDirectory(java.io.File.new(dir))
-      end
-      
       # Install stub apis and force all datastore operations to use
       # an in-memory datastore.
       #
       # You may call this multiple times to reset to a new in-memory datastore.
       def install_test_datastore
-        delegate = install_api_stubs
-        lds = Java.ComGoogleAppengineApiDatastoreDev.LocalDatastoreService
-        
-        delegate.set_property(
-            lds::NO_STORAGE_PROPERTY, "true")
-        delegate.set_property(
-            lds::MAX_QUERY_LIFETIME_PROPERTY,
-            java.lang.Integer::MAX_VALUE.to_s)
-        delegate.set_property(
-            lds::MAX_TRANSACTION_LIFETIME_PROPERTY,
-            java.lang.Integer::MAX_VALUE.to_s)
-        ApiProxy::setDelegate(delegate)
-        delegate
+        self.persistent_datastore = false
+        setup
       end
-      
-      # Install stub apis. The datastore will be written to the disk
-      # inside #app_dir.
-      #
-      # You could potentially use this to run under a ruby web server
-      # 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.getDelegate
-        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
+      def persistent_datastore
+        helper
+        !@datastore_config.is_no_storage
+      end
+
+      def persistent_datastore=(value)
+        helper
+        @datastore_config.set_no_storage(!value)
+        setup
+      end
+
+      def setup
+        if delegate
+          teardown rescue nil
         end
-        delegate
+        helper.setUp
       end
-      
+
+      def teardown
+        helper.tearDown
+      end
+
       # Loads stub API implementations if no API implementation is
       # currently configured.
       #
-      # Sets up a datastore saved to disk in +app_dir+. +app_dir+ defaults
-      # to ENV['APPLICATION_ROOT'] or '.' if not specified.
+      # Sets up a datastore saved to disk in '.'.
       #
       # Does nothing is APIs are already configured (e.g. in production).
       #
       # As a shortcut you can use
       #   require 'appengine-apis/local_boot'
       # 
-      def boot(app_dir=nil)
-        if AppEngine::ApiProxy.current_environment &&
-            AppEngine::ApiProxy.getDelegate
+      def boot
+        if delegate
           return
         end
-        app_dir ||= ENV['APPLICATION_ROOT'] || '.'
-        unless AppEngine::ApiProxy.current_environment
-          env = install_test_env
-          appid = get_app_id(app_dir)
-          env.appid = appid if appid
-        end
-        unless AppEngine::ApiProxy.getDelegate
-          self.app_dir = app_dir
-          install_api_stubs
-        end
-      end
-      
-      # 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')
-        if File.exist?(aeweb_path)
-          require 'rexml/document'
-          aeweb = REXML::Document.new(File.new(aeweb_path))
-          return aeweb.root.elements['application'].text
-        end
+        self.persistent_datastore = true
+        setup
       end
-      
     end
 
   end

data/lib/appengine-apis/urlfetch.rb

@@ -103,9 +103,11 @@ module AppEngine
       payload = options.delete(:payload)
       headers = options.delete(:headers) || {}
       truncate = options.delete(:allow_truncated)
-      follow_redirects = options.delete(:follow_redirects) || true
+      follow_redirects = options.delete(:follow_redirects)
       deadline = options.delete(:deadline)
       
+      follow_redirects = true if follow_redirects.nil?
+      
       unless options.empty?
         raise ArgumentError, "Unsupported options #{options.inspect}."
       end
@@ -204,7 +206,11 @@ module Net  # :nodoc:
         yield res if block_given?
       }
       return res
-    end    
+    end
+
+    def use_ssl=(flag)
+      @use_ssl = flag
+    end
   end
   
   class HTTPResponse  # :nodoc:

data/spec/memcache_spec.rb

@@ -21,61 +21,57 @@ describe AppEngine::Memcache do
     AppEngine::Testing::install_test_datastore
     @cache = AppEngine::Memcache.new
   end
-  
-  before :all do
-    AppEngine::Testing::install_test_env
-  end
-  
+
   describe 'get' do
-    
+
     it 'should return nil on miss' do
       @cache.get('foobar').should == nil
       @cache['foobar'].should == nil
     end
-    
+
     it 'should support strings' do
       @cache.set('foobar', 'test').should == true
       @cache.get('foobar').should == 'test'
       @cache['foobar'].should == 'test'
     end
-    
+
     it 'should support multiple values' do
       @cache.get('foo', 'bar', 'baz').should == [nil, nil, nil]
       @cache['foo', 'bar', 'baz'].should == [nil, nil, nil]
       @cache.set('bar', 'food').should == true
       @cache['foo', 'bar', 'baz'].should == [nil, 'food', nil]
     end
-    
+
     it 'should support getting an array of keys' do
       @cache.set('foobar', 'test').should == true
       @cache.get(['foobar', 'flowers']).should == ['test', nil]
       @cache.get(['foobar']).should == ['test']
     end
-    
+
     it 'should support numbers' do
       @cache.set('one', 1).should == true
       @cache.set('pi', 3.14).should == true
       @cache.get('pi').should == 3.14
       @cache.get('one').should === 1
     end
-    
+
     it 'should support symbol keys' do
       @cache.set(:a, 'A')
       @cache.get(:a).should == 'A'
     end
-    
+
     it 'should support booleans' do
       @cache.set('true', true)
       @cache.set('false', false)
       @cache.get('true').should == true
       @cache.get('false').should == false
     end
-    
+
     it 'should support marshaled objects' do
       @cache.set('a', 1..5)
       @cache.get('a').should == (1..5)
     end
-    
+
     it 'should support false keys' do
       @cache.set(nil, 'nil')
       @cache.set(false, 'false')
@@ -83,19 +79,19 @@ describe AppEngine::Memcache do
       @cache.get(false).should == 'false'
     end
   end
-  
+
   describe 'get_hash' do
     it 'should not include missing keys' do
       @cache.get_hash(:a, :b).should == {}
     end
-    
+
     it 'should get objects' do
       @cache.set('a', 'A')
       @cache.set('b', 3)
       @cache.get_hash('a', 'c', 'b').should == {'a' => 'A', 'b' => 3 }
     end
   end
-  
+
   describe 'clear' do
     it 'should clear the cache' do
       @cache.set(:a, 'A')
@@ -104,7 +100,7 @@ describe AppEngine::Memcache do
       @cache.get_hash(:a, 'b', :c).should == {}
     end
   end
-  
+
   describe 'flush_all' do
     it 'should clear the cache' do
       @cache.set(:a, 'A')
@@ -113,7 +109,7 @@ describe AppEngine::Memcache do
       @cache.get_hash(:a, 'b', :c).should == {}
     end
   end
-  
+
   describe 'stats' do
     it 'should count items' do
       @cache.stats[:items].should == 0
@@ -130,11 +126,11 @@ describe AppEngine::Memcache do
       @cache.get(:a).should == nil
       @cache.get_hash(:a).should == {}
     end
-    
+
     it 'should return false on missing items' do
       @cache.delete(:a).should == false
     end
-    
+
     it 'should allow blocking adds' do
       @cache.set(:a, '1')
       @cache.set(:b, '2')
@@ -144,7 +140,7 @@ describe AppEngine::Memcache do
       @cache.add(:b, 'B').should == false
     end
   end
-  
+
   describe 'delete_many' do
     it 'should remove items' do
       @cache.set(:a, 'A')
@@ -153,7 +149,7 @@ describe AppEngine::Memcache do
       @cache.delete_many([:a, :c])
       @cache.get_hash(:a, :b, :c).should == {:b => 'B'}
     end
-    
+
     it 'should return removed keys' do
       @cache.set('a', 'A')
       @cache.set('b', 'B')
@@ -161,7 +157,7 @@ describe AppEngine::Memcache do
       removed = @cache.delete_many(['a', 'c'])
       removed.sort.should == ['a', 'c']
     end
-    
+
     it 'should not return missing keys' do
       @cache.set('a', 'A')
       @cache.set('b', 'B')
@@ -170,8 +166,8 @@ describe AppEngine::Memcache do
       removed.sort.should == ['a', 'c']
       @cache.delete_many(['e']).should == []
     end
-    
-    
+
+
     it 'should allow blocking adds' do
       @cache.set(:a, '1')
       @cache.set(:b, '2')
@@ -181,44 +177,44 @@ describe AppEngine::Memcache do
       @cache.add(:b, 'B').should == false
     end
   end
-  
+
   describe 'add' do
     it 'should add missing' do
       @cache.add(:a, 'A').should == true
       @cache.get(:a).should == 'A'
     end
-    
+
     it 'should not replace existing entries' do
       @cache.set(:a, 1)
       @cache.add(:a, 'A').should == false
       @cache.get(:a).should == 1
     end
   end
-  
+
   describe 'add_many' do
     it 'should add missing' do
       @cache.add_many({:a => 1, :b =>2})
       @cache.get(:b, :a).should == [2, 1]
     end
-    
+
     it 'should not replace existing entries' do
       @cache.set(:a, 1)
       @cache.add_many({:a => 'A', :b => 'B'})
       @cache.get(:a, :b).should == [1, 'B']
     end
-    
+
     it 'should return existing keys' do
       @cache.set(:a, 1)
       @cache.add_many({:a => 'A', :b => 'B'}).should == [:a]
     end
   end
-  
+
   describe 'set' do
     it 'should add missing' do
       @cache.set(:a, :A).should == true
       @cache.get(:a).should == :A
     end
-    
+
     it 'should replace existing' do
       @cache.set(:a, :A).should == true
       @cache.get(:a).should == :A
@@ -226,13 +222,13 @@ describe AppEngine::Memcache do
       @cache.get(:a).should == 1
     end
   end
-  
+
   describe 'set_many' do
     it 'should set multiple values' do
       @cache.set_many({:a => 1, :b => 2}).should == []
     end
   end
-  
+
   describe 'replace' do
     it 'should replace existing' do
       @cache.set(:a, :A).should == true
@@ -240,12 +236,12 @@ describe AppEngine::Memcache do
       @cache.replace(:a, 1).should == true
       @cache.get(:a).should == 1
     end
-    
+
     it 'should not replace missing' do
       @cache.replace(:a, :A).should == false
     end
   end
-  
+
   describe 'replace_many' do
     it 'should replace many' do
       @cache.set_many({:a => 1, :c => 3})
@@ -253,7 +249,7 @@ describe AppEngine::Memcache do
       @cache.get(:a, :b, :c).should == [:A, nil, :C]
     end
   end
-  
+
   describe 'dict access' do
     it 'should support getting with []' do
       @cache.set(:a, 7)
@@ -261,7 +257,7 @@ describe AppEngine::Memcache do
       @cache.set(:b, :B)
       @cache[:a, :b].should == [7, :B]
     end
-    
+
     it 'should support setting with []=' do
       @cache[:a, :b] = [1, :B]
       @cache[:c] = 3
@@ -270,7 +266,7 @@ describe AppEngine::Memcache do
       @cache[:c].should == 3
     end
   end
-  
+
   describe 'incr' do
     it 'should increment number' do
       @cache.set(:a, 1)
@@ -278,13 +274,13 @@ describe AppEngine::Memcache do
       @cache.incr(:a, 7).should == 9
       @cache.get(:a).should == 9
     end
-    
+
     it 'should wrap' do
       @cache.set(:a, 7)
       @cache.incr(:a, 2**62).should == 2**62 + 7
       @cache.incr(:a, 2**62).should < 2**62
     end
-    
+
     it 'should fail if not number' do
       @cache.incr(:a).should == nil
       @cache.get_hash([:a]).should == {}
@@ -292,13 +288,13 @@ describe AppEngine::Memcache do
       lambda {@cache.incr(:b)}.should raise_error(
           AppEngine::Memcache::InvalidValueError)
     end
-    
+
     it 'should increment strings' do
       @cache.set(:a, '7')
       @cache.incr(:a).should == 8
     end
   end
-  
+
   describe 'decr' do
     it 'should decrement number' do
       @cache.set(:a, 7)
@@ -312,72 +308,85 @@ describe AppEngine::Memcache do
       @cache.get(:a).should == 0
     end
   end
-  
+
   describe 'readonly' do
     before :each do
       @rocache = AppEngine::Memcache.new(:readonly => true)
       @ex = AppEngine::Memcache::MemcacheError
     end
-    
+
     it 'should allow reads' do
       @cache[:a] = 1
       @rocache.get(:a).should == 1
     end
-    
+
     it 'should allow stats' do
       @cache[:a] = 7
       @rocache.stats[:items].should == 1
     end
-    
+
     it 'should block delete' do
       @cache[:a] = 1
       lambda {@rocache.delete(:a)}.should raise_error(@ex)
       @cache[:a].should == 1
     end
-    
+
     it 'should block add' do
       lambda {@rocache.add(:a, 1)}.should raise_error(@ex)
       lambda {@rocache.add_many({:b => 1})}.should raise_error(@ex)
       @rocache.get_hash(:a, :b).should == {}
     end
-    
+
     it 'should block set' do
       lambda {@rocache.set(:a, 1)}.should raise_error(@ex)
       lambda {@rocache.set_many({:b => 1})}.should raise_error(@ex)
       @rocache.get_hash(:a, :b).should == {}
     end
-    
+
     it 'should block replace' do
       @cache[:a, :b] = :A, :B
       lambda {@rocache.replace(:a, 1)}.should raise_error(@ex)
       lambda {@rocache.replace_many({:b => 1})}.should raise_error(@ex)
       @rocache[:a, :b].should == [:A, :B]
     end
-    
+
     it 'should block clear' do
       @cache[:a] = 1
       lambda {@rocache.clear}.should raise_error(@ex)
       lambda {@rocache.flush_all}.should raise_error(@ex)
       @rocache[:a].should == 1
     end
-    
+
     it 'should block incr' do
       @cache[:a] = 1
       lambda {@rocache.incr(:a)}.should raise_error(@ex)
       @rocache[:a].should == 1
     end
-    
+
     it 'should block decr' do
       @cache[:a] = 1
       lambda {@rocache.decr(:a)}.should raise_error(@ex)
       @rocache[:a].should == 1
     end
   end
-  
+
   describe "namespaces" do
     it 'should get namespace from initialize' do
       cache = AppEngine::Memcache.new(:namespace => "foo")
       cache.namespace.should == "foo"
     end
   end
+
+  describe "utf8" do
+    it "should support utf8 value" do
+      @cache.set('foobar', 'テスト').should == true
+      @cache.get('foobar').should == 'テスト'
+      @cache['foobar'].should == 'テスト'
+    end
+    it "should support utf8 key" do
+      @cache.set('ふーばー', 'てすと').should == true
+      @cache.get('ふーばー').should == 'てすと'
+      @cache['ふーばー'].should == 'てすと'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -8,9 +8,8 @@ rescue LoadError
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-AppEngine::SDK.load_apiproxy
 require 'appengine-apis/testing'
-AppEngine::Testing.install_test_env
+AppEngine::Testing.setup
 
 class ProtoMatcher
   def compare(hash, proto, prefix='')
@@ -36,19 +35,19 @@ class ProtoMatcher
       end
     end
   end
-  
+
   def compare_value(label, expected, actual)
     if expected != actual
-      @failures << "%s differs. expected: %s actual: %s" % 
+      @failures << "%s differs. expected: %s actual: %s" %
           [label, expected.inspect, actual.inspect]
     end
   end
-  
+
   def initialize(klass, expected)
     @klass = klass
     @expected = expected
   end
-  
+
   def matches(bytes)
     @failures = []
     @proto = @klass.new
@@ -56,12 +55,12 @@ class ProtoMatcher
     compare(@expected, @proto)
     @failures.empty?
   end
-  
+
   def ==(bytes)
     Spec::Expectations.fail_with(failure_message) unless matches(bytes)
     true
   end
-  
+
   def failure_message
     @failures.join("\n")
   end
@@ -72,7 +71,7 @@ module ProtoMethods
     ProtoMatcher.new(klass, hash)
   end
   alias be_proto proto
-  
+
   def mock_delegate
     delegate = mock("apiproxy")
     delegate.instance_eval do
@@ -80,7 +79,7 @@ module ProtoMethods
         include AppEngine::ApiProxy::Delegate
       end
     end
-  end  
+  end
 end
 
 Spec::Runner.configure do |config|

data/spec/users_spec.rb

@@ -18,50 +18,52 @@ require 'appengine-apis/users'
 
 describe AppEngine::Users do
   before :all do
-    AppEngine::Testing::install_api_stubs
+    AppEngine::Testing::setup
   end
-  
+
   before :each do
-    @env = AppEngine::Testing::install_test_env
-    @env.email = 'foo@example.com'
+    @env = AppEngine::Testing::helper
+    @env.set_env_email 'foo@example.com'
+    @env.set_env_auth_domain 'gmail.com'
+    @env.set_env_is_logged_in true
   end
-  
+
   it "should have default auth_domain" do
     user = AppEngine::Users.current_user
     user.email.should == 'foo@example.com'
     user.auth_domain.should == 'gmail.com'
   end
-  
+
   it 'should read auth_domain' do
-    @env.auth_domain = 'example.com'
+    @env.set_env_auth_domain 'example.com'
     AppEngine::Users.current_user.auth_domain.should == 'example.com'
   end
-  
+
   it 'should read admin' do
     AppEngine::Users.admin?.should == false
-    @env.admin = true
+    @env.set_env_is_admin true
     AppEngine::Users.admin?.should == true
   end
 
   it 'should set logged_in?' do
     AppEngine::Users.logged_in?.should == true
-    @env.email = nil
+    @env.set_env_is_logged_in nil
     AppEngine::Users.logged_in?.should == false
   end
-  
+
   it 'should create urls' do
     login = AppEngine::Users.create_login_url('/foobar')
     logout = AppEngine::Users.create_logout_url('/foobaz')
     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'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-apis
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -08:00
+date: 2010-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: appengine-rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Ruby API wrappers for App Engine
 email: ribrdb@gmail.com
 executables: []
@@ -45,6 +52,7 @@ files:
 - lib/appengine-apis/mail.rb
 - lib/appengine-apis/memcache.rb
 - lib/appengine-apis/merb-logger.rb
+- lib/appengine-apis/runtime.rb
 - lib/appengine-apis/sdk.rb
 - lib/appengine-apis/tempfile.rb
 - lib/appengine-apis/testing.rb
@@ -76,18 +84,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby API wrappers for App Engine