strava-ruby-client 0.2.0 → 0.3.0

data/lib/strava/models/club.rb

@@ -17,6 +17,12 @@ module Strava
       property 'featured'
       property 'verified'
       property 'url'
+      property 'membership'
+      property 'admin'
+      property 'owner'
+      property 'description'
+      property 'club_type'
+      property 'following_count'
 
       def strava_url
         "https://www.strava.com/clubs/#{url || id}"

data/lib/strava/models/club_admin.rb

@@ -0,0 +1,13 @@
+module Strava
+  module Models
+    class ClubAdmin < Model
+      property 'resource_state'
+      property 'firstname'
+      property 'lastname'
+
+      def name
+        [firstname, lastname].compact.join(' ') if firstname || lastname
+      end
+    end
+  end
+end

data/lib/strava/models/club_member.rb

@@ -0,0 +1,16 @@
+module Strava
+  module Models
+    class ClubMember < Model
+      property 'resource_state'
+      property 'firstname'
+      property 'lastname'
+      property 'owner'
+      property 'admin'
+      property 'membership'
+
+      def name
+        [firstname, lastname].compact.join(' ') if firstname || lastname
+      end
+    end
+  end
+end

data/lib/strava/models/explorer_segment.rb

@@ -0,0 +1,19 @@
+module Strava
+  module Models
+    class ExplorerSegment < Model
+      include Mixins::MetricDistance
+
+      property 'id'
+      property 'resource_state'
+      property 'name'
+      property 'climb_category'
+      property 'climb_category_desc'
+      property 'avg_grade'
+      property 'start_latlng'
+      property 'end_latlng'
+      property 'elev_difference'
+      property 'points'
+      property 'starred'
+    end
+  end
+end

data/lib/strava/models/gear.rb

@@ -1,11 +1,16 @@
 module Strava
   module Models
     class Gear < Model
+      include Mixins::MetricDistance
+
       property 'id'
       property 'resource_state'
       property 'distance'
       property 'name'
       property 'primary'
+      property 'brand_name'
+      property 'model_name'
+      property 'description'
     end
   end
 end

data/lib/strava/models/heart_rate_zone_ranges.rb

@@ -0,0 +1,8 @@
+module Strava
+  module Models
+    class HeartRateZoneRanges < Model
+      property 'custom_zones'
+      property 'zones', transform_with: ->(v) { v.map { |r| Strava::Models::ZoneRange.new(r) } }
+    end
+  end
+end

data/lib/strava/models/kudoser.rb

@@ -0,0 +1,10 @@
+module Strava
+  module Models
+    class Kudoser < Model
+      property 'destination_url'
+      property 'display_name'
+      property 'avatar_url'
+      property 'show_name'
+    end
+  end
+end

data/lib/strava/models/lap.rb

@@ -21,6 +21,9 @@ module Strava
       property 'lap_index'
       property 'split'
       property 'pace_zone'
+      property 'average_cadence'
+      property 'device_watts'
+      property 'average_watts'
     end
   end
 end

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

@@ -68,6 +68,24 @@ module Strava
           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
+        end
+      end
     end
   end
 end

data/lib/strava/models/power_zone_ranges.rb

@@ -0,0 +1,7 @@
+module Strava
+  module Models
+    class PowerZoneRanges < Model
+      property 'zones', transform_with: ->(v) { v.map { |r| Strava::Models::ZoneRange.new(r) } }
+    end
+  end
+end

data/lib/strava/models/route.rb

@@ -0,0 +1,27 @@
+module Strava
+  module Models
+    class Route < Model
+      include Mixins::MetricDistance
+      include Mixins::Elevation
+      include Mixins::Time
+
+      property 'id'
+      property 'athlete', transform_with: ->(v) { Strava::Models::Athlete.new(v) }
+      property 'name'
+      property 'description'
+      property 'total_elevation_gain', from: 'elevation_gain'
+      property 'map', transform_with: ->(v) { Strava::Models::Map.new(v) }
+      property 'private'
+      property 'resource_state'
+      property 'starred'
+      property 'sub_type'
+      property 'timestamp', transform_with: ->(v) { Time.at(v) }
+      property 'created_at', transform_with: ->(v) { Time.parse(v) }
+      property 'updated_at', transform_with: ->(v) { Time.parse(v) }
+      property 'type'
+      property 'estimated_moving_time'
+      property 'moving_time', from: 'estimated_moving_time'
+      property 'segments', transform_with: ->(v) { v.map { |r| Strava::Models::Segment.new(r) } }
+    end
+  end
+end

data/lib/strava/models/running_race.rb

@@ -0,0 +1,33 @@
+module Strava
+  module Models
+    class RunningRace < Model
+      include Mixins::MetricDistance
+
+      property 'id'
+      property 'resource_state'
+      property 'name'
+      property 'running_race_type'
+      property 'distance'
+      property 'start_date_local', transform_with: ->(v) { Time.parse(v) }
+      property 'city'
+      property 'state'
+      property 'country'
+      property 'route_ids'
+      property 'measurement_preference'
+      property 'url'
+      property 'website_url'
+      property 'status'
+
+      def strava_url
+        "https://www.strava.com/running-races/#{url}" if url
+      end
+
+      def distance_s
+        case measurement_preference
+        when 'meters' then distance_in_kilometers_s
+        when 'feet' then distance_in_miles_s
+        end
+      end
+    end
+  end
+end

data/lib/strava/models/segment.rb

@@ -1,7 +1,9 @@
 module Strava
   module Models
     class Segment < Model
-      include Mixins::Distance
+      include Mixins::MetricDistance
+      include Mixins::Elevation
+      include Mixins::Time
 
       property 'id'
       property 'resource_state'
@@ -24,9 +26,19 @@ module Strava
       property 'private'
       property 'hazardous'
       property 'starred'
+      property 'created_at', transform_with: ->(v) { Time.parse(v) }
+      property 'updated_at', transform_with: ->(v) { Time.parse(v) }
+      property 'map', transform_with: ->(v) { Strava::Models::Map.new(v) }
+      property 'effort_count'
+      property 'athlete_count'
+      property 'star_count'
+      property 'athlete_segment_stats', transform_with: ->(v) { Strava::Models::SegmentStats.new(v) }
+      property 'pr_time'
+      property 'athlete_pr_effort', transform_with: ->(v) { Strava::Models::SegmentEffort.new(v) }
+      property 'starred_date', transform_with: ->(v) { Time.parse(v) }
 
-      def units
-        :metric
+      def elapsed_time
+        pr_time
       end
     end
   end

data/lib/strava/models/segment_effort.rb

@@ -1,6 +1,7 @@
 module Strava
   module Models
     class SegmentEffort < Model
+      include Mixins::MetricDistance
       include Mixins::Time
 
       property 'id'
@@ -10,15 +11,19 @@ module Strava
       property 'athlete', transform_with: ->(v) { Strava::Models::Athlete.new(v) }
       property 'start_date', transform_with: ->(v) { Time.parse(v) }
       property 'start_date_local', transform_with: ->(v) { Time.parse(v) }
-      property 'distance'
       property 'start_index'
       property 'end_index'
       property 'average_heartrate'
       property 'max_heartrate'
       property 'segment', transform_with: ->(v) { Strava::Models::Segment.new(v) }
-      property 'achievements'
+      property 'achievements', transform_with: ->(v) { v.map { |r| Strava::Models::Achievement.new(r) } }
       property 'hidden'
       property 'pr_rank'
+      property 'average_cadence'
+      property 'device_watts'
+      property 'average_watts'
+      property 'athlete_segment_stats', transform_with: ->(v) { Strava::Models::SegmentStats.new(v) }
+      property 'is_kom'
     end
   end
 end

data/lib/strava/models/segment_leaderboard.rb

@@ -0,0 +1,10 @@
+module Strava
+  module Models
+    class SegmentLeaderboard < Model
+      property 'effort_count'
+      property 'entry_count'
+      property 'kom_type'
+      property 'entries', transform_with: ->(v) { v.map { |r| SegmentLeaderboardEntry.new(r) } }
+    end
+  end
+end

data/lib/strava/models/segment_leaderboard_entry.rb

@@ -0,0 +1,12 @@
+module Strava
+  module Models
+    class SegmentLeaderboardEntry < Model
+      include Mixins::Time
+
+      property 'athlete_name'
+      property 'start_date', transform_with: ->(v) { Time.parse(v) }
+      property 'start_date_local', transform_with: ->(v) { Time.parse(v) }
+      property 'rank'
+    end
+  end
+end

data/lib/strava/models/segment_stats.rb

@@ -0,0 +1,15 @@
+module Strava
+  module Models
+    class SegmentStats < Model
+      include Mixins::Time
+
+      property 'pr_elapsed_time'
+      property 'pr_date', transform_with: ->(v) { Date.parse(v) }
+      property 'effort_count'
+
+      def elapsed_time
+        pr_elapsed_time
+      end
+    end
+  end
+end

data/lib/strava/models/stream.rb

@@ -0,0 +1,10 @@
+module Strava
+  module Models
+    class Stream < Model
+      property 'original_size'
+      property 'resolution'
+      property 'series_type'
+      property 'data'
+    end
+  end
+end

data/lib/strava/models/stream_set.rb

@@ -0,0 +1,17 @@
+module Strava
+  module Models
+    class StreamSet < Model
+      property 'distance', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'time', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'latlng', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'altitude', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'velocity_smooth', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'heartrate', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'cadence', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'watts', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'temp', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'moving', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+      property 'grade_smooth', transform_with: ->(v) { Strava::Models::Stream.new(v) }
+    end
+  end
+end

data/lib/strava/models/upload.rb

@@ -0,0 +1,11 @@
+module Strava
+  module Models
+    class Upload < Model
+      property 'id'
+      property 'external_id'
+      property 'error'
+      property 'status'
+      property 'activity_id'
+    end
+  end
+end

data/lib/strava/models/zone_range.rb

@@ -0,0 +1,8 @@
+module Strava
+  module Models
+    class ZoneRange < Model
+      property 'max'
+      property 'min'
+    end
+  end
+end

data/lib/strava/models/zones.rb

@@ -0,0 +1,8 @@
+module Strava
+  module Models
+    class Zones < Model
+      property 'heart_rate', transform_with: ->(v) { Strava::Models::HeartRateZoneRanges.new(v) }
+      property 'power', transform_with: ->(v) { Strava::Models::PowerZoneRanges.new(v) }
+    end
+  end
+end

data/lib/strava/version.rb

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

data/lib/strava/web/client.rb

@@ -10,7 +10,7 @@ module Strava
         Strava::Web::Config::ATTRIBUTES.each do |key|
           send("#{key}=", options[key] || Strava::Web.config.send(key))
         end
-        @logger ||= Strava::Logger.default
+        @logger ||= Strava::Logger.logger
       end
 
       def endpoint
@@ -26,6 +26,16 @@ module Strava
           Config
         end
       end
+
+      def parse_args(id_or_options, options = {})
+        if id_or_options.is_a?(Hash)
+          throw ArgumentError.new('Required argument :id missing') if id_or_options[:id].nil?
+          [id_or_options[:id], id_or_options.except(:id)]
+        else
+          throw ArgumentError.new('Required argument :id missing') if id_or_options.nil?
+          [id_or_options, options]
+        end
+      end
     end
   end
 end

data/lib/strava/web/connection.rb

@@ -25,7 +25,7 @@ module Strava
           connection.use ::Faraday::Request::Multipart
           connection.use ::Faraday::Request::UrlEncoded
           connection.use ::Strava::Web::Response::RaiseError
-          connection.use ::FaradayMiddleware::ParseJson
+          connection.use ::FaradayMiddleware::ParseJson, content_type: /\bjson$/
           connection.response :logger, logger if logger
           connection.adapter ::Faraday.default_adapter
         end

data/lib/strava/webhooks/client.rb

@@ -0,0 +1,58 @@
+module Strava
+  module Webhooks
+    class Client < Strava::Web::Client
+      attr_accessor(*Config::ATTRIBUTES)
+
+      def initialize(options = {})
+        Strava::Webhooks::Config::ATTRIBUTES.each do |key|
+          send("#{key}=", options[key] || Strava::Webhooks.config.send(key))
+        end
+        super
+      end
+
+      def request(method, path, options)
+        super method, path, { client_id: client_id, client_secret: client_secret }.merge(options)
+      end
+
+      #
+      # Get existing push subscriptions.
+      #
+      def push_subscriptions(options = {})
+        get('push_subscriptions', options).map do |row|
+          Strava::Webhooks::Models::Subscription.new(row)
+        end
+      end
+
+      #
+      # Delete an existing push subscription.
+      #
+      def delete_push_subscription(id_or_options, options = {})
+        id, options = parse_args(id_or_options, options)
+        delete("push_subscriptions/#{id}", options)
+        nil
+      end
+
+      #
+      # Create a subscription.
+      #
+      # @option options [String] :callback_url
+      #   Address where webhook events will be sent.
+      # @option options [String] :verify_token
+      #   String chosen by the application owner for client security. An identical string should be returned by Strava's subscription service.
+      #
+      def create_push_subscription(options = {})
+        Strava::Webhooks::Models::Subscription.new(post('push_subscriptions', options))
+      end
+
+      class << self
+        def configure
+          block_given? ? yield(Config) : Config
+        end
+
+        def config
+          Config
+        end
+      end
+    end
+  end
+end