nike_v2 0.3.4 → 0.3.7

data/lib/nike_v2/activities.rb

@@ -19,8 +19,8 @@ module NikeV2
         define_method(method_var_name){ ivar = instance_variable_get('@' + method_var_name); ivar ||= sum_of(method_var_name)}
 
 
-        define_method("total_#{type.downcase}_during") do |start_date, end_date|
-          @activities_array.reject{|a| ((a.started_at..a.ended_at) & (start_date..end_date)).nil?}.collect{|a| a.send("total_#{type.downcase}_during", start_date, end_date)}.inject(:+)
+        define_method("total_#{type.downcase}_during") do |start_date, end_date, convert = false|
+          @activities_array.reject{|a| ((a.started_at..a.ended_at) & (start_date..end_date)).nil?}.collect{|a| a.send("total_#{type.downcase}_during", start_date, end_date, convert)}.inject(:+)
         end
       end
     end

data/lib/nike_v2/activity.rb

@@ -22,6 +22,10 @@ module NikeV2
       super(attributes)
     end
 
+    def tz
+      TZInfo::Timezone.get(self.activity_time_zone)
+    end
+
     def gps_data
       @gps_data ||= NikeV2::GpsData.new(:activity => self)
     end
@@ -40,11 +44,20 @@ module NikeV2
     end
 
     def started_at
-      @started_at ||= Time.parse(self.start_time.gsub(/Z$/,''))
+      @started_at ||= Time.parse(self.start_time.gsub('Z', '-') + '00:00')
     end
 
+    # some reason activities aren't always complete so we need metrics to figure out how long they are
     def ended_at
-      @ended_at ||= Time.parse(self.end_time.gsub(/Z$/,''))
+      @ended_at ||= self.respond_to?(:end_time) ? Time.parse(self.end_time.gsub('Z', '-') + '00:00') : started_at + (metrics.durations.to.seconds).to_f 
+    end
+
+    def to_tz(time)
+      if time.respond_to?(:strftime)
+        return Time.parse(time.strftime('%Y-%m-%d %H:%M:%S ' + self.tz.to_s))
+      else
+        return Time.parse(time + ' ' + self.tz.to_s)
+      end
     end
 
     private 

data/lib/nike_v2/metric.rb

@@ -21,12 +21,22 @@ module NikeV2
       @total ||= values.inject(:+)
     end
 
-    def total_during(start, stop)
+    def total_during(start, stop, convert_to_local = false)
+      if convert_to_local
+        start = @activity.to_tz(start)
+        stop = @activity.to_tz(stop)
+      end
       during(start, stop).collect(&:to_f).inject(:+) rescue 0
     end
 
     def during(start, stop)
-      @values[time_to_index(start)..time_to_index(stop)]
+      start_point = time_to_index(start)
+      duration = time_to_index(stop) - start_point
+      @values[start_point, duration]
+    end
+
+    def duration
+      @values.length.send(@unit.downcase)
     end
 
     private

data/lib/nike_v2/metrics.rb

@@ -23,6 +23,10 @@ module NikeV2
       define_method(method_var_name + '_during'){|*args| sum_of_type_during(type, *args)}
     end
 
+    def durations
+      @metrics_array.collect(&:duration).sort.first
+    end
+
     private
     def build_metrics(data_set)
       data_set.each do |metric|

data/lib/nike_v2/version.rb

@@ -1,3 +1,3 @@
 module NikeV2
-  VERSION = '0.3.4'
+  VERSION = '0.3.7'
 end

data/lib/nike_v2.rb

@@ -1,6 +1,7 @@
 require 'alchemist'
 require 'forwardable'
 require 'ext/core_ext'
+require 'tzinfo'
 
 module NikeV2
   def self.configuration

data/nike_v2.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'httparty', '>= 0.10.0'
-  s.add_runtime_dependency "httparty_sober", "~> 0.2.1"
-  s.add_runtime_dependency 'alchemist', '>= 0.1.3'
+  s.add_runtime_dependency 'httparty', '0.10.2'
+  s.add_runtime_dependency "httparty_sober", "0.2.1"
+  s.add_runtime_dependency 'alchemist', '0.1.3'
+  s.add_runtime_dependency 'tzinfo', '0.3.36'
 
   s.add_development_dependency 'factory_girl', '~> 4.2.0'
   s.add_development_dependency 'rake', '~> 10.0.3'

data/spec/fixtures/nike_api_cassettes/activities.yml

@@ -331,8 +331,40 @@ http_interactions:
         "calories": 581, "fuel": 1653, "distance": 2.0936965942382812, "steps": 2659,
         "duration": "7:02:00.000", "activityType": "ALL_DAY", "startTime": "2013-02-26T07:00:00Z",
         "activityTimeZone": "America/Phoenix", "status": "IN_PROGRESS", "deviceType":
-        "FUELBAND", "tags": [], "metrics": [] } ], "paging": { 
-        } }'
+        "FUELBAND", "tags": [], "metrics": [] } ], "paging": { } }'
     http_version: 
   recorded_at: Thu, 14 Mar 2013 00:45:14 GMT
+- request:
+    method: get
+    uri: https://api.nike.com/me/sport/activities?access_token=foobar&count=1&endDate=2013-03-29&startDate=2013-03-29
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Appid:
+      - nike
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json;charset=UTF-8
+      Date:
+      - Sun, 31 Mar 2013 00:42:39 GMT
+      Server:
+      - Apache
+      X-Swooshlet:
+      - app-msp-api-0 prd sin-165-app-msp-api-0
+      Content-Length:
+      - '472'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"data":[{"activityId":"1b4f5b2c-26c4-45cc-952a-d62c61cf506a","activityType":"ALL_DAY","startTime":"2013-03-30T07:00:00Z","activityTimeZone":"America/Phoenix","status":"NONE","deviceType":"FUELBAND","metricSummary":{"calories":1462,"fuel":4158,"distance":6.641719,"steps":8435,"duration":"8:48:00.000"},"tags":[],"metrics":[]}],"paging":{"next":"/me/sport/activities?count=1&startDate=2013-03-29&endDate=2013-03-29&access_token=foobar&offset=2"}}'
+    http_version: 
+  recorded_at: Sun, 31 Mar 2013 00:42:43 GMT
 recorded_with: VCR 2.4.0

data/spec/fixtures/nike_api_cassettes/activity.yml

@@ -32,8 +32,8 @@ http_interactions:
       encoding: US-ASCII
       string: ! '{ "activityId": "91b501dc-4a38-44aa-b537-6095418713d8", "calories":
         257, "fuel": 662, "distance": 3.1317999362945557, "steps": 10, "duration":
-        "0:14:31.000", "activityType": "RUN", "startTime": "2011-08-11T00:00:00Z",
-        "activityTimeZone": "GMT-08:00", "status": "COMPLETE", "deviceType": "SPORTWATCH",
+        "0:14:31.000", "activityType": "RUN", "startTime": "2011-08-11T07:00:00Z",
+        "activityTimeZone": "America/Phoenix", "status": "COMPLETE", "deviceType": "SPORTWATCH",
         "tags": [ { "tagType": "NOTE", "value": "text string" }, { "tagType": "COURT",
         "value": "DUNK" }, { "tagType": "TERRAIN", "value": "TRAIL" }, { "tagType":
         "EMOTION", "value": "HAPPY" }, { "tagType": "SHOES", "value": "AirMax" },

data/spec/nike_v2/{acitivites_spec.rb → activites_spec.rb}

@@ -26,10 +26,9 @@ describe NikeV2::Activities do
     end
 
     it 'should accept the start_date parameter, camelcase it and return an array of Nike::Activity' do
-      pending
-      # person.activities(:count => 1).should be_kind_of(NikeV2::Activities)
-      # person.activities(:count => 1).first.should be_kind_of(NikeV2::Activity)
-      # person.activities(:count => 1).length.should == 1
+      person.activities(:count => 1, :start_date => '2013-03-29', :end_date => '2013-03-29').should be_kind_of(NikeV2::Activities)
+      person.activities(:count => 1).first.should be_kind_of(NikeV2::Activity)
+      person.activities(:count => 1).length.should == 1
     end
 
     it 'should calculate all the fuels' do

data/spec/nike_v2/activity_spec.rb

@@ -18,7 +18,7 @@ describe NikeV2::Activity do
 
     it 'should sum the metrics during a time period' do
       activity.load_data.should be_true
-      activity.total_fuel_during(Time.parse('2011-08-11T00:00:00 '+ activity.activity_time_zone), Time.parse('2011-08-11T01:00:00 ' + activity.activity_time_zone)).should == 905.0
+      activity.total_fuel_during(Time.parse('2011-08-11T00:00:00-07:00'), Time.parse('2011-08-11T01:00:00-07:00'), true).should == 883.0
     end
   end
 end

data/spec/nike_v2/metric_spec.rb

@@ -18,12 +18,12 @@ describe NikeV2::Metric do
 
     it 'should give an array of values during a time range' do
       metric = activity.metrics.last
-      metric.during(Time.at(activity.started_at.to_i + (60 * 60)), Time.at(activity.started_at.to_i + (60 * 120) - 1)).length.should == 60
+      metric.during(Time.at(activity.started_at.to_i + (60 * 60)), Time.at(activity.started_at.to_i + (60 * 120))).length.should == 60
     end
 
     it 'should total the values during a time range' do
       metric = activity.metrics.last
-      metric.total_during(Time.at(activity.started_at.to_i + (60 * 60)), Time.at(activity.started_at.to_i + (60 * 120))).should == 831
+      metric.total_during(Time.at(activity.started_at.to_i + (60 * 60)), Time.at(activity.started_at.to_i + (60 * 120))).should == 806
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nike_v2
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: httparty_sober
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.1.3
   type: :runtime
@@ -56,9 +56,25 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.36
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.36
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +186,7 @@ files:
 - spec/fixtures/nike_api_cassettes/activity.yml
 - spec/fixtures/nike_api_cassettes/gps_data.yml
 - spec/fixtures/nike_api_cassettes/summary.yml
-- spec/nike_v2/acitivites_spec.rb
+- spec/nike_v2/activites_spec.rb
 - spec/nike_v2/activity_spec.rb
 - spec/nike_v2/base_spec.rb
 - spec/nike_v2/gps_data_spec.rb
@@ -211,7 +227,7 @@ test_files:
 - spec/fixtures/nike_api_cassettes/activity.yml
 - spec/fixtures/nike_api_cassettes/gps_data.yml
 - spec/fixtures/nike_api_cassettes/summary.yml
-- spec/nike_v2/acitivites_spec.rb
+- spec/nike_v2/activites_spec.rb
 - spec/nike_v2/activity_spec.rb
 - spec/nike_v2/base_spec.rb
 - spec/nike_v2/gps_data_spec.rb