habitica_client 0.0.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc30d20c07e3c6080844554c2cc94e3ff7c4edd7
-  data.tar.gz: 77b5d94876785015859720c6362f7034cc617e27
+  metadata.gz: fc2e42de48e261575d3cec43ced4290ac9759fce
+  data.tar.gz: 14cd60f8f5885c64b2dd5cbc4653d0c502f4eca6
 SHA512:
-  metadata.gz: 36ed2def94d025fe54261204a2fa6f170b35a7c029295d85599625b617ac3ba1694066450d8cd0036cc84cbde61ab42e53b3d0ad67ec5939a2f764741b6a17ba
-  data.tar.gz: d08db6ac1a0ddfffc9c0ba0a5cc5d2db5eac2311597280d22803d42b5f7308508eaf963b427211d171950030d49d0ee1612d80fee20bf4942b74c6de128ce5b5
+  metadata.gz: 08aba3ec6e1018ffcb0911554231d606d0904e93c7f504a45c4159f9311508a408f2dced29d1a16a132b0c39e6c15a6b9a90b2e8021e7bb495ffc2325dbb91d9
+  data.tar.gz: 455fc761bc9b115d1a856174a20372ff8f6fe24e7b073eaa3a4a1368a4bca1fd9b757a020c42270891e3b393ae9c1ff0a7a3421aa2e1f0318d8e3d49c5798a8e

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.2

data/README.md

@@ -35,12 +35,12 @@ habit.user.stats.hp
 # 50
 
 # Get tasks
-habit.user.tasks.each do |task|
+habit.tasks.each do |task|
   puts task.text
 end
 
 # Create task
-task = habit.user.tasks.create(
+task = habit.tasks.create(
   text: 'Do the dishes',
   type: 'todo'
 )
@@ -74,7 +74,7 @@ puts stats.player_class
 
 ### Task
 ```ruby
-stats = habitica_client.user.tasks
+stats = habitica_client.tasks
 
 tasks.each do |task|
     puts task.daily?

data/habitica_client.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'byebug', '~> 5.0'
   spec.add_development_dependency 'yard', '~> 0.8'
   spec.add_development_dependency 'redcarpet', '~> 3.3'
+  spec.add_development_dependency 'awesome_print', '~> 1.7'
   spec.add_runtime_dependency 'httparty', '~> 0.13'
 end

data/lib/habitica_client/api_base.rb

@@ -12,6 +12,18 @@ class HabiticaClient
       @client = client
     end
 
+    def data
+      @data ||= client.class.get(endpoint)['data']
+    end
+
+    def endpoint
+      self.class.instance_variable_get(:@endpoint)
+    end
+
+    def self.endpoint(url)
+      instance_variable_set(:@endpoint, url)
+    end
+
   end
 
 end

data/lib/habitica_client/client.rb

@@ -11,14 +11,14 @@ class HabiticaClient
 
     include HTTParty
 
-    base_uri 'https://habitrpg.com:443/api/v2/'
+    base_uri 'https://habitrpg.com:443/api/v3/'
 
     def initialize(user_id, api_token)
       @user_id = user_id
       @api_token = api_token
 
       self.class.headers('User-Agent' => 'habitapi-rpg',
-                         'Content-Type'  => 'application/json',
+                         'Content-Type' => 'application/json',
                          'x-api-key' => @api_token,
                          'x-api-user' => @user_id)
     end

data/lib/habitica_client/restful.rb

@@ -74,9 +74,11 @@ class HabiticaClient
                                    url,
                                    body: to_json)
 
-      fail ServerError, "#{response['err']}" unless response.ok?
+      unless response.response.code =~ /2\d{2}/
+        raise ServerError, response['err']
+      end
 
-      response.parsed_response
+      response.parsed_response['data']
     end
 
     def post

data/lib/habitica_client/{user/task → task}/date_accessor.rb

@@ -1,4 +1,6 @@
-class HabiticaClient::User::Task
+# rubocop:disable Style/UnneededInterpolation
+
+class HabiticaClient::Task
 
   module DateAccessor
 

data/lib/habitica_client/{user/task → task}/status.rb

@@ -1,4 +1,4 @@
-class HabiticaClient::User::Task
+class HabiticaClient::Task
 
   module Status
 

data/lib/habitica_client/{user/task → task}/type.rb

@@ -1,4 +1,4 @@
-class HabiticaClient::User::Task
+class HabiticaClient::Task
 
   module Type
 

data/lib/habitica_client/task.rb

@@ -0,0 +1,45 @@
+require 'ostruct'
+require 'forwardable'
+require 'time'
+require 'hashup'
+require 'habitica_client/restful'
+
+class HabiticaClient
+
+  # A user task, which can be a habit, daily, or todo.
+  class Task < HabiticaClient::Restful
+
+    require 'habitica_client/task/date_accessor'
+    require 'habitica_client/task/status'
+    require 'habitica_client/task/type'
+
+    extend DateAccessor
+    include Status
+    include Type
+    extend Hashup
+
+    endpoint '/tasks'
+
+    attr_accessor :user_id, :reminders, :id, :text, :notes, :value, :priority,
+                  :attribute, :type, :tags, :checklist, :value, :priority,
+                  :challenge, :down, :up, :history, :streak, :frequency,
+                  :history, :completed, :every_x, :repeat, :collapse_checklist
+
+    date_accessor :created_at, :updated_at, :start_date, :date
+
+    hashup :id, :text, :notes, :value, :priority, :attribute, :type, :tags,
+           :checklist, :value, :priority, :challenge, :down, :up, :history,
+           :streak, :frequency, :history, :completed, :every_x, :repeat,
+           :collapse_checklist, :created_at, :updated_at, :start_date, :date
+
+    private
+
+    def url
+      return "#{endpoint}/#{id}" unless new?
+
+      "#{endpoint}/user/#{id}"
+    end
+
+  end
+
+end

data/lib/habitica_client/{user/tasks → tasks}/status.rb

@@ -1,4 +1,4 @@
-class HabiticaClient::User::Tasks
+class HabiticaClient::Tasks
 
   module Status
 

data/lib/habitica_client/{user/tasks → tasks}/types.rb

@@ -1,4 +1,4 @@
-class HabiticaClient::User::Tasks
+class HabiticaClient::Tasks
 
   module Types
 

data/lib/habitica_client/{user/tasks.rb → tasks.rb}

@@ -1,22 +1,24 @@
-class HabiticaClient::User
+class HabiticaClient
 
   # An enumerable object of all the user's tasks.
   #
   # Also contains the endpoint for creating new tasks.
   class Tasks < HabiticaClient::ApiBase
 
-    require 'habitica_client/user/tasks/types'
-    require 'habitica_client/user/tasks/status'
-    require 'habitica_client/user/task'
+    require 'habitica_client/tasks/types'
+    require 'habitica_client/tasks/status'
+    require 'habitica_client/task'
 
     include Enumerable
     include Types
     include Status
 
+    endpoint '/tasks/user'
+
     # Iterate over user tasks
-    def each(&block)
-      tasks.each do |task|
-        block.call Task.parse(client, task)
+    def each
+      data.each do |task|
+        yield Task.parse(client, task)
       end
     end
 
@@ -27,12 +29,6 @@ class HabiticaClient::User
       Task.new(client, attributes).save
     end
 
-    private
-
-    def tasks
-      @tasks ||= client.class.get('/user/tasks')
-    end
-
   end
 
 end

data/lib/habitica_client/user/stats.rb

@@ -4,11 +4,18 @@ require 'hashup'
 
 class HabiticaClient::User
 
-  class Stats < HabiticaClient::ApiBase
+  module StatsProperty
+    def stats
+      @stats ||= Stats.new(data['stats'])
+    end
+  end
 
+  class Stats
     extend Forwardable
     extend Hashup
 
+    attr_reader :stats
+
     def_delegators :stats, :training, :buffs, :per, :int, :con, :str,
                    :points, :lvl, :gp, :exp, :mp, :hp, :player_class
 
@@ -20,16 +27,9 @@ class HabiticaClient::User
            :gp, :exp, :mp, :hp, :player_class, :to_next_level,
            :max_health, :max_mp
 
-    def self.parse(stats)
-      stats.tap do |s|
-        s['player_class'] = s['class']
-      end
-    end
-
-    private
-
-    def stats
-      @stats ||= OpenStruct.new(Stats.parse(client.class.get('/user')['stats']))
+    def initialize(api_data)
+      api_data['player_class'] = api_data['class'] # 'class' is reserved
+      @stats = OpenStruct.new(api_data)
     end
 
   end

data/lib/habitica_client/user.rb

@@ -5,21 +5,12 @@ class HabiticaClient
   # The authed user.
   class User < HabiticaClient::ApiBase
 
+    endpoint '/user/'
+
     require 'habitica_client/user/stats'
-    require 'habitica_client/user/tasks'
 
-    # Returns user's stats.
-    #
-    # @return [HabiticaClient::Stats]
     def stats
-      @stats ||= Stats.new(client)
-    end
-
-    # Returns user's tasks.
-    #
-    # @return [HabiticaClient::Tasks]
-    def tasks
-      @tasks ||= Tasks.new(client)
+      @stats ||= Stats.new(data['stats'])
     end
 
   end

data/lib/habitica_client/version.rb

@@ -1,3 +1,3 @@
 class HabiticaClient
-  VERSION = '0.0.7'
+  VERSION = '1.0.0'.freeze
 end

data/lib/habitica_client.rb

@@ -3,6 +3,7 @@ class HabiticaClient
   require 'habitica_client/version'
   require 'habitica_client/client'
   require 'habitica_client/user'
+  require 'habitica_client/tasks'
 
   attr_accessor :client
 
@@ -14,4 +15,8 @@ class HabiticaClient
     @user ||= User.new(client)
   end
 
+  def tasks
+    @tasks ||= Tasks.new(client)
+  end
+
 end

data/lib/hashup.rb

@@ -4,7 +4,7 @@ module Hashup
     define_method(:to_h) do
 
       kv = attributes.map { |k| [k, send(k)] }
-           .delete_if { |_k, v| v.nil? }
+                     .delete_if { |_k, v| v.nil? }
 
       Hash[kv]
 

data/spec/habit_client/{user/task_spec.rb → task_spec.rb}

@@ -3,15 +3,30 @@ require 'spec_helper'
 properties = [:id, :text, :notes, :value, :checklist, :priority,
               :attribute, :tags]
 
-date_properties = [:date_completed, :date_created]
+date_properties = [:created_at, :updated_at]
 
 describe 'Task', vcr: { cassette_name: 'task' } do
 
   let(:habitrpg) { HabiticaClient.new(USER_ID, API_TOKEN) }
-  let(:tasks) { habitrpg.user.tasks }
+  let(:tasks) { habitrpg.tasks }
   let(:todo) { tasks.todos.last }
   let(:habit) { tasks.habits.last }
   let(:daily) { tasks.dailies.last }
+  dummy_tasks = nil
+
+  before do
+    dummy_tasks = {
+      todo: tasks.create(text: 'Testing 123', type: 'todo'),
+      habit: tasks.create(text: 'Testing 123', type: 'habit'),
+      daily: tasks.create(text: 'Testing 123', type: 'daily')
+    }
+  end
+
+  after do
+    # Don't leave tasks in my todo list!
+    dummy_tasks.each { |_k, t| t.delete }
+
+  end
 
   describe '#completed?' do
     it 'is the completed status' do
@@ -94,7 +109,7 @@ describe 'Task', vcr: { cassette_name: 'task' } do
 
         expect(task.text).to eq(updated_text)
 
-        task.delete  # Don't leave tasks in my todo list!
+        task.delete # Don't leave tasks in my todo list!
       end
 
     end

data/spec/habit_client/{user/tasks_spec.rb → tasks_spec.rb}

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe 'Tasks', vcr: { cassette_name: 'tasks' } do
 
   let(:habitrpg) { HabiticaClient.new(USER_ID, API_TOKEN) }
-  let(:tasks) { habitrpg.user.tasks }
+  let(:tasks) { habitrpg.tasks }
 
   describe '.each' do
 
     it 'can be iterated' do
       tasks.each do |task|
-        expect(task).to be_a(HabiticaClient::User::Task)
+        expect(task).to be_a(HabiticaClient::Task)
       end
     end
 
@@ -72,7 +72,7 @@ describe 'Tasks', vcr: { cassette_name: 'tasks' } do
       it 'can create a new task' do
         task = tasks.create(text: 'Testing 123', type: 'todo')
         expect(task.id).not_to be_nil
-        task.delete  # Don't leave tasks in my todo list!
+        task.delete # Don't leave tasks in my todo list!
       end
 
     end

data/spec/habit_client/user_spec.rb

@@ -9,24 +9,4 @@ describe 'User', :vcr do
     expect(user).to be_a(HabiticaClient::User)
   end
 
-  describe '#stats' do
-
-    subject { user.stats }
-
-    it 'returns Stats' do
-      expect(subject).to be_a(HabiticaClient::User::Stats)
-    end
-
-  end
-
-  describe '#tasks' do
-
-    subject { user.tasks }
-
-    it 'returns Tasks' do
-      expect(subject).to be_a(HabiticaClient::User::Tasks)
-    end
-
-  end
-
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require_relative '../lib/habitica_client'
 
+require 'awesome_print'
 require 'byebug'
 require 'vcr'
 require 'dotenv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: habitica_client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Stephen Mckellar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -199,21 +213,20 @@ files:
 - lib/habitica_client/api_base.rb
 - lib/habitica_client/client.rb
 - lib/habitica_client/restful.rb
+- lib/habitica_client/task.rb
+- lib/habitica_client/task/date_accessor.rb
+- lib/habitica_client/task/status.rb
+- lib/habitica_client/task/type.rb
+- lib/habitica_client/tasks.rb
+- lib/habitica_client/tasks/status.rb
+- lib/habitica_client/tasks/types.rb
 - lib/habitica_client/user.rb
 - lib/habitica_client/user/stats.rb
-- lib/habitica_client/user/task.rb
-- lib/habitica_client/user/task/date_accessor.rb
-- lib/habitica_client/user/task/status.rb
-- lib/habitica_client/user/task/type.rb
-- lib/habitica_client/user/tasks.rb
-- lib/habitica_client/user/tasks/status.rb
-- lib/habitica_client/user/tasks/types.rb
 - lib/habitica_client/version.rb
 - lib/hashup.rb
-- spec/cassettes/.keep
+- spec/habit_client/task_spec.rb
+- spec/habit_client/tasks_spec.rb
 - spec/habit_client/user/stats_spec.rb
-- spec/habit_client/user/task_spec.rb
-- spec/habit_client/user/tasks_spec.rb
 - spec/habit_client/user_spec.rb
 - spec/habit_client_spec.rb
 - spec/spec_helper.rb
@@ -238,15 +251,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Another Habitica client
 test_files:
-- spec/cassettes/.keep
+- spec/habit_client/task_spec.rb
+- spec/habit_client/tasks_spec.rb
 - spec/habit_client/user/stats_spec.rb
-- spec/habit_client/user/task_spec.rb
-- spec/habit_client/user/tasks_spec.rb
 - spec/habit_client/user_spec.rb
 - spec/habit_client_spec.rb
 - spec/spec_helper.rb

data/lib/habitica_client/user/task.rb

@@ -1,43 +0,0 @@
-require 'ostruct'
-require 'forwardable'
-require 'time'
-require 'hashup'
-require 'habitica_client/restful'
-
-class HabiticaClient::User
-
-  # A user task, which can be a habit, daily, or todo.
-  class Task < HabiticaClient::Restful
-
-    require 'habitica_client/user/task/date_accessor'
-    require 'habitica_client/user/task/status'
-    require 'habitica_client/user/task/type'
-
-    extend DateAccessor
-    include Status
-    include Type
-    extend Hashup
-
-    attr_accessor :id, :text, :notes, :value, :priority, :attribute,
-                  :type, :tags, :checklist, :value, :priority,
-                  :challenge, :down, :up, :history, :streak,
-                  :frequency, :history, :completed, :every_x, :repeat,
-                  :collapse_checklist
-
-    date_accessor :date_created, :date_completed, :start_date, :date
-
-    hashup :id, :text, :notes, :value, :priority, :attribute, :type,
-           :tags, :checklist, :value, :priority, :challenge, :down,
-           :up, :history, :streak, :frequency, :history, :completed,
-           :every_x, :repeat, :collapse_checklist, :date_created,
-           :date_completed, :start_date, :date
-
-    private
-
-    def endpoint
-      '/user/tasks'
-    end
-
-  end
-
-end