ruby-trello 0.4.4.3 → 0.5.0

data/spec/card_spec.rb

@@ -4,14 +4,30 @@ module Trello
   describe Card do
     include Helpers
 
+    let(:card) { client.find(:card, 'abcdef123456789123456789') }
+    let(:client) { Client.new }
+
     before(:each) do
-      Client.stub(:get).with("/cards/abcdef123456789123456789").
+      client.stub(:get).with("/cards/abcdef123456789123456789").
         and_return JSON.generate(cards_details.first)
+    end
+
+    context "finding" do
+      let(:client) { Trello.client }
+
+      it "delegates to Trello.client#find" do
+        client.should_receive(:find).with(:card, 'abcdef123456789123456789')
+        Card.find('abcdef123456789123456789')
+      end
 
-      @card = Card.find('abcdef123456789123456789')
+      it "is equivalent to client#find" do
+        Card.find('abcdef123456789123456789').should eq(card)
+      end
     end
 
     context "creating" do
+      let(:client) { Trello.client }
+
       it "creates a new record" do
         card = Card.new(cards_details.first)
         card.should be_valid
@@ -37,7 +53,7 @@ module Trello
 
         expected_payload = {:name => "Test Card", :desc => nil, :idList => "abcdef123456789123456789"}
 
-        Client.should_receive(:post).with("/cards", expected_payload).and_return result
+        client.should_receive(:post).with("/cards", expected_payload).and_return result
 
         card = Card.create(cards_details.first.merge(payload.merge(:list_id => lists_details.first['id'])))
 
@@ -51,110 +67,123 @@ module Trello
 
         payload = {
           :name      => expected_new_name,
-          :desc      => "Awesome things are awesome.",
-          :due       => nil,
-          :closed    => false,
-          :idList    => "abcdef123456789123456789",
-          :idBoard   => "abcdef123456789123456789",
-          :idMembers => ["abcdef123456789123456789"],
-          :pos       => 12
         }
 
-        Client.should_receive(:put).once.with("/cards/abcdef123456789123456789", payload)
-        card = @card.dup
+        client.should_receive(:put).once.with("/cards/abcdef123456789123456789", payload)
+
         card.name = expected_new_name
         card.save
       end
     end
 
+    context "deleting" do
+      it "allows a member to be removed from a card" do
+        client.should_receive(:delete).with("/cards/#{card.id}")
+        card.delete
+      end
+    end
+
     context "fields" do
       it "gets its id" do
-        @card.id.should_not be_nil
+        card.id.should_not be_nil
       end
 
       it "gets its short id" do
-        @card.short_id.should_not be_nil
+        card.short_id.should_not be_nil
       end
 
       it "gets its name" do
-        @card.name.should_not be_nil
+        card.name.should_not be_nil
       end
 
       it "gets its description" do
-        @card.description.should_not be_nil
+        card.description.should_not be_nil
       end
 
       it "knows if it is open or closed" do
-        @card.closed.should_not be_nil
+        card.closed.should_not be_nil
       end
 
       it "gets its url" do
-        @card.url.should_not be_nil
+        card.url.should_not be_nil
       end
     end
 
     context "actions" do
       it "asks for all actions by default" do
-        Client.stub(:get).with("/cards/abcdef123456789123456789/actions", { :filter => :all }).and_return actions_payload
-        @card.actions.count.should be > 0
+        client.stub(:get).with("/cards/abcdef123456789123456789/actions", { :filter => :all }).and_return actions_payload
+        card.actions.count.should be > 0
       end
 
       it "allows overriding the filter" do
-        Client.stub(:get).with("/cards/abcdef123456789123456789/actions", { :filter => :updateCard }).and_return actions_payload
-        @card.actions(:filter => :updateCard).count.should be > 0
+        client.stub(:get).with("/cards/abcdef123456789123456789/actions", { :filter => :updateCard }).and_return actions_payload
+        card.actions(:filter => :updateCard).count.should be > 0
       end
     end
 
     context "boards" do
       it "has a board" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789").and_return JSON.generate(boards_details.first)
-        @card.board.should_not be_nil
+        client.stub(:get).with("/boards/abcdef123456789123456789").and_return JSON.generate(boards_details.first)
+        card.board.should_not be_nil
       end
     end
 
     context "checklists" do
       it "has a list of checklists" do
-        Client.stub(:get).with("/cards/abcdef123456789123456789/checklists", { :filter => :all }).and_return checklists_payload
-        @card.checklists.count.should be > 0
+        client.stub(:get).with("/cards/abcdef123456789123456789/checklists", { :filter => :all }).and_return checklists_payload
+        card.checklists.count.should be > 0
       end
     end
 
     context "list" do
       it 'has a list' do
-        Client.stub(:get).with("/lists/abcdef123456789123456789").and_return JSON.generate(lists_details.first)
-        @card.list.should_not be_nil
+        client.stub(:get).with("/lists/abcdef123456789123456789").and_return JSON.generate(lists_details.first)
+        card.list.should_not be_nil
       end
 
       it 'can be moved to another list' do
         other_list = stub(:id => '987654321987654321fedcba')
         payload = {:value => other_list.id}
-        Client.should_receive(:put).with("/cards/abcdef123456789123456789/idList", payload)
-        @card.move_to_list(other_list)
+        client.should_receive(:put).with("/cards/abcdef123456789123456789/idList", payload)
+        card.move_to_list(other_list)
+      end
+
+      it 'should not be moved if new list is identical to old list' do
+        other_list = stub(:id => 'abcdef123456789123456789')
+        payload = {:value => other_list.id}
+        client.should_not_receive(:put)
+        card.move_to_list(other_list)
       end
 
       it 'can be moved to another board' do
         other_board = stub(:id => '987654321987654321fedcba')
         payload = {:value => other_board.id}
-        Client.should_receive(:put).with("/cards/abcdef123456789123456789/idBoard", payload)
-        @card.move_to_board(other_board)
+        client.should_receive(:put).with("/cards/abcdef123456789123456789/idBoard", payload)
+        card.move_to_board(other_board)
       end
 
       it 'can be moved to a list on another board' do
         other_board = stub(:id => '987654321987654321fedcba')
         other_list = stub(:id => '987654321987654321aalist')
         payload = {:value => other_board.id, :idList => other_list.id}
-        Client.should_receive(:put).with("/cards/abcdef123456789123456789/idBoard", payload)
-        @card.move_to_board(other_board, other_list)
+        client.should_receive(:put).with("/cards/abcdef123456789123456789/idBoard", payload)
+        card.move_to_board(other_board, other_list)
+      end
+
+      it 'should not be moved if new board is identical with old board', :focus => true do
+        other_board = stub(:id => 'abcdef123456789123456789')
+        client.should_not_receive(:put)
+        card.move_to_board(other_board)
       end
     end
 
     context "members" do
       it "has a list of members" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789").and_return JSON.generate(boards_details.first)
-        Client.stub(:get).with("/members/abcdef123456789123456789").and_return user_payload
+        client.stub(:get).with("/boards/abcdef123456789123456789").and_return JSON.generate(boards_details.first)
+        client.stub(:get).with("/members/abcdef123456789123456789").and_return user_payload
 
-        @card.board.should_not be_nil
-        @card.members.should_not be_nil
+        card.board.should_not be_nil
+        card.members.should_not be_nil
       end
 
       it "allows a member to be added to a card" do
@@ -162,32 +191,32 @@ module Trello
         payload = {
           :value => new_member.id
         }
-        Client.should_receive(:post).with("/cards/abcdef123456789123456789/members", payload)
-        @card.add_member(new_member)
+        client.should_receive(:post).with("/cards/abcdef123456789123456789/members", payload)
+        card.add_member(new_member)
       end
 
       it "allows a member to be removed from a card" do
         existing_member = stub(:id => '4ee7df3ce582acdec80000b2')
-        Client.should_receive(:delete).with("/cards/abcdef123456789123456789/members/#{existing_member.id}")
-        @card.remove_member(existing_member)
+        client.should_receive(:delete).with("/cards/abcdef123456789123456789/members/#{existing_member.id}")
+        card.remove_member(existing_member)
       end
     end
 
     context "comments" do
       it "posts a comment" do
-        Client.should_receive(:post).
+        client.should_receive(:post).
           with("/cards/abcdef123456789123456789/actions/comments", { :text => 'testing' }).
           and_return JSON.generate(boards_details.first)
 
-        @card.add_comment "testing"
+        card.add_comment "testing"
       end
     end
 
     context "labels" do
       it "can retrieve labels" do
-        Client.stub(:get).with("/cards/abcdef123456789123456789/labels").
+        client.stub(:get).with("/cards/abcdef123456789123456789/labels").
           and_return label_payload
-        labels = @card.labels
+        labels = card.labels
         labels.size.should == 2
 
         labels[0].color.should == 'yellow'
@@ -198,94 +227,87 @@ module Trello
       end
 
       it "can add a label" do
-        Client.stub(:post).with("/cards/abcdef123456789123456789/labels", { :value => 'green' }).
+        client.stub(:post).with("/cards/abcdef123456789123456789/labels", { :value => 'green' }).
           and_return "not important"
-        @card.add_label('green')
-        @card.errors.should be_empty
+        card.add_label('green')
+        card.errors.should be_empty
       end
 
       it "can remove a label" do
-        Client.stub(:delete).with("/cards/abcdef123456789123456789/labels/green").
+        client.stub(:delete).with("/cards/abcdef123456789123456789/labels/green").
           and_return "not important"
-        @card.remove_label('green')
-        @card.errors.should be_empty
+        card.remove_label('green')
+        card.errors.should be_empty
       end
 
       it "throws an error when trying to add a label with an unknown colour" do
-        Client.stub(:post).with("/cards/abcdef123456789123456789/labels", { :value => 'green' }).
+        client.stub(:post).with("/cards/abcdef123456789123456789/labels", { :value => 'green' }).
           and_return "not important"
-        @card.add_label('mauve')
-        @card.errors.full_messages.to_sentence.should == "Label colour 'mauve' does not exist"
+        card.add_label('mauve')
+        card.errors.full_messages.to_sentence.should == "Label colour 'mauve' does not exist"
       end
 
       it "throws an error when trying to remove a label with an unknown colour" do
-        Client.stub(:delete).with("/cards/abcdef123456789123456789/labels/mauve").
+        client.stub(:delete).with("/cards/abcdef123456789123456789/labels/mauve").
           and_return "not important"
-        @card.remove_label('mauve')
-        @card.errors.full_messages.to_sentence.should == "Label colour 'mauve' does not exist"
+        card.remove_label('mauve')
+        card.errors.full_messages.to_sentence.should == "Label colour 'mauve' does not exist"
       end
     end
 
     context "attachments" do
       it "can add an attachment" do
         f = File.new('spec/list_spec.rb', 'r')
-        Client.stub(:get).with("/cards/abcdef123456789123456789/attachments").and_return attachments_payload
-        Client.stub(:post).with("/cards/abcdef123456789123456789/attachments",
+        client.stub(:get).with("/cards/abcdef123456789123456789/attachments").and_return attachments_payload
+        client.stub(:post).with("/cards/abcdef123456789123456789/attachments",
               { :file => f, :name => ''  }).
               and_return "not important"
 
-        @card.add_attachment(f)
+        card.add_attachment(f)
 
-        @card.errors.should be_empty
+        card.errors.should be_empty
       end
 
       it "can list the existing attachments" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789").and_return JSON.generate(boards_details.first)
-        Client.stub(:get).with("/cards/abcdef123456789123456789/attachments").and_return attachments_payload
+        client.stub(:get).with("/boards/abcdef123456789123456789").and_return JSON.generate(boards_details.first)
+        client.stub(:get).with("/cards/abcdef123456789123456789/attachments").and_return attachments_payload
 
-        @card.board.should_not be_nil
-        @card.attachments.should_not be_nil
+        card.board.should_not be_nil
+        card.attachments.should_not be_nil
       end
 
       it "can remove an attachment" do
-        Client.stub(:delete).with("/cards/abcdef123456789123456789/attachments/abcdef123456789123456789").
+        client.stub(:delete).with("/cards/abcdef123456789123456789/attachments/abcdef123456789123456789").
           and_return "not important"
-        Client.stub(:get).with("/cards/abcdef123456789123456789/attachments").and_return attachments_payload
+        client.stub(:get).with("/cards/abcdef123456789123456789/attachments").and_return attachments_payload
 
-        @card.remove_attachment(@card.attachments.first)
-        @card.errors.should be_empty
+        card.remove_attachment(card.attachments.first)
+        card.errors.should be_empty
       end
     end
 
     describe "#closed?" do
       it "returns the closed attribute" do
-        @card.closed?.should_not be_true
+        card.closed?.should_not be_true
       end
     end
 
     describe "#close" do
       it "updates the close attribute to true" do
-        @card.close
-        @card.closed.should be_true
+        card.close
+        card.closed.should be_true
       end
     end
 
     describe "#close!" do
       it "updates the close attribute to true and saves the list" do
         payload = {
-          :name      => @card.name,
-          :desc      => "Awesome things are awesome.",
-          :due       => nil,
           :closed    => true,
-          :idList    => "abcdef123456789123456789",
-          :idBoard   => "abcdef123456789123456789",
-          :idMembers => ["abcdef123456789123456789"],
-          :pos       => 12
         }
 
-        Client.should_receive(:put).once.with("/cards/abcdef123456789123456789", payload)
+        client.should_receive(:put).once.with("/cards/abcdef123456789123456789", payload)
 
-        @card.close!
+        card.close!
       end
     end
 

data/spec/checklist_spec.rb

@@ -4,14 +4,30 @@ module Trello
   describe Checklist do
     include Helpers
 
+    let(:checklist) { client.find(:checklist, 'abcdef123456789123456789') }
+    let(:client) { Client.new }
+
     before(:each) do
-      Client.stub(:get).with("/checklists/abcdef123456789123456789").
+      client.stub(:get).with("/checklists/abcdef123456789123456789").
         and_return JSON.generate(checklists_details.first)
+    end
 
-      @checklist = Checklist.find('abcdef123456789123456789')
+    context "finding" do
+      let(:client) { Trello.client }
+
+      it "delegates to Trello.client#find" do
+        client.should_receive(:find).with(:checklist, 'abcdef123456789123456789')
+        Checklist.find('abcdef123456789123456789')
+      end
+
+      it "is equivalent to client#find" do
+        Checklist.find('abcdef123456789123456789').should eq(checklist)
+      end
     end
 
     context "creating" do
+      let(:client) { Trello.client }
+
       it 'creates a new record and saves it on Trello', :refactor => true do
         payload = {
           :name    => 'Test Checklist',
@@ -22,7 +38,7 @@ module Trello
 
         expected_payload = {:name => "Test Checklist", :idBoard => "abcdef123456789123456789"}
 
-        Client.should_receive(:post).with("/checklists", expected_payload).and_return result
+        client.should_receive(:post).with("/checklists", expected_payload).and_return result
 
         checklist = Checklist.create(checklists_details.first.merge(payload.merge(:board_id => boards_details.first['id'])))
 
@@ -33,18 +49,31 @@ module Trello
     context "updating" do
       it "updating name does a put on the correct resource with the correct value" do
         expected_new_name = "xxx"
-        expected_resource = "/checklists/#{@checklist.id}"
+        expected_resource = "/checklists/abcdef123456789123456789"
         payload = {
           :name      => expected_new_name
         }
 
         result = JSON.generate(checklists_details.first)
-        Client.should_receive(:put).once.with("/checklists/abcdef123456789123456789", payload).and_return result
-        checklist = @checklist.dup
+        client.should_receive(:put).once.with("/checklists/abcdef123456789123456789", payload).and_return result
+
         checklist.name = expected_new_name
         checklist.save
       end
     end
 
+    context "board" do
+      it "has a board" do
+        client.stub(:get).with("/boards/abcdef123456789123456789").and_return JSON.generate(boards_details.first)
+        checklist.board.should_not be_nil
+      end
+    end
+
+    context "list" do
+      it 'has a list' do
+        client.stub(:get).with("/lists/abcdef123456789123456789").and_return JSON.generate(lists_details.first)
+        checklist.list.should_not be_nil
+      end
+    end
   end
 end

data/spec/client_spec.rb

@@ -9,19 +9,22 @@ describe Client, "and how it handles authorization" do
       :code => 200,
       :body => "A fake response body"
   }
-  
+  let(:client) { Client.new }
+  let(:auth_policy) { stub }
+
   before do
     TInternet.stub(:execute).and_return fake_ok_response
-    Authorization::AuthPolicy.stub(:authorize) do |request|
+    Authorization::AuthPolicy.stub(:new).and_return(auth_policy)
+    auth_policy.stub(:authorize) do |request|
       request
     end
   end
 
   it "authorizes before it queries the internet" do
-    AuthPolicy.should_receive(:authorize).once.ordered
+    auth_policy.should_receive(:authorize).once.ordered
     TInternet.should_receive(:execute).once.ordered
 
-    Client.get "/xxx"
+    client.get "/xxx"
   end
 
   it "queries the internet with expanded earl and query parameters" do
@@ -30,7 +33,7 @@ describe Client, "and how it handles authorization" do
 
     TInternet.should_receive(:execute).once.with expected_request
 
-    Client.get "/xxx", :a => "1", :b => "2"
+    client.get "/xxx", :a => "1", :b => "2"
   end
 
   it "encodes parameters" do
@@ -39,42 +42,42 @@ describe Client, "and how it handles authorization" do
 
     TInternet.should_receive(:execute).once.with expected_request
 
-    Client.get "/xxx", :name => "Jazz Kang"
+    client.get "/xxx", :name => "Jazz Kang"
   end
 
   it "raises an error when response has non-200 status" do
     expected_error_message = "An error response"
-    response_with_non_200_status = stub "A fake OK response", 
+    response_with_non_200_status = stub "A fake OK response",
       :code => 404,
       :body => expected_error_message
 
     TInternet.stub(:execute).and_return response_with_non_200_status
 
-    lambda{Client.get "/xxx"}.should raise_error expected_error_message
+    lambda{client.get "/xxx"}.should raise_error expected_error_message
   end
 
   it "uses version 1 of the API" do
     TInternet.should_receive(:execute).once do |request|
       request.uri.to_s.should =~ /1\//
       fake_ok_response
-    end 
+    end
 
-    Client.get "/"
-  end 
+    client.get "/"
+  end
 
   it "omits the \"?\" when no parameters" do
     TInternet.should_receive(:execute).once do |request|
       request.uri.to_s.should_not =~ /\?$/
       fake_ok_response
-    end 
+    end
 
-    Client.get "/xxx"
+    client.get "/xxx"
   end
 
   it "supports post" do
     TInternet.should_receive(:execute).once.and_return fake_ok_response
 
-    Client.post "/xxx", { :phil => "T' north" }
+    client.post "/xxx", { :phil => "T' north" }
   end
 
   it "supplies the body for a post" do
@@ -85,7 +88,7 @@ describe Client, "and how it handles authorization" do
       fake_ok_response
     end
 
-    Client.post "/xxx", expected_body
+    client.post "/xxx", expected_body
   end
 
   it "supplies the path for a post" do
@@ -96,7 +99,7 @@ describe Client, "and how it handles authorization" do
       fake_ok_response
     end
 
-    Client.post "/xxx", {}
+    client.post "/xxx", {}
   end
 
   it "supports put" do
@@ -104,7 +107,7 @@ describe Client, "and how it handles authorization" do
 
     TInternet.should_receive(:execute).once.and_return fake_ok_response
 
-    Client.put "/xxx", { :phil => "T' north" }
+    client.put "/xxx", { :phil => "T' north" }
   end
 
   it "supplies the body for a put" do
@@ -115,7 +118,7 @@ describe Client, "and how it handles authorization" do
       fake_ok_response
     end
 
-    Client.put "/xxx", expected_body
+    client.put "/xxx", expected_body
   end
 
   it "supplies the path for a put" do
@@ -126,6 +129,40 @@ describe Client, "and how it handles authorization" do
       fake_ok_response
     end
 
-    Client.put "/xxx", {}
+    client.put "/xxx", {}
+  end
+
+  context "initialize" do
+    let(:client) {
+      Client.new(
+        :consumer_key => 'consumer_key',
+        :consumer_secret => 'consumer_secret',
+        :oauth_token => 'oauth_token',
+        :oauth_token_secret => 'oauth_token_secret'
+      )
+    }
+
+    it "is configurable" do
+      client.consumer_key.should eq('consumer_key')
+      client.consumer_secret.should eq('consumer_secret')
+      client.oauth_token.should eq('oauth_token')
+      client.oauth_token_secret.should eq('oauth_token_secret')
+    end
+  end
+
+  describe "configure" do
+    it "sets key attributes through config block" do
+      client.configure do |config|
+        config.consumer_key = 'consumer_key'
+        config.consumer_secret = 'consumer_secret'
+        config.oauth_token = 'oauth_token'
+        config.oauth_token_secret = 'oauth_token_secret'
+      end
+
+      client.consumer_key.should eq('consumer_key')
+      client.consumer_secret.should eq('consumer_secret')
+      client.oauth_token.should eq('oauth_token')
+      client.oauth_token_secret.should eq('oauth_token_secret')
+    end
   end
 end