exvo-auth 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/exvo-auth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]

data/lib/exvo_auth/controllers/merb.rb

@@ -8,8 +8,19 @@ module ExvoAuth::Controllers::Merb
     def authenticate_user!
       super
       throw :halt unless signed_in?
-    end 
+    end
+
+    def authenticate_app_in_scope!(scope)    
+      basic_authentication do |consumer_id, access_token|
+        @current_scopes = ExvoAuth::Autonomous::Provider.new(
+          :consumer_id  => consumer_id,
+          :access_token => access_token
+        ).scopes
 
+        @current_scopes.include?(scope)
+      end
+    end
+    
     protected
 
     def redirect_to(*args)

data/lib/exvo_auth/controllers/rails.rb

@@ -6,8 +6,6 @@ module ExvoAuth::Controllers::Rails
   end
     
   module InstanceMethods
-    protected
-    
     def authenticate_app_in_scope!(scope)
       authenticate_or_request_with_http_basic do |consumer_id, access_token|
         @current_scopes = ExvoAuth::Autonomous::Provider.new(
@@ -19,6 +17,8 @@ module ExvoAuth::Controllers::Rails
       end
     end
 
+    protected
+    
     def find_user_by_id(id)
       User.find(id)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jacek Becela