wl 0.0.3 → 0.0.4

data/lib/wl/cli.rb

@@ -4,22 +4,32 @@ require 'highline'
 module Wl
   class CLI < Thor
     desc 'login', 'Logs in to Wunderlist'
-    option :email,    desc: 'Wunderlist email'
+    option :email, desc: 'Wunderlist email'
     option :password, desc: 'Wunderlist password'
     def login
-      email    = options[:email]    || ui.ask('Wunderlist email: ')
+      email = options[:email] || ui.ask('Wunderlist email: ')
       password = options[:password] || ui.ask('Wunderlist password: ') { |q| q.echo = '*' }
 
-      client = Wl::Client.new
       login = client.login(email, password)
-
-      dotwl = Dotwl.new
       dotwl.login(login)
 
       say login.to_json
     end
 
+    desc 'tasks', 'Lists all your tasks'
+    def tasks
+      say client.tasks.to_json
+    end
+
     private
+    def client
+      @client ||= Wl::Client.new(dotwl: dotwl)
+    end
+
+    def dotwl
+      @dotwl ||= Dotwl.new
+    end
+
     def ui
       @ui ||= HighLine.new
     end

data/lib/wl/client.rb

@@ -1,15 +1,28 @@
+require 'shy'
 require 'api_smith'
 
 module Wl
-  class Client < APISmith::Base
+  class Client < Shy.new(:dotwl)
+    include APISmith::Client
     base_uri 'https://api.wunderlist.com/'
 
     def login(email, password)
-      response = post('login', extra_query: {email: email, password: password}, as: Login)
-      if response.code == 200
-        Login.new(response.parsed_response)
+      post('login', extra_query: {email: email, password: password}, transformer: Login)
+    end
+
+    def tasks
+      get('me/tasks', transformer: Task)
+    end
+
+    def base_request_options
+      if dotwl.token
+        {
+          headers: {
+            'Authorization' => "Bearer #{dotwl.token}"
+          }
+        }
       else
-        raise response.inspect
+        super
       end
     end
   end

data/lib/wl/dotwl.rb

@@ -9,6 +9,10 @@ module Wl
       FileUtils.mkdir_p("#{Dir.home}/.wl", mode: 0700).last
     end
 
+    def token
+      File.read(token_path) rescue nil
+    end
+
     private
     def token_path
       "#{dir}/token"

data/lib/wl/login.rb

@@ -14,5 +14,6 @@ module Wl
     property :confirmation_state
     property :type
     property :email_confirmed
+    property :errors
   end
 end

data/lib/wl/task.rb

@@ -0,0 +1,30 @@
+require 'api_smith'
+
+module Wl
+  class Task < APISmith::Smash
+    property :id
+    property :assignee_id
+    property :completed_at
+    property :created_at
+    property :created_by_id
+    property :deleted_at
+    property :due_date
+    property :list_id
+    property :local_identifier
+    property :note
+    property :owner_id
+    property :parent_id
+    property :position
+    property :recurrence_count
+    property :recurrence_type
+    property :recurring_parent_id
+    property :starred
+    property :title
+    property :type
+    property :updated_at
+    property :updated_by_id
+    property :user_id
+    property :version
+    property :errors
+  end
+end

data/lib/wl/version.rb

@@ -1,3 +1,3 @@
 module Wl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/wl.rb

@@ -5,4 +5,5 @@ module Wl
   autoload :CLI,    'wl/cli'
   autoload :Dotwl,  'wl/dotwl'
   autoload :Login,  'wl/login'
+  autoload :Task,   'wl/task'
 end

data/spec/cassettes/tasks.yml

@@ -0,0 +1,125 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.wunderlist.com/me/tasks?
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer 131378dbc2490bf87b6080ad6aeb758a46673270bbca9c7ea26f434473bbe741
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - must-revalidate, private, max-age=0
+      Content-Type:
+      - application/json; charset=utf-8
+      Date:
+      - Sun, 24 Mar 2013 07:31:29 GMT
+      Etag:
+      - ! '"778391fe24fb7fcae2a445c4b3a7982a"'
+      Server:
+      - nginx
+      Status:
+      - 200 OK
+      Vary:
+      - Accept-Encoding
+      X-6w-Client-Status:
+      - unknown
+      X-6w-Timestamp:
+      - '1364110288'
+      X-Rack-Cache:
+      - miss
+      X-Ratelimit-Delay-Hard:
+      - '0'
+      X-Ratelimit-Delay-Soft:
+      - '620'
+      X-Request-Id:
+      - 25225fa3fe737f995481ab2cc5ec4548
+      X-Server:
+      - ip-10-227-29-235
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! "[{\n  \"id\": \"ACIdABLJbhA\",\n  \"created_at\": \"2013-03-24T07:31:24Z\",\n
+        \ \"updated_at\": \"2013-03-24T07:31:24Z\",\n  \"title\": \"Do something you
+        want\",\n  \"starred\": false,\n  \"note\": null,\n  \"completed_at\": null,\n
+        \ \"local_identifier\": \"localId:web:ABcDEFGhIJk:Task:BLAHBLAHBLAHBLAH_01\",\n
+        \ \"recurrence_type\": null,\n  \"recurrence_count\": 0,\n  \"recurring_parent_id\":
+        null,\n  \"due_date\": null,\n  \"parent_id\": null,\n  \"created_by_id\":
+        \"ABcDEFGhIJk\",\n  \"updated_by_id\": \"ABcDEFGhIJk\",\n  \"completed_by_id\":
+        null,\n  \"version\": 1,\n  \"assignee_id\": null,\n  \"type\": \"Task\",\n
+        \ \"user_id\": \"ABcDEFGhIJk\",\n  \"owner_id\": \"ABcDEFGhIJk\",\n  \"position\":
+        20.00006,\n  \"list_id\": \"inbox\",\n  \"deleted_at\": null\n}, {\n  \"id\":
+        \"ACIdABLJbg4\",\n  \"created_at\": \"2013-03-24T07:31:24Z\",\n  \"updated_at\":
+        \"2013-03-24T07:31:24Z\",\n  \"title\": \"Do something productive\",\n  \"starred\":
+        false,\n  \"note\": null,\n  \"completed_at\": null,\n  \"local_identifier\":
+        \"localId:web:ABcDEFGhIJk:Task:BLAHBLAHBLAHBLAH_02\",\n  \"recurrence_type\":
+        null,\n  \"recurrence_count\": 0,\n  \"recurring_parent_id\": null,\n  \"due_date\":
+        null,\n  \"parent_id\": null,\n  \"created_by_id\": \"ABcDEFGhIJk\",\n  \"updated_by_id\":
+        \"ABcDEFGhIJk\",\n  \"completed_by_id\": null,\n  \"version\": 1,\n  \"assignee_id\":
+        null,\n  \"type\": \"Task\",\n  \"user_id\": \"ABcDEFGhIJk\",\n  \"owner_id\":
+        \"ABcDEFGhIJk\",\n  \"position\": 10.00003,\n  \"list_id\": \"inbox\",\n  \"deleted_at\":
+        null\n}, {\n  \"id\": \"ACIdABLJbg0\",\n  \"created_at\": \"2013-03-24T07:31:24Z\",\n
+        \ \"updated_at\": \"2013-03-24T07:31:24Z\",\n  \"title\": \"Do something useful\",\n
+        \ \"starred\": false,\n  \"note\": null,\n  \"completed_at\": null,\n  \"local_identifier\":
+        \"localId:web:ABcDEFGhIJk:Task:lw6d7911b474ef405b27406da031d526\",\n  \"recurrence_type\":
+        null,\n  \"recurrence_count\": 0,\n  \"recurring_parent_id\": null,\n  \"due_date\":
+        null,\n  \"parent_id\": null,\n  \"created_by_id\": \"ABcDEFGhIJk\",\n  \"updated_by_id\":
+        \"ABcDEFGhIJk\",\n  \"completed_by_id\": null,\n  \"version\": 1,\n  \"assignee_id\":
+        null,\n  \"type\": \"Task\",\n  \"user_id\": \"ABcDEFGhIJk\",\n  \"owner_id\":
+        \"ABcDEFGhIJk\",\n  \"position\": 2.0e-05,\n  \"list_id\": \"inbox\",\n  \"deleted_at\":
+        null\n}]\n"
+    http_version: 
+  recorded_at: Sun, 24 Mar 2013 07:31:29 GMT
+- request:
+    method: get
+    uri: https://api.wunderlist.com/me/tasks?
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json; charset=utf-8
+      Date:
+      - Sun, 24 Mar 2013 07:47:46 GMT
+      Server:
+      - nginx
+      Status:
+      - 401 Unauthorized
+      X-6w-Client-Status:
+      - unknown
+      X-6w-Timestamp:
+      - '1364111266'
+      X-Rack-Cache:
+      - miss
+      X-Ratelimit-Delay-Hard:
+      - '0'
+      X-Ratelimit-Delay-Soft:
+      - '755'
+      X-Request-Id:
+      - 251d1dd71af0be5b5359ab58a956c367
+      Content-Length:
+      - '85'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"errors":{"message":"You must be authenticated to continue.","type":"unauthorized"}}'
+    http_version: 
+  recorded_at: Sun, 24 Mar 2013 07:47:46 GMT
+recorded_with: VCR 2.4.0

data/spec/helpers/vcr.rb

@@ -4,4 +4,5 @@ VCR.configure do |c|
   c.cassette_library_dir = 'spec/cassettes'
   c.hook_into :webmock
   c.configure_rspec_metadata!
+  c.default_cassette_options = { match_requests_on: [:method, :uri, :headers] }
 end

data/spec/wl/cli_spec.rb

@@ -2,13 +2,16 @@ require 'spec_helper'
 
 module Wl
   describe CLI do
-    let(:dotwl) { double(Dotwl).as_null_object }
+    let(:dotwl) { double(Dotwl, token: nil).as_null_object }
 
     subject do
-      Dotwl.stub(:new).and_return(dotwl)
       Wl::CLI.start(args)
     end
 
+    before do
+      Dotwl.stub(:new).and_return(dotwl)
+    end
+
     context "by default" do
       let(:args) { [] }
 
@@ -28,7 +31,7 @@ module Wl
 
       it 'stores the token' do
         dotwl.should_receive(:login).with(an_instance_of(Login))
-        subject
+        capture(:stdout) { subject }
       end
 
       context 'when an email and password are not provided' do
@@ -48,5 +51,19 @@ module Wl
         end
       end
     end
+
+    describe 'tasks', vcr: {cassette_name: 'tasks'} do
+      let(:args) { %w"tasks" }
+
+      before do
+        dotwl.stub(token: '131378dbc2490bf87b6080ad6aeb758a46673270bbca9c7ea26f434473bbe741')
+      end
+
+      it 'prints all the tasks' do
+        output = capture(:stdout) { subject }
+
+        JSON.parse(output).should have(3).tasks
+      end
+    end
   end
 end

data/spec/wl/client_spec.rb

@@ -2,20 +2,52 @@ require 'spec_helper'
 
 module Wl
   describe Client do
+    let(:dotwl) { double(Dotwl, token: nil) }
+
+    subject do
+      Client.new(dotwl: dotwl)
+    end
+
     describe '#login' do
       context 'when the email address and password are accepted', vcr: {cassette_name: 'login'} do
         it 'packages the api response in a Login object' do
           response = subject.login('fake@example.com', 'fakepass')
           response.should be_a(Login)
           response.email.should == 'fake@example.com'
+          response.errors.should be_nil
         end
       end
 
       context 'when something goes wrong' do
-        it 'fails fast printing the raw api response', vcr: {cassette_name: 'login'} do
-          expect {
-            subject.login('fake@example.com', 'badpassword')
-          }.to raise_error /We were unable to locate a user based on the credentials you supplied/
+        it 'inserts the errors into the Login object', vcr: {cassette_name: 'login'} do
+          response = subject.login('fake@example.com', 'badpassword')
+          response.should be_a(Login)
+          response.email.should be_nil
+          response.errors['type'].should eq('not_found.no_such_user')
+        end
+      end
+    end
+
+    describe '#tasks' do
+      context 'when the user has logged in', vcr: {cassette_name: 'tasks'} do
+        before do
+          dotwl.stub(token: '131378dbc2490bf87b6080ad6aeb758a46673270bbca9c7ea26f434473bbe741')
+        end
+
+        it 'lists all tasks' do
+          tasks = subject.tasks
+          tasks.map(&:title).should eq [
+                                         "Do something you want",
+                                         "Do something productive",
+                                         "Do something useful"
+                                       ]
+        end
+      end
+
+      context 'when the user has not logged in', vcr: {cassette_name: 'tasks' } do
+        it 'fails gracefully' do
+          tasks = subject.tasks
+          tasks.errors['type'].should eq('unauthorized')
         end
       end
     end

data/spec/wl/task_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+module Wl
+  describe Task do
+    it { should be_an(APISmith::Smash) }
+  end
+end

data/wl.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "highline"
   spec.add_dependency "api_smith"
+  spec.add_dependency "shy"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -163,8 +179,10 @@ files:
 - lib/wl/client.rb
 - lib/wl/dotwl.rb
 - lib/wl/login.rb
+- lib/wl/task.rb
 - lib/wl/version.rb
 - spec/cassettes/login.yml
+- spec/cassettes/tasks.yml
 - spec/helpers/capture_output.rb
 - spec/helpers/vcr.rb
 - spec/spec_helper.rb
@@ -172,6 +190,7 @@ files:
 - spec/wl/client_spec.rb
 - spec/wl/dotwl_spec.rb
 - spec/wl/login_spec.rb
+- spec/wl/task_spec.rb
 - wl.gemspec
 homepage: http://github.com/hiremaga/wl
 licenses:
@@ -188,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2086549849182975583
+      hash: 110259217908952548
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2086549849182975583
+      hash: 110259217908952548
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -207,6 +226,7 @@ summary: ! '`wl` is an unofficial Ruby client and command line interface for the
   awesome Wunderlist'
 test_files:
 - spec/cassettes/login.yml
+- spec/cassettes/tasks.yml
 - spec/helpers/capture_output.rb
 - spec/helpers/vcr.rb
 - spec/spec_helper.rb
@@ -214,3 +234,4 @@ test_files:
 - spec/wl/client_spec.rb
 - spec/wl/dotwl_spec.rb
 - spec/wl/login_spec.rb
+- spec/wl/task_spec.rb