bsm-sso-client 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f0c1a3a68deb279c8c0ab07902467feb474f63b4
-  data.tar.gz: d65454a036a2b8a8eb490c46a1f4f5e82eafffba
+SHA256:
+  metadata.gz: e2130651c34cb85c562ab688d121eed6f6d709c002ca6388d9a6742b19f2e134
+  data.tar.gz: 6fd1a90fb066f52d007086f30e5d2590639f3df17c4994b50bb1dbd89d6e7a3f
 SHA512:
-  metadata.gz: 51490c8cb4da30a9e36e1c4591b86bdf8f44d3018081e6b471b478a9184aa139514973b9863af58df2ed15e4dde0bb1a8d66a710258908a850e9815af680cfc4
-  data.tar.gz: 06e1b7fae948976796355ba5b17de669969d849c36f0926a28950855cf89a58af16c167f7233480470ea7bb8a68b8eb7eb1f07516aaa74b20ac30040062d463f
+  metadata.gz: 37811dc50112157d7ca226004bebd51f9ebdd77e7986d173bdaa7509ce88a7447bf17fa01f9a401bae8d0a04563e399a2eaabf34c2fe3512f0fff81a8da9d698
+  data.tar.gz: 3e84ae2f5bbbc07f2c7f990f957abd2944e7b123d779f7f6c38701f4a2b50ea07e63c81dc10ce49a21a9e76e8642783b1964ceb33f50391342918fca8a831d48

data/lib/bsm/sso/client.rb

@@ -69,7 +69,7 @@ module Bsm
         #
         #   # config/initializers/sso.rb
         #   Bsm::Sso::Client.configure do |c|
-        #     c.site = "https://sso.example.com"
+        #     c.site = "https://sso.test.host"
         #     c.secret = "m4GHRWxvXiL3ZSR8adShpqNWXmepkqeyUqRfpB8F"
         #   end
         def configure(&block)

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

@@ -1,89 +1,90 @@
-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(Bsm::Sso::Client.token_timeout.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[:query] ||= params.delete(:params)
-      collection       = params.delete(:collection)
-      params           = params.merge(:path => path)
-      params[:headers] = (params[:headers] || {}).merge(headers)
-
-      response = site.get(params)
-      return (collection ? [] : nil) unless response.status == 200
-
-      result = ActiveSupport::JSON.decode(response.body)
-      result = Array.wrap(result).map do |record|
-        instance = new(record)
-        instance if instance.id
-      end.compact
-      collection ? result : result.first
-    rescue MultiJson::DecodeError
-      collection ? [] : 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
-
-  # @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.sub(/[=?]$/, ''))
-  end
-
-  # @return [Hash] attributes hash
-  def attributes
-    dup
-  end
-
-  protected
-
-    def method_missing(method, *arguments)
-      method, punctation = method.to_s.sub(/([=?])$/, ''), $1
-
-      case punctation
-      when "="
-        store(method, arguments.first)
-      when "?"
-        self[method]
-      else
-        key?(method) ? fetch(method) : super
-      end
-    end
-
-end
+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,
+        mock:       defined?(WebMock),
+        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(Bsm::Sso::Client.token_timeout.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[:query] ||= params.delete(:params)
+      collection       = params.delete(:collection)
+      params           = params.merge(:path => path)
+      params[:headers] = (params[:headers] || {}).merge(headers)
+
+      response = site.get(params)
+      return (collection ? [] : nil) unless response.status == 200
+
+      result = ActiveSupport::JSON.decode(response.body)
+      result = Array.wrap(result).map do |record|
+        instance = new(record)
+        instance if instance.id
+      end.compact
+      collection ? result : result.first
+    rescue ActiveSupport::JSON.parse_error
+      collection ? [] : 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
+
+  # @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.sub(/[=?]$/, ''))
+  end
+
+  # @return [Hash] attributes hash
+  def attributes
+    dup
+  end
+
+  protected
+
+    def method_missing(method, *arguments)
+      method, punctation = method.to_s.sub(/([=?])$/, ''), $1
+
+      case punctation
+      when "="
+        store(method, arguments.first)
+      when "?"
+        self[method]
+      else
+        key?(method) ? fetch(method) : super
+      end
+    end
+
+end

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

@@ -1,3 +1,3 @@
-module Bsm::Sso::Client::Cached
-  autoload :ActiveRecord, "bsm/sso/client/cached/active_record"
-end
+module Bsm::Sso::Client::Cached
+  autoload :ActiveRecord, "bsm/sso/client/cached/active_record"
+end

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

@@ -1,50 +1,50 @@
-class Bsm::Sso::Client::User < Bsm::Sso::Client::AbstractResource
-
-  class << self
-
-    def all(options={})
-      get("/users", options.reverse_merge(:expects => [200, 404, 422], :collection => true))
-    end
-
-    def sso_find(id)
-      Bsm::Sso::Client.cache_store.fetch "users:#{id}", :expires_in => Bsm::Sso::Client.expire_after do
-        get "/users/#{id}", :expects => [200, 404, 422]
-      end
-    end
-
-    def sso_consume(ticket, service)
-      get "/consume", :query => { :ticket => ticket, :service => service }
-    end
-
-    def sso_authorize(token)
-      get "/authorize", :query => { :auth_token => token }
-    end
-
-    def sso_authenticate(credentials)
-      get "/authenticate", :query => credentials.slice(:email, :password)
-    end
-
-    def sso_sign_in_url(params = {})
-      sso_custom_absolute_method_root_url(:sign_in, params)
-    end
-
-    def sso_sign_out_url(params = {})
-      sso_custom_absolute_method_root_url(:sign_out, params)
-    end
-
-    private
-
-      def sso_custom_absolute_method_root_url(method_name, params = {})
-        conn = site.data
-        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_h.to_query}" unless params.empty?
-        url
-      end
-
-  end
-end
+class Bsm::Sso::Client::User < Bsm::Sso::Client::AbstractResource
+
+  class << self
+
+    def all(options={})
+      get("/users", options.reverse_merge(:expects => [200, 404, 422], :collection => true))
+    end
+
+    def sso_find(id)
+      Bsm::Sso::Client.cache_store.fetch "users:#{id}", :expires_in => Bsm::Sso::Client.expire_after do
+        get "/users/#{id}", :expects => [200, 404, 422]
+      end
+    end
+
+    def sso_consume(ticket, service)
+      get "/consume", :query => { :ticket => ticket, :service => service }
+    end
+
+    def sso_authorize(token)
+      get "/authorize", :query => { :auth_token => token }
+    end
+
+    def sso_authenticate(credentials)
+      get "/authenticate", :query => credentials.slice(:email, :password)
+    end
+
+    def sso_sign_in_url(params = {})
+      sso_custom_absolute_method_root_url(:sign_in, params)
+    end
+
+    def sso_sign_out_url(params = {})
+      sso_custom_absolute_method_root_url(:sign_out, params)
+    end
+
+    private
+
+      def sso_custom_absolute_method_root_url(method_name, params = {})
+        conn = site.data
+        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_h.to_query}" unless params.empty?
+        url
+      end
+
+  end
+end

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

@@ -1,38 +1,38 @@
-module Bsm::Sso::Client::UserMethods
-  extend ActiveSupport::Concern
-
-  included do
-    class << self
-      delegate :sso_sign_in_url, :sso_sign_out_url, :to => :"Bsm::Sso::Client::User"
-    end
-  end
-
-  module ClassMethods
-
-    def sso_find(id)
-      resource = Bsm::Sso::Client::User.sso_find(id)
-      sso_cache(resource, :find) if resource
-    end
-
-    def sso_consume(*a)
-      resource = Bsm::Sso::Client::User.sso_consume(*a)
-      sso_cache(resource, :consume) if resource
-    end
-
-    def sso_authenticate(*a)
-      resource = Bsm::Sso::Client::User.sso_authenticate(*a)
-      sso_cache(resource, :authenticate) if resource
-    end
-
-    def sso_authorize(*a)
-      resource = Bsm::Sso::Client::User.sso_authorize(*a)
-      sso_cache(resource, :authorize) if resource
-    end
-
-    def sso_cache(resource, action = nil)
-      new(resource.attributes)
-    end
-
-  end
-end
-
+module Bsm::Sso::Client::UserMethods
+  extend ActiveSupport::Concern
+
+  included do
+    class << self
+      delegate :sso_sign_in_url, :sso_sign_out_url, :to => :"Bsm::Sso::Client::User"
+    end
+  end
+
+  module ClassMethods
+
+    def sso_find(id)
+      resource = Bsm::Sso::Client::User.sso_find(id)
+      sso_cache(resource, :find) if resource
+    end
+
+    def sso_consume(*a)
+      resource = Bsm::Sso::Client::User.sso_consume(*a)
+      sso_cache(resource, :consume) if resource
+    end
+
+    def sso_authenticate(*a)
+      resource = Bsm::Sso::Client::User.sso_authenticate(*a)
+      sso_cache(resource, :authenticate) if resource
+    end
+
+    def sso_authorize(*a)
+      resource = Bsm::Sso::Client::User.sso_authorize(*a)
+      sso_cache(resource, :authorize) if resource
+    end
+
+    def sso_cache(resource, action = nil)
+      new(resource.attributes)
+    end
+
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bsm-sso-client
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -78,20 +78,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: BSM's internal SSO client