exvo-auth 0.7.3 → 0.7.4

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/exvo-auth.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/exvo_auth/autonomous/base.rb",
      "lib/exvo_auth/autonomous/cache.rb",
      "lib/exvo_auth/autonomous/consumer.rb",
+     "lib/exvo_auth/autonomous/http.rb",
      "lib/exvo_auth/autonomous/provider.rb",
      "lib/exvo_auth/config.rb",
      "lib/exvo_auth/controllers/base.rb",

data/lib/exvo-auth.rb

@@ -24,6 +24,7 @@ module ExvoAuth
     autoload :Provider, 'exvo_auth/autonomous/provider'
     autoload :Cache,    'exvo_auth/autonomous/cache'
     autoload :Auth,     'exvo_auth/autonomous/auth'
+    autoload :Http,     'exvo_auth/autonomous/http'
   end
   
   module OAuth2

data/lib/exvo_auth/autonomous/auth.rb

@@ -1,6 +1,15 @@
 class ExvoAuth::Autonomous::Auth
-  include HTTParty
-
-  base_uri(ExvoAuth::Config.host)
-  basic_auth(ExvoAuth::Config.client_id, ExvoAuth::Config.client_secret)
+  include ExvoAuth::Autonomous::Http
+  
+  def base_uri
+    ExvoAuth::Config.host
+  end
+  
+  def username
+    ExvoAuth::Config.client_id
+  end
+  
+  def password
+    ExvoAuth::Config.client_secret
+  end
 end

data/lib/exvo_auth/autonomous/base.rb

@@ -20,6 +20,6 @@ class ExvoAuth::Autonomous::Base
   
   # Makes testing easy
   def auth
-    ExvoAuth::Autonomous::Auth
+    ExvoAuth::Autonomous::Auth.new
   end
 end

data/lib/exvo_auth/autonomous/consumer.rb

@@ -1,46 +1,21 @@
 class ExvoAuth::Autonomous::Consumer < ExvoAuth::Autonomous::Base
+  include ExvoAuth::Autonomous::Http
+  
   def initialize(params = {})
     super
     validate_params!(:provider_id)
   end
-
-  def get(*args)
-    http.get(*args)
-  end
-
-  def post(*args)
-    http.post(*args)
-  end
-
-  def put(*args)
-    http.put(*args)
-  end
-
-  def delete(*args)
-    http.delete(*args)
-  end
-
-  def head(*args)
-    http.head(*args)
-  end
-
-  def options(*args)
-    http.options(*args)
-  end
   
-  protected
+  def base_uri
+    authorization["url"]
+  end
   
-  # Url and Token set on each request so expired authorization will cause re-authorization.
-  def http
-    basement.base_uri(authorization["url"])
-    basement.basic_auth(params[:client_id], authorization["access_token"])
-    basement
+  def username
+    params[:client_id]
   end
   
-  def basement
-    @basement ||= Class.new do
-      include HTTParty
-    end
+  def password
+    authorization["access_token"]
   end
   
   def authorization

data/lib/exvo_auth/autonomous/http.rb

@@ -0,0 +1,39 @@
+module ExvoAuth::Autonomous::Http
+  def get(*args)
+    http.get(*args)
+  end
+
+  def post(*args)
+    http.post(*args)
+  end
+
+  def put(*args)
+    http.put(*args)
+  end
+
+  def delete(*args)
+    http.delete(*args)
+  end
+
+  def head(*args)
+    http.head(*args)
+  end
+
+  def options(*args)
+    http.options(*args)
+  end
+  
+  protected
+  
+  def http
+    basement.base_uri(base_uri)
+    basement.basic_auth(username, password)
+    basement
+  end
+  
+  def basement
+    @basement ||= Class.new do
+      include HTTParty
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Jacek Becela
@@ -94,6 +94,7 @@ files:
 - lib/exvo_auth/autonomous/base.rb
 - lib/exvo_auth/autonomous/cache.rb
 - lib/exvo_auth/autonomous/consumer.rb
+- lib/exvo_auth/autonomous/http.rb
 - lib/exvo_auth/autonomous/provider.rb
 - lib/exvo_auth/config.rb
 - lib/exvo_auth/controllers/base.rb