bsm-sso-client 0.7.0 → 0.7.1

data/lib/bsm/sso/client.rb

@@ -6,7 +6,6 @@ require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/date_time/acts_like'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/dependencies'
-require 'active_resource'
 require 'action_controller'
 require 'action_controller/metal/exceptions'
 require 'rails_warden'

data/lib/bsm/sso/client/abstract_resource.rb

@@ -1,12 +1,73 @@
-class Bsm::Sso::Client::AbstractResource < ActiveResource::Base
-  self.format = :json
+require 'excon'
+require 'active_support/json'
+require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/hash/keys'
+
+class Bsm::Sso::Client::AbstractResource < Hash
 
   class << self
 
+    # @param [String] url
+    def site=(url)
+      @site = Excon.new url,
+        :idempotent => true,
+        :expects    => [200, 422],
+        :headers    => { 'Accept' => Mime::JSON.to_s, 'Content-Type' => Mime::JSON.to_s }
+    end
+
+    # @return [Excon::Connection] site connection
+    def site
+      @site || (superclass.respond_to?(:site) && superclass.site) || raise("No site specified for #{name}. Please specify #{name}.site = 'http://your.sso.host'")
+    end
+
+    # @return [Hash] default headers
     def headers
-      { 'AUTHORIZATION' => Bsm::Sso::Client.verifier.generate(30.seconds.from_now) }
+      { 'Authorization' => Bsm::Sso::Client.verifier.generate(30.seconds.from_now) }
     end
 
+    # @param [String] path
+    # @param [Hash] params, request params - see Excon::Connection#request
+    # @return [Bsm::Sso::Client::AbstractResource] fetches object from remote
+    def get(path, params = {})
+      params = params.merge(:path => path)
+      params[:headers] = (params[:headers] || {}).merge(headers)
+      response = site.get(params)
+      return nil unless response.status == 200
+
+      instance = new ActiveSupport::JSON.decode(response.body)
+      instance if instance.id
+    rescue MultiJson::DecodeError
+      nil
+    end
+
+  end
+
+  # Constuctor
+  # @param [Hash,NilClass] attributes the attributes to assign
+  def initialize(attributes = nil)
+    super()
+    update(attributes.stringify_keys) if attributes.is_a?(Hash)
   end
-end
 
+  # @return [Integer] ID, the primary key
+  def id
+    self["id"]
+  end
+
+  # @return [Boolean] true, if method exists?
+  def respond_to?(method, *)
+    super || key?(method.to_s)
+  end
+
+  # @return [Hash] attributes hash
+  def attributes
+    dup
+  end
+
+  protected
+
+    def method_missing(method, *)
+      key?(method.to_s) ? fetch(method.to_s) : super
+    end
+
+end

data/lib/bsm/sso/client/user.rb

@@ -1,28 +1,23 @@
 class Bsm::Sso::Client::User < Bsm::Sso::Client::AbstractResource
+
   class << self
 
     def sso_find(id)
       Bsm::Sso::Client.cache_store.fetch "users:#{id}", :expires_in => Bsm::Sso::Client.expire_after do
-        find(id)
+        get "/users/#{id}", :expects => [200, 404, 422]
       end
     end
 
     def sso_consume(ticket, service)
-      find :one, :from => '/consume', :params => { :ticket => ticket, :service => service }
-    rescue ActiveResource::ResourceInvalid
-      nil
+      get "/consume", :query => { :ticket => ticket, :service => service }
     end
 
     def sso_authorize(token)
-      find :one, :from => '/authorize', :params => { :auth_token => token }
-    rescue ActiveResource::ResourceInvalid
-      nil
+      get "/authorize", :query => { :auth_token => token }
     end
 
     def sso_authenticate(credentials)
-      find :one, :from => "/authenticate", :params => credentials.slice(:email, :password)
-    rescue ActiveResource::ResourceInvalid
-      nil
+      get "/authenticate", :query => credentials.slice(:email, :password)
     end
 
     def sso_sign_in_url(params = {})
@@ -36,7 +31,15 @@ class Bsm::Sso::Client::User < Bsm::Sso::Client::AbstractResource
     private
 
       def sso_custom_absolute_method_root_url(method_name, params = {})
-        "#{site.to_s.chomp('/')}/#{method_name}#{query_string(params)}"
+        conn = site.connection
+        port = ""
+        unless conn[:port].blank? || (conn[:scheme] == "http" && conn[:port].to_i == 80) || (conn[:scheme] == "https" && conn[:port].to_i == 443)
+          port = ":#{conn[:port]}"
+        end
+
+        url  = "#{conn[:scheme]}://#{conn[:host]}#{port}/#{method_name.to_s}"
+        url << "?#{params.to_query}" unless params.empty?
+        url
       end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bsm-sso-client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activeresource
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails_warden
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement