appengine-apis 0.0.17 → 0.0.18

data/Rakefile

@@ -15,6 +15,19 @@ begin
 rescue Exception
 end
 
+def find_sdk_version
+  labs = Dir.glob("lib/appengine-api-labs-*")
+  if labs.size < 1
+    puts "Unable to determine SKD version."
+    puts "You must first package the App Engine SDK."
+    exit 1
+  else
+    return labs[0].split(/\.|-/)[-4..-2].join('.')
+  end
+end
+
+sdk_version = find_sdk_version
+
 GEM = "appengine-apis"
 GEM_VERSION = AppEngine::VERSION
 AUTHOR = "Ryan Brown"
@@ -29,13 +42,15 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.rdoc", "COPYING"]
   s.summary = SUMMARY
-  s.description = s.summary
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  
+  s.description = <<-EOF
+This gem includes the JRuby API wrappers for App Engine, as well as the
+required jar files from Google App Engine SDK for Java. Version #{sdk_version} 
+is included in this release.
+EOF
   s.add_dependency("appengine-rack")
-  
   s.require_path = 'lib'
   s.files = %w(COPYING README.rdoc Rakefile) + 
       Dir.glob("spec/**/*.rb") + Dir.glob("lib/**/*")
@@ -49,7 +64,6 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_opts = %w(-fs --color)
 end
 
-
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end

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.17'
+  VERSION = '0.0.18'
 end

data/lib/appengine-apis/oauth.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/ruby1.8 -w
+#
+# Copyright:: Copyright 2009 Google Inc.
+# Original Author:: John Wang (mailto:jwang392@gmail.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
+  # OAuth protocol provides information useful for granting permissions, and
+  # retrieving information about the user who is currently logged-in.
+  module OAuth
+    import com.google.appengine.api.users.User
+    import com.google.appengine.api.oauth.OAuthRequestException;
+    import com.google.appengine.api.oauth.OAuthService;
+    import com.google.appengine.api.oauth.OAuthServiceFactory;
+    import com.google.appengine.api.oauth.OAuthServiceFailureException;    
+    
+    Service = OAuthServiceFactory.getOAuthService
+    
+    class << self
+      
+      # If the user is logged in, this method will return a User that contains
+      # information about them. Note that repeated calls may not necessarily
+      # return the same User object.
+      def current_user
+          Service.current_user
+      end
+      
+      # Returns the oauth_consumer_key OAuth parameter from the request.
+      # Throws:
+      # OAuthRequestException  - If the request was not a valid OAuth request. 
+      # OAuthServiceFailureException - If an unknown OAuth error occurred.
+      def oauth_consumer_key
+        Service.get_oauth_consumer_key
+      end
+      
+      # Returns true if the user making this request is an admin for this
+      # application, false otherwise.
+      # 
+      # This is a separate function, and not a member function of the User
+      # class, because admin status is not persisted in the datastore. It
+      # only exists for the user making this request right now.
+      def admin?
+        Service.is_user_admin?
+      end
+    end
+
+  end
+end

data/lib/appengine-apis/testing.rb

@@ -50,9 +50,11 @@ module AppEngine
             testing::LocalImagesServiceTestConfig.new,
             testing::LocalMailServiceTestConfig.new,
             testing::LocalMemcacheServiceTestConfig.new,
-            testing::LocalTaskQueueTestConfig.new,
+          # TODO: need a flag to optionally enable this
+          # testing::LocalTaskQueueTestConfig.new,
             testing::LocalURLFetchServiceTestConfig.new,
             testing::LocalUserServiceTestConfig.new,
+            testing::LocalOAuthServiceTestConfig.new,
             testing::LocalXMPPServiceTestConfig.new,
           ].to_java(testing::LocalServiceTestConfig)
           testing::LocalServiceTestHelper.new(configs)

data/spec/oauth_spec.rb

@@ -0,0 +1,43 @@
+# Copyright:: Copyright 2009 Google Inc.
+# Original Author:: John Wang (mailto:jwang392@gmail.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.
+
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'appengine-apis/oauth'
+
+describe AppEngine::OAuth do
+  before :all do
+    AppEngine::Testing::setup
+  end
+
+  before :each do
+    @env = AppEngine::Testing::helper
+    @env.set_env_consumer_key '0685bd9184jfhq22'
+  end
+
+  it "should get current user" do
+    user = AppEngine::OAuth.current_user
+  end
+
+  it 'should read consumer key' do
+    AppEngine::OAuth.oauth_consumer_key.should == '0685bd9184jfhq22'
+  end
+
+  it 'should read admin' do
+    AppEngine::OAuth.admin?.should == false
+    @env.set_env_is_admin true
+    AppEngine::OAuth.admin?.should == true
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Ryan Brown
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 -04:00
+date: 2010-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,11 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Ruby API wrappers for App Engine
+description: |
+  This gem includes the JRuby API wrappers for App Engine, as well as the
+  required jar files from Google App Engine SDK for Java. Version 1.3.5 
+  is included in this release.
+
 email: ribrdb@gmail.com
 executables: []
 
@@ -47,13 +51,14 @@ files:
 - spec/logger_spec.rb
 - spec/mail_spec.rb
 - spec/memcache_spec.rb
+- spec/oauth_spec.rb
 - spec/spec_helper.rb
 - spec/taskqueue_spec.rb
 - spec/urlfetch_spec.rb
 - spec/users_spec.rb
 - spec/xmpp_spec.rb
-- lib/appengine-api-1.0-sdk-1.3.4.jar
-- lib/appengine-api-labs-1.3.4.jar
+- lib/appengine-api-1.0-sdk-1.3.5.jar
+- lib/appengine-api-labs-1.3.5.jar
 - lib/appengine-apis/apiproxy.rb
 - lib/appengine-apis/datastore.rb
 - lib/appengine-apis/datastore_types.rb
@@ -64,6 +69,7 @@ files:
 - lib/appengine-apis/mail.rb
 - lib/appengine-apis/memcache.rb
 - lib/appengine-apis/merb-logger.rb
+- lib/appengine-apis/oauth.rb
 - lib/appengine-apis/runtime.rb
 - lib/appengine-apis/sdk.rb
 - lib/appengine-apis/tempfile.rb