coach_assist 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81df849eba98166f8c445668a19ca1fae8a94fdf
-  data.tar.gz: d341ac7ee8a96f4b772e50737354e03fef08a2b7
+  metadata.gz: 278bc2ac79ab1f23248370336dc8263ad042dc5e
+  data.tar.gz: 9ce647e23df24610214a04f09612ce5e7175a550
 SHA512:
-  metadata.gz: 9ab982b66efe308daf2a98e7de337c33c9503a060a6115ac52aafd4993e5ffed55129a0d4e7e8e35d207fb10d37321b3777944199083a2277955164e0779f59b
-  data.tar.gz: 3b5d8fa51b5662963d1e742debc8de4d63a7daf04c3da798e9aba3fb5d41a0ce32ded3603293308b18ebd578eda4323cf6033df8a6aa396d19ce847eb2c2053a
+  metadata.gz: 50c6d6f01ad4ec1f2b1930665dba59c5245f75790596e5c9724e87d4aa544fb1efb405a2c8feb10a25a82b61170642f1c63673160f826283650bcb91bc1474f3
+  data.tar.gz: edeb36fe187eb95091c29e4216db029bcf3285d2ee73cb52974a2e6ab21b8eab63b03ef7d68adfbd6acac9602d5c91ac3c5ef3af7a870ed5c02555e761b8518d

data/lib/coach/client.rb

@@ -0,0 +1,58 @@
+module Coach
+  class Client
+    include HTTParty
+
+    debug_output $stdout
+    format :json
+
+    headers  'Accept' => 'application/json'
+    base_uri 'http://diufvm31.unifr.ch:8090/CyberCoachServer/resources'
+
+    def get(path, options={})
+      Client.get(path, options.merge(basic_auth: @auth))
+    end
+
+    def post(path, options={})
+     Client.post(path, options.merge(basic_auth: @auth))
+    end
+
+    def put(path, options={})
+      Client.put(path, options.merge(basic_auth: @auth))
+    end
+
+    def delete(path, options={})
+      Client.delete(path, options.merge(basic_auth: @auth))
+    end
+
+    def authenticate(username, password)
+      @auth = { username: username, password: password }
+    end
+
+    def authenticated(username, password, &block)
+      authenticate(username, password)
+      block.call
+      @auth = nil
+    end
+
+    def has_auth?
+      !!@auth
+    end
+
+    def assert_authenticated!
+      raise 'Method must be authenticated first!' unless has_auth?
+    end
+
+    def users
+      @user_finder || (@user_finder = Finders::UserFinder.new(self))
+    end
+
+    def partnerships
+      @ps_finder || (@ps_finder = Finders::PartnershipFinder.new(self))
+    end
+
+    def subscriptions
+      @sub_finder || (@sub_finder = Finders::SubscriptionFinder.new(self))
+    end
+
+  end
+end

data/lib/coach/entity.rb

@@ -1,40 +1,48 @@
 module Coach
   class Entity < Hashie::Trash
     include Hashie::Extensions::IndifferentAccess
-    include HTTParty
+
+    attr_accessor :client
 
     property :uri
     property :id
     property :created_at, from: :datecreated
-    property :visibility, from: :publicvisible
-
-    headers  'Accept' => 'application/json'
-    base_uri 'http://diufvm31.unifr.ch:8090/CyberCoachServer/resources'
-
-    class << self
-      def authenticated(username, password, &block)
-        @auth = { username: username, password: password }
-        res = instance_eval &block
-        @auth = nil
-        res
-      end
-    end
+    property :visibility, from: :publicvisible, default: 2
 
     # Fetch an entity based on its uri. Each entity containing a valid uri will be retrievable through this method
     def fetch
-      return self if @fetched
-      raise 'Entity has not been loaded yet and does not have "uri" property' if self.uri.blank?
+      assert_has_uri!
 
-      response = Entity.get clean_uri
+      response = client.get clean_uri
       update_attributes! JSON.parse(response.body)
 
-      @fetched = true
       self
     end
 
-    # Remove overlapping url parts
-    def clean_uri
-      self.uri.gsub('/CyberCoachServer/resources', '')
+    def destroy
+      assert_has_uri!
+      client.delete clean_uri
+    end
+
+    def update(attributes={})
+      assert_has_uri!
+      response = client.put clean_uri, body: attributes
+      update_attributes! JSON.parse(response.body) if response.code == 200
     end
+
+    def set_client(client)
+      self.client = client
+      self
+    end
+
+    private
+      # Remove overlapping url parts
+      def clean_uri
+        self.uri.gsub('/CyberCoachServer/resources', '')
+      end
+
+      def assert_has_uri!
+        raise 'Entity has no URI associated with it' unless self.uri
+      end
   end
 end

data/lib/coach/finders/finder.rb

@@ -0,0 +1,11 @@
+module Coach
+  module Finders
+    class Finder
+      attr_accessor :client
+
+      def initialize(client)
+        @client = client
+      end
+    end
+  end
+end

data/lib/coach/finders/partnership_finder.rb

@@ -0,0 +1,31 @@
+module Coach
+  module Finders
+    class PartnershipFinder < Finder
+      def all
+        eager, search = options.values_at(:eager, :search)
+        response = client.get '/partnerships', query: { start: 0, size: 10000, searchCriteria: search }
+        JSON.parse(response.body)['partnerships'].map { |ps| eager ? build(ps).fetch : build(ps) }
+      end
+
+      def find(username1, username2)
+        response = client.get "/partnerships/#{username1};#{username2}"
+        response.code == 200 ? build(JSON.parse(response.body)) : nil
+      end
+
+      def exists?(username1, username2)
+        !!find(username1, username2)
+      end
+
+      def create(username1, username2, attributes={})
+        response = client.put "/partnerships/#{username1};#{username2}", body: attributes
+        response.code == 201 ? build(JSON.parse(response.body)) : nil
+      end
+
+      def build(attributes={})
+        u = Coach::Partnership.new(attributes)
+        u.set_client(client)
+        u
+      end
+    end
+  end
+end

data/lib/coach/finders/subscription_finder.rb

@@ -0,0 +1,27 @@
+module Coach
+  module Finders
+    class SubscriptionFinder < Finder
+
+      def find(username, sport)
+        response = client.get "/users/#{username}/#{sport}"
+        response.code == 200 ? build(JSON.parse(response.body)) : nil
+      end
+
+      def exists?(username1, username2)
+        !!find(username1, username2)
+      end
+
+      def create(username, sport, attributes={})
+        response = client.put "/users/#{username}/#{sport}", body: attributes
+        response.code == 201 ? build(JSON.parse(response.body)) : nil
+      end
+
+      def build(attributes={})
+        s = Coach::Subscription.new(attributes)
+        s.set_client(client)
+        s
+      end
+
+    end
+  end
+end

data/lib/coach/finders/user_finder.rb

@@ -0,0 +1,49 @@
+module Coach
+  module Finders
+    class UserFinder < Finder
+
+      # Find all users on server. Pass :eager option to return results eagerly (slow)
+      # Pass :search option to only include users matching the search query
+      def all(options={})
+        eager, search = options.values_at(:eager, :search)
+        response = client.get '/users', query: { start: 0, size: 10000, searchCriteria: search }
+        JSON.parse(response.body)['users'].map { |u| eager ? build(u).fetch : build(u) }
+      end
+
+      # Find user by username
+      def find(username)
+        response = client.get "/users/#{username}"
+        response.code == 200 ? build(JSON.parse(response.body)) : nil
+      end
+
+      # Check whether user exists
+      def exists?(username)
+        !!find(username)
+      end
+
+      def authenticated?(username, password)
+        authenticated(username, password) do
+          response = client.get '/authenticateduser'
+          response.code == 200 ? build(JSON.parse(response.body)) : nil
+        end
+      end
+
+      # Create new user
+      def create(username, attributes={})
+        response = client.put "/users/#{username}", body: attributes
+        [200, 201].include?(response.code) ? build(JSON.parse(response.body)) : nil
+      end
+
+      def find_or_create(username, attributes={})
+        u = find(username)
+        u || create(username, attributes)
+      end
+
+      def build(attributes={})
+        u = Coach::User.new(attributes)
+        u.set_client(client)
+        u
+      end
+    end
+  end
+end

data/lib/coach/partnership.rb

@@ -4,20 +4,31 @@ module Coach
     property :confirmed_by_user2, from: :userconfirmed2
     property :user1
     property :user2
+    property :subscriptions
 
     alias_method :old_user1, :user1
     alias_method :old_user2, :user2
+    alias_method :subscriptions_orig, :subscriptions
 
     def user1
-      Coach::User.new(old_user1).fetch
+      client.users.build(old_user1).fetch
     end
 
     def user2
-      Coach::User.new(old_user2).fetch
+      client.users.build(old_user2).fetch
     end
 
     def users
       [user1, user2]
     end
+
+    def subscriptions
+      (subscriptions_orig || []).map { |s| client.subscriptions.build(s).fetch }
+    end
+
+    def confirm
+      client.assert_authenticated!
+      client.put clean_uri
+    end
   end
 end

data/lib/coach/subscription.rb

@@ -8,7 +8,11 @@ module Coach
     alias_method :old_user, :user
 
     def user
-      Coach::User.new(old_user).fetch
+      client.users.build(old_user).fetch
+    end
+
+    def self.types
+      [:running, :cycling]
     end
   end
 end

data/lib/coach/user.rb

@@ -5,63 +5,46 @@ module Coach
     property :password
     property :real_name, from: :realname
     property :email
-    property :partnerships
-    property :subscriptions
+    property :partnerships, default: []
+    property :subscriptions, default: []
 
-    alias_method :old_partnerships, :partnerships
-    alias_method :old_subscriptions, :subscriptions
+    alias_method :partnerships_orig, :partnerships
+    alias_method :subscriptions_orig, :subscriptions
 
-    class << self
-      # Find all users on server. Pass :eager option to return results eagerly (slow)
-      # Pass :search option to only include users matching the search query
-      def all(options={})
-        eager, search = options.values_at(:eager, :search)
-        response = get '/users', query: { start: 0, size: 10000, searchCriteria: search }
-        JSON.parse(response.body)['users'].map { |u| eager ? Coach::User.new(u).fetch : Coach::User.new(u) }
-      end
-
-      # Find user by username
-      def find(username)
-        response = get "/users/#{username}", basic_auth: @auth
-        response.code == 200 ? Coach::User.new(JSON.parse(response.body)) : nil
-      end
-
-      # Check whether user exists
-      def exists?(username)
-        !!find(username)
-      end
-
-      def authenticated?(username, password)
-        authenticated(username, password) do
-          response = get '/authenticateduser', basic_auth: @auth
-          response.code == 200 ? Coach::User.new(JSON.parse(response.body)) : nil
-        end
-      end
+    def partnerships
+      (partnerships_orig || []).map { |p| client.partnerships.build(p).fetch }
+    end
 
-      # Create new user
-      def create(username, attributes={})
-        response = put "/users/#{username}", body: attributes
-        response.code == 201 ? Coach::User.new(JSON.parse(response.body)) : nil
-      end
+    def subscriptions
+      (subscriptions_orig || []).map { |p| client.subscriptions.build(p).fetch }
+    end
 
-      # Update user
-      def update(username, attributes={})
-        response = put "/users/#{username}", body: attributes, basic_auth: @auth
-        response.code == 200 ? Coach::User.new(JSON.parse(response.body)) : nil
-      end
+    def pending_partnerships
+      partnerships.select { |ps| ps.user2.username == self.username && !ps.confirmed_by_user2}
+    end
 
-      # Delete user
-      def delete(username)
-        HTTParty::delete "/users/#{username}", basic_auth: @auth
-      end
+    def confirm_partnership(ps)
+      ps.confirm
     end
 
-    def partnerships
-      (old_partnerships || []).map { |p| Coach::Partnership.new(p).fetch }
+    def subscribe_to(sport)
+      raise 'Can only subscribe to :running or :cycling' unless Coach::Subscription.types.include? sport.to_sym
+      client.subscriptions.create(self.username, sport, publicvisible: 2)
     end
 
-    def subscriptions
-      (old_subscriptions || []).map { |p| Coach::Subscription.new(p).fetch }
+    def destroy
+      destroy_partnerships
+      destroy_subscriptions
+      super
     end
+
+    private
+      def destroy_partnerships
+        partnerships.each(&:destroy)
+      end
+
+      def destroy_subscriptions
+        subscriptions.each(&:destroy)
+      end
   end
 end

data/lib/coach_assist.rb

@@ -1,10 +1,14 @@
 require 'httparty'
 require 'hashie'
-require 'active_support/all'
-require "coach_assist/version"
-require "coach/entity"
-require "coach/user"
-require "coach/subscription"
-require "coach/partnership"
-
 
+require 'active_support/all'
+require 'coach_assist/version'
+require 'coach/entity'
+require 'coach/user'
+require 'coach/subscription'
+require 'coach/partnership'
+require 'coach/client'
+require 'coach/finders/finder'
+require 'coach/finders/user_finder'
+require 'coach/finders/subscription_finder'
+require 'coach/finders/partnership_finder'

data/lib/coach_assist/version.rb

@@ -1,3 +1,3 @@
 module CoachAssist
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coach_assist
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Urs Gerber
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,7 +111,12 @@ files:
 - bin/console
 - bin/setup
 - coach_assist.gemspec
+- lib/coach/client.rb
 - lib/coach/entity.rb
+- lib/coach/finders/finder.rb
+- lib/coach/finders/partnership_finder.rb
+- lib/coach/finders/subscription_finder.rb
+- lib/coach/finders/user_finder.rb
 - lib/coach/partnership.rb
 - lib/coach/subscription.rb
 - lib/coach/user.rb