todaysplan 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f15a61fe0e7c44b9184e3eec252f2527f7f270d
-  data.tar.gz: 702570cbc3b9e829c37a90d9cdc3e3e5f95ab5a1
+  metadata.gz: 282b2cf2f7d630c1ac5b3d5abc7a0af9a256c97f
+  data.tar.gz: f9e2c2653716d8407c4f3e3829168191170374e4
 SHA512:
-  metadata.gz: 21b04b33a7f90c9b8a556f14494f12ff2ea0b51d93e58b061042aede1982fa8bea40d96788ade9f80c270f1f72ffeeaae299f598f48b1cf8c70a7f0ccf93e509
-  data.tar.gz: bf26d14ee97f05b2991941b5fca413c12ea878b200bdf164a199eb9bb6add6bbab4cc9ee0278ffa60848d4d114429ea89f68a9c110de4b00485b52ca9f9c3ac4
+  metadata.gz: fb494b63767c70fa28c649abd389400bef271cfc8bbfac8ebace68c7d616d840bf680b73ece5ca07c704c4401a70b73de96f11a5bc42b48505b7ac209fbabcb4
+  data.tar.gz: 93fdbf177e80b1fae7cbf1b13ec07ad4c01f4bc1fce2b87b20ad07193bee45a49fb70f4e55d8dbaa45fae28ba0d1a8e6b224c7e32392d5eb02a2e361c7bcc7dc

data/lib/todays_plan.rb

@@ -1,7 +1,7 @@
 require 'todays_plan/version'
 require 'todays_plan/client'
 require 'todays_plan/connector'
-require 'todays_plan/athlete'
+require 'todays_plan/user'
 require 'todays_plan/activity'
 require 'todays_plan/errors'
 require 'rest_client'

data/lib/todays_plan/{athlete.rb → user.rb}

@@ -1,7 +1,7 @@
 module TodaysPlan
   # Uses the TodaysPlan API for workouts and athlete information
 
-  class Athlete
+  class User
     
     attr_reader :id
     attr_reader :name
@@ -28,51 +28,72 @@ module TodaysPlan
       
     # Find a single athlete 
     # +id+:: the athlete id
+    # returns User
     def self.find(id)      
       all().find{|a| a.id==id}
     end
     
     # Find all the coaches athletes 
     # +client+:: the authenticated client
+    # returns [User]
     def self.all(client = nil)
       Connector.new('/users/delegates/users', client).get.map do |data|
         new(data)
       end
     end
     
-    # Create new Athlete\
-    # options 
-    #   user_email - email address of new user
+    
+    # Register a new user
+    # This is an unauthenticated request.
+    # options:
+    #   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)
-
+    # returns User
+    def self.register(options)
       #preregister
       response = RestClient.get("#{TodaysPlan.endpoint}/auth/preregister")
 
-      # register the user
-      payload = {email: options[:user_email], firstname: options[:firstname],
+      # register/create the user
+      payload = {email: options[: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
+      new(JSON.parse(response.body))
+    end
+    
+    # Invite delegates
+    # This is an authenticated request of the new user to invite the delegates (coach)
+    # options 
+    #   relationship - relationship of delegate, i.e coach
+    #   state - state of invite. i.e pending_coach
+    #   email - delegates email in todaysplan
+    # returns Hash of the invite
+    def self.invite(options, client = nil)
+      # new user invites coach
+      invite={"email"=>options[:email],"state"=> options[:state], 
+        "relationship"=> options[:relationship]}.to_json
+      Connector.new('/users/delegates/invite', client).post(invite)
+    end
+    
+    # Accept pending invitations
+    # This is an authenticated request of the delegate (coach) to accept invites
+    # from the new user.
+    # queries for pending invitations and accept them.
+    # options 
+    #   id - id of the invite from #invite 
+    #   state - state of invite. i.e pending_coach
+    # returns [User]
+    def self.accept_invites(options, client = nil) 
       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() 
+        post({ "state"=> options[:state]}.to_json)["results"].map do |data|
+
+        # accept found invite
+        new(Connector.new("/users/delegates/invite/accept/#{data["id"]}").get()["client"])
         
       end
-      athlete
     end
   end
 end

data/lib/todays_plan/version.rb

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

data/spec/todays_plan/{athlete_spec.rb → user_spec.rb}

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
-describe TodaysPlan::Athlete do
+describe TodaysPlan::User do
 
-  let(:response){File.read("spec/fixtures/athletes/search_response.json")}
+  let(:response){File.read("spec/fixtures/users/search_response.json")}
   
   it "expect to get all athletes" do
     stub_request(:get, "#{TodaysPlan.endpoint}/users/delegates/users").
       with(:headers => {'Accept'=>'application/json',  
         'Authorization'=>'Bearer abc-123', }).
       to_return(:status => 200, :body => response, :headers => {})
-    all = TodaysPlan::Athlete.all()
-    expect(all).to be_a(Array)
-    expect(all[0]).to be_a(TodaysPlan::Athlete)
-    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"
+    users = TodaysPlan::User.all()
+    expect(users).to be_a(Array)
+    expect(users[0]).to be_a(TodaysPlan::User)
+    expect(users[0].first_name).to eq "Joe"
+    expect(users[0].last_name).to eq "Athlete"
+    expect(users[0].coach).to eq 7187033
+    expect(users[0].timezone).to eq "US/Mountain"
+    expect(users[0].id).to eq 7187033
+    expect(users[0].name).to eq "Joe Athlete"
+    expect(users[0].email).to eq "joeathlete@example.com"
   end
   
   it "expect to get one athlete" do
@@ -26,19 +26,20 @@ describe TodaysPlan::Athlete do
       with(:headers => {'Accept'=>'application/json',  
         'Authorization'=>'Bearer abc-123', }).
       to_return(:status => 200, :body => response, :headers => {})
-    athlete = TodaysPlan::Athlete.find(7187033)
-    expect(athlete).to be_a(TodaysPlan::Athlete)
-    expect(athlete).to respond_to(:first_name)
-    expect(athlete).to respond_to(:last_name)
-    expect(athlete).to respond_to(:coach)
-    expect(athlete).to respond_to(:timezone)
-    expect(athlete).to respond_to(:id)
-    expect(athlete).to respond_to(:name)
-    expect(athlete).to respond_to(:email)
-    expect(athlete).to respond_to(:dob)
+    user = TodaysPlan::User.find(7187033)
+    expect(user).to be_a(TodaysPlan::User)
+    expect(user).to respond_to(:first_name)
+    expect(user).to respond_to(:last_name)
+    expect(user).to respond_to(:coach)
+    expect(user).to respond_to(:timezone)
+    expect(user).to respond_to(:id)
+    expect(user).to respond_to(:name)
+    expect(user).to respond_to(:email)
+    expect(user).to respond_to(:dob)
+    expect(user).to respond_to(:country)
   end
 
-  it "expect to create one athlete" do
+  it "register user" do
     options = {user_email: 'joeathlete@example.com', firstname: 'joe',
       lastname: 'athlete', password:'password', coach_email: 'coach@email.com'}
     # preregister
@@ -50,23 +51,33 @@ describe TodaysPlan::Athlete do
       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"),
+      :body => File.read("spec/fixtures/users/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 => {}) 
+    
+    user = TodaysPlan::User.register(options)
+    expect(user.first_name).to eq "joe"
+    expect(user.last_name).to eq "athlete"
+    expect(user.email).to eq "joeathlete@example.com"
+    expect(user.id).to eq(1234)
+  end
+  
+  it "invite delegate" do
+    options = { relationship: 'coach', state: 'pending_coach', email: 'coach@email.com'}
     #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', 
+        'Authorization'=>'Bearer abc-123', 
         'Content-Type'=>'application/json'}).
       to_return(:status => 200, 
-      :body => File.read("spec/fixtures/athletes/invite_response.json"), 
+      :body => File.read("spec/fixtures/users/invite_response.json"), 
       :headers => {})
+    invite = TodaysPlan::User.invite(options)
+    expect(invite["id"]).to eq 8765
+  end 
+  
+  it "accept invite" do
+    options = { state: 'pending_coach'}
     # search for pending invites
     stub_request(:post, "#{TodaysPlan.endpoint}/users/delegates/search/0/100").
       with(:body => '{"state":"pending_coach"}',
@@ -74,19 +85,16 @@ describe TodaysPlan::Athlete do
         'Authorization'=>'Bearer abc-123', 
         'Content-Type'=>'application/json'}).
       to_return(:status => 200, 
-      :body => File.read("spec/fixtures/athletes/delegates_response.json"), 
+      :body => File.read("spec/fixtures/users/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"),  
+      :body => File.read("spec/fixtures/users/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)
+    users = TodaysPlan::User.accept_invites(options)
+    expect(users[0].id).to eq 7189071
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todaysplan
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Curt Wilhelm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -92,23 +92,23 @@ files:
 - Rakefile
 - lib/todays_plan.rb
 - lib/todays_plan/activity.rb
-- lib/todays_plan/athlete.rb
 - lib/todays_plan/client.rb
 - lib/todays_plan/connector.rb
 - lib/todays_plan/errors.rb
+- lib/todays_plan/user.rb
 - lib/todays_plan/version.rb
 - spec/fixtures/activities/incomplete.json
 - spec/fixtures/activities/incomplete_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/fixtures/users/accept_response.json
+- spec/fixtures/users/delegates_response.json
+- spec/fixtures/users/invite_response.json
+- spec/fixtures/users/register_response.json
+- spec/fixtures/users/search_response.json
 - spec/spec_helper.rb
 - spec/todays_plan/activity_spec.rb
-- spec/todays_plan/athlete_spec.rb
 - spec/todays_plan/client_spec.rb
 - spec/todays_plan/connector_spec.rb
+- spec/todays_plan/user_spec.rb
 - spec/todays_plan_spec.rb
 homepage: https://github.com/9ksoftware/todaysplan-ruby
 licenses:
@@ -137,14 +137,14 @@ summary: A Ruby Library for TodaysPlan
 test_files:
 - spec/fixtures/activities/incomplete.json
 - spec/fixtures/activities/incomplete_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/fixtures/users/accept_response.json
+- spec/fixtures/users/delegates_response.json
+- spec/fixtures/users/invite_response.json
+- spec/fixtures/users/register_response.json
+- spec/fixtures/users/search_response.json
 - spec/spec_helper.rb
 - spec/todays_plan/activity_spec.rb
-- spec/todays_plan/athlete_spec.rb
 - spec/todays_plan/client_spec.rb
 - spec/todays_plan/connector_spec.rb
+- spec/todays_plan/user_spec.rb
 - spec/todays_plan_spec.rb