paypal-sdk-core 0.1.2 → 0.1.3

data/README.md

@@ -1,4 +1,4 @@
-# Paypal::Sdk::Core
+# PayPal SDK Core
 
 Core library for PayPal ruby SDKs.
 

data/lib/paypal-sdk-core.rb

@@ -1,41 +1,41 @@
-require "paypal-sdk/core/version"
-require "paypal-sdk/core/config"
-require "paypal-sdk/core/logging"
-
-module PayPal
-  module SDK
-    module Core
-
-      autoload :Authentication, "paypal-sdk/core/authentication"
-
-      module API
-        autoload :Base,     "paypal-sdk/core/api/base"
-        autoload :Merchant, "paypal-sdk/core/api/merchant"
-        autoload :Platform, "paypal-sdk/core/api/platform"
-        autoload :IPN,      "paypal-sdk/core/api/ipn"
-
-        module DataTypes
-          autoload :Base, "paypal-sdk/core/api/data_types/base"
-          autoload :Enum, "paypal-sdk/core/api/data_types/enum"
-          autoload :SimpleTypes, "paypal-sdk/core/api/data_types/simple_types"
-        end
-      end
-
-      module Util
-        autoload :OauthSignature, "paypal-sdk/core/util/oauth_signature"
-      end
-
-      module Credential
-        autoload :Base,         "paypal-sdk/core/credential/base"
-        autoload :Certificate,  "paypal-sdk/core/credential/certificate"
-        autoload :Signature,    "paypal-sdk/core/credential/signature"
-
-        module ThirdParty
-          autoload :Token,    "paypal-sdk/core/credential/third_party/token"
-          autoload :Subject,  "paypal-sdk/core/credential/third_party/subject"
-        end
-      end
-
-    end
-  end
-end
+require "paypal-sdk/core/version"
+require "paypal-sdk/core/config"
+require "paypal-sdk/core/logging"
+
+module PayPal
+  module SDK
+    module Core
+
+      autoload :Authentication, "paypal-sdk/core/authentication"
+
+      module API
+        autoload :Base,     "paypal-sdk/core/api/base"
+        autoload :Merchant, "paypal-sdk/core/api/merchant"
+        autoload :Platform, "paypal-sdk/core/api/platform"
+        autoload :IPN,      "paypal-sdk/core/api/ipn"
+
+        module DataTypes
+          autoload :Base, "paypal-sdk/core/api/data_types/base"
+          autoload :Enum, "paypal-sdk/core/api/data_types/enum"
+          autoload :SimpleTypes, "paypal-sdk/core/api/data_types/simple_types"
+        end
+      end
+
+      module Util
+        autoload :OauthSignature, "paypal-sdk/core/util/oauth_signature"
+      end
+
+      module Credential
+        autoload :Base,         "paypal-sdk/core/credential/base"
+        autoload :Certificate,  "paypal-sdk/core/credential/certificate"
+        autoload :Signature,    "paypal-sdk/core/credential/signature"
+
+        module ThirdParty
+          autoload :Token,    "paypal-sdk/core/credential/third_party/token"
+          autoload :Subject,  "paypal-sdk/core/credential/third_party/subject"
+        end
+      end
+
+    end
+  end
+end

data/lib/paypal-sdk/core/api/base.rb

@@ -125,13 +125,13 @@ module PayPal::SDK::Core
         uri, content, header = format_request(action, params)
         initheader    = default_http_header.merge(header).merge(initheader)
         initheader.delete_if{|key, val| val.nil? }
-        start_time    = Time.now
-        response      = @http.post(uri.path, content, initheader)
+        response      = 
+          log_event("Request: #{action}") do
+            @http.post(uri.path, content, initheader)
+          end
         format_response(action, response)
       rescue Net::HTTPBadGateway, Errno::ECONNRESET, Errno::ECONNABORTED, SocketError => error
         format_error(error, error.message)
-      ensure
-        log_event("Request: #{action}", start_time)
       end
 
       # Format Request data. It will be override by child class

data/lib/paypal-sdk/core/config.rb

@@ -1,139 +1,153 @@
-require 'erb'
-require 'yaml'
-
-module PayPal::SDK::Core
-
-  # Include Configuration module to access configuration from any object
-  # == Examples
-  #   # Include in any class
-  #   include Configuration
-  #
-  #   # Access config object and attributes
-  #   config
-  #   config.username
-  #
-  #   # Change configuration
-  #   set_config(:development)
-  module Configuration
-
-    # To get default Config object.
-    def config
-      @config ||= Config.config
-    end
-
-    # To change the configuration to given environment or configuration
-    # === Arguments
-    # * <tt>env</tt> -- Environment
-    # * <tt>override_configurations</tt> (Optional) -- To override the default configuration.
-    def set_config(env, override_configurations = {})
-      @config = env.is_a?(Config) ? env : Config.config(env, override_configurations)
-    end
-
-    alias_method :config=, :set_config
-  end
-
-  # Config class is used to hold the configurations.
-  # == Examples
-  #   # To load configurations from file
-  #   Config.load('config/paypal.yml', 'development')
-  #
-  #   # Get configuration
-  #   Config.config   # load default configuration
-  #   Config.config(:development) # load development configuration
-  #   Config.config(:development, :app_id => "XYZ") # Override configuration
-  #
-  #   # Read configuration attributes
-  #   config = Config.config
-  #   config.username
-  #   config.end_point
-  class Config
-    attr_accessor :username, :password, :signature, :app_id, :cert_path,
-        :token, :token_secret, :subject,
-        :http_timeout, :http_retry, :http_proxy, :ca_file,
-        :device_ipaddress, :sandbox_email_address,
-        :mode, :end_point, :merchant_end_point, :platform_end_point, :ipn_end_point,
-        :redirect_url, :dev_central_url,
-        :logfile
-
-    # Create Config object
-    # === Options(Hash)
-    # * <tt>username</tt>   -- Username
-    # * <tt>password</tt>   -- Password
-    # * <tt>signature</tt> (Optional if certificate present) -- Signature
-    # * <tt>app_id</tt>     -- Application ID
-    # * <tt>cert_path</tt> (Optional if signature present)  -- Certificate file path
-    def initialize(options)
-      options.each do |key, value|
-        send("#{key}=", value)
-      end
-    end
-
-    class << self
-
-      @@config_cache = {}
-
-      # Load configurations from file
-      # === Arguments
-      # * <tt>file_name</tt>             -- Configuration file path
-      # * <tt>default_environment</tt> (Optional)    -- default environment configuration to load
-      # === Example
-      #   Config.load('config/paypal.yml', 'development')
-      def load(file_name, default_env = default_environment)
-        @@configurations      = read_configurations(file_name)
-        @@default_environment = default_env
-        config
-      end
-
-      # Get default environment name
-      def default_environment
-        @@default_environment ||= ENV['PAYPAL_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['ENV'] || "development"
-      end
-
-      # Create or Load Config object based on given environment and configurations.
-      # === Attributes
-      # * <tt>env</tt> (Optional) -- Environment name
-      # * <tt>override_configuration</tt> (Optional) -- Override the configuration given in file.
-      # === Example
-      #   Config.config
-      #   Config.config(:development)
-      #   Config.config(:development, { :app_id => "XYZ" })
-      def config(env = default_environment, override_configuration = {})
-        if env.is_a? Hash
-          override_configuration = env
-          env = default_environment
-        end
-        env = (env || default_environment).to_s
-        raise "Configuration[#{env}] NotFound" unless configurations[env]
-        if override_configuration.nil? or override_configuration.empty?
-          @@config_cache[env] ||= new configurations[env]
-        else
-          new configurations[env].merge(override_configuration)
-        end
-      end
-
-      def logger=(logger)
-        Logging.logger = logger
-      end
-
-      def logger
-        Logging.logger
-      end
-
-      private
-      # Read configurations from the given file name
-      # === Arguments
-      # * <tt>file_name</tt> (Optional) -- Configuration file path
-      def read_configurations(file_name = "config/paypal.yml")
-        erb = ERB.new(File.read(file_name))
-        erb.filename = file_name
-        YAML.load(erb.result)
-      end
-
-      # Get raw configurations in Hash format.
-      def configurations
-        @@configurations ||= read_configurations
-      end
-
-    end
-  end
-end
+require 'erb'
+require 'yaml'
+
+module PayPal::SDK::Core
+
+  # Include Configuration module to access configuration from any object
+  # == Examples
+  #   # Include in any class
+  #   include Configuration
+  #
+  #   # Access config object and attributes
+  #   config
+  #   config.username
+  #
+  #   # Change configuration
+  #   set_config(:development)
+  module Configuration
+
+    # To get default Config object.
+    def config
+      @config ||= Config.config
+    end
+
+    # To change the configuration to given environment or configuration
+    # === Arguments
+    # * <tt>env</tt> -- Environment
+    # * <tt>override_configurations</tt> (Optional) -- To override the default configuration.
+    def set_config(env, override_configurations = {})
+      @config = env.is_a?(Config) ? env : Config.config(env, override_configurations)
+    end
+
+    alias_method :config=, :set_config
+  end
+
+  # Config class is used to hold the configurations.
+  # == Examples
+  #   # To load configurations from file
+  #   Config.load('config/paypal.yml', 'development')
+  #
+  #   # Get configuration
+  #   Config.config   # load default configuration
+  #   Config.config(:development) # load development configuration
+  #   Config.config(:development, :app_id => "XYZ") # Override configuration
+  #
+  #   # Read configuration attributes
+  #   config = Config.config
+  #   config.username
+  #   config.end_point
+  class Config
+    attr_accessor :username, :password, :signature, :app_id, :cert_path,
+        :token, :token_secret, :subject,
+        :http_timeout, :http_retry, :http_proxy, :ca_file,
+        :device_ipaddress, :sandbox_email_address,
+        :mode, :end_point, :merchant_end_point, :platform_end_point, :ipn_end_point,
+        :redirect_url, :dev_central_url,
+        :logfile
+
+    # Create Config object
+    # === Options(Hash)
+    # * <tt>username</tt>   -- Username
+    # * <tt>password</tt>   -- Password
+    # * <tt>signature</tt> (Optional if certificate present) -- Signature
+    # * <tt>app_id</tt>     -- Application ID
+    # * <tt>cert_path</tt> (Optional if signature present)  -- Certificate file path
+    def initialize(options)
+      options.each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+
+    class << self
+
+      @@config_cache = {}
+
+      # Load configurations from file
+      # === Arguments
+      # * <tt>file_name</tt>             -- Configuration file path
+      # * <tt>default_environment</tt> (Optional)    -- default environment configuration to load
+      # === Example
+      #   Config.load('config/paypal.yml', 'development')
+      def load(file_name, default_env = default_environment)
+        @@config_cache        = {}
+        @@configurations      = read_configurations(file_name)
+        @@default_environment = default_env
+        config
+      end
+
+      # Get default environment name
+      def default_environment
+        @@default_environment ||= ENV['PAYPAL_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['ENV'] || "development"
+      end
+
+      # Set default environment
+      def default_environment=(env)
+        @@default_environment = env.to_s
+      end
+
+      # Create or Load Config object based on given environment and configurations.
+      # === Attributes
+      # * <tt>env</tt> (Optional) -- Environment name
+      # * <tt>override_configuration</tt> (Optional) -- Override the configuration given in file.
+      # === Example
+      #   Config.config
+      #   Config.config(:development)
+      #   Config.config(:development, { :app_id => "XYZ" })
+      def config(env = default_environment, override_configuration = {})
+        if env.is_a? Hash
+          override_configuration = env
+          env = default_environment
+        end
+        env = (env || default_environment).to_s
+        raise "Configuration[#{env}] NotFound" unless configurations[env]
+        if override_configuration.nil? or override_configuration.empty?
+          @@config_cache[env] ||= new configurations[env]
+        else
+          new configurations[env].merge(override_configuration)
+        end
+      end
+
+      # Set logger
+      def logger=(logger)
+        Logging.logger = logger
+      end
+
+      # Get logger
+      def logger
+        Logging.logger
+      end
+
+      # Get raw configurations in Hash format.
+      def configurations
+        @@configurations ||= read_configurations
+      end
+
+      # Set configuration
+      def configurations=(configs)
+        @@config_cache   = {}
+        @@configurations = Hash[configs.map{|k,v| [k.to_s, v] }]
+      end
+
+      private
+      # Read configurations from the given file name
+      # === Arguments
+      # * <tt>file_name</tt> (Optional) -- Configuration file path
+      def read_configurations(file_name = "config/paypal.yml")
+        erb = ERB.new(File.read(file_name))
+        erb.filename = file_name
+        YAML.load(erb.result)
+      end
+
+    end
+  end
+end

data/lib/paypal-sdk/core/credential/third_party/token.rb

@@ -21,9 +21,9 @@ module PayPal::SDK::Core
 
         # Return credential properties for authentication.
         def properties
-          certificate_properties = {}
-          certificate_properties.delete_if{|k,v| RemoveProperties.include? k }
-          certificate_properties.merge( :authorization => oauth_authentication )
+          credential_properties = credential.properties
+          credential_properties.delete_if{|k,v| RemoveProperties.include? k }
+          credential_properties.merge( :authorization => oauth_authentication )
         end
 
         private

data/lib/paypal-sdk/core/logging.rb

@@ -1,43 +1,45 @@
-require 'logger'
-
-module PayPal::SDK::Core
-  # Include Logging module to provide logger functionality.
-  # == Configure logger
-  #   Logging.logger = Logger.new(STDERR)
-  #
-  # == Example
-  #   include Logger
-  #   logger.info "Debug message"
-  module Logging
-
-    # Get logger object
-    def logger
-      @logger ||= Logging.logger
-    end
-
-    def log_event(message, start_time, end_time = Time.now)
-      duration = sprintf("%.3f", end_time - start_time)
-      logger.info "[#{duration}] #{message}"
-    end
-
-    class << self
-
-      # Get or Create configured logger based on the default environment configuration
-      def logger
-        @logger ||= Logger.new(Config.config.logfile || STDERR)
-      end
-
-      # Set logger directly and clear the loggers cache.
-      # === Attributes
-      # * <tt>logger</tt> -- Logger object
-      # === Example
-      #   Logging.logger = Logger.new(STDERR)
-      def logger=(logger)
-        @logger  = logger
-      end
-
-    end
-  end
-
-end
-
+require 'logger'
+
+module PayPal::SDK::Core
+  # Include Logging module to provide logger functionality.
+  # == Configure logger
+  #   Logging.logger = Logger.new(STDERR)
+  #
+  # == Example
+  #   include Logger
+  #   logger.info "Debug message"
+  module Logging
+
+    # Get logger object
+    def logger
+      @logger ||= Logging.logger
+    end
+
+    def log_event(message, &block)
+      start_time = Time.now
+      block.call
+    ensure
+      logger.info sprintf("[%.3fs] %s", Time.now - start_time, message)
+    end
+
+    class << self
+
+      # Get or Create configured logger based on the default environment configuration
+      def logger
+        @logger ||= Logger.new(Config.config.logfile || STDERR)
+      end
+
+      # Set logger directly and clear the loggers cache.
+      # === Attributes
+      # * <tt>logger</tt> -- Logger object
+      # === Example
+      #   Logging.logger = Logger.new(STDERR)
+      def logger=(logger)
+        @logger  = logger
+      end
+
+    end
+  end
+
+end
+