lib/etsy.rb in etsy-0.2.0 vs lib/etsy.rb in etsy-0.2.1

@@ -1,23 +1,32 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'net/http'
 require 'json'
 require 'oauth'
+require 'uri'
 
 require 'etsy/request'
 require 'etsy/response'
 
 require 'etsy/basic_client'
 require 'etsy/secure_client'
 require 'etsy/verification_request'
 
 require 'etsy/model'
 require 'etsy/user'
+require 'etsy/profile'
 require 'etsy/shop'
 require 'etsy/listing'
 require 'etsy/image'
+require 'etsy/transaction'
+require 'etsy/address'
+require 'etsy/category'
+require 'etsy/payment_template'
+require 'etsy/country'
+require 'etsy/shipping_template'
+require 'etsy/section'
 
 # = Etsy: A friendly Ruby interface to the Etsy API
 #
 # == Quick Start
 #
@@ -53,75 +62,75 @@
   class Error < RuntimeError; end
 
   class << self
     attr_accessor :api_key, :api_secret
     attr_writer :callback_url
+    attr_writer :permission_scopes
   end
 
+  SANDBOX_HOST = 'sandbox.openapi.etsy.com'
+  PRODUCTION_HOST = 'openapi.etsy.com'
+
   # Set the environment, accepts either :sandbox or :production. Defaults to :sandbox
   # and will raise an exception when set to an unrecognized environment.
   #
   def self.environment=(environment)
     unless [:sandbox, :production].include?(environment)
       raise(ArgumentError, "environment must be set to either :sandbox or :production")
     end
     @environment = environment
+    @host = (environment == :sandbox) ? SANDBOX_HOST : PRODUCTION_HOST
   end
 
   # The currently configured environment.
   #
   def self.environment
     @environment || :sandbox
   end
 
-  # Set the access mode, can either be :read_only or :read_write.  Defaults to :read_only
-  # and will raise an exception when set to an invalid value.
-  #
-  def self.access_mode=(mode)
-    unless [:read_only, :read_write].include?(mode)
-      raise(ArgumentError, "access mode must be set to either :read_only or :read_write")
-    end
-    @access_mode = mode
+  def self.host # :nodoc:
+    @host || SANDBOX_HOST
   end
 
-  # The currently configured access mode
-  #
-  def self.access_mode
-    @access_mode || :read_only
-  end
-
   # The configured callback URL or 'oob' if no callback URL is configured. This controls
   # whether or not we need to pass the OAuth verifier by hand.
   #
   def self.callback_url
     @callback_url || 'oob'
   end
 
+  # OAuth permission scopes. Defines which private fields we can have access to.
+  #
+  def self.permission_scopes
+    @permission_scopes || []
+  end
+
   # Find a user by username.  See Etsy::User for more information.
   #
   def self.user(username)
     User.find(username)
   end
 
   # Convenience method for accessing the authenticated user's own user information. Requires
   # authentication.
   #
-  def self.myself(token, secret)
-    User.myself(token, secret)
+  def self.myself(token, secret, options = {})
+    User.myself(token, secret, options)
   end
 
   # Generate a request token for authorization.
   #
   def self.request_token
+    clear_for_new_authorization
     verification_request.request_token
   end
 
   # Generate an access token from the request token, secret, and verifier. The verifier can
   # either be passed manually or from the params in the callback URL.
   #
   def self.access_token(request_token, request_secret, verifier)
-    @access_token ||= begin
+    @access_token = begin
       client = Etsy::SecureClient.new({
         :request_token  => request_token,
         :request_secret => request_secret,
         :verifier       => verifier
       })
@@ -133,11 +142,31 @@
   #
   def self.verification_url
     verification_request.url
   end
 
+  def self.single_user(access_token, access_secret)
+    @credentials = {
+      :access_token => access_token,
+      :access_secret => access_secret
+    }
+    nil
+  end
+
+  def self.credentials
+    @credentials || {}
+  end
+
   private
 
   def self.verification_request
     @verification_request ||= VerificationRequest.new
+  end
+
+  def self.clear_for_new_authorization
+    @verification_request = nil
+  end
+
+  def self.deprecate(message)
+    puts "DEPRECATED: #{message}."
   end
 end