moves 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e194eda796dc1f6f5750343434c2a6e7e1a7d24e
-  data.tar.gz: 78882e1f3ec1402d11160d8c1828c5fa5ece0a9f
+  metadata.gz: 586d9629aea04bbbd947c97877999a2e689adcfb
+  data.tar.gz: dee6b28c75496903e0613b660e9950a4d1fb389e
 SHA512:
-  metadata.gz: 5406d051d67f3e4954e3a5ecd6ca2a9974cf54030aed158c81cafcfce98577b98e98508b940c4b64b2f3c50515875c857fdde3c8e7db3d2ebb593b5ffaca68da
-  data.tar.gz: d1e8d13e95d7b0e085d9676a3cb9de8ccfe7cd76d74201d6cc5d1dc3d7a884a86e2c34afb493f5230d56c578758a373e4eb4d4728d79373e2a18e40f8e273870
+  metadata.gz: 59eab146e896dfb9bde357b641df02b201083a083fdf0126bda42baafc701964142ab2e0de7d47e4a05a4d72ff16de78863c962234d07b89804fe93b2d3c6c3a
+  data.tar.gz: b30869d993ff7423bd1ddfb5a4a23a72f17f6e7b2e467eaf22a5cc8f8ba79b9b93ff1e34eb4310cdba70382c1cafb3d371bbcc7964616b2ef5cb67fab95e2187

data/README.md

@@ -1,6 +1,6 @@
 # Moves
 
-Ruby client for [Moves](http://www.moves-app.com/)
+Ruby client for [Moves](https://dev.moves-app.com/docs/overview)
 
 ## Usage
 
@@ -19,31 +19,47 @@ client.profile
 Get daily summary
 
 ```ruby
-client.daily_summary # default to current day
+client.daily_summary                  # current day
+client.daily_summary("2013-06-20")    # any day
+client.daily_summary("2013-W25")      # week
+client.daily_summary("2013-06")       # month
 client.daily_summary(:from => "2013-06-20", :to => "2013-06-23") # max 31 days
 ```
 
 Get daily activities
 
 ```ruby
-client.daily_activities # default to current day
+client.daily_activities               # current day
+client.daily_activities("2013-06-20") # any day
+client.daily_activities("2013-W25")   # week
 client.daily_activities(:from => "2013-06-20", :to => "2013-06-23") # max 7 days
 ```
 
 Get daily places
 
 ```ruby
-client.daily_places # default to current day
+client.daily_places                   # current day
+client.daily_places("2013-06-20")     # any day
+client.daily_places("2013-W25")       # week
 client.daily_places(:from => "2013-06-20", :to => "2013-06-23") # max 7 days
 ```
 
 Get daily storyline
 
 ```ruby
-client.daily_storyline # default to current day
+client.daily_storyline                # current day
+client.daily_storyline("2013-06-20")  # any day
+client.daily_storyline("2013-W25")    # week
 client.daily_storyline(:from => "2013-06-20", :to => "2013-06-23") # max 7 days
 ```
 
+Get daily storyline with track points
+
+```ruby
+client.daily_storyline(:trackPoints => true)               # current day
+client.daily_storyline("2013-06-20", :trackPoints => true) # any day
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :default => :test
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+end
+

data/lib/moves/version.rb

@@ -1,3 +1,3 @@
 module Moves
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/moves.rb

@@ -16,20 +16,20 @@ module Moves
       get "user/profile"
     end
 
-    def daily_summary(params = {})
-      get_range "user/summary/daily", params
+    def daily_summary(*args)
+      get_range "user/summary/daily", *args
     end
 
-    def daily_activities(params = {})
-      get_range "user/activities/daily", params
+    def daily_activities(*args)
+      get_range "user/activities/daily", *args
     end
 
-    def daily_places(params = {})
-      get_range "user/places/daily", params
+    def daily_places(*args)
+      get_range "user/places/daily", *args
     end
 
-    def daily_storyline(params = {})
-      get_range "user/storyline/daily", params
+    def daily_storyline(*args)
+      get_range "user/storyline/daily", *args
     end
 
     protected
@@ -39,10 +39,21 @@ module Moves
       JSON.parse(response.body)
     end
 
-    def get_range(path, params = {})
-      today = Time.now.strftime("%Y-%m-%d")
-      get path, {:to => today, :from => today}.merge(params)
-    end
+    def get_range(path, *args)
+      extra_path, params =
+        if args[0].is_a?(String)
+          ["/#{args[0]}", args[1]]
+        else
+          ["", args[0]]
+        end
+      params ||= {}
+
+      # default to current day
+      if extra_path.empty? and !(params[:to] or params[:from])
+        extra_path = "/#{Time.now.strftime("%Y%m%d")}"
+      end
 
+      get "#{path}#{extra_path}", params
+    end
   end
 end

data/moves.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

data/test/moves_test.rb

@@ -0,0 +1,103 @@
+require "test_helper"
+
+class TestMoves < Minitest::Test
+
+  def setup
+    @client = Moves::Client.new(ENV["ACCESS_TOKEN"])
+    @today = Time.now.strftime("%Y-%m-%d")
+    @day = "2013-06-20"
+    @week = "2013-W25"
+    @month = "2013-06"
+    @from_to = {:from => "2013-06-20", :to => "2013-06-23"}
+  end
+
+  def test_profile
+    profile = @client.profile
+    assert_kind_of Hash, profile
+  end
+
+  def test_daily_summary
+    assert_works @client.daily_summary
+  end
+
+  def test_daily_summary_day
+    assert_works @client.daily_summary(@day)
+  end
+
+  def test_daily_summary_week
+    assert_works @client.daily_summary(@week)
+  end
+
+  def test_daily_summary_month
+    assert_works @client.daily_summary(@month)
+  end
+
+  def test_daily_summary_from_to
+    assert_works @client.daily_summary(@from_to)
+  end
+
+  def test_daily_activites
+    assert_works @client.daily_activities
+  end
+
+  def test_daily_activites_day
+    assert_works @client.daily_activities(@day)
+  end
+
+  def test_daily_activites_week
+    assert_works @client.daily_activities(@week)
+  end
+
+  def test_daily_activities_from_to
+    assert_works @client.daily_activities(@from_to)
+  end
+
+  def test_daily_places
+    assert_works @client.daily_places
+  end
+
+  def test_daily_places_day
+    assert_works @client.daily_places(@day)
+  end
+
+  def test_daily_places_week
+    assert_works @client.daily_places(@week)
+  end
+
+  def test_daily_places_from_to
+    assert_works @client.daily_places(@from_to)
+  end
+
+  def test_daily_storyline
+    assert_works @client.daily_storyline
+  end
+
+  def test_daily_storyline_day
+    assert_works @client.daily_storyline(@day)
+  end
+
+  def test_daily_storyline_week
+    assert_works @client.daily_storyline(@week)
+  end
+
+  def test_daily_storyline_from_to
+    assert_works @client.daily_storyline(@from_to)
+  end
+
+  def test_daily_storyline_track_points
+    assert_works @client.daily_storyline(:trackPoints => true)
+  end
+
+  def test_daily_storyline_track_points_day
+    assert_works @client.daily_storyline(@day, :trackPoints => true)
+  end
+
+  protected
+
+  # TODO better tests
+
+  def assert_works(actual)
+    assert_operator actual.size, :>=, 1
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require "bundler/setup"
+Bundler.require(:default)
+require "minitest/autorun"
+require "minitest/pride"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moves
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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'
 description: Ruby client for Moves
 email:
 - acekane1@gmail.com
@@ -67,6 +81,8 @@ files:
 - lib/moves.rb
 - lib/moves/version.rb
 - moves.gemspec
+- test/moves_test.rb
+- test/test_helper.rb
 homepage: https://github.com/ankane/moves
 licenses:
 - MIT
@@ -91,4 +107,6 @@ rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Ruby client for Moves
-test_files: []
+test_files:
+- test/moves_test.rb
+- test/test_helper.rb