ruby-trello 0.2.1 → 0.3.0

data/lib/trello/member.rb

@@ -24,6 +24,7 @@ module Trello
       @gravatar_id = fields['gravatar']
       @bio         = fields['bio']
       @url         = fields['url']
+      self
     end
 
     # Returns a list of the users actions.

data/lib/trello/net.rb

@@ -0,0 +1,35 @@
+module Trello
+  Request = Struct.new "Request", :verb, :uri, :headers, :body
+  Response = Struct.new "Response", :code, :headers, :body
+
+  class TInternet
+    class << self
+      def execute(request)
+        try_execute request
+      end
+
+      private 
+
+      def try_execute(request)
+        begin
+          result = execute_core request
+          Response.new(200, {}, result)
+        rescue Exception => e
+          Response.new(e.http_code, {}, e.http_body)
+        end
+      end
+
+      def execute_core(request)
+        require "rest_client"
+        
+        RestClient::Request.execute(
+          :method => request.verb, 
+          :url => request.uri.to_s, 
+          :headers => request.headers, 
+          :payload => request.body, 
+          :timeout => 10
+        )
+      end
+    end
+  end
+end

data/lib/trello/notification.rb

@@ -5,6 +5,7 @@ module Trello
   class Notification < BasicData
     def update_fields(fields)
       @id = fields['id']
+      self
     end
   end
 end

data/lib/trello/organization.rb

@@ -20,6 +20,7 @@ module Trello
       @display_name = fields['displayName']
       @description  = fields['description']
       @url          = fields['url']
+      self
     end
 
     # Returns a timeline of actions.

data/lib/trello/string.rb

@@ -25,7 +25,7 @@ class String
     end
   rescue JSON::ParserError => json_error
     if json_error.message =~ /model not found/
-      raise Trello::RecordNotFound
+      raise Trello::Error, "Request could not be found."
     else
       raise
     end

data/spec/action_spec.rb

@@ -4,17 +4,11 @@ module Trello
   describe Action do
     include Helpers
 
-    before(:all) do
-      Client.public_key = 'dummy'
-      Client.secret     = 'dummy'
-    end
-
     before(:each) do
-      stub_request(:get, "https://api.trello.com/1/actions/abcdef123456789123456789?").
-        with(:headers => {'Accept'=>'*/*', 'Authorization'=>/.*/, 'User-Agent' => /.*/}).
-        to_return(:status => 200, :headers => {}, :body => JSON.generate(actions_details.first))
+      Client.stub(:get).with("/actions/4ee2482134a81a757a08af47").
+        and_return JSON.generate(actions_details.first)
 
-      @action = Action.find('abcdef123456789123456789')
+      @action = Action.find('4ee2482134a81a757a08af47')
     end
 
     context "fields" do
@@ -34,5 +28,40 @@ module Trello
         @action.data.should == @detail['data']
       end
     end
+
+    context "boards" do
+      it "has a board" do
+        Client.stub(:get).with("/actions/4ee2482134a81a757a08af47/board").
+          and_return JSON.generate(boards_details.first)
+
+        @action.board.should_not be_nil
+      end
+    end
+
+    context "card" do
+      it "has a card" do
+        Client.stub(:get).with("/actions/4ee2482134a81a757a08af47/card").
+          and_return JSON.generate(cards_details.first)
+        
+        @action.card.should_not be_nil
+      end
+    end
+
+    context "list" do
+      it "has a list of lists" do
+        Client.stub(:get).with("/actions/4ee2482134a81a757a08af47/list").
+          and_return JSON.generate(lists_details.first)
+
+        @action.list.should_not be_nil
+      end
+    end
+
+    context "member creator" do
+      it "knows its member creator" do
+        Client.stub(:get).with("/members/abcdef123456789123456789").and_return user_payload
+
+        @action.member_creator.should_not be_nil
+      end
+    end
   end
-end
+end

data/spec/basic_auth_policy_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+
+include Trello::Authorization
+
+describe BasicAuthPolicy do
+  before do
+    BasicAuthPolicy.developer_public_key = "xxx"
+    BasicAuthPolicy.member_token = "xxx"
+  end
+
+  it "adds key and token query parameters" do
+    BasicAuthPolicy.developer_public_key = "xxx_developer_public_key_xxx"
+    BasicAuthPolicy.member_token = "xxx_member_token_xxx"
+
+    uri = Addressable::URI.parse("https://xxx/")
+
+    request = Request.new :get, uri
+
+    authorized_request = BasicAuthPolicy.authorize request
+
+    the_query_parameters = Addressable::URI.parse(authorized_request.uri).query_values
+
+    the_query_parameters["key"].should === "xxx_developer_public_key_xxx"
+    the_query_parameters["token"].should === "xxx_member_token_xxx"
+  end
+
+  it "preserves other query parameters" do
+    uri = Addressable::URI.parse("https://xxx/?name=Phil")
+
+    request = Request.new :get, uri, {:example_header => "example_value"}
+
+    authorized_request = BasicAuthPolicy.authorize request
+
+    the_query_parameters = Addressable::URI.parse(authorized_request.uri).query_values
+
+    the_query_parameters["name"].should == "Phil"
+  end
+
+  it "preserves headers" do
+    uri = Addressable::URI.parse("https://xxx/")
+
+    request = Request.new :get, uri, {:example_header => "example_value"}
+
+    authorized_request = BasicAuthPolicy.authorize request
+
+    authorized_request.headers.should === request.headers
+  end
+
+  it "returns nil body if one is supplied" do
+    uri = Addressable::URI.parse("https://xxx/")
+    request = Request.new :get, uri, {}, "any body"
+    BasicAuthPolicy.authorize(request).body.should be_nil
+  end
+
+  it "does what when a query parameter already exists called key or token?"
+end

data/spec/board_spec.rb

@@ -4,15 +4,9 @@ module Trello
   describe Board do
     include Helpers
 
-    before(:all) do
-      Client.public_key = 'dummy'
-      Client.secret     = 'dummy'
-    end
-
     before(:each) do
-      stub_request(:get, "https://api.trello.com/1/boards/abcdef123456789123456789?").
-        with(:headers => {'Accept'=>'*/*', 'Authorization'=>/.*/, 'User-Agent' => /.*/}).
-        to_return(:status => 200, :headers => {}, :body => JSON.generate(boards_details.first))
+      Client.stub(:get).with("/boards/abcdef123456789123456789").
+        and_return JSON.generate(boards_details.first)
 
       @board = Board.find('abcdef123456789123456789')
     end
@@ -31,7 +25,7 @@ module Trello
       end
 
       it "knows if it is closed or open" do
-        @board.closed.should_not be_nil
+        @board.closed?.should_not be_nil
       end
 
       it "gets its url" do
@@ -39,14 +33,163 @@ module Trello
       end
     end
 
+    context "actions" do
+      it "has a list of actions" do
+        Client.stub(:get).with("/boards/abcdef123456789123456789/actions").
+          and_return actions_payload
+
+        @board.actions.count.should be > 0
+      end
+    end
+
     context "cards" do
       it "gets its list of cards" do
-        stub_request(:get, "https://api.trello.com/1/boards/abcdef123456789123456789/cards?").
-          with(:headers => {'Accept'=>'*/*', 'Authorization'=>/.*/, 'User-Agent' => /.*/}).
-          to_return(:status => 200, :headers => {}, :body => cards_payload)
+        Client.stub(:get).with("/boards/abcdef123456789123456789/cards").
+          and_return cards_payload
 
         @board.cards.count.should be > 0
       end
     end
+
+    context "lists" do
+      it "has a list of lists" do
+        Client.stub(:get).with("/boards/abcdef123456789123456789/lists", hash_including(:filter => :open)).
+          and_return lists_payload
+
+        @board.lists.count.should be > 0
+      end
+    end
+
+    context "members" do
+      it "has a list of members" do
+        Client.stub(:get).with("/boards/abcdef123456789123456789/members", hash_including(:filter => :all)).
+          and_return JSON.generate([user_details])
+
+        @board.members.count.should be > 0
+      end
+    end
+
+    context "organization" do
+      it "belongs to an organization" do
+        Client.stub(:get).with("/organizations/abcdef123456789123456789").
+          and_return JSON.generate(orgs_details.first)
+
+        @board.organization.should_not be_nil
+      end
+    end
+
+    it "is not closed" do
+      @board.closed?.should_not be_true
+    end
+  end
+
+  describe "#update_fields" do
+    it "does not set any fields when the fields argument is empty" do
+      expected = {
+       'id' => "id",
+       'name' => "name",
+       'desc' => "desc",
+       'closed' => false,
+       'url' => "url",
+       'idOrganization' => "org_id"
+      }
+
+      board = Board.new(expected)
+
+      board.update_fields({})
+
+      expected.each_pair do |key, value|
+        if board.respond_to?(key)
+          board.send(key).should == value
+        end
+      end
+
+      board.description.should == expected['desc']
+      board.organization_id.should == expected['idOrganization']
+    end
+
+    it "sets any attributes supplied in the fields argument"
+  end
+
+  describe "#save!" do
+    include Helpers
+
+    let(:any_board_json) do
+      JSON.generate(boards_details.first)      
+    end
+
+    it "cannot currently save a new instance" do
+      Client.should_not_receive :put
+      
+      the_new_board = Board.new
+      lambda{the_new_board.save!}.should raise_error "Cannot save new instance."
+    end
+
+    it "puts all fields except id" do
+      expected_fields = %w{name description closed url organisation_id}.map{|s| s.to_sym}
+        
+      Client.should_receive(:put) do |anything, body|
+        body.keys.should =~ expected_fields
+        any_board_json
+      end
+      
+      the_new_board = Board.new 'id' => "xxx"
+      the_new_board.save!
+    end
+
+    it "mutates the current instance" do
+      Client.stub(:put).and_return any_board_json
+      
+      board = Board.new 'id' => "xxx"
+      
+      the_result_of_save = board.save!
+
+      the_result_of_save.should equal board
+    end
+
+    it "uses the correct resource" do
+      expected_resource_id = "xxx_board_id_xxx"
+
+      Client.should_receive(:put) do |path, anything|
+        path.should =~ /#{expected_resource_id}\/$/
+        any_board_json
+      end
+      
+      the_new_board = Board.new 'id' => expected_resource_id
+      the_new_board.save!
+    end 
+
+    it "saves OR updates depending on whether or not it has an id set"
+  end
+  
+  describe "Repository" do
+    include Helpers
+
+    let(:any_board_json) do
+      JSON.generate(boards_details.first)      
+    end
+
+    it "creates a new board with whatever attributes are supplied " do
+      expected_attributes = { :name => "Any new board name", :description => "Any new board desription" }
+      
+      Client.should_receive(:post).with(anything, expected_attributes).and_return any_board_json
+
+      Board.create expected_attributes
+    end
+
+    it "posts to the boards collection" do
+      Client.should_receive(:post).with("/boards/", anything).and_return any_board_json
+
+      Board.create :xxx => ""
+    end
+
+    it "returns a board" do
+      Client.stub(:post).with("/boards/", anything).and_return any_board_json
+
+      the_new_board = Board.create :xxx => ""
+      the_new_board.should be_a Board
+    end
+    
+    it "at least name is required"
   end
-end
+end

data/spec/card_spec.rb

@@ -4,15 +4,9 @@ module Trello
   describe Card do
     include Helpers
 
-    before(:all) do
-      Client.public_key = 'dummy'
-      Client.secret     = 'dummy'
-    end
-
     before(:each) do
-      stub_request(:get, "https://api.trello.com/1/cards/abcdef123456789123456789?").
-        with(:headers => {'Accept'=>'*/*', 'Authorization'=>/.*/, 'User-Agent' => /.*/}).
-        to_return(:status => 200, :headers => {}, :body => JSON.generate(cards_details.first))
+      Client.stub(:get).with("/cards/abcdef123456789123456789").
+        and_return JSON.generate(cards_details.first)
 
       @card = Card.find('abcdef123456789123456789')
     end
@@ -33,14 +27,31 @@ module Trello
         card.should_not be_valid
       end
 
-      it 'creates a new record and saves it on Trello' do
+      it 'creates a new record and saves it on Trello', :refactor => true do
         payload = {
           :name    => 'Test Card',
           :desc    => '',
         }
-        stub_trello_request!(:post, '/cards', payload.merge(:idList => lists_details.first['id']))
-        card = Card.create(payload.merge(:list_id => lists_details.first['id']))
-        card.should == ''
+ 
+        result = JSON.generate(cards_details.first.merge(payload.merge(:idList => lists_details.first['id'])))
+
+        expected_payload = {:name => "Test Card", :desc => nil, :idList => "abcdef123456789123456789"}
+
+        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'])))
+        
+        card.class.should be Card
+      end
+    end
+
+    context "updating" do
+      it "updating name does a put on the correct resource with the correct value" do
+        expected_new_name = "xxx"
+        expected_resource = "/card/#{@card.id}/name"
+
+        Client.should_receive(:put).once.with expected_resource, :value => expected_new_name
+        @card.name = expected_new_name
       end
     end
 
@@ -66,28 +77,52 @@ module Trello
       end
     end
 
+    context "actions" do
+      it "has a list of actions" do
+        Client.stub(:get).with("/cards/abcdef123456789123456789/actions").and_return actions_payload
+        @card.actions.count.should be > 0
+      end
+    end
+
     context "boards" do
       it "has a board" do
-        stub_request(:get, "https://api.trello.com/1/boards/abcdef123456789123456789?").
-          with(:headers => {'Accept'=>'*/*', 'Authorization'=>/.*/, 'User-Agent' => /.*/}).
-          to_return(:status => 200, :headers => {}, :body => JSON.generate(boards_details.first))
-
+        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
+      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
+      end
+    end
+
     context "members" do
       it "has a list of members" do
-        stub_request(:get, "https://api.trello.com/1/boards/abcdef123456789123456789?").
-          with(:headers => {'Accept'=>'*/*', 'Authorization'=>/.*/, 'User-Agent' => /.*/}).
-          to_return(:status => 200, :headers => {}, :body => JSON.generate(boards_details.first))
-        stub_request(:get, "https://api.trello.com/1/members/abcdef123456789123456789?").
-          with(:headers => {'Accept'=>'*/*', 'Authorization'=>/.*/, 'User-Agent' => /.*/}).
-          to_return(:status => 200, :headers => {}, :body => 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
       end
     end
+
+    context "comments" do
+      it "posts a comment" do
+        Client.should_receive(:post).
+          with("/cards/abcdef123456789123456789/actions/comments", { :text => 'testing' }).
+          and_return JSON.generate(boards_details.first)
+        
+        @card.add_comment "testing"
+      end
+    end
   end
-end
+end