coach_assist 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 278bc2ac79ab1f23248370336dc8263ad042dc5e
-  data.tar.gz: 9ce647e23df24610214a04f09612ce5e7175a550
+  metadata.gz: 825a48ddff4715336e5d350d6651ec94fb6a5f1b
+  data.tar.gz: 35661453cbfd0e9b09deb5a6b5ada71a162ca75a
 SHA512:
-  metadata.gz: 50c6d6f01ad4ec1f2b1930665dba59c5245f75790596e5c9724e87d4aa544fb1efb405a2c8feb10a25a82b61170642f1c63673160f826283650bcb91bc1474f3
-  data.tar.gz: edeb36fe187eb95091c29e4216db029bcf3285d2ee73cb52974a2e6ab21b8eab63b03ef7d68adfbd6acac9602d5c91ac3c5ef3af7a870ed5c02555e761b8518d
+  metadata.gz: 580256fba7b637106ea57732c267a345945f85dfe59672f4de187d85ffa1699e1d07d01571d5fdedc581da4c2c4837299d0d36edcaec77931305884330036ab0
+  data.tar.gz: b9e58a80ee1bbe031973f0f4b20e5cc88e19206356d03f71fc7a477b3c55c3ac1e0a52f07a90effbff97ef6ddcf0ea5613336dd39bac4b635267124fd21001be

data/coach_assist.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_dependency 'httparty'
-  spec.add_dependency 'hashie'
-  spec.add_dependency 'activesupport'
+  spec.add_dependency 'httparty', '~> 0.13.7'
+  spec.add_dependency 'hashie', '~> 3.4'
+  spec.add_dependency 'activesupport', '~> 4.2'
 end

data/lib/coach/client.rb

@@ -13,7 +13,7 @@ module Coach
     end
 
     def post(path, options={})
-     Client.post(path, options.merge(basic_auth: @auth))
+      Client.post(path, options.merge(basic_auth: @auth))
     end
 
     def put(path, options={})
@@ -54,5 +54,9 @@ module Coach
       @sub_finder || (@sub_finder = Finders::SubscriptionFinder.new(self))
     end
 
+    def entries
+      @entry_finder || (@entry_finder = Finders::EntryFinder.new(self))
+    end
+
   end
 end

data/lib/coach/entity.rb

@@ -13,8 +13,8 @@ module Coach
     def fetch
       assert_has_uri!
 
-      response = client.get clean_uri
-      update_attributes! JSON.parse(response.body)
+      response = client.get clean_uri, query: { start: 0, size: 10000 }
+      update_attributes! filter_response_body(JSON.parse(response.body))
 
       self
     end
@@ -27,7 +27,7 @@ module Coach
     def update(attributes={})
       assert_has_uri!
       response = client.put clean_uri, body: attributes
-      update_attributes! JSON.parse(response.body) if response.code == 200
+      update_attributes! filter_response_body(JSON.parse(response.body)) if response.code == 200
     end
 
     def set_client(client)
@@ -44,5 +44,10 @@ module Coach
       def assert_has_uri!
         raise 'Entity has no URI associated with it' unless self.uri
       end
+
+      def filter_response_body(body)
+        # This is necessary because of the shitty REST implemenation by CyberCoach :(
+        body['entryrunning'] || body['entrycycling'] || body
+      end
   end
 end

data/lib/coach/entry.rb

@@ -0,0 +1,16 @@
+module Coach
+  class Entry < Coach::Entity
+
+    property :modified_at, from: :datemodified
+    property :subscription
+    property :rounds, from: :numberofrounds
+    property :distance, from: :courselength
+    property :duration, from: :entryduration
+
+    alias_method :subscription_orig, :subscription
+
+    def subscription
+      client.subscriptions.build(subscription_orig).fetch
+    end
+  end
+end

data/lib/coach/finders/entry_finder.rb

@@ -0,0 +1,34 @@
+module Coach
+  module Finders
+    class EntryFinder < Finder
+
+      def all(username, sport, options={})
+        eager = options[:eager]
+        response = client.get "/users/#{username}/#{sport}", query: { start: 0, size: 10000 }
+        JSON.parse(response.body)['entries'].map { |e| eager ? build(e).fetch : build(e) }
+      end
+
+      def find(username, sport)
+        response = client.get "/users/#{username}/#{sport}/"
+        build(JSON.parse(response.body))
+      end
+
+      def create(username, sport, attributes={})
+        client.assert_authenticated!
+
+        body = { "entry#{sport}".to_s => attributes }
+        response = client.post "/users/#{username}/#{sport}", body: body.to_json, headers: {'Content-Type' => 'application/json'}
+        response.code.in?([200, 201]) ? build(JSON.parse(response.body).merge(uri: response.response['Location'])).fetch : nil
+      end
+
+      def build(attributes={})
+        attrs = attributes['entryrunning'] || attributes['entrycycling'] || attributes
+
+        e = Coach::Entry.new(attrs)
+        e.set_client client
+        e
+      end
+
+    end
+  end
+end

data/lib/coach/finders/user_finder.rb

@@ -31,7 +31,7 @@ module Coach
       # 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
+        response.code.in?([200, 201]) ? build(JSON.parse(response.body)) : nil
       end
 
       def find_or_create(username, attributes={})

data/lib/coach/subscription.rb

@@ -5,14 +5,19 @@ module Coach
     property :user
     property :entries
 
-    alias_method :old_user, :user
+    alias_method :user_orig, :user
+    alias_method :entries_orig, :entries
 
     def user
-      client.users.build(old_user).fetch
+      client.users.build(user_orig).fetch
     end
 
     def self.types
       [:running, :cycling]
     end
+
+    def entries
+      (entries_orig || []).map { |e| client.entries.build(e).fetch }
+    end
   end
 end

data/lib/coach/user.rb

@@ -38,7 +38,7 @@ module Coach
       super
     end
 
-    private
+
       def destroy_partnerships
         partnerships.each(&:destroy)
       end

data/lib/coach_assist/version.rb

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

data/lib/coach_assist.rb

@@ -8,7 +8,9 @@ require 'coach/user'
 require 'coach/subscription'
 require 'coach/partnership'
 require 'coach/client'
+require 'coach/entry'
 require 'coach/finders/finder'
 require 'coach/finders/user_finder'
 require 'coach/finders/subscription_finder'
 require 'coach/finders/partnership_finder'
+require 'coach/finders/entry_finder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coach_assist
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Urs Gerber
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,58 +42,58 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.7
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 description: 
 email:
 - ug.gerber@gmail.com
@@ -113,6 +113,8 @@ files:
 - coach_assist.gemspec
 - lib/coach/client.rb
 - lib/coach/entity.rb
+- lib/coach/entry.rb
+- lib/coach/finders/entry_finder.rb
 - lib/coach/finders/finder.rb
 - lib/coach/finders/partnership_finder.rb
 - lib/coach/finders/subscription_finder.rb