omniauth-naranya_id 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a149dcf33862e6c9b242b23f4ad8c5ff4f9711d5
-  data.tar.gz: 9a67a8ca0db6ca616ac12f13baf9eb123e555032
+  metadata.gz: dd5d9ba8398dfc7cc94221b3828a0cf90b0073a4
+  data.tar.gz: 319f59cc5dbe14b92fa7467bb7620a3f40c41431
 SHA512:
-  metadata.gz: f4d2f8f8d38302e88407638ea02e62913a035e30d110edddd6f0a69a8398a63884dc7f97f00ffe8262fb5a7f64cd3b88b9c5b3cc810637d6eb383ce3a19dd842
-  data.tar.gz: 868bcc197e17512a5fde37b6879b6e7f0d79b9cb21756f545904c7d758b557e9ec732d0e55ac6bd060844c48387aece0af57adb399b8fd27e45dcf39c91d90e0
+  metadata.gz: e15cd66b4038afe486bac339400976ab12e32a2ce0dd7af3eab23390e1dd520665b039e55e906b73a625d98abd845a00bae20f2ebe09a2d1f4f841f7a69df9f8
+  data.tar.gz: 84b218948904ef1763772dd292751432c1afec452081de41b00a2d85e2618cd088528dea5d46f376d6f31d32e10a5c837f12a18336f181803ee89f09e83eff1e

data/lib/naranya_id/{user.rb → models/user.rb}

@@ -12,11 +12,6 @@ module NaranyaId
 
     class << self
 
-      def email_exists?(given_email_address)
-        Net::HTTP.get
-        consumer.post('/register/checkemail.php')
-      end
-
       def translate_attributes(attributes)
         translated_attributes = {
           id: attributes[:uuid],
@@ -31,15 +26,15 @@ module NaranyaId
       end
 
       def find_one(options={})
-
-        token = options.delete :token
-        secret = options.delete :secret
-
-        raise "Token/Secret not provided" unless token.present? and secret.present?
+        options = options.with_indifferent_access
+        
+        raise "Token/Secret not provided" unless options.has_key?(:token) and options.has_key?(:secret)
 
         api_consumer = NaranyaId.consumer
         
-        api_access_token = ::OAuth::AccessToken.new api_consumer, token, secret
+        NaranyaId.logger.info "Consumer key: '#{api_consumer.key}', Consumer secret: '#{api_consumer.secret}'"
+        NaranyaId.logger.info "Access token key: '#{options[:token]}', Access token secret: '#{options[:secret]}'"
+        api_access_token = ::OAuth::AccessToken.new api_consumer, options[:token], options[:secret]
         
         user_info_response = api_access_token.get('/crmcapi/index.php/user')
         

data/lib/naranya_id/railtie.rb

@@ -0,0 +1,134 @@
+# encoding: utf-8
+require "naranya_id"
+require "rails"
+
+module Rails
+  module NaranyaId
+
+    # Hooks NaranyaId into Rails 3 and higher.
+    #
+    # @since 2.0.0
+    class Railtie < Rails::Railtie
+
+      # # Determine which generator to use. app_generators was introduced after
+      # # 3.0.0.
+      # #
+      # # @example Get the generators method.
+      # # railtie.generators
+      # #
+      # # @return [ Symbol ] The method name to use.
+      # #
+      # # @since 2.0.0.rc.4
+      # def self.generator
+      #   config.respond_to?(:app_generators) ? :app_generators : :generators
+      # end
+
+      # # Mapping of rescued exceptions to HTTP responses
+      # #
+      # # @example
+      # # railtie.rescue_responses
+      # #
+      # # @ return [Hash] rescued responses
+      # #
+      # # @since 2.4.3
+      # def self.rescue_responses
+      #   {
+      #     "Mongoid::Errors::DocumentNotFound" => :not_found,
+      #     "Mongoid::Errors::Validations" => 422
+      #   }
+      # end
+
+      # config.send(generator).orm :mongoid, migration: false
+
+      # if config.action_dispatch.rescue_responses
+      #   config.action_dispatch.rescue_responses.merge!(rescue_responses)
+      # end
+
+      # rake_tasks do
+      #   load "mongoid/railties/database.rake"
+      # end
+
+      # Exposes NaranyaId's configuration to the Rails application configuration.
+      #
+      # @example Set up configuration in the Rails app.
+      # module MyApplication
+      # class Application < Rails::Application
+      # config.naranya_id.logger = Logger.new($stdout, :warn)
+      # config.naranya_id.consumer_key = "AAAA"
+      # end
+      # end
+      #
+      # @since 2.0.0
+      config.naranya_id = ::NaranyaId
+
+      # Initialize NaranyaId. This will look for a naranya_id.yml in the config
+      # directory and configure NaranyaId appropriately.
+      #
+      # @since 2.0.0
+      initializer "naranya_id.load-config" do
+        config_file = Rails.root.join("config", "naranya_id.yml")
+        if config_file.file?
+          begin
+            ::NaranyaId.load_config_from_yml!(config_file)
+          rescue ::NaranyaId::Errors::NoConsumerKeyConfig => e
+            handle_configuration_error(e)
+          rescue ::NaranyaId::Errors::NoConsumerSecretConfig => e
+            handle_configuration_error(e)
+          end
+        end
+      end
+
+      # # Set the proper error types for Rails. DocumentNotFound errors should be
+      # # 404s and not 500s, validation errors are 422s.
+      # #
+      # # @since 2.0.0
+      # config.after_initialize do
+      #   unless config.action_dispatch.rescue_responses
+      #     ActionDispatch::ShowExceptions.rescue_responses.update(Railtie.rescue_responses)
+      #   end
+      # end
+
+      # # Due to all models not getting loaded and messing up inheritance queries
+      # # and indexing, we need to preload the models in order to address this.
+      # #
+      # # This will happen every request in development, once in ther other
+      # # environments.
+      # #
+      # # @since 2.0.0
+      # initializer "mongoid.preload-models" do |app|
+      #   config.to_prepare do
+      #     ::Rails::Mongoid.preload_models(app)
+      #   end
+      # end
+
+      # config.after_initialize do
+      #   # Unicorn clears the START_CTX when a worker is forked, so if we have
+      #   # data in START_CTX then we know we're being preloaded. Unicorn does
+      #   # not provide application-level hooks for executing code after the
+      #   # process has forked, so we reconnect lazily.
+      #   if defined?(Unicorn) && !Unicorn::HttpServer::START_CTX.empty?
+      #     ::Mongoid.default_session.disconnect if ::Mongoid.configured?
+      #   end
+
+      #   # Passenger provides the :starting_worker_process event for executing
+      #   # code after it has forked, so we use that and reconnect immediately.
+      #   if ::Mongoid::Config.running_with_passenger?
+      #     PhusionPassenger.on_event(:starting_worker_process) do |forked|
+      #       ::Mongoid.default_session.disconnect if forked
+      #     end
+      #   end
+      # end
+
+      # Rails runs all initializers first before getting into any generator
+      # code, so we have no way in the intitializer to know if we are
+      # generating a mongoid.yml. So instead of failing, we catch all the
+      # errors and print them out.
+      #
+      # @since 3.0.0
+      def handle_configuration_error(e)
+        puts "There is a configuration error with the current naranya_id.yml."
+        puts e.message
+      end
+    end
+  end
+end

data/lib/naranya_id.rb

@@ -6,11 +6,21 @@ module NaranyaId
   
   extend ActiveSupport::Autoload
   
-  autoload :User
+  autoload_under 'models' do
+    autoload :User
+  end
+
+  module Errors
+    class NoConsumerKeyConfig < StandardError;        end
+    class NoConsumerSecretConfig < StandardError;     end
+    class ExpectedConfigTypeMismatch < StandardError; end
+  end
 
   include ActiveSupport::Configurable
 
-  CONSUMER_DEFAULTS = {
+  config_accessor(:setup, :skip_info, :debug_oauth)  { false }
+  config_accessor(:consumer_key, :consumer_secret)
+  config_accessor(:client_options) { {
     # TODO: Eliminar el :signature_method cuando se solucione el problema
     # con la firma del endpoint de access_token de Naranya ID:
     # (Se reestablecerá el default de 'HMAC-SHA1')
@@ -18,51 +28,138 @@ module NaranyaId
 
     # Sitio de Naranya ID:
     # TODO: Sustituir con el URL de producción (https)
-    #site:               "http://192.237.215.233:89",
+    # site:             "http://192.237.215.233:89",
     site:               "http://192.237.215.233",
-
     scheme:             :query_string,
     http_method:        :post,
     request_token_path: "/oauthv1/request_token.php",
     access_token_path:  "/oauthv1/access_token.php",
-    authorize_path:     "/oauthv1/authorize.php"
-  }.with_indifferent_access.freeze
+    authorize_path:     "/oauthv1/authorize.php",
+    debug_oauth:        false
+  }.with_indifferent_access }
+  config_accessor(:open_timeout, :read_timeout)       { 30 }
+  config_accessor(:authorize_params, :request_params) { {} }
+  config_accessor(:name)                              { "naranya_id" }
 
   class << self
 
     def consumer
-      auto_conf unless config.present?
-      @@consumer ||= begin
-        ::OAuth::Consumer.new config.api_key, config.api_secret, CONSUMER_DEFAULTS.merge( site: CONSUMER_DEFAULTS[:site] + ":89")
+
+      raise Errors::NoConsumerKeyConfig     unless config.consumer_key.present?
+      raise Errors::NoConsumerSecretConfig  unless config.consumer_secret.present?
+      
+      consumer = ::OAuth::Consumer.new(config.consumer_key, config.consumer_secret,
+        config.client_options.merge(site: "#{config.client_options[:site]}:89"))
+
+      consumer.http.open_timeout = config.open_timeout  if config.open_timeout
+      consumer.http.read_timeout = config.read_timeout  if config.read_timeout
+      
+      # Se habilita el output sólo si en las opciones debug_oauth es true:
+      consumer.http.set_debug_output($stderr)           if config.debug_oauth
+      consumer
+    end
+
+    def load_config_from_yml!(yml_path, env="production")
+      raise "YAML file doesn't exist" unless File.exist?(yml_path)
+      yml_config = YAML::load(ERB.new(File.read(yml_path)).result)
+      yml_config = yml_config[env] if yml_config.has_key?(env)
+      load_config_from_hash!(yml_config)
+    end
+
+    def load_config_from_hash!(given_hash)
+      configure do |config|
+        given_hash.each do |key, value|
+          
+          existing_value = config.send(key.to_sym)
+          
+          if existing_value.nil? || existing_value.is_a?(TrueClass) && value.is_a?(FalseClass) || existing_value.is_a?(FalseClass) && value.is_a?(TrueClass)
+            # Existing value was nil, or a boolean with a different value:
+            config.send "#{key}=".to_sym, value
+          else
+            if existing_value.is_a?(Hash) && value.is_a?(Hash)
+              # Merge hashes:
+              config.send "#{key}=".to_sym, existing_value.merge(value)
+            elsif existing_value.is_a?(Array) && value.is_a?(Array)
+              # Concat arrays:
+              config.send "#{key}=".to_sym, (existing_value + value).uniq
+            else
+              # Assign directly:
+              config.send "#{key}=".to_sym, value
+            end
+          end
+
+        end
       end
     end
 
-    def setup
-      yield config
+    # Get the logger.
+    #
+    # @note Will try to grab Rails' logger first before creating a new logger
+    # with stdout.
+    #
+    # @example Get the logger.
+    # Loggable.logger
+    #
+    # @return [ Logger ] The logger.
+    #
+    # @since 3.0.0
+    def logger
+      return @logger if defined?(@logger)
+      @logger = rails_logger || default_logger
     end
 
-    def options
-      auto_conf unless config.present?
-      opts = config.clone
-      opts.delete :api_key
-      opts.delete :api_secret
-      opts
+    # Set the logger.
+    #
+    # @example Set the logger.
+    # Loggable.logger = Logger.new($stdout)
+    #
+    # @param [ Logger ] The logger to set.
+    #
+    # @return [ Logger ] The new logger.
+    #
+    # @since 3.0.0
+    def logger=(logger)
+      @logger = logger
     end
 
-    def load_config_from_yml(yml_path, env="production")
-      raise "YAML file doesn't exist" unless File.exist?(yml_path)
-      yml_config = YAML::load(ERB.new(File.read(yml_path)).result)[env]
-      setup { |config| yml_config.each { |key, val| config.send "#{key}=".to_sym, val } }
+    private
+
+    # Gets the default Mongoid logger - stdout.
+    #
+    # @api private
+    #
+    # @example Get the default logger.
+    # Loggable.default_logger
+    #
+    # @return [ Logger ] The default logger.
+    #
+    # @since 3.0.0
+    def default_logger
+      logger = Logger.new($stdout)
+      logger.level = Logger::INFO
+      logger
     end
-  
-  protected
-    def auto_conf
-      # Cargar configuracion dentro del folder de config en Rails:
-      if defined?(Rails)
-        yml_path = File.join(Rails.root, 'config', 'naranya_id.yml')
-        load_config_from_yml(yml_path, Rails.env) if File.exists?(yml_path)     
-      end
+
+    # Get the Rails logger if it's defined.
+    #
+    # @api private
+    #
+    # @example Get Rails' logger.
+    # Loggable.rails_logger
+    #
+    # @return [ Logger ] The Rails logger.
+    #
+    # @since 3.0.0
+    def rails_logger
+      defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
     end
+
   end
   
+end
+
+# If we are using Rails then we will include the Mongoid railtie. This has all
+# the nifty initializers that Mongoid needs.
+if defined?(Rails)
+  require "naranya_id/railtie"
 end

data/lib/omniauth/strategies/naranya_id.rb

@@ -11,7 +11,7 @@ module OmniAuth
 
       # This is where you pass the options you would pass when
       # initializing your consumer from the OAuth gem.
-      option :client_options, ::NaranyaId::CONSUMER_DEFAULTS
+      option :client_options, ::NaranyaId.client_options
 
       # Override para habilitar/deshabilitar el output de debuggeo de HTTP:
       def consumer
@@ -73,7 +73,7 @@ module OmniAuth
       # Provee la informacion consultada del usuario vía el API de Naranya ID ()
       def raw_info
         @raw_info ||= begin
-          setup_sdk_key_and_secret! if sdk_key_or_secret_missing? and consumer_key_and_secret_present?
+          configure_sdk! if sdk_key_or_secret_missing? and consumer_key_and_secret_present?
           u = ::NaranyaId::User.find_one(
             token:  access_token.params[:oauth_token],
             secret: access_token.params[:oauth_token_secret]
@@ -86,17 +86,21 @@ module OmniAuth
 
       # Indicates if the SDK's api key + secret are missing
       def sdk_key_or_secret_missing?
-        !(::NaranyaId.config.has_key?(:api_key) && ::NaranyaId.config.has_key?(:api_secret))
+        !(::NaranyaId.consumer_key && ::NaranyaId.consumer_secret)
       end
 
       # Indicates whether the consumer key and secret where configured in the strategy initializer
       def consumer_key_and_secret_present?
-        options.consumer_key.present? && options.consumer_secret.present?
+        options.consumer_key && options.consumer_secret
       end
 
       # Configures the SDK's key + secret using the strategy's configured key and secret
-      def setup_sdk_key_and_secret!
-        ::NaranyaId.setup { |c| c.api_key, c.api_secret = options.consumer_key, options.consumer_secret }
+      def configure_sdk!
+        ::NaranyaId.configure do |config|
+          %w(consumer_key consumer_secret debug_oauth).each do |method|
+            config.send "#{method}=".to_sym, options.send(method.to_sym)
+          end
+        end
       end
 
     end

data/lib/omniauth-naranya_id/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module NaranyaId
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/omniauth-naranya_id.rb

@@ -1,3 +1,2 @@
 require 'omniauth-naranya_id/version'
-require 'naranya_id'
 require 'omniauth/strategies/naranya_id'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-naranya_id
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,7 +150,8 @@ files:
 - README.md
 - Rakefile
 - lib/naranya_id.rb
-- lib/naranya_id/user.rb
+- lib/naranya_id/models/user.rb
+- lib/naranya_id/railtie.rb
 - lib/omniauth-naranya_id.rb
 - lib/omniauth-naranya_id/version.rb
 - lib/omniauth/strategies/naranya_id.rb