uber-ruby 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89cf9d67885edb72a64702305cfb59e3bcea2f1
-  data.tar.gz: e9df6916f86475d22c8daffa0405abe10f715e42
+  metadata.gz: 1b110234300659f7056d22ff62ad5aa7d943f78f
+  data.tar.gz: 3b241992c3341246329bfd2e72efa0cee30b7a11
 SHA512:
-  metadata.gz: da1a0fd3b05179576f6684c3ac2fa4c2d6dca5d3af4b61b649cb7fabb43e6c29647cf55bf7c2290fec8f2989aba553a4607861e070476c090c00cb1337e1a8b8
-  data.tar.gz: 27280b1553c2e0e833936590812b6deef9b408c35914d900d36f7bc716ccc4627d6d029b56e22a890488490d7a6337a0aef060d6aa50b7a7d8244c7da216c745
+  metadata.gz: b24e742d27c346d71a8fbb3f6e9b95dc14ebb928b57512f7da5d032af426137193a8ec6b7044a0863149c0f8f9ac45aafa42f0ad79aa3b43735d80ae89ba31a4
+  data.tar.gz: f278ed4c63d1866a86ab96c3102c09eb93cbc9c5094d01588ce36b89f49244074b667beca3329d63cb3c7c0a95130d72945629d7016a902d87df27bae4cebece

data/lib/uber/api.rb

@@ -1,9 +1,10 @@
-require 'uber/products'
-require 'uber/price_estimates'
-require 'uber/time_estimates'
-require 'uber/activities'
-require 'uber/me'
-require 'uber/promotions'
+require 'uber/api/products'
+require 'uber/api/price_estimates'
+require 'uber/api/time_estimates'
+require 'uber/api/activities'
+require 'uber/api/me'
+require 'uber/api/promotions'
+require 'uber/api/requests'
 
 module Uber
   module API
@@ -14,5 +15,6 @@ module Uber
     include Uber::API::Activities
     include Uber::API::Me
     include Uber::API::Promotions
+    include Uber::API::Requests
   end
 end

data/lib/uber/{activities.rb → api/activities.rb}

@@ -1,6 +1,6 @@
 require 'uber/arguments'
-require 'uber/request'
-require 'uber/activity'
+require 'uber/api_request'
+require 'uber/models/activity'
 
 module Uber
   module API

data/lib/uber/{me.rb → api/me.rb}

@@ -1,6 +1,6 @@
 require 'uber/arguments'
-require 'uber/request'
-require 'uber/user'
+require 'uber/api_request'
+require 'uber/models/user'
 
 module Uber
   module API

data/lib/uber/{price_estimates.rb → api/price_estimates.rb}

@@ -1,6 +1,6 @@
 require 'uber/arguments'
-require 'uber/request'
-require 'uber/price'
+require 'uber/api_request'
+require 'uber/models/price'
 
 module Uber
   module API

data/lib/uber/{products.rb → api/products.rb}

@@ -1,6 +1,6 @@
 require 'uber/arguments'
-require 'uber/request'
-require 'uber/product'
+require 'uber/api_request'
+require 'uber/models/product'
 
 module Uber
   module API

data/lib/uber/{promotions.rb → api/promotions.rb}

@@ -1,6 +1,6 @@
 require 'uber/arguments'
-require 'uber/request'
-require 'uber/promotion'
+require 'uber/api_request'
+require 'uber/models/promotion'
 
 module Uber
   module API

data/lib/uber/api/requests.rb

@@ -0,0 +1,27 @@
+require 'uber/arguments'
+require 'uber/api_request'
+require 'uber/models/request'
+require 'uber/models/map'
+
+module Uber
+  module API
+    module Requests
+      def trip_request(*args)
+        arguments = Uber::Arguments.new(args)
+        perform_with_object(:post, "v1/requests", arguments.options, Request)
+      end
+
+      def trip_details(request_id)
+        perform_with_object(:get, "v1/requests/#{request_id}", {}, Request)
+      end
+
+      def trip_map(request_id)
+        perform_with_object(:get, "v1/requests/#{request_id}/map", {}, Map)
+      end
+
+      def trip_update(request_id, status)
+        perform_with_object(:put, "v1/sandbox/requests/#{request_id}", {status: status}, Request)
+      end
+    end
+  end
+end

data/lib/uber/{time_estimates.rb → api/time_estimates.rb}

@@ -1,6 +1,6 @@
 require 'uber/arguments'
-require 'uber/request'
-require 'uber/time'
+require 'uber/api_request'
+require 'uber/models/time'
 
 module Uber
   module API

data/lib/uber/{request.rb → api_request.rb}

@@ -1,5 +1,5 @@
 module Uber
-  class Request
+  class ApiRequest
     attr_accessor :client, :request_method, :path, :options
     alias_method :verb, :request_method
 
@@ -7,7 +7,7 @@ module Uber
     # @param request_method [String, Symbol]
     # @param path [String]
     # @param options [Hash]
-    # @return [Uber::Request]
+    # @return [Uber::ApiRequest]
     def initialize(client, request_method, path, options = {})
       @client = client
       @request_method = request_method.to_sym
@@ -21,7 +21,7 @@ module Uber
     end
 
     # @param klass [Class]
-    # @param request [Uber::Request]
+    # @param request [Uber::ApiRequest]
     # @return [Object]
     def perform_with_object(klass)
       klass.new(perform)

data/lib/uber/base.rb

@@ -8,9 +8,11 @@ module Uber
     # @param attrs [Hash]
     # @return [Uber::Base]
     def initialize(attrs = {})
-      attrs.each do |key, value|
-        if respond_to?(:"#{key}=")
-          send(:"#{key}=", value)
+      if !(attrs.nil? || attrs == "")
+        attrs.each do |key, value|
+          if respond_to?(:"#{key}=")
+            send(:"#{key}=", value)
+          end
         end
       end
     end

data/lib/uber/client.rb

@@ -11,8 +11,11 @@ module Uber
 
     attr_accessor :server_token, :client_id, :client_secret
     attr_accessor :bearer_token
+    attr_accessor :sandbox
+
     attr_writer :connection_options, :middleware
     ENDPOINT = 'https://api.uber.com'
+    SANDBOX_ENDPOINT = 'https://sandbox-api.uber.com'
 
     def initialize(options = {})
       options.each do |key, value|
@@ -54,8 +57,6 @@ module Uber
       @middleware ||= Faraday::RackBuilder.new do |faraday|
         # Encodes as "application/x-www-form-urlencoded" if not already encoded
         faraday.request :url_encoded
-        # Handle error responses
-        faraday.response :raise_error
         # Parse JSON response bodies
         faraday.response :parse_json
         # Use instrumentation if available
@@ -74,7 +75,13 @@ module Uber
     # Perform an HTTP POST request
     def post(path, params = {})
       headers = params.values.any? { |value| value.respond_to?(:to_io) } ? request_headers(:post, path, params, {}) : request_headers(:post, path, params)
-      request(:post, path, params, headers)
+      request(:post, path, params.to_json, headers)
+    end
+
+    # Perform an HTTP PUT request
+    def put(path, params = {})
+      headers = params.values.any? { |value| value.respond_to?(:to_io) } ? request_headers(:post, path, params, {}) : request_headers(:put, path, params)
+      request(:put, path, params.to_json, headers)
     end
 
     # @return [Boolean]
@@ -114,7 +121,7 @@ module Uber
     #
     # @return [Faraday::Connection]
     def connection
-      @connection ||= Faraday.new(ENDPOINT, connection_options)
+      @connection ||= Faraday.new(self.sandbox ? SANDBOX_ENDPOINT : ENDPOINT, connection_options)
     end
 
     def request(method, path, params = {}, headers = {})
@@ -128,7 +135,7 @@ module Uber
     def request_headers(method, path, params = {}, signature_params = params)
       headers = {}
       headers[:accept]        = '*/*'
-      headers[:content_type]  = 'application/x-www-form-urlencoded; charset=UTF-8'
+      headers[:content_type]  = 'application/json; charset=UTF-8'
       if bearer_token?
         headers[:authorization] = bearer_auth_header
       else

data/lib/uber/models/map.rb

@@ -0,0 +1,5 @@
+module Uber
+  class Map < Base
+    attr_accessor :request_id, :href
+  end
+end

data/lib/uber/models/request.rb

@@ -0,0 +1,55 @@
+module Uber
+  class Request < Base
+    attr_accessor :request_id, :status, :vehicle, :driver, :location, :eta, :surge_multiplier, :meta, :errors
+
+    def driver=(value)
+      @driver = value.nil? ? nil : Driver.new(value)
+    end
+
+    def vehicle=(value)
+      @vehicle = value.nil? ? nil : Vehicle.new(value)
+    end
+
+    def location=(value)
+      @location = value.nil? ? nil : Location.new(value)
+    end
+
+    def errors=(values)
+      @errors = values.map { |v| RequestError.new(v) }
+    end
+
+    def vehicle_name
+      vehicle.nil? ? nil : "#{vehicle.make} #{vehicle.model}"
+    end
+
+    def vehicle_image_url
+      vehicle.nil? ? nil : "#{vehicle.picture_url}"
+    end
+
+    def driver_image_url
+      driver.nil? ? nil : "#{driver.picture_url}"
+    end
+
+    def humanized_eta
+      unless eta.nil?
+        eta.to_i == 1 ? "#{eta} minute" : "#{eta} minutes"
+      end
+    end
+  end
+
+  class RequestError < Base
+    attr_accessor :status, :code, :title
+  end
+
+  class Driver < Base
+    attr_accessor :phone_number, :rating, :picture_url, :name
+  end
+
+  class Vehicle < Base
+    attr_accessor :make, :model, :license_plate, :picture_url
+  end
+
+  class Location < Base
+    attr_accessor :latitude, :longitude, :bearing
+  end
+end

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

@@ -1,5 +1,5 @@
 module Uber
   class User < Base
-    attr_accessor :first_name, :last_name, :email, :picture, :promo_code
+    attr_accessor :first_name, :last_name, :email, :picture, :promo_code, :uuid
   end
 end

data/lib/uber/utils.rb

@@ -1,5 +1,5 @@
 require 'uber/arguments'
-require 'uber/request'
+require 'uber/api_request'
 
 module Uber
   module Utils
@@ -8,7 +8,7 @@ module Uber
     # @param options [Hash]
     # @param klass [Class]
     def perform_with_object(request_method, path, options, klass)
-      request = Uber::Request.new(self, request_method, path, options)
+      request = Uber::ApiRequest.new(self, request_method, path, options)
       request.perform_with_object(klass)
     end
 
@@ -17,7 +17,7 @@ module Uber
     # @param options [Hash]
     # @param klass [Class]
     def perform_with_objects(request_method, path, options, klass)
-      request = Uber::Request.new(self, request_method, path, options)
+      request = Uber::ApiRequest.new(self, request_method, path, options)
       request.perform_with_objects(klass)
     end
   end

data/lib/uber/version.rb

@@ -1,8 +1,8 @@
 module Uber
   class Version
     MAJOR = 0
-    MINOR = 2
-    PATCH = 2
+    MINOR = 4
+    PATCH = 0
 
     class << self
       # @return [String]

data/uber-ruby.gemspec

@@ -21,8 +21,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_rubygems_version = '>= 1.3.5'
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", '~> 0'
+  spec.add_development_dependency "bundler",  "~> 1.5"
+  spec.add_development_dependency "rake",     "~> 0"
+  spec.add_development_dependency "webmock",  "~> 1.21.0"
+  spec.add_development_dependency "rspec",    "~> 3.3.0"
 
   spec.add_dependency 'faraday', '~> 0.9.0'
   spec.add_dependency 'json', '~> 1.8'

metadata

@@ -1,69 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: uber-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dingding Ye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.21.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 description: A Ruby interface to the Uber API.
@@ -77,27 +105,30 @@ files:
 - README.md
 - Rakefile
 - lib/uber.rb
-- lib/uber/activities.rb
-- lib/uber/activity.rb
 - lib/uber/api.rb
+- lib/uber/api/activities.rb
+- lib/uber/api/me.rb
+- lib/uber/api/price_estimates.rb
+- lib/uber/api/products.rb
+- lib/uber/api/promotions.rb
+- lib/uber/api/requests.rb
+- lib/uber/api/time_estimates.rb
+- lib/uber/api_request.rb
 - lib/uber/arguments.rb
 - lib/uber/base.rb
 - lib/uber/client.rb
 - lib/uber/error.rb
-- lib/uber/me.rb
+- lib/uber/models/activity.rb
+- lib/uber/models/map.rb
+- lib/uber/models/price.rb
+- lib/uber/models/product.rb
+- lib/uber/models/promotion.rb
+- lib/uber/models/request.rb
+- lib/uber/models/time.rb
+- lib/uber/models/user.rb
 - lib/uber/parse_json.rb
-- lib/uber/price.rb
-- lib/uber/price_estimates.rb
-- lib/uber/product.rb
-- lib/uber/products.rb
-- lib/uber/promotion.rb
-- lib/uber/promotions.rb
 - lib/uber/rate_limit.rb
-- lib/uber/request.rb
-- lib/uber/time.rb
-- lib/uber/time_estimates.rb
 - lib/uber/token.rb
-- lib/uber/user.rb
 - lib/uber/utils.rb
 - lib/uber/version.rb
 - uber-ruby.gemspec
@@ -111,17 +142,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The Uber Ruby Gem.