rack-oauth2-server 1.4.5 → 1.4.6

data/test/setup.rb

@@ -7,6 +7,7 @@ require "timecop"
 require "ap"
 require "json"
 $: << File.dirname(__FILE__) + "/../lib"
+$: << File.expand_path(File.dirname(__FILE__) + "/..")
 require "rack/oauth2/server"
 
 
@@ -37,29 +38,45 @@ when "sinatra", nil
 
 when "rails"
 
-  require "initializer"
-  require "action_controller"
-  RAILS_ROOT = File.dirname(__FILE__) + "/rails"
   RAILS_ENV = "test"
-
-  class << Rails
-    def vendor_rails?
-      false
-    end
+  RAILS_ROOT = File.dirname(__FILE__) + "/rails3"
+  begin
+    require "rails"
+  rescue LoadError
   end
-  require RAILS_ROOT + "/config/environment"
-  puts "Testing with Rails #{Rails.version}"
+
+  if defined?(Rails::Railtie)
+    # Rails 3.x
+    require "rack/oauth2/server/railtie"
+    require File.dirname(__FILE__) + "/rails3/config/environment"
+    puts "Testing with Rails #{Rails.version}"
   
-  class Test::Unit::TestCase
-    def app
-      ActionController::Dispatcher.new
-    end
+    class Test::Unit::TestCase
+      def app
+        Rails.application
+      end
 
-    def admin!
+      def config
+        Rails.configuration.oauth
+      end
     end
 
-    def config
-      Rails.configuration.oauth
+  else
+    # Rails 2.x
+    RAILS_ROOT = File.dirname(__FILE__) + "/rails2"
+    require "initializer"
+    require "action_controller"
+    require File.dirname(__FILE__) + "/rails2/config/environment"
+    puts "Testing with Rails #{Rails.version}"
+  
+    class Test::Unit::TestCase
+      def app
+        ActionController::Dispatcher.new
+      end
+
+      def config
+        Rails.configuration.oauth
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2-server
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 4
-  - 5
-  version: 1.4.5
+  - 6
+  version: 1.4.6
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -08:00
+date: 2010-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,7 @@ files:
 - lib/rack/oauth2/admin/js/application.js
 - lib/rack/oauth2/admin/js/jquery.js
 - lib/rack/oauth2/admin/js/jquery.tmpl.js
+- lib/rack/oauth2/admin/js/jquery.tools.js
 - lib/rack/oauth2/admin/js/sammy.js
 - lib/rack/oauth2/admin/js/sammy.json.js
 - lib/rack/oauth2/admin/js/sammy.storage.js
@@ -114,6 +115,7 @@ files:
 - lib/rack/oauth2/rails.rb
 - lib/rack/oauth2/server/errors.rb
 - lib/rack/oauth2/server/helper.rb
+- lib/rack/oauth2/server/railtie.rb
 - lib/rack/oauth2/server/utils.rb
 - lib/rack/oauth2/server.rb
 - lib/rack/oauth2/sinatra.rb
@@ -124,13 +126,20 @@ files:
 - test/oauth/access_grant_test.rb
 - test/oauth/access_token_test.rb
 - test/oauth/authorization_test.rb
-- test/rails/app/controllers/api_controller.rb
-- test/rails/app/controllers/application_controller.rb
-- test/rails/app/controllers/oauth_controller.rb
-- test/rails/config/environment.rb
-- test/rails/config/environments/test.rb
-- test/rails/config/routes.rb
-- test/rails/log/test.log
+- test/rails2/app/controllers/api_controller.rb
+- test/rails2/app/controllers/application_controller.rb
+- test/rails2/app/controllers/oauth_controller.rb
+- test/rails2/config/environment.rb
+- test/rails2/config/environments/test.rb
+- test/rails2/config/routes.rb
+- test/rails2/log/test.log
+- test/rails3/app/controllers/api_controller.rb
+- test/rails3/app/controllers/application_controller.rb
+- test/rails3/app/controllers/oauth_controller.rb
+- test/rails3/config/application.rb
+- test/rails3/config/environment.rb
+- test/rails3/config/routes.rb
+- test/rails3/log/test.log
 - test/setup.rb
 - test/sinatra/my_app.rb
 - CHANGELOG
@@ -147,7 +156,7 @@ licenses: []
 post_install_message: To get started, run the command oauth2-server
 rdoc_options: 
 - --title
-- rack-oauth2-server 1.4.5
+- rack-oauth2-server 1.4.6
 - --main
 - README.rdoc
 - --webcvs