Move to Faraday

.gitignore

@@ -6,3 +6,4 @@ Gemfile.lock
 .rvmrc
 *.sw*
 *.orig
+coverage/

Rakefile

@@ -1,12 +1,63 @@
 #!/usr/bin/env rake
 require 'rubygems'
 require 'rake/testtask'
+require 'rspec/core/rake_task'
 require "bundler/gem_tasks"
 
-task :default => :test
+task :default => [:test, :spec]
 
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = false
 end
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb"
+end
+
+namespace :spec do
+  desc "Setup specs"
+  task :setup do
+    require 'oauth'
+    require './lib/etsy/client'
+    key = ENV["ETSY_API_KEY"]
+    unless key
+      puts
+      puts "No API key found. Run (or add to .bashrc):"
+      puts "  export ETSY_API_KEY=<your api key>"
+    end
+
+    secret = ENV["ETSY_API_SECRET"]
+    unless secret
+      puts
+      puts "For authenticated (oauth) requests, you also need a secret"
+      puts "  export ETSY_API_SECRET=<your api secret>"
+    end
+
+    environment = ENV["ETSY_ENVIRONMENT"]
+    unless environment
+      puts
+      puts "Defaulting to production environment. To override:"
+      puts "  export ETSY_ENVIRONMENT=sandbox"
+    end
+
+    client = Etsy::Client.new(:api_key => key, :api_secret => secret)
+
+    req = client.request_token
+
+    puts "Go to:"
+    puts req.params[:login_url]
+    print "What is the verifier key? "
+    verifier = STDIN.gets.chomp.strip
+    token, secret = client.oauth_token(req, verifier)
+
+    puts
+    puts "These are your environment variables: "
+    puts "export ETSY_OAUTH_TOKEN=#{token}"
+    puts "export ETSY_OAUTH_SECRET=#{secret}"
+    puts "export ETSY_OAUTH_VERIFIER=#{verifier}"
+    puts
+  end
+end

etsy.gemspec

@@ -21,9 +21,20 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "json", ">= 1.5.0"
   gem.add_dependency "oauth", "~> 0.4.0"
+  gem.add_dependency "faraday", "~> 0.8.0"
+  gem.add_dependency "faraday_middleware", "~> 0.8.8"
+  gem.add_dependency "simple_oauth", "~> 0.1.8"
+  gem.add_dependency "jruby-openssl", "~> 0.7.7" if RUBY_PLATFORM == 'java'
 
   gem.add_development_dependency "rake", "~> 10.0.4"
   gem.add_development_dependency "jnunemaker-matchy", "~> 0.4.0"
+  # rspec version > 2.7.x breaks with jruby
+  # see http://jira.codehaus.org/browse/JRUBY-6324
+  # apparently this has been fixed. See http://jira.codehaus.org/browse/JRUBY-6324?focusedCommentId=287912&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-287912
+  gem.add_development_dependency "rspec", "~> 2.12.0"
+  gem.add_development_dependency "vcr", "~> 2.2.3"
+  gem.add_development_dependency "webmock", "~> 1.8.7"
+  gem.add_development_dependency "simplecov", "~> 0.6.4"
   gem.add_development_dependency 'shoulda', "~> 3.4.0"
   gem.add_development_dependency 'mocha', "~> 0.13.3"
   # shoulda-context blows up on ActiveSupport not being defined

lib/etsy.rb

@@ -1,10 +1,14 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'net/http'
+require 'faraday'
+require 'faraday_middleware'
 require 'json'
 require 'oauth'
 require 'uri'
 
+require 'etsy/client'
+
 require 'etsy/request'
 require 'etsy/response'
 

lib/etsy/client.rb

@@ -0,0 +1,71 @@
+module Etsy
+  class Client
+    attr_accessor :oauth_token, :oauth_secret
+
+    def initialize(options={})
+      @api_key      = options[:api_key]
+      @api_secret   = options[:api_secret]
+      @oauth_token  = options[:oauth_token]
+      @oauth_secret = options[:oauth_secret]
+      @environment = options[:environment] || :production
+    end
+
+    def myself
+      get("users/__SELF__").body["results"].first
+    end
+
+    def user(username)
+      get("users", :keywords => username).body["results"].first
+    end
+
+    def request_token
+      consumer = OAuth::Consumer.new(@api_key, @api_secret,
+        :site               => endpoint,
+        :request_token_path => "/v2/oauth/request_token",
+        :access_token_path  => "/v2/oauth/access_token"
+      )
+      consumer.get_request_token
+    end
+
+    def oauth_token(req, verifier)
+      access_token = req.get_access_token :oauth_verifier => verifier
+      [access_token.token, access_token.secret]
+    end
+
+    def get(path, options={})
+      connection.get(path, options)
+    end
+
+    private
+
+    def connection
+      @connection ||= Faraday.new(
+        :url => "#{endpoint}/v2",
+        :params => default_params
+      ) do |conn|
+        conn.request :json
+        conn.request :oauth, {
+          :token           => @oauth_token,
+          :token_secret    => @oauth_secret,
+          :consumer_key    => @api_key,
+          :consumer_secret => @api_secret
+        } if @oauth_token
+
+        conn.response :json, :content_type => /\bjson$/
+
+        conn.adapter Faraday.default_adapter
+      end
+    end
+
+    def endpoint
+      @environment == :production ? "http://openapi.etsy.com" : "http://sandbox.openapi.etsy.com"
+    end
+
+    def default_params
+      params = {}
+      params[:api_key] = @api_key if @api_key && !@oauth_token
+
+      params
+    end
+  end
+end

lib/etsy/query.rb

@@ -0,0 +1,70 @@
+require 'cgi'
+require 'etsy/resource'
+
+module Etsy
+  class Query
+
+    attr_reader :resource, :options, :associations
+    def initialize(*resource)
+      @resource = resource.join('/')
+      @options = {}
+      @associations = []
+    end
+
+    def limit
+      options.fetch(:limit) { 25 }
+    end
+
+    def offset
+      options.fetch(:offset) { 0 }
+    end
+
+    def page
+      options.fetch(:page) { 1 }
+    end
+
+    def include(resource, options = {})
+      @associations << Resource.new(resource, options) #.to_s.split('_').map(&:capitalize).join
+    end
+
+    def endpoint
+      "/#{resource}"
+    end
+
+    def query
+      return {} if options.size == 0 && associations.empty?
+      params = {}
+      options.each do |k, v|
+        params[k] = list(v)
+      end
+      unless associations.empty?
+        params[:includes] = associations.join(',')
+      end
+      params
+    end
+
+    private
+
+    def method_missing(method, *args, &block)
+      if assignment?(method)
+        key = method.to_s[0..-2].to_sym
+        options[key] = args.length == 1 ? args.first : args
+      elsif options.has_key?(method)
+        options[method]
+      else
+        super
+      end
+    end
+
+    def assignment?(method)
+      # Depending on the version of Ruby,
+      # s[-1] will return a character or a Fixnum
+      method.to_s[-1] == '='[0]
+    end
+
+    def list(values)
+      Array(values).join(',')
+    end
+
+  end
+end

lib/etsy/resource.rb

@@ -0,0 +1,47 @@
+module Etsy
+  class Resource
+
+    attr_reader :name, :limit, :offset, :fields, :scope, :child
+    def initialize(name, options = {})
+      @name = name.to_s.split('_').map(&:capitalize).join
+      @limit = options[:limit]
+      @offset = options[:offset]
+      @fields = options[:fields] || []
+      @scope = options[:scope]
+    end
+
+    def to_s
+      "#{name}#{selected_fields}#{scoped}#{range}#{child_resource}"
+    end
+
+    def include(resource)
+      @child = resource
+      self
+    end
+
+    private
+
+    def range
+      return unless offset || limit
+
+      if limit
+        ":#{offset || 0}:#{limit}"
+      else
+        ":#{offset}"
+      end
+    end
+
+    def selected_fields
+      "(#{fields.join(',')})" unless fields.empty?
+    end
+
+    def scoped
+      ":#{scope}" if scope
+    end
+
+    def child_resource
+      "/#{child}" if child
+    end
+
+  end
+end

spec/api_credentials.rb

@@ -0,0 +1,10 @@
+module Etsy
+  module Test
+    API_KEY        = ENV["ETSY_API_KEY"]        || "API_KEY"
+    API_SECRET     = ENV["ETSY_API_SECRET"]     || "API_SECRET"
+    OAUTH_TOKEN    = ENV["ETSY_OAUTH_TOKEN"]    || "OAUTH_TOKEN"
+    OAUTH_SECRET   = ENV["ETSY_OAUTH_SECRET"]   || "OAUTH_SECRET"
+    OAUTH_VERIFIER = ENV["ETSY_OAUTH_VERIFIER"] || "OAUTH_VERIFIER"
+    ENVIRONMENT    = ENV["ETSY_ENVIRONMENT"] || 'production'
+  end
+end