ticketevolution-ruby 0.6.6 → 0.7.0

data/.minimum.versions.gemfile

@@ -1,7 +1,7 @@
 source :gemcutter
 
 gem 'activesupport', '3.0.0'
-gem 'curb', '0.7.8'
+gem 'faraday', '0.7.3'
 gem 'yajl-ruby', '0.7.7'
 gem 'multi_json', '0.0.4'
 gem 'nokogiri', '1.4.3'

data/README.markdown

@@ -58,7 +58,7 @@ Each set of API credentials can be combined with a mode and api version to creat
       :version => 8       # => (optional) API version to use - the only available
                                           version at the time of this writing is 8
       :logger => nil      # => (optional) Object to use for logging requests and
-                          #               responses. Any object which responds to '<<'
+                          #               responses. Any 'Logger' instance object
                           #               is valid. EX: Logger.new('log/te_api.log')
     })
 
@@ -256,7 +256,7 @@ Click on the links next to each endpoint for more detail.
     @venue = @connection.venues.show(id)
 
 
-######ticketevolution-ruby v0.6.2
+######ticketevolution-ruby v0.7.0
 
 License
 -------

data/Rakefile

@@ -32,9 +32,8 @@ namespace :documentation do
     # Endpoints
     contents << load_doc('endpoints')
 
-    endpoints_connection = Curl::Easy.new('http://developer.ticketevolution.com/endpoints.xml')
-    endpoints_connection.http_get
-    endpoints_xml = Nokogiri::XML(endpoints_connection.body_str)
+    endpoints_connection = Faraday.new('http://developer.ticketevolution.com/endpoints.xml').get
+    endpoints_xml = Nokogiri::XML(endpoints_connection.body)
 
     endpoints_xml.xpath('//endpoint').sort_by{|x| x.xpath('name').children.to_s}.each do |xml|
       presenter = ThisTask::EndpointPresenter.new(xml)

data/lib/docs/objects.markdown

@@ -16,7 +16,7 @@ Each set of API credentials can be combined with a mode and api version to creat
       :version => 8       # => (optional) API version to use - the only available
                                           version at the time of this writing is 8
       :logger => nil      # => (optional) Object to use for logging requests and
-                          #               responses. Any object which responds to '<<'
+                          #               responses. Any 'Logger' instance object
                           #               is valid. EX: Logger.new('log/te_api.log')
     })
 

data/lib/faraday/response/verbose_logger.rb

@@ -0,0 +1,34 @@
+require 'forwardable'
+
+module Faraday
+  class Response::VerboseLogger < Response::Middleware
+    extend Forwardable
+
+    def initialize(app, logger)
+      super(app)
+      @logger = logger
+    end
+
+    def_delegators :@logger, :debug, :info, :warn, :error, :fatal
+
+    def call(env)
+      info "#{env[:method]} #{env[:url].to_s}"
+      debug('request headers') { dump_headers env[:request_headers] }
+      debug('request body') { env[:body] }
+      super
+    end
+
+    def on_complete(env)
+      info('Status') { env[:status].to_s }
+      debug('response headers') { dump_headers env[:response_headers] }
+      debug('response body') { env[:body] }
+    end
+
+    private
+
+    def dump_headers(headers)
+      headers.map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
+    end
+  end
+end
+

data/lib/ticket_evolution/core/connection.rb

@@ -1,6 +1,6 @@
 module TicketEvolution
   class Connection < Base
-    cattr_reader :default_options, :expected_options, :oldest_version_in_service
+    cattr_reader :default_options, :expected_options, :oldest_version_in_service, :adapter
     cattr_accessor :protocol, :url_base
 
     @@oldest_version_in_service = 8
@@ -24,7 +24,10 @@ module TicketEvolution
     @@url_base = "ticketevolution.com"
     @@protocol = "https"
 
+    @@adapter = :net_http
+
     def initialize(opts = {})
+      @adapter = self.class.adapter
       @config = self.class.default_options.merge(opts)
       @config.delete_if{|k, v| ! TicketEvolution::Connection.expected_options.include?(k)}
 
@@ -56,27 +59,31 @@ module TicketEvolution
     end
 
     def sign(method, path, content = nil)
+      d = "#{method} #{process_params(method, path, content).gsub(TicketEvolution::Connection.protocol+'://', '').gsub(/\:\d{2,5}\//, '/')}"
       Base64.encode64(
         OpenSSL::HMAC.digest(
           OpenSSL::Digest::Digest.new('sha256'),
           @config[:secret],
-          "#{method} #{process_params(method, path, content).gsub(TicketEvolution::Connection.protocol+'://', '').gsub(/\:\d{2,5}\//, '/')}"
+          d
       )).chomp
     end
 
     def build_request(method, path, params = nil)
-      Curl::Easy.new(generate_url(method, self.uri(path), params)) do |request|
-        if @config.has_key?(:ssl_verify)
-          request.ssl_verify_host = @config[:ssl_verify]
-          request.ssl_verify_peer = @config[:ssl_verify]
-        end
-        if self.logger.present?
-          request.on_debug { |type, data| self.logger << data }
-        end
-        request.post_body = post_body(params) unless method == :GET
-        request.headers["Accept"] = "application/vnd.ticketevolution.api+json; version=#{@config[:version]}" unless @config[:version] > 8
-        request.headers["X-Signature"] = sign(method, self.uri(path), params)
-        request.headers["X-Token"] = @config[:token]
+      options = {
+        :headers => {
+          "X-Signature" => sign(method, self.uri(path), params),
+          "X-Token" => @config[:token]
+        },
+        :ssl => {
+          :verify => @config[:ssl_verify]
+        }
+      }
+      options[:ssl][:verify] = false unless @config[:mode].to_s == 'production' ## REMOVE ME WHEN SANDBOX SSL IS FIXED
+      options[:params] = params if method == :GET
+      options[:headers]["Accept"] = "application/vnd.ticketevolution.api+json; version=#{@config[:version]}" unless @config[:version] > 8
+      Faraday.new(self.uri(path), options) do |builder|
+        builder.use Faraday::Response::VerboseLogger, self.logger if self.logger.present?
+        builder.adapter @adapter
       end
     end
 
@@ -90,15 +97,6 @@ module TicketEvolution
       MultiJson.encode(params)
     end
 
-    def generate_url(method, uri, params)
-      case method
-      when :GET
-        process_params(method, uri, params)
-      else
-        uri
-      end
-    end
-
     def process_params(method, uri, params)
       "#{uri}?#{if params.present?
         case method

data/lib/ticket_evolution/core/endpoint/request_handler.rb

@@ -20,11 +20,20 @@ module TicketEvolution
 
       def request(method, path, params = nil, &response_handler)
         redirecting = caller.first =~ /request_handler/ ? false : true
-        response = self.build_request(method, path, params, redirecting)
-        response.http(method)
-        response = self.naturalize_response(response)
+        request = self.build_request(method, path, params, redirecting)
+
+        response = self.naturalize_response do
+          method = method.to_s.downcase.to_sym
+          if method == :get
+            request.send(method)
+          else
+            request.send(method) do |req|
+              req.body = MultiJson.encode(params)
+            end
+          end
+        end
         if [301, 302].include?(response.response_code)
-          new_path = response.header.match(/Location: ([\w\.:\/]*)/).to_a[1].to_s.match(/^https?:\/\/[a-zA-Z_]+[\.a-zA-Z_]+(\/[\w\/]+)[\?]*/).to_a[1]
+          new_path = response.header['location'].match(/^https?:\/\/[a-zA-Z_]+[\.a-zA-Z_]+(\/[\w\/]+)[\?]*/).to_a[1]
           self.request(method, new_path, params, &response_handler)
         elsif response.response_code >= 300
           TicketEvolution::ApiError.new(response)
@@ -38,12 +47,13 @@ module TicketEvolution
         self.connection.build_request(method, "#{build_path ? self.base_path : ''}#{path}", params)
       end
 
-      def naturalize_response(response)
+      def naturalize_response(response = nil)
+        response = yield if block_given?
         OpenStruct.new.tap do |resp|
-          resp.header = response.header_str
-          resp.response_code = response.response_code
-          resp.body = MultiJson.decode(response.body_str).merge({:connection => self.connection})
-          resp.server_message = (CODES[response.response_code] || ['Unknown Error']).last
+          resp.header = response.headers
+          resp.response_code = response.status
+          resp.body = MultiJson.decode(response.body).merge({:connection => self.connection})
+          resp.server_message = (CODES[resp.response_code] || ['Unknown Error']).last
         end
       end
     end

data/lib/ticket_evolution/core/model.rb

@@ -48,10 +48,12 @@ module TicketEvolution
           define_method(name) do
             begin
               obj = @table[name]
-              def obj.endpoint=(e); @endpoint = e; end
-              def obj.method_missing(method, *args); @endpoint.send(method, *args); end
-              named_endpoint = "#{self.plural_class_name}::#{name.to_s.camelize}".constantize
-              obj.endpoint = named_endpoint.new(:parent => self.plural_class.new(:id => self.id, :parent => @connection))
+              unless obj.nil?
+                def obj.endpoint=(e); @endpoint = e; end
+                def obj.method_missing(method, *args); @endpoint.send(method, *args); end
+                named_endpoint = "#{self.plural_class_name}::#{name.to_s.camelize}".constantize
+                obj.endpoint = named_endpoint.new(:parent => self.plural_class.new(:id => self.id, :parent => @connection))
+              end
               obj
             rescue
               @table[name]

data/lib/ticket_evolution/modules/update.rb

@@ -4,20 +4,33 @@ module TicketEvolution
       def self.included(klass)
         Class.new{extend SingularClass}.singular_class(klass.name).send(:include, Module.new{
           def update_attributes(params)
-            params.each{|k, v| send("#{k}=", process_datum(v))}
-            plural_class.new({:parent => @connection, :id => params.delete(:id)}).update(params)
+            atts = self.attributes.merge(params)
+            id = atts.delete(:id)
+            response = plural_class.new({:parent => @connection, :id => id}).update(atts)
+            if response.is_a?(TicketEvolution::ApiError)
+              response
+            else
+              self.attributes = response.attributes
+              self
+            end
           end
 
           def save
-            atts = self.attributes
-            plural_class.new({:parent => @connection, :id => atts.delete(:id)}).update(atts)
+            update_attributes({})
           end
         })
       end
 
       def update(params = nil)
         ensure_id
-        request(:PUT, "/#{self.id}", params)
+        request(:PUT, nil, params, &method(:build_for_update))
+      end
+
+      def build_for_update(response)
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message
+        }))
       end
     end
   end

data/lib/ticket_evolution/version.rb

@@ -1,3 +1,3 @@
 module TicketEvolution
-  VERSION = '0.6.6'
+  VERSION = '0.7.0'
 end

data/lib/ticket_evolution.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'yajl'
 require 'multi_json'
-require 'curb'
+require 'faraday'
 
 require 'ostruct'
 require 'base64'
@@ -18,6 +18,8 @@ require 'active_support/core_ext/module'
 require 'active_support/core_ext/object'
 require 'active_support/inflector'
 
+require 'faraday/response/verbose_logger'
+
 if ActiveSupport::VERSION::STRING < "3.1.0"
   class Hash
     def to_param(namespace = nil)

data/spec/fixtures/fake.rb

@@ -26,7 +26,7 @@ class Fake
 
   def self.redirect_response
     r = self.response
-    r.header = "HTTP/1.1 301 Moved Permanently\r\nContent-Type: text/html\r\nConnection: keep-alive\r\nStatus: 301\r\nX-Powered-By: Phusion Passenger (mod_rails/mod_rack) 3.0.11\r\nX-UA-Compatible: IE=Edge,chrome=1\r\nLocation: http://api.ticketevolution.com/something_else/1\r\nX-Runtime: 0.001401\r\nContent-Length: 102\r\nServer: nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)\r\n\r\n"
+    r.header = {'location' => 'http://api.ticketevolution.com/something_else/1'}
     r.response_code = 302
     r.server_message = TicketEvolution::Endpoint::RequestHandler::CODES[302].last
     r

data/spec/fixtures/net/core/connection.yml

@@ -86,7 +86,7 @@
       accept:
       - application/vnd.ticketevolution.api+json; version=8
       x-signature:
-      - F/qzyf3TZi71VSZ7GtP9yfgdfB/LFGKIqup6s5GoQ8E=
+      - 6tWs3CIO4szKWCKxo8OkrtPCxTsdgjAT32LrpgZvr4M=
       x-token:
       - 621e8a816a4e31a4dcf9f450e6de150f
   response: !ruby/struct:VCR::Response
@@ -107,7 +107,7 @@
       location:
       - http://developer.ticketevolution.com
       x-runtime:
-      - '0.001958'
+      - '0.001729'
       content-length:
       - '102'
       server:
@@ -123,7 +123,7 @@
       accept:
       - application/vnd.ticketevolution.api+json; version=8
       x-signature:
-      - F/qzyf3TZi71VSZ7GtP9yfgdfB/LFGKIqup6s5GoQ8E=
+      - 6tWs3CIO4szKWCKxo8OkrtPCxTsdgjAT32LrpgZvr4M=
       x-token:
       - 621e8a816a4e31a4dcf9f450e6de150f
   response: !ruby/struct:VCR::Response
@@ -144,7 +144,46 @@
       location:
       - http://developer.ticketevolution.com
       x-runtime:
-      - '0.001958'
+      - '0.001729'
+      content-length:
+      - '102'
+      server:
+      - nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)
+    body: <html><body>You are being <a href="http://developer.ticketevolution.com">redirected</a>.</body></html>
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: https://api.sandbox.ticketevolution.com:443/
+    body: !!null 
+    headers:
+      x-signature:
+      - EHMCoxW80aA60GAi04x5zWHsthNwAijm8tu85Dw9mw0=
+      x-token:
+      - 621e8a816a4e31a4dcf9f450e6de150f
+      accept:
+      - application/vnd.ticketevolution.api+json; version=8
+      accept-encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 301
+      message: Moved Permanently
+    headers:
+      content-type:
+      - text/html
+      connection:
+      - keep-alive
+      status:
+      - '301'
+      x-powered-by:
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.11
+      x-ua-compatible:
+      - IE=Edge,chrome=1
+      location:
+      - http://developer.ticketevolution.com
+      x-runtime:
+      - '0.002040'
       content-length:
       - '102'
       server:

data/spec/fixtures/net/endpoints/accounts.yml

@@ -327,3 +327,47 @@
       - nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)
     body: <html><body>You are being <a href="http://developer.ticketevolution.com">redirected</a>.</body></html>
     http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: https://api.sandbox.ticketevolution.com:443/accounts/62
+    body: !!null 
+    headers:
+      x-signature:
+      - pJI/Zi+UHr/bfyNIT2P604nnFQdEoC6CyuasOGhKP68=
+      x-token:
+      - b2b5a7a33b1a78896ed1b53d81c5c9cc
+      accept:
+      - application/vnd.ticketevolution.api+json; version=8
+      accept-encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      content-type:
+      - application/vnd.ticketevolution.api+json; version=8; charset=utf-8
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      status:
+      - '200'
+      x-powered-by:
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.11
+      etag:
+      - ! '"2aa05292e24fd9ebd325cc99027a64a1"'
+      x-ua-compatible:
+      - IE=Edge,chrome=1
+      x-runtime:
+      - '0.057554'
+      cache-control:
+      - max-age=0, private, must-revalidate
+      strict-transport-security:
+      - max-age=31536000
+      server:
+      - nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)
+    body: ! '{"balance":"8583.71","url":"/accounts/62","updated_at":"2012-02-13T18:47:04Z","currency":"USD","id":"62","client":{"url":"/clients/3","name":"Main
+      Office","id":"3"}}'
+    http_version: '1.1'

data/spec/fixtures/net/endpoints/brokerages.yml

@@ -255,3 +255,47 @@
       - NY","_score":1.4142135,"name":"Totally New York","url":"/brokerages/725","id":"725","updated_at":"2011-02-10T13:44:47Z"},{"_type":"Brokerage","natb_member":false,"abbreviation":"At
       New York","_score":1.4142135,"name":"At New York & Company","url":"/brokerages/781","id":"781","updated_at":"2011-03-28T16:21:41Z"}]}'
     http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: https://api.sandbox.ticketevolution.com:443/brokerages/2
+    body: !!null 
+    headers:
+      x-signature:
+      - 36B0ISsVd28X7Ml4r2v/QTYLf0q9lCnA0WFb98NZ004=
+      x-token:
+      - b2b5a7a33b1a78896ed1b53d81c5c9cc
+      accept:
+      - application/vnd.ticketevolution.api+json; version=8
+      accept-encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      content-type:
+      - application/vnd.ticketevolution.api+json; version=8; charset=utf-8
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      status:
+      - '200'
+      x-powered-by:
+      - Phusion Passenger (mod_rails/mod_rack) 3.0.11
+      etag:
+      - ! '"6d78396d1811212dc31c155b1b14a8a7"'
+      x-ua-compatible:
+      - IE=Edge,chrome=1
+      x-runtime:
+      - '0.447611'
+      cache-control:
+      - max-age=0, private, must-revalidate
+      strict-transport-security:
+      - max-age=31536000
+      server:
+      - nginx/1.0.11 + Phusion Passenger 3.0.11 (mod_rails/mod_rack)
+    body: ! '{"natb_member":true,"url":"/brokerages/2","updated_at":"2012-01-11T23:07:43Z","abbreviation":"Golden
+      Tickets","name":"Golden Tickets","id":"2"}'
+    http_version: '1.1'