rlyft 1.0.0 → 2.0.0

data/lib/lyft/client/api/user.rb

@@ -2,45 +2,38 @@ module Lyft
   class Client
     module Api
       class User < Lyft::Client::Api::Base
-        ENDPOINTS = {
-          history: "/#{API_VERSION}/rides",
-          profile: "/#{API_VERSION}/profile"
-        }
-
         ##
         # Get ride history
         #
-        # @param [Hash] args
-        # @option args [String] :access_token (*required*)
-        # @option args [DateTime] :start_time (*required*)
-        # @option args [DateTime] :end_time
-        # @option args [Integer] :limit
+        # @param access_token [String] The access_token (*required*)
+        # @param params [Hash] The lyft parameters.
+        # @option params [DateTime] :start_time (*required*)
+        # @option params [DateTime] :end_time
+        # @option params [Integer] :limit
         #
-        def ride_history(args = {})
-          args.delete(:end_time) if args[:end_time].blank?
-          args.delete(:limit) if args[:limit].blank?
+        def ride_history(access_token:, params: {})
+          params.delete(:end_time) if params[:end_time].blank?
+          params.delete(:limit) if params[:limit].blank?
 
-          make_request(
-            http_method: :get,
-            endpoint: path_for(:history),
-            access_token: args.delete(:access_token),
-            options: { query: args }
-          )
+          resp = connection(access_token).get do |req|
+            req.url "/#{Api::VERSION}/rides"
+            req.params = params
+          end
+          handle_response(resp)
         end
 
         ##
         # Get user's profile
         #
-        # @param [Hash] args
-        # @option args [String] :access_token (*required*)
+        # @param access_token [String] The access_token (*required*)
+        # @param params [Hash] The lyft parameters.
         #
-        def profile(args = {})
-          make_request(
-            http_method: :get,
-            endpoint: path_for(:profile),
-            access_token: args.delete(:access_token),
-            options: { query: args }
-          )
+        def profile(access_token:, params: {})
+          resp = connection(access_token).get do |req|
+            req.url "/#{Api::VERSION}/profile"
+            req.params = params
+          end
+          handle_response(resp)
         end
       end
     end

data/lib/lyft/client/configuration.rb

@@ -1,7 +1,8 @@
 module Lyft
   class Client
     class Configuration
-      attr_reader :client_id, :client_secret, :debug_output, :use_sandbox
+      attr_accessor :access_token
+      attr_reader :client_id, :client_secret, :headers, :use_sandbox
 
       def initialize(args = {})
         raise ArgumentError, ':client_id is missing' if args[:client_id].blank?
@@ -10,7 +11,7 @@ module Lyft
         @client_id = args.fetch(:client_id)
         @client_secret = args.fetch(:client_secret)
         @use_sandbox = args.fetch(:use_sandbox, false)
-        @debug_output = args[:debug_output]
+        @headers = args[:headers] || {}
 
         @client_secret = "SANDBOX-#{@client_secret}" if sandbox?
       end

data/lib/lyft/response.rb

@@ -0,0 +1,8 @@
+module Lyft
+  class Response < Faraday::Response
+    def initialize(response)
+      super()
+      finish(response.env)
+    end
+  end
+end

data/lib/lyft/version.rb

@@ -1,3 +1,3 @@
 module Lyft
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

data/lyft.gemspec

@@ -27,17 +27,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'httparty'
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'hashie'
+  spec.add_runtime_dependency 'faraday'
+  spec.add_runtime_dependency 'faraday_middleware'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
-  spec.add_development_dependency "rubocop", "~> 0.47.1"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rlyft
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Taylor Scott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,20 +110,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.47.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.47.1
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -198,13 +184,16 @@ files:
 - bin/setup
 - lib/lyft.rb
 - lib/lyft/client.rb
+- lib/lyft/client/api.rb
 - lib/lyft/client/api/availability.rb
 - lib/lyft/client/api/base.rb
 - lib/lyft/client/api/oauth.rb
+- lib/lyft/client/api/oauth/grant_type.rb
+- lib/lyft/client/api/oauth/scope.rb
 - lib/lyft/client/api/rides.rb
 - lib/lyft/client/api/user.rb
 - lib/lyft/client/configuration.rb
-- lib/lyft/client/mashed_parser.rb
+- lib/lyft/response.rb
 - lib/lyft/ride.rb
 - lib/lyft/ride/status.rb
 - lib/lyft/ride/type.rb

data/lib/lyft/client/mashed_parser.rb

@@ -1,31 +0,0 @@
-module Lyft
-  class Client
-    class MashedParser < HTTParty::Parser
-      protected
-
-      def xml
-        mashed super
-      end
-
-      def json
-        mashed super
-      end
-
-      def yaml
-        mashed super
-      end
-
-      private
-
-      def mashed(body)
-        if body.is_a? Hash
-          Hashie::Mash.new body
-        elsif body.is_a? Array
-          body.map(&method(:mashed))
-        else
-          body
-        end
-      end
-    end
-  end
-end