strava-ruby-client 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a1b298638723dd74bcfe279fcaacb537f5026db4ecb2e92e990381b5dafded1
-  data.tar.gz: 7186ed4468c5d027cac4a3dec6874f27e5d19ff0067b5a84cbd004d069d22127
+  metadata.gz: f045573621bd73cc02f898a0490f82e9dd23bb16c3bb19b59d8a221769f82b05
+  data.tar.gz: bad5418a5021c71875676cdcad683d436f2e3d657a1bf5dd0f235140d625c7fa
 SHA512:
-  metadata.gz: 5355242600a38d9d72156a11b80f7e86b4c08d59696ace79db384d99819ca4358fc562e658f15f14e2bbd4c3a4ed42776fd828569972fef8da90ff396e74819e
-  data.tar.gz: 485676cac51d01d18071132be42ff798dc12dfa127c8b4552baa7eb2f1189dd637869320b039057d1e6295ec2c81c71b6e45b101068d6dd691943c5bf13f12d0
+  metadata.gz: e7df01bd670072327b685ecfdeee70f9e2eb04be470a950baa6c7fb577236c263d8938c128ee9aad08c9290f8976883094a54f14fb621a8ebe8d5992a49e7741
+  data.tar.gz: 2044195773cb4676fd417d73746c4f0287f986f15a8fa997c703ae9aa3c857dabe65dc4533f102ca5ee077531d6d6a82ab1978f2d236892592fadc4b511ca155

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+### 0.4.1 (2021/07/11)
+
+* [#37](https://github.com/dblock/strava-ruby-client/pull/38): Added `Club#club_events` - [@simonneutert](https://github.com/simonneutert).
+* [#34](https://github.com/dblock/strava-ruby-client/pull/34): Added `Athlete#ftp` - [@virae](https://github.com/virae).
+
+### 0.4.0 (2020/05/09)
+
+* [#29](https://github.com/dblock/strava-ruby-client/pull/29): Cache `Faraday::Connection` for persistent adapters - [@dblock](https://github.com/dblock).
+* [#30](https://github.com/dblock/strava-ruby-client/pull/30): Require Faraday >= 1.0 - [@dblock](https://github.com/dblock).
+
+### 0.3.2 (2020/03/28)
+
+* [#26](https://github.com/dblock/strava-ruby-client/pull/26): Corrected `Strava::Webhooks.config.endpoint` - [@dblock](https://github.com/dblock).
+* Automatically convert `before` and `after` arguments of `Strava::Api::Client#athlete_activities` from `Time` to `Integer` - [@dblock](https://github.com/dblock).
+* [#18](https://github.com/dblock/strava-ruby-client/pull/18): Testing against Ruby 2.5.3 and 2.6.0 - [@lucianosousa](https://github.com/lucianosousa).
+* [#18](https://github.com/dblock/strava-ruby-client/pull/18): Upgraded Rubocop to 0.61.1 - [@lucianosousa](https://github.com/lucianosousa).
+* [#21](https://github.com/dblock/strava-ruby-client/pull/21): Include headers in error response - [@jameschevalier](https://github.com/jameschevalier).
+
+### 0.3.1 (2018/12/05)
+
+* Added `Strava::Api::Client#activity_photos` - [@dblock](https://github.com/dblock).
+* [#2](https://github.com/dblock/strava-ruby-client/issues/2): Added `Strava::Api::Client#deauthorize` - [@dblock](https://github.com/dblock).
+* [#15](https://github.com/dblock/strava-ruby-client/issues/15): Added `strava-oauth-token` and `strava-webhooks` to gem executables - [@dblock](https://github.com/dblock).
+* Fix: `Strava::Models::Activity#total_elevation_gain` no returns blank for negative and zero elevation differences - [@dblock](https://github.com/dblock).
+* Fix: `Strava::Models::Split#distance` and `total_elevation_gain` incorrect for `Strava::Models::Activity#splits_standard` - [@dblock](https://github.com/dblock).
+
 ### 0.3.0 (2018/12/03)
 
 * Added webhooks support - [@dblock](https://github.com/dblock).

data/README.md

@@ -15,6 +15,7 @@ Unlike other clients, including [strava-api-v3](https://github.com/jaredholdcrof
   - [Activities](#activities)
     - [Create an Activity](#create-an-activity)
     - [Get Activity](#get-activity)
+    - [List Activity Photos](#list-activity-photos)
     - [List Activity Comments](#list-activity-comments)
     - [List Activity Kudoers](#list-activity-kudoers)
     - [List Activity Laps](#list-activity-laps)
@@ -60,6 +61,9 @@ Unlike other clients, including [strava-api-v3](https://github.com/jaredholdcrof
     - [Get Upload](#get-upload)
   - [Pagination](#pagination)
   - [OAuth](#oauth)
+    - [OAuth Workflow](#oauth-workflow)
+    - [Deauthorize](#deauthorize)
+    - [Command Line OAuth Workflow](#command-line-oauth-workflow)
   - [Webhooks](#webhooks)
 - [Configuration](#configuration)
   - [Web Client Options](#web-client-options)
@@ -69,6 +73,9 @@ Unlike other clients, including [strava-api-v3](https://github.com/jaredholdcrof
 - [Errors](#errors)
 - [Tools](#tools)
   - [Strava OAuth Token](#strava-oauth-token)
+- [Users](#users)
+- [Resources](#resources)
+- [Upgrading](#upgrading)
 - [Contributing](#contributing)
 - [Copyright and License](#copyright-and-license)
 
@@ -143,6 +150,29 @@ google_image_url = "https://maps.googleapis.com/maps/api/staticmap?maptype=roadm
 
 See [Strava::Models::Map](lib/strava/models/map.rb) for all available properties.
 
+#### List Activity Photos
+
+Returns the photos on the given activity. This API is undocumented.
+
+```ruby
+photos = client.activity_photos(1982980795) # => Array[Strava::Models::Photo]
+
+photo = photos.first # => Strava::Models::Photo
+
+photo.id # => nil
+photo.unique_id # => '65889142-538D-4EE5-96F5-3DC3B773B1E3'
+photo.urls # => { '0' => 'https://dgtzuqphqg23d.cloudfront.net/eb4DMJ2hJW3k_g9URZEMfaJ8rZfHagrNlZRuEZz0osU-29x64.jpg' }
+photo.athlete_id # => 26_462_176
+photo.activity_id # => 1_946_417_534
+photo.activity_name # => 'TCS NYC Marathon 2018'
+photo.created_at # => Time
+photo.uploaded_at # => Time
+photo.sizes # => { '0' => [29, 64] }
+photo.default_photo # => false
+```
+
+See [Strava::Models::Photo](lib/strava/models/photo.rb) for all available properties.
+
 #### List Activity Comments
 
 Returns the comments on the given activity.
@@ -327,6 +357,20 @@ activity.name # => 'Afternoon Run'
 
 See [Strava::Models::Activity](lib/strava/models/activity.rb) for all available properties. Note that Strava does not return activity or athlete ID via this API.
 
+#### List Club Events
+
+Retrieve recent Events from a specific club.
+
+```ruby
+events = client.club_events(108605) # => Array[Strava::Models::ClubEvent]
+
+event = events.first # => Strava::Models::ClubEvent
+
+event.title # => 'First Group Event Ever! Yippieh!'
+```
+
+See [Strava::Models::ClubEvent](lib/strava/models/club_event.rb) for all available properties.
+
 #### List Club Administrators
 
 Returns a list of the administrators of a given club.
@@ -760,7 +804,9 @@ end
 
 ### OAuth
 
-Obtain a redirect URL.
+#### OAuth Workflow
+
+Obtain a redirect URL using an instance of `Strava::OAuth::Client`.
 
 ```ruby
 client = Strava::OAuth::Client.new(
@@ -800,16 +846,32 @@ response = client.oauth_token(
   grant_type: 'refresh_token'
 )
 
-response.access_token # new access token
-response.refresh_token # new refresh token
-response.expires_at # new timestamp when the access token expires
+response.access_token # => String, new access token
+response.refresh_token # => String, new refresh token
+response.expires_at # => Time, new timestamp when the access token expires
+```
+
+#### Deauthorize
+
+Revoke access to an athlete's data using an instance of `Strava::API::Client`.
+
+```ruby
+authorization = client.deauthorize
+
+authorization.access_token # => String, access token being revoked
 ```
 
+#### Command Line OAuth Workflow
+
+The OAuth process is web-based and you cannot obtain a token from a Strava client ID and secret without user intervention. You can, however, start a local web server to handle the OAuth redirect and open a browser from the command-line.
+
+See [strava-oauth-token](/bin/strava-oauth-token) or [strava-ruby-cli](https://github.com/dblock/strava-ruby-cli) for an example.
+
 ### Webhooks
 
-Strava provides a [Webhook Event API](https://developers.strava.com/docs/webhooks/) that requires special access obtained by emailing [developers@strava.com](mailto:developers@strava.com).
+Strava provides a [Webhook Event API](https://developers.strava.com/docs/webhooks/).
 
-A complete example that handles subscription creation, deletion and handling can be found in [strava-webhooks.rb](bin/strava-webhooks.rb). Run `strava-webhooks` to see current registrations, `strava-webhooks handle` to run an HTTP server that handles both challenges and event data, `strava-webhooks create [url]` to create a new subscription and `strava-webhooks delete [id]` to delete it.
+A complete example that handles subscription creation, deletion and handling can be found in [strava-webhooks](bin/strava-webhooks). Run `strava-webhooks` to see current registrations, `strava-webhooks handle` to run an HTTP server that handles both challenges and event data, `strava-webhooks create [url]` to create a new subscription and `strava-webhooks delete [id]` to delete it.
 
 Before creating a webhook subscription you must implement and run an HTTP server that will handle a `GET` challenge at the subscription URL.
 
@@ -978,11 +1040,11 @@ setting             | description
 --------------------|------------
 client_id           | Application client ID.
 client_secret       | Application client secret.
-endpoint            | Defaults to `https://api.strava.com/api/v3`.
+endpoint            | Defaults to `https://www.strava.com/api/v3`.
 
 ## Errors
 
-All errors that return HTTP codes 400-600 result in either `Faraday::Error::ResourceNotFound`, `Faraday::Error::ConnectionFailed` or [Strava::Errors::Fault](lib/strava/errors/fault.rb) exceptions.
+All errors that return HTTP codes 400-600 result in either `Faraday::ResourceNotFound`, `Faraday::ConnectionFailed` or [Strava::Errors::Fault](lib/strava/errors/fault.rb) exceptions.
 
 ```ruby
 begin
@@ -990,19 +1052,40 @@ begin
 rescue Strava::Errors::Fault => e
   e.message # => Bad Request
   e.errors # => [{ 'code' => 'invalid', 'field' => 'code', 'resource' => 'RequestToken' }]
+  e.headers # => { "status" => "403 Bad Request", "x-ratelimit-limit" => "600,30000", "x-ratelimit-usage" => "314,27536" }
 end
 ```
 
 ## Tools
 
+For a complete set of command-line tools, check out [strava-ruby-cli](https://github.com/dblock/strava-ruby-cli) built on top of this gem.
+
 ### Strava OAuth Token
 
-Use [strava-oauth-token](bin/strava-outh-token.rb) to obtain a token from the command-line. This will open a new browser window, navigate to Strava, request the appropriate permissions, then handle OAuth in a local redirect. The token type, refresh token, access token and token expiration will be displayed in the browser.
+Use [strava-oauth-token](bin/strava-oauth-token) to obtain a token from the command-line. This will open a new browser window, navigate to Strava, request the appropriate permissions, then handle OAuth in a local redirect. The token type, refresh token, access token and token expiration will be displayed in the browser.
 
 ```bash
 $ STRAVA_CLIENT_ID=... STRAVA_CLIENT_SECRET=... strava-oauth-token
 ```
 
+## Users
+
+* [Slava: Strava integration with Slack](https://slava.playplay.io), [source](https://github.com/dblock/slack-strava).
+* [Jekyll Blog at run.dblock.org](https://run.dblock.org), [source](https://github.com/dblock/run.dblock.org)
+* [Secret Strava](https://steele.blue/secret-strava/), [source](https://github.com/mattdsteele/secret-strava)
+
+## Resources
+
+* [Strava API Documentation](https://developers.strava.com)
+* [Writing a New Strava API Ruby Client](https://code.dblock.org/2018/11/27/writing-a-new-strava-api-ruby-client.html)
+* [Dealing with Strava API OAuth Token Migration](https://code.dblock.org/2018/11/17/dealing-with-strava-api-token-migration.html)
+* [Auto-Publishing Strava Runs to Github Pages](https://code.dblock.org/2018/02/17/auto-publishing-strava-runs-to-github-pages.html)
+* [Strava Command-Line Client](https://github.com/dblock/strava-ruby-cli)
+
+## Upgrading
+
+See [UPGRADING](UPGRADING.md).
+
 ## Contributing
 
 See [CONTRIBUTING](CONTRIBUTING.md).

data/lib/strava-ruby-client.rb

@@ -25,6 +25,7 @@ require_relative 'strava/models/map'
 require_relative 'strava/models/activity'
 require_relative 'strava/models/club'
 require_relative 'strava/models/club_admin'
+require_relative 'strava/models/club_event'
 require_relative 'strava/models/club_member'
 require_relative 'strava/models/segment_effort'
 require_relative 'strava/models/photos'
@@ -55,6 +56,7 @@ require_relative 'strava/models/explorer_segment'
 require_relative 'strava/models/stream_set'
 require_relative 'strava/models/stream'
 require_relative 'strava/models/upload'
+require_relative 'strava/models/authorization'
 
 require_relative 'strava/web/raise_error'
 require_relative 'strava/web/connection'
@@ -84,5 +86,6 @@ require_relative 'strava/api/endpoints/segment_efforts'
 require_relative 'strava/api/endpoints/segments'
 require_relative 'strava/api/endpoints/streams'
 require_relative 'strava/api/endpoints/uploads'
+require_relative 'strava/api/endpoints/oauth'
 
 require_relative 'strava/api/client'

data/lib/strava/api/client.rb

@@ -11,6 +11,7 @@ module Strava
       include Endpoints::Segments
       include Endpoints::Streams
       include Endpoints::Uploads
+      include Endpoints::OAuth
 
       attr_accessor(*Config::ATTRIBUTES)
 

data/lib/strava/api/endpoints/activities.rb

@@ -35,6 +35,21 @@ module Strava
           paginate "activities/#{id}/comments", options, Strava::Models::Comment, &block
         end
 
+        #
+        # List activity photos.
+        #
+        # @option options [String] :id
+        #   Activity id.
+        # @option options [Integer] :page
+        #   Page number.
+        # @option options [Integer] :per_page
+        #   Number of items per page. Defaults to 30.
+        #
+        def activity_photos(id_or_options, options = {}, &block)
+          id, options = parse_args(id_or_options, options)
+          paginate "activities/#{id}/photos", options, Strava::Models::Photo, &block
+        end
+
         #
         # List activity kudoers.
         #
@@ -76,6 +91,9 @@ module Strava
         #   Number of items per page. Defaults to 30.
         #
         def athlete_activities(options = {}, &block)
+          options = options.dup if options.key?(:after) || options.key?(:before)
+          options[:after] = options[:after].to_i if options[:after]
+          options[:before] = options[:before].to_i if options[:before]
           paginate 'athlete/activities', options, Strava::Models::Activity, &block
         end
 

data/lib/strava/api/endpoints/clubs.rb

@@ -17,6 +17,21 @@ module Strava
           paginate "clubs/#{id}/activities", options, Strava::Models::Activity, &block
         end
 
+        #
+        # List club / group events.
+        #
+        # @option options [String] :id
+        #   Club id.
+        # @option options [Integer] :page
+        #   Page number.
+        # @option options [Integer] :per_page
+        #   Number of items per page. Defaults to 30.
+        #
+        def club_events(id_or_options, options = {}, &block)
+          id, options = parse_args(id_or_options, options)
+          paginate "clubs/#{id}/group_events", options, Strava::Models::ClubEvent, &block
+        end
+
         #
         # List club administrators.
         #

data/lib/strava/api/endpoints/oauth.rb

@@ -0,0 +1,14 @@
+module Strava
+  module Api
+    module Endpoints
+      module OAuth
+        #
+        # Revoke access to an athlete's data.
+        #
+        def deauthorize(options = {})
+          Strava::Models::Authorization.new(post('deauthorize', { endpoint: Strava::OAuth.config.endpoint }.merge(options)))
+        end
+      end
+    end
+  end
+end

data/lib/strava/errors/fault.rb

@@ -5,6 +5,10 @@ module Strava
         response[:body]['message'] || super
       end
 
+      def headers
+        response[:headers]
+      end
+
       def errors
         response[:body]['errors']
       end

data/lib/strava/models/activity.rb

@@ -1,7 +1,7 @@
 module Strava
   module Models
     class Activity < Model
-      include Mixins::MetricDistance
+      include Mixins::Distance
       include Mixins::Time
       include Mixins::Elevation
 
@@ -60,8 +60,8 @@ module Strava
       property 'similar_activities', transform_with: ->(v) { Strava::Models::SimilarActivities.new(v) }
       property 'embed_token'
       property 'available_zones'
-      property 'splits_metric', transform_with: ->(v) { v.map { |r| Strava::Models::Split::Metric.new(r) } }
-      property 'splits_standard', transform_with: ->(v) { v.map { |r| Strava::Models::Split::Standard.new(r) } }
+      property 'splits_metric', transform_with: ->(v) { v.map { |r| Strava::Models::Split.new(r) } }
+      property 'splits_standard', transform_with: ->(v) { v.map { |r| Strava::Models::Split.new(r) } }
       property 'laps', transform_with: ->(v) { v.map { |r| Strava::Models::Lap.new(r) } }
       property 'gear', transform_with: ->(v) { Strava::Models::Gear.new(v) }
       property 'device_name'
@@ -78,30 +78,18 @@ module Strava
 
       def distance_s
         if type == 'Swim'
-          case units
-          when :metric then distance_in_meters_s
-          when :imperial then distance_in_yards_s
-          end
+          distance_in_meters_s
         else
-          case units
-          when :metric then distance_in_kilometers_s
-          when :imperial then distance_in_miles_s
-          end
+          distance_in_kilometers_s
         end
       end
 
       def pace_s
         case type
         when 'Swim'
-          case units
-          when :metric then pace_per_100_meters_s
-          when :imperial then pace_per_100_yards_s
-          end
+          pace_per_100_meters_s
         else
-          case units
-          when :metric then pace_per_kilometer_s
-          when :imperial then pace_per_mile_s
-          end
+          pace_per_kilometer_s
         end
       end
 

data/lib/strava/models/activity_total.rb

@@ -1,7 +1,7 @@
 module Strava
   module Models
     class ActivityTotal < Model
-      include Mixins::MetricDistance
+      include Mixins::Distance
       include Mixins::Time
       include Mixins::Elevation
 

data/lib/strava/models/athlete.rb

@@ -27,6 +27,7 @@ module Strava
       property 'date_preference'
       property 'measurement_preference'
       property 'clubs', transform_with: ->(v) { v.map { |r| Strava::Models::Club.new(r) } }
+      property 'ftp'
       property 'weight'
       property 'bikes', transform_with: ->(v) { v.map { |r| Strava::Models::Gear.new(r) } }
       property 'shoes', transform_with: ->(v) { v.map { |r| Strava::Models::Gear.new(r) } }

data/lib/strava/models/authorization.rb

@@ -0,0 +1,7 @@
+module Strava
+  module Models
+    class Authorization < Model
+      property 'access_token'
+    end
+  end
+end

data/lib/strava/models/club_event.rb

@@ -0,0 +1,28 @@
+module Strava
+  module Models
+    class ClubEvent < Model
+      property 'id'
+      property 'resource_state'
+      property 'title'
+      property 'club_id'
+      property 'club', transform_with: ->(c) { Strava::Models::Club.new(c) }
+      property 'organizing_athlete', transform_with: ->(oa) { Strava::Models::Athlete.new(oa) }
+      property 'activity_type'
+      property 'created_at', transform_with: ->(v) { Time.parse(v) }
+      property 'route_id'
+      property 'route', transform_with: ->(r) { Strava::Models::Route.new(r) }
+      property 'women_only'
+      property 'private'
+      property 'skill_levels'
+      property 'terrain'
+      property 'upcoming_occurrences', transform_with: ->(upcoming) { upcoming.map { |o| Time.parse(o) } }
+      property 'zone'
+      property 'address'
+      property 'start_latlng'
+
+      def strava_url
+        "https://www.strava.com/clubs/#{club_id}/group_events/#{id}"
+      end
+    end
+  end
+end

data/lib/strava/models/explorer_segment.rb

@@ -1,7 +1,7 @@
 module Strava
   module Models
     class ExplorerSegment < Model
-      include Mixins::MetricDistance
+      include Mixins::Distance
 
       property 'id'
       property 'resource_state'

data/lib/strava/models/gear.rb

@@ -1,7 +1,7 @@
 module Strava
   module Models
     class Gear < Model
-      include Mixins::MetricDistance
+      include Mixins::Distance
 
       property 'id'
       property 'resource_state'

data/lib/strava/models/mixins/distance.rb

@@ -9,24 +9,15 @@ module Strava
         end
 
         def distance_in_meters
-          case units
-          when :metric then distance
-          when :imperial then distance / 3.28084
-          end
+          distance
         end
 
         def distance_in_feet
-          case units
-          when :metric then distance * 3.28084
-          when :imperial then distance
-          end
+          distance * 3.28084
         end
 
         def distance_in_miles
-          case units
-          when :metric then distance_in_meters * 0.00062137
-          when :imperial then distance_in_feet / 5280
-          end
+          distance_in_meters * 0.00062137
         end
 
         def distance_in_miles_s
@@ -62,28 +53,7 @@ module Strava
         end
 
         def distance_s
-          case units
-          when :metric then distance_in_kilometers_s
-          when :imperial then distance_in_miles_s
-          end
-        end
-      end
-
-      module MetricDistance
-        extend ActiveSupport::Concern
-        include Strava::Models::Mixins::Distance
-
-        def units
-          :metric
-        end
-      end
-
-      module ImperialDistance
-        extend ActiveSupport::Concern
-        include Strava::Models::Mixins::Distance
-
-        def units
-          :imperial
+          distance_in_kilometers_s
         end
       end
     end

data/lib/strava/models/mixins/elevation.rb

@@ -9,36 +9,27 @@ module Strava
         end
 
         def total_elevation_gain_in_feet
-          case units
-          when :metric then total_elevation_gain * 3.28084
-          when :imperial then total_elevation_gain
-          end
+          total_elevation_gain * 3.28084
         end
 
         def total_elevation_gain_in_meters
-          case units
-          when :metric then total_elevation_gain
-          when :imperial then total_elevation_gain / 3.28084
-          end
+          total_elevation_gain
         end
 
         def total_elevation_gain_in_meters_s
-          return unless total_elevation_gain && total_elevation_gain.positive?
+          return if total_elevation_gain.nil?
 
           format('%gm', format('%.1f', total_elevation_gain_in_meters))
         end
 
         def total_elevation_gain_in_feet_s
-          return unless total_elevation_gain && total_elevation_gain.positive?
+          return if total_elevation_gain.nil?
 
           format('%gft', format('%.1f', total_elevation_gain_in_feet))
         end
 
         def total_elevation_gain_s
-          case units
-          when :metric then total_elevation_gain_in_meters_s
-          when :imperial then total_elevation_gain_in_feet_s
-          end
+          total_elevation_gain_in_meters_s
         end
       end
     end

data/lib/strava/models/mixins/time.rb

@@ -52,10 +52,7 @@ module Strava
         end
 
         def speed_s
-          case units
-          when :metric then kilometer_per_hour_s
-          when :imperial then miles_per_hour_s
-          end
+          kilometer_per_hour_s
         end
 
         private

data/lib/strava/models/photo.rb

@@ -5,6 +5,16 @@ module Strava
       property 'unique_id'
       property 'urls'
       property 'source'
+      property 'athlete_id'
+      property 'activity_id'
+      property 'activity_name'
+      property 'resource_state'
+      property 'caption'
+      property 'created_at', transform_with: ->(v) { Time.parse(v) }
+      property 'created_at_local', transform_with: ->(v) { Time.parse(v) }
+      property 'uploaded_at', transform_with: ->(v) { Time.parse(v) }
+      property 'sizes'
+      property 'default_photo'
     end
   end
 end

data/lib/strava/models/route.rb

@@ -1,7 +1,7 @@
 module Strava
   module Models
     class Route < Model
-      include Mixins::MetricDistance
+      include Mixins::Distance
       include Mixins::Elevation
       include Mixins::Time
 

data/lib/strava/models/running_race.rb

@@ -1,7 +1,7 @@
 module Strava
   module Models
     class RunningRace < Model
-      include Mixins::MetricDistance
+      include Mixins::Distance
 
       property 'id'
       property 'resource_state'

data/lib/strava/models/segment.rb

@@ -1,7 +1,7 @@
 module Strava
   module Models
     class Segment < Model
-      include Mixins::MetricDistance
+      include Mixins::Distance
       include Mixins::Elevation
       include Mixins::Time
 

data/lib/strava/models/segment_effort.rb

@@ -1,7 +1,7 @@
 module Strava
   module Models
     class SegmentEffort < Model
-      include Mixins::MetricDistance
+      include Mixins::Distance
       include Mixins::Time
 
       property 'id'

data/lib/strava/models/split.rb

@@ -10,20 +10,6 @@ module Strava
       property 'split'
       property 'average_heartrate'
       property 'pace_zone'
-
-      class Standard < Split
-        private
-
-        def units
-          :imperial
-        end
-      end
-
-      class Metric < Split
-        def units
-          :metric
-        end
-      end
     end
   end
 end

data/lib/strava/version.rb

@@ -1,3 +1,3 @@
 module Strava
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/lib/strava/web/connection.rb

@@ -8,26 +8,28 @@ module Strava
       end
 
       def connection
-        options = {
-          headers: headers.merge('Accept' => 'application/json; charset=utf-8')
-        }
+        @connection ||= begin
+          options = {
+            headers: headers.merge('Accept' => 'application/json; charset=utf-8')
+          }
 
-        options[:headers]['User-Agent'] = user_agent if user_agent
-        options[:proxy] = proxy if proxy
-        options[:ssl] = { ca_path: ca_path, ca_file: ca_file } if ca_path || ca_file
+          options[:headers]['User-Agent'] = user_agent if user_agent
+          options[:proxy] = proxy if proxy
+          options[:ssl] = { ca_path: ca_path, ca_file: ca_file } if ca_path || ca_file
 
-        request_options = {}
-        request_options[:timeout] = timeout if timeout
-        request_options[:open_timeout] = open_timeout if open_timeout
-        options[:request] = request_options if request_options.any?
+          request_options = {}
+          request_options[:timeout] = timeout if timeout
+          request_options[:open_timeout] = open_timeout if open_timeout
+          options[:request] = request_options if request_options.any?
 
-        ::Faraday::Connection.new(endpoint, options) do |connection|
-          connection.use ::Faraday::Request::Multipart
-          connection.use ::Faraday::Request::UrlEncoded
-          connection.use ::Strava::Web::Response::RaiseError
-          connection.use ::FaradayMiddleware::ParseJson, content_type: /\bjson$/
-          connection.response :logger, logger if logger
-          connection.adapter ::Faraday.default_adapter
+          ::Faraday::Connection.new(endpoint, options) do |connection|
+            connection.use ::Faraday::Request::Multipart
+            connection.use ::Faraday::Request::UrlEncoded
+            connection.use ::Strava::Web::Response::RaiseError
+            connection.use ::FaradayMiddleware::ParseJson, content_type: /\bjson$/
+            connection.response :logger, logger if logger
+            connection.adapter ::Faraday.default_adapter
+          end
         end
       end
     end

data/lib/strava/web/raise_error.rb

@@ -7,10 +7,10 @@ module Strava
         def on_complete(env)
           case env[:status]
           when 404
-            raise Faraday::Error::ResourceNotFound, response_values(env)
+            raise Faraday::ResourceNotFound, response_values(env)
           when 407
             # mimic the behavior that we get with proxy requests with HTTPS
-            raise Faraday::Error::ConnectionFailed, %(407 "Proxy Authentication Required ")
+            raise Faraday::ConnectionFailed, %(407 "Proxy Authentication Required ")
           when ClientErrorStatuses
             raise Strava::Errors::Fault, response_values(env)
           end

data/lib/strava/web/request.rb

@@ -20,7 +20,9 @@ module Strava
       private
 
       def request(method, path, options)
-        path = [endpoint, path].join('/')
+        options = options.dup if options.key?(:request) || options.key?(:endpoint)
+        root = options.delete(:endpoint) || endpoint
+        path = [root, path].join('/')
         response = connection.send(method) do |request|
           case method
           when :get, :delete

data/lib/strava/webhooks/config.rb

@@ -12,7 +12,7 @@ module Strava
       attr_accessor(*Config::ATTRIBUTES)
 
       def reset
-        self.endpoint = 'https://api.strava.com/api/v3'
+        self.endpoint = 'https://www.strava.com/api/v3'
         self.client_id = nil
         self.client_secret = nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strava-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -66,17 +66,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: dblock@dblock.org
-executables: []
+executables:
+- strava-oauth-token
+- strava-webhooks
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE.md
 - README.md
-- bin/strava-oauth-token.rb
-- bin/strava-webhooks.rb
+- bin/strava-oauth-token
+- bin/strava-webhooks
 - lib/strava-ruby-client.rb
 - lib/strava/api/client.rb
 - lib/strava/api/config.rb
@@ -85,6 +87,7 @@ files:
 - lib/strava/api/endpoints/athletes.rb
 - lib/strava/api/endpoints/clubs.rb
 - lib/strava/api/endpoints/gears.rb
+- lib/strava/api/endpoints/oauth.rb
 - lib/strava/api/endpoints/routes.rb
 - lib/strava/api/endpoints/running_races.rb
 - lib/strava/api/endpoints/segment_efforts.rb
@@ -99,8 +102,10 @@ files:
 - lib/strava/models/activity_total.rb
 - lib/strava/models/activity_zone.rb
 - lib/strava/models/athlete.rb
+- lib/strava/models/authorization.rb
 - lib/strava/models/club.rb
 - lib/strava/models/club_admin.rb
+- lib/strava/models/club_event.rb
 - lib/strava/models/club_member.rb
 - lib/strava/models/comment.rb
 - lib/strava/models/explorer_segment.rb
@@ -150,7 +155,7 @@ homepage: http://github.com/dblock/strava-ruby-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,9 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Strava API Ruby client.
 test_files: []