todaysplan 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f11f6637035fa0e823a298286a69726d6906256
-  data.tar.gz: a7fccf886bd13b23f2194b558cf7172e259a82fe
+  metadata.gz: 0f15a61fe0e7c44b9184e3eec252f2527f7f270d
+  data.tar.gz: 702570cbc3b9e829c37a90d9cdc3e3e5f95ab5a1
 SHA512:
-  metadata.gz: 35d5eb9895c1c0b3a52bace60d768a6369e00eab837417887dc54f0c858b07eed7a54bf8d887e26b525c7a3ad5c12df902593e286702a97f70034563b4b3cb2a
-  data.tar.gz: d4ee841df274b6db233af9cef40b40c8d15ed388d9ba7ec816b7032c87648a2ca322e5cbfde7ea7cfd8d67e8223d70eee0ce4542761d8a9b6162f37ef51a324e
+  metadata.gz: 21b04b33a7f90c9b8a556f14494f12ff2ea0b51d93e58b061042aede1982fa8bea40d96788ade9f80c270f1f72ffeeaae299f598f48b1cf8c70a7f0ccf93e509
+  data.tar.gz: bf26d14ee97f05b2991941b5fca413c12ea878b200bdf164a199eb9bb6add6bbab4cc9ee0278ffa60848d4d114429ea89f68a9c110de4b00485b52ca9f9c3ac4

data/README.md

@@ -10,7 +10,7 @@ Pull Request to include additional calls.
 Add the gem to your app
 
 ```ruby
-gem 'todaysplan-ruby'
+gem 'todaysplan-ruby', require: 'todays_plan
 ```
 
 ### Usage
@@ -40,4 +40,3 @@ timeout: 120
 logger: 'stdout'
 debug: true 
 ```
-

data/lib/todays_plan/athlete.rb

@@ -11,6 +11,7 @@ module TodaysPlan
     attr_reader :coach
     attr_reader :email
     attr_reader :dob
+    attr_reader :country
     
 
     def initialize(fields)
@@ -18,16 +19,15 @@ module TodaysPlan
       @name = fields['_name']
       @first_name = fields['firstname']
       @last_name = fields['lastname']
-      @timezone = fields['timezone']
+      @timezone =fields['timezone']
       @coach =  fields['coach']["id"].to_i if fields.has_key?("coach")
       @email = fields['email']
       @dob =  Time.at(fields['dob'].to_i/1000)
+      @country = fields['country']
     end
       
     # Find a single athlete 
-    # +client+:: the authenticated client
     # +id+:: the athlete id
-    # +options+:: has of options
     def self.find(id)      
       all().find{|a| a.id==id}
     end
@@ -39,5 +39,40 @@ module TodaysPlan
         new(data)
       end
     end
+    
+    # Create new Athlete\
+    # options 
+    #   user_email - email address of new user
+    #   firstname - first name of new user
+    #   lastname - last name of new user
+    #   password - password of new user
+    #   coach_email - coach email in todaysplan
+    def self.create(options, client = nil)
+
+      #preregister
+      response = RestClient.get("#{TodaysPlan.endpoint}/auth/preregister")
+
+      # register the user
+      payload = {email: options[:user_email], firstname: options[:firstname],
+        lastname: options[:lastname], password: options[:password]}
+      response = RestClient.post("#{TodaysPlan.endpoint}/auth/register",payload.to_json,
+        { content_type: :json})
+      response.body
+      athlete = new(JSON.parse(response.body))
+      # user invites coach
+      user_client = TodaysPlan::Client.new(options[:user_email], options[:password])
+      invite={"email"=>options[:coach_email],"state"=> "pending_coach", 
+        "relationship"=> "coach"}.to_json
+      response = Connector.new('/users/delegates/invite', user_client).post(invite)
+      
+      # find invitation and accept
+      Connector.new('/users/delegates/search/0/100', client).
+        post({ "state"=> "pending_coach"}.to_json)["results"].each do |result|
+        id = result["id"]
+        Connector.new("/users/delegates/invite/accept/#{id}", client).get() 
+        
+      end
+      athlete
+    end
   end
 end

data/lib/todays_plan/connector.rb

@@ -12,28 +12,60 @@ module TodaysPlan
     #
     # Returns the parsed JSON response body.
     def get()
-      @response =  RestClient::Request.execute(method: :get, url: @uri, 
-        timeout: @timeout, 
-        headers: {:Authorization => "Bearer #{@client.token}",accept: :json} )
-      puts "#{@response.body}" if TodaysPlan.debug
-      @body = JSON.parse(@response.body)
+      options={
+        method: :get, 
+        headers:{ accept: :json}
+      }
+      run(options)
     end
     
     # Internal: Run GET request.
     #
     # Returns the parsed JSON response body.
     def post(payload = {})
-      @response =  RestClient::Request.execute(method: :post,
-        payload: payload, url: @uri, 
+      options={method: :post, 
+        payload: payload, 
+        headers:{content_type: :json, accept: :json}
+      }
+      run(options)
+    end
+    
+    private
+    
+    def run(options)
+      @response = RestClient::Request.execute(
+        method: options[:method],
+        payload: options[:payload], url: @uri, 
         timeout: @timeout, 
-        headers:{:Authorization => "Bearer #{@client.token}",
-          content_type: :json,
-          accept: :json})
-      puts "#{@response.body}" if TodaysPlan.debug
+        headers: options[:headers].merge({:Authorization => "Bearer #{@client.token}"})
+      )
+      if @response.body.nil? || @response.body.empty?
+        raise TodaysPlan::ServerError.new(0, 'Server error', 'Try to connect later')
+      end
+      
+      puts "#{@response.inspect}" if TodaysPlan.debug
+      
       @body = JSON.parse(@response.body)
-      @body
+      case @response.code
+      when 200..207
+        @body
+      else
+        raise_error
+      end
     end
     
-    
+    # Internal: Raise an error with the class depending on @response.
+    #
+    # Returns an Array with arguments.
+    def raise_error
+      klass = case @response.to_s
+        when "RestClient::BadRequest" then TodaysPlan::BadRequestError
+        when "RestClient::Unauthorized" then  TodaysPlan::UnauthorizedError
+        when "RestClient::NotFound" then TodaysPlan::NotFoundError
+        else
+          TodaysPlan::ServerError
+        end
+      raise klass.new(body['code'], body['message'], body['resolve'])
+    end
   end
 end

data/lib/todays_plan/errors.rb

@@ -0,0 +1,37 @@
+module TodaysPlan
+  # Public: Exception to throw when there are configuration problems
+  class NotConfiguredError < StandardError; end
+
+  # Internal: Base class for TodaysPlan errors
+  class TodaysPlanError < StandardError
+    attr_reader :code, :resolve
+
+    # Internal: Initialize a error with proper attributes.
+    #
+    # code    - The Integer code (e.g. 1501).
+    # message - The String message, describing the error.
+    # resolve - The String description how to fix the error.
+    def initialize(code, message, resolve)
+      @code = code
+      @resolve = resolve
+
+      super "Code #{@code}: #{message}. #{resolve}"
+    end
+  end
+
+  # Public: Exception which is thrown when TodaysPlan API returns a 400 response.
+  class BadRequestError    < TodaysPlanError; end
+
+  # Public: Exception which is thrown when TodaysPlan API returns a 401 response.
+  class UnauthorizedError  < TodaysPlanError; end
+
+  # Public: Exception which is thrown when TodaysPlan API returns a 402 response.
+  class RequestFailedError < TodaysPlanError; end
+
+  # Public: Exception which is thrown when TodaysPlan API returns a 404 response.
+  class NotFoundError      < TodaysPlanError; end
+
+  # Public: Exception which is thrown when TodaysPlan API returns a response which
+  # is neither 2xx, nor 4xx. Presumably 5xx.
+  class ServerError        < TodaysPlanError; end
+end

data/lib/todays_plan/version.rb

@@ -1,3 +1,3 @@
 module TodaysPlan
-  VERSION  = '0.1.0'
+  VERSION  = '0.2.0'
 end

data/lib/todays_plan.rb

@@ -3,6 +3,7 @@ require 'todays_plan/client'
 require 'todays_plan/connector'
 require 'todays_plan/athlete'
 require 'todays_plan/activity'
+require 'todays_plan/errors'
 require 'rest_client'
 
 module TodaysPlan

data/spec/fixtures/athletes/accept_response.json

@@ -0,0 +1,27 @@
+{
+    "id": 7171264,
+    "coach": {
+        "_name": "Coach Joh",
+        "id": 7186982,
+        "email": "curt@mtbcoach.com",
+        "firstname": "Curt",
+        "lastname": "Wilhelm",
+        "isPremium": true
+    },
+    "client": {
+        "_name": "curt wilhelm",
+        "id": 7189071,
+        "email": "curt+1@mtbcoach.com",
+        "dob": 315532800000,
+        "_dob-display": "1/1/80",
+        "firstname": "curt",
+        "lastname": "wilhelm",
+        "relationship": "coach",
+        "_relationship-display": "Coach",
+        "isPremium": true
+    },
+    "state": "active",
+    "_state-display": "Active",
+    "relationship": "coach",
+    "_relationship-display": "Coach"
+}

data/spec/fixtures/athletes/delegates_response.json

@@ -0,0 +1,26 @@
+{
+    "cnt": 1,
+    "offset": 0,
+    "results": [{
+            "id": 98765,
+            "coach": {
+                "_name": "Coach John",
+                "id": 5678,
+                "email": "coach@example.com",
+                "firstname": "Coach",
+                "lastname": "john",
+                "isPremium": true
+            },
+            "client": {
+                "_name": "joe athlete",
+                "id": 1234,
+                "email": "joeathlete@example.com",
+                "firstname": "joe",
+                "lastname": "athlete"
+            },
+            "state": "pending_coach",
+            "_state-display": "Pending",
+            "relationship": "coach",
+            "_relationship-display": "Coach"
+        }]
+}

data/spec/fixtures/athletes/invite_response.json

@@ -0,0 +1,22 @@
+{
+    "id": 8765,
+    "coach": {
+        "_name": "coach John",
+        "id": 5678,
+        "email": "coach@example.com",
+        "firstname": "Coach",
+        "lastname": "John"
+    },
+    "client": {
+        "_name": "joe athlete",
+        "id": 1234,
+        "email": "joeathlete@example.com",
+        "firstname": "joe",
+        "lastname": "athlete",
+        "isPremium": true
+    },
+    "state": "pending_coach",
+    "_state-display": "Pending",
+    "relationship": "coach",
+    "_relationship-display": "Coach"
+}

data/spec/fixtures/athletes/register_response.json

@@ -0,0 +1,14 @@
+{
+    "email": "joeathlete@example.com",
+    "uuid": "yyyy",
+    "firstname": "joe",
+    "lastname": "athlete",
+    "locale": "English (United States)",
+    "timezone": "Etc/UTC",
+    "weekStart": "sun",
+    "_weekStart-display": "Sunday",
+    "stripeId": "xxxx",
+    "prefsMask": 0,
+    "cls": "net.todaysplan.model.users.User",
+    "id": 1234
+}

data/spec/todays_plan/athlete_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe TodaysPlan::Athlete do
 
-  let(:response){File.read("spec/fixtures/athletes/response.json")}
+  let(:response){File.read("spec/fixtures/athletes/search_response.json")}
   
   it "expect to get all athletes" do
     stub_request(:get, "#{TodaysPlan.endpoint}/users/delegates/users").
@@ -12,13 +12,13 @@ describe TodaysPlan::Athlete do
     all = TodaysPlan::Athlete.all()
     expect(all).to be_a(Array)
     expect(all[0]).to be_a(TodaysPlan::Athlete)
-    expect(all[0].first_name).to_not be_nil
-    expect(all[0].last_name).to_not be_nil
-    expect(all[0].coach).to_not be_nil
-    expect(all[0].timezone).to_not be_nil
-    expect(all[0].id).to_not be_nil
-    expect(all[0].name).to_not be_nil
-    expect(all[0].email).to_not be_nil
+    expect(all[0].first_name).to eq "Joe"
+    expect(all[0].last_name).to eq "Athlete"
+    expect(all[0].coach).to eq 7187033
+    expect(all[0].timezone).to eq "US/Mountain"
+    expect(all[0].id).to eq 7187033
+    expect(all[0].name).to eq "Joe Athlete"
+    expect(all[0].email).to eq "joeathlete@example.com"
   end
   
   it "expect to get one athlete" do
@@ -38,5 +38,55 @@ describe TodaysPlan::Athlete do
     expect(athlete).to respond_to(:dob)
   end
 
+  it "expect to create one athlete" do
+    options = {user_email: 'joeathlete@example.com', firstname: 'joe',
+      lastname: 'athlete', password:'password', coach_email: 'coach@email.com'}
+    # preregister
+    stub_request(:get, "#{TodaysPlan.endpoint}/auth/preregister").
+      with(:headers => {'Accept'=>'*/*'}).
+      to_return(:status => 200, :body => "", :headers => {})
+    #register
+    stub_request(:post, "#{TodaysPlan.endpoint}/auth/register").
+      with(:body => '{"email":"joeathlete@example.com","firstname":"joe","lastname":"athlete","password":"password"}',
+      :headers => {'Accept'=>'*/*'}).
+      to_return(:status => 200, 
+      :body => File.read("spec/fixtures/athletes/register_response.json"),
+      :headers => {})
+    #login as new user
+    stub_request(:post, TodaysPlan.endpoint+'/auth/login').
+      with(:body => "{\"username\":\"joeathlete@example.com\",\"password\":\"password\",\"token\":true}",
+      :headers => {'Accept'=>'application/json', 
+        'Content-Type'=>'application/json', }).
+      to_return(:status => 200, :body => '{"token":"abc-456"}', :headers => {}) 
+    #invite the coach
+    stub_request(:post, "#{TodaysPlan.endpoint}/users/delegates/invite").
+      with(:body => '{"email":"coach@email.com","state":"pending_coach","relationship":"coach"}',
+      :headers => {'Accept'=>'application/json', 
+        'Authorization'=>'Bearer abc-456', 
+        'Content-Type'=>'application/json'}).
+      to_return(:status => 200, 
+      :body => File.read("spec/fixtures/athletes/invite_response.json"), 
+      :headers => {})
+    # search for pending invites
+    stub_request(:post, "#{TodaysPlan.endpoint}/users/delegates/search/0/100").
+      with(:body => '{"state":"pending_coach"}',
+      :headers => {'Accept'=>'application/json', 
+        'Authorization'=>'Bearer abc-123', 
+        'Content-Type'=>'application/json'}).
+      to_return(:status => 200, 
+      :body => File.read("spec/fixtures/athletes/delegates_response.json"), 
+      :headers => {})
+    # accept invite
+    stub_request(:get, "#{TodaysPlan.endpoint}/users/delegates/invite/accept/98765").
+      with(:headers => {'Accept'=>'application/json', 'Authorization'=>'Bearer abc-123'}).
+      to_return(:status => 200, 
+      :body => File.read("spec/fixtures/athletes/accept_response.json"),  
+      :headers => {})
+    athlete = TodaysPlan::Athlete.create(options)
+    expect(athlete.first_name).to eq "joe"
+    expect(athlete.last_name).to eq "athlete"
+    expect(athlete.email).to eq "joeathlete@example.com"
+    expect(athlete.id).to eq(1234)
+  end
 
 end

data/spec/todays_plan/connector_spec.rb

@@ -17,25 +17,62 @@ describe TodaysPlan::Connector do
   end
   
   it "expect to create new connect with client" do
-    client = double(token: 'abc-123')
+    client = double(token: 'abc-123', code: 200)
     expect(TodaysPlan::Client).to_not receive(:new)
     TodaysPlan::Connector.new("/test", client)
   end
   
   it "expect rest-client get request" do
-    response = double(body: '{"message":"test"}')
+    response = double(body: '{"message":"test"}', code: 200)
     client = double(token: 'abc-123')
     expect(TodaysPlan::Client).to receive(:new).with(username, password).and_return(client)
     expect(RestClient::Request).to receive(:execute).and_return(response)
     expect(TodaysPlan::Connector.new("/test",).get()).to eq({"message"=>"test"})
   end
+  
   it "expect rest-client post request" do
-    response = double(body: '{"message":"test"}')
+    response = double(body: '{"message":"test"}', code: 201)
     client = double(token: 'abc-123')
     expect(TodaysPlan::Client).to receive(:new).with(username, password).and_return(client)
     expect(RestClient::Request).to receive(:execute).and_return(response)
     expect(TodaysPlan::Connector.new("/test",).post()).to eq({"message"=>"test"})
   end
  
-
+  
+  it "expect rest-client post raise error empty body" do
+    response = double(body: nil, code: 503)
+    client = double(token: 'abc-123')
+    expect(TodaysPlan::Client).to receive(:new).with(username, password).and_return(client)
+    expect(RestClient::Request).to receive(:execute).and_return(response)
+    expect{TodaysPlan::Connector.new("/test",).post()}.to raise_error(TodaysPlan::ServerError)
+  end
+  
+  it "expect rest-client get raise error empty body" do
+    response = double(body: nil, code: 200)
+    client = double(token: 'abc-123')
+    expect(TodaysPlan::Client).to receive(:new).with(username, password).and_return(client)
+    expect(RestClient::Request).to receive(:execute).and_return(response)
+    expect{TodaysPlan::Connector.new("/test",).get()}.to raise_error(TodaysPlan::ServerError)
+  end
+  
+  it "expect rest-client get raise error 404" do
+    client = double(token: 'abc-123')
+    allow(RestClient::NotFound).to receive(:body).and_return('{"message":"testing"}')
+    allow(RestClient::NotFound).to receive(:code).and_return(404)
+    expect(TodaysPlan::Client).to receive(:new).with(username, password).and_return(client)
+    expect(RestClient::Request).to receive(:execute).and_return(RestClient::NotFound)
+    expect{TodaysPlan::Connector.new("/test",).get()}.to raise_error(TodaysPlan::NotFoundError)
+  end
+  
+  it "expect rest-client get raise error 401" do
+    response = double('RestClient::Unauthorized',body: '{}', code: 401)
+    client = double(token: 'abc-123')
+    expect(TodaysPlan::Client).to receive(:new).with(username, password).and_return(client)
+    allow(RestClient::Unauthorized).to receive(:body).and_return('{"message":"testing"}')
+    allow(RestClient::Unauthorized).to receive(:code).and_return(401)
+    expect(RestClient::Request).to receive(:execute).and_return(RestClient::Unauthorized)
+    expect{TodaysPlan::Connector.new("/test",).get()}.to raise_error(TodaysPlan::UnauthorizedError)
+  end
+  
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todaysplan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Curt Wilhelm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -95,10 +95,15 @@ files:
 - lib/todays_plan/athlete.rb
 - lib/todays_plan/client.rb
 - lib/todays_plan/connector.rb
+- lib/todays_plan/errors.rb
 - lib/todays_plan/version.rb
 - spec/fixtures/activities/incomplete.json
 - spec/fixtures/activities/incomplete_response.json
-- spec/fixtures/athletes/response.json
+- spec/fixtures/athletes/accept_response.json
+- spec/fixtures/athletes/delegates_response.json
+- spec/fixtures/athletes/invite_response.json
+- spec/fixtures/athletes/register_response.json
+- spec/fixtures/athletes/search_response.json
 - spec/spec_helper.rb
 - spec/todays_plan/activity_spec.rb
 - spec/todays_plan/athlete_spec.rb
@@ -132,7 +137,11 @@ summary: A Ruby Library for TodaysPlan
 test_files:
 - spec/fixtures/activities/incomplete.json
 - spec/fixtures/activities/incomplete_response.json
-- spec/fixtures/athletes/response.json
+- spec/fixtures/athletes/accept_response.json
+- spec/fixtures/athletes/delegates_response.json
+- spec/fixtures/athletes/invite_response.json
+- spec/fixtures/athletes/register_response.json
+- spec/fixtures/athletes/search_response.json
 - spec/spec_helper.rb
 - spec/todays_plan/activity_spec.rb
 - spec/todays_plan/athlete_spec.rb