ruby-trello 0.4.4.3 → 0.5.0

data/lib/trello/configuration.rb

@@ -0,0 +1,68 @@
+module Trello
+  class Configuration
+    CONFIGURABLE_ATTRIBUTES = [
+      :developer_public_key,
+      :member_token,
+      :consumer_key,
+      :consumer_secret,
+      :oauth_token,
+      :oauth_token_secret,
+      :callback,
+      :return_url
+    ]
+
+    attr_accessor *CONFIGURABLE_ATTRIBUTES
+
+    def self.configurable_attributes
+      CONFIGURABLE_ATTRIBUTES
+    end
+
+    def initialize(attrs = {})
+      self.attributes = attrs
+    end
+
+    def attributes=(attrs = {})
+      attrs.each { |key, value| instance_variable_set("@#{key}", value) }
+    end
+
+    def credentials
+      case
+      when oauth?
+        oauth_credentials
+      when basic?
+        basic_credentials
+      else
+        {}
+      end
+    end
+
+    def oauth?
+      consumer_key && consumer_secret
+    end
+
+    def basic?
+      developer_public_key && member_token
+    end
+
+    private
+
+    def oauth_credentials
+      {
+        :consumer_key => consumer_key,
+        :consumer_secret => consumer_secret,
+        :oauth_token => oauth_token,
+        :oauth_token_secret => oauth_token_secret,
+        :return_url => return_url,
+        :callback => callback,
+      }.delete_if { |key, value| value.nil? }
+    end
+
+    def basic_credentials
+      {
+        :developer_public_key => developer_public_key,
+        :member_token => member_token
+      }
+    end
+
+  end
+end

data/lib/trello/has_actions.rb

@@ -2,7 +2,7 @@ module Trello
   module HasActions
     # Returns a list of the actions associated with this object.
     def actions(options = {})
-      actions = Client.get("#{request_prefix}/actions", { :filter => :all }.merge(options)).json_into(Action)
+      actions = client.get("#{request_prefix}/actions", { :filter => :all }.merge(options)).json_into(Action)
       MultiAssociation.new(self, actions).proxy
     end
   end

data/lib/trello/list.rb

@@ -1,7 +1,7 @@
 module Trello
   # A List is a container which holds cards. Lists are items on a board.
   class List < BasicData
-    register_attributes :id, :name, :closed, :board_id, :readonly => [ :id, :board_id ]
+    register_attributes :id, :name, :closed, :board_id, :pos, :readonly => [ :id, :board_id ]
     validates_presence_of :id, :name, :board_id
     validates_length_of   :name, :in => 1..16384
 
@@ -10,12 +10,13 @@ module Trello
     class << self
       # Finds a specific list, given an id.
       def find(id)
-        super(:lists, id)
+        client.find(:list, id)
       end
 
       def create(options)
-        new('name'    => options[:name],
-            'idBoard' => options[:board_id]).save
+        client.create(:list,
+            'name'    => options[:name],
+            'idBoard' => options[:board_id])
       end
     end
 
@@ -28,13 +29,14 @@ module Trello
       attributes[:name]     = fields['name']
       attributes[:closed]   = fields['closed']
       attributes[:board_id] = fields['idBoard']
+      attributes[:pos]      = fields['pos']
       self
     end
 
     def save
       return update! if id
 
-      Client.post("/lists", {
+      client.post("/lists", {
         :name    => name,
         :closed  => closed || false,
         :idBoard => board_id
@@ -42,7 +44,7 @@ module Trello
     end
 
     def update!
-      Client.put("/lists/#{id}", {
+      client.put("/lists/#{id}", {
         :name   => name,
         :closed => closed
       })
@@ -63,7 +65,7 @@ module Trello
     end
 
     # Return the board the list is connected to.
-    one :board, :using => :board_id
+    one :board, :path => :boards, :using => :board_id
 
     # Returns all the cards on this list.
     #

data/lib/trello/member.rb

@@ -13,7 +13,7 @@ module Trello
       #
       # The argument may be specified as either an _id_ or a _username_.
       def find(id_or_username)
-        super(:members, id_or_username)
+        client.find(:member, id_or_username)
       end
     end
 
@@ -32,7 +32,7 @@ module Trello
     end
 
     # Retrieve a URL to the avatar.
-    # 
+    #
     # Valid values for options are:
     #   :large (170x170)
     #   :small (30x30)
@@ -79,7 +79,7 @@ module Trello
     end
 
     def update!
-      Client.put(request_prefix, {
+      client.put(request_prefix, {
         :fullName => full_name,
         :bio      => bio
       }).json_into(self)

data/lib/trello/multi_association.rb

@@ -1,10 +1,12 @@
 module Trello
   class MultiAssociation < Association
-    delegate :count, :to => :target
+    extend Forwardable
+
+    def_delegator :target, :count
 
     def initialize(owner, target = [])
       super
       @proxy = AssociationProxy.new(self)
     end
   end
-end
+end

data/lib/trello/notification.rb

@@ -7,7 +7,7 @@ module Trello
     class << self
       # Locate a notification by its id
       def find(id)
-        super(:notifications, id)
+        client.find(:notification, id)
       end
     end
 
@@ -23,26 +23,26 @@ module Trello
 
     alias :unread? :unread
 
-    one :member_creator, :via => Member, :using => :member_creator_id
+    one :member_creator, :path => :members, :via => Member, :using => :member_creator_id
 
     def board
-      Client.get("/notifications/#{id}/board").json_into(Board)
+      client.get("/notifications/#{id}/board").json_into(Board)
     end
 
     def list
-      Client.get("/notifications/#{id}/list").json_into(List)
+      client.get("/notifications/#{id}/list").json_into(List)
     end
 
     def card
-      Client.get("/notifications/#{id}/card").json_into(Card)
+      client.get("/notifications/#{id}/card").json_into(Card)
     end
 
     def member
-      Client.get("/notifications/#{id}/member").json_into(Member)
+      client.get("/notifications/#{id}/member").json_into(Member)
     end
 
     def organization
-      Client.get("/notifications/#{id}/organization").json_into(Organization)
+      client.get("/notifications/#{id}/organization").json_into(Organization)
     end
   end
-end
+end

data/lib/trello/organization.rb

@@ -10,7 +10,7 @@ module Trello
     class << self
       # Find an organization by its id.
       def find(id)
-        super(:organizations, id)
+        client.find(:organization, id)
       end
     end
 
@@ -29,13 +29,13 @@ module Trello
 
     # Returns a list of boards under this organization.
     def boards
-      boards = Client.get("/organizations/#{id}/boards/all").json_into(Board)
+      boards = client.get("/organizations/#{id}/boards/all").json_into(Board)
       MultiAssociation.new(self, boards).proxy
     end
 
     # Returns an array of members associated with the organization.
     def members
-      members = Client.get("/organizations/#{id}/members/all").json_into(Member)
+      members = client.get("/organizations/#{id}/members/all").json_into(Member)
       MultiAssociation.new(self, members).proxy
     end
 

data/lib/trello/token.rb

@@ -2,11 +2,11 @@ module Trello
   class Token < BasicData
     register_attributes :id, :member_id, :created_at, :permissions,
       :readonly => [ :id, :member_id, :created_at, :permissions ]
-  
+
     class << self
       # Finds a token
       def find(token)
-        super(:tokens, token)
+        client.find(:token, token)
       end
     end
 
@@ -19,6 +19,6 @@ module Trello
     end
 
     # Returns a reference to the user who authorized the token.
-    one :member, :using => :member_id
+    one :member, :path => :members, :using => :member_id
   end
-end
+end

data/spec/action_spec.rb

@@ -4,67 +4,79 @@ module Trello
   describe Action do
     include Helpers
 
+    let(:action) { client.find(:action, '4ee2482134a81a757a08af47') }
+    let(:client) { Client.new }
+
     before(:each) do
-      Client.stub(:get).with("/actions/4ee2482134a81a757a08af47").
+      client.stub(:get).with("/actions/4ee2482134a81a757a08af47").
         and_return JSON.generate(actions_details.first)
+    end
+
+    context "finding" do
+      let(:client) { Trello.client }
+
+      it "delegates to Trello.client#find" do
+        client.should_receive(:find).with(:action, '4ee2482134a81a757a08af47')
+        Action.find('4ee2482134a81a757a08af47')
+      end
 
-      @action = Action.find('4ee2482134a81a757a08af47')
+      it "is equivalent to client#find" do
+        Action.find('4ee2482134a81a757a08af47').should eq(action)
+      end
     end
 
     context "fields" do
-      before(:all) do
-        @detail = actions_details.first
-      end
+      let(:detail) { actions_details.first }
 
       it "gets its id" do
-        @action.id.should == @detail['id']
+        action.id.should == detail['id']
       end
 
       it "gets its type" do
-        @action.type.should == @detail['type']
+        action.type.should == detail['type']
       end
 
       it "has the same data" do
-        @action.data.should == @detail['data']
+        action.data.should == detail['data']
       end
 
       it "gets the date" do
-        @action.date.utc.iso8601.should == @detail['date']
+        action.date.utc.iso8601.should == detail['date']
       end
     end
 
     context "boards" do
       it "has a board" do
-        Client.stub(:get).with("/actions/4ee2482134a81a757a08af47/board").
+        client.stub(:get).with("/actions/4ee2482134a81a757a08af47/board").
           and_return JSON.generate(boards_details.first)
 
-        @action.board.should_not be_nil
+        action.board.should_not be_nil
       end
     end
 
     context "card" do
       it "has a card" do
-        Client.stub(:get).with("/actions/4ee2482134a81a757a08af47/card").
+        client.stub(:get).with("/actions/4ee2482134a81a757a08af47/card").
           and_return JSON.generate(cards_details.first)
-        
-        @action.card.should_not be_nil
+
+        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").
+        client.stub(:get).with("/actions/4ee2482134a81a757a08af47/list").
           and_return JSON.generate(lists_details.first)
 
-        @action.list.should_not be_nil
+        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
+        client.stub(:get).with("/members/abcdef123456789123456789").and_return user_payload
 
-        @action.member_creator.should_not be_nil
+        action.member_creator.should_not be_nil
       end
     end
   end

data/spec/basic_auth_policy_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 
+include Trello
 include Trello::Authorization
 
 describe BasicAuthPolicy do

data/spec/board_spec.rb

@@ -4,232 +4,253 @@ module Trello
   describe Board do
     include Helpers
 
+    let(:board) { client.find(:board, 'abcdef123456789123456789') }
+    let(:client) { Client.new }
+
     before(:each) do
-      Client.stub(:get).with("/boards/abcdef123456789123456789").
+      client.stub(:get).with("/boards/abcdef123456789123456789").
         and_return JSON.generate(boards_details.first)
+    end
+
+    context "finding" do
+      let(:client) { Trello.client }
 
-      @board = Board.find('abcdef123456789123456789')
+      it "delegates to client#find" do
+        client.should_receive(:find).with(:board, 'abcdef123456789123456789')
+        Board.find('abcdef123456789123456789')
+      end
+
+      it "is equivalent to client#find" do
+        Board.find('abcdef123456789123456789').should eq(board)
+      end
     end
 
-    it "gets all boards" do
-      Member.stub_chain(:find, :username).and_return "testuser"
-      Client.stub(:get).with("/members/testuser/boards").and_return boards_payload
+    context "self.all" do
+      let(:client) { Trello.client }
 
-      expected = Board.new(boards_details.first)
-      Board.all.first.should eq(expected)
+      it "gets all boards" do
+        Member.stub_chain(:find, :username).and_return "testuser"
+        client.stub(:get).with("/members/testuser/boards").and_return boards_payload
+
+        expected = Board.new(boards_details.first)
+        Board.all.first.should eq(expected)
+      end
     end
 
     context "fields" do
       it "gets an id" do
-        @board.id.should_not be_nil
+        board.id.should_not be_nil
       end
 
       it "gets a name" do
-        @board.name.should_not be_nil
+        board.name.should_not be_nil
       end
 
       it "gets the description" do
-        @board.description.should_not be_nil
+        board.description.should_not be_nil
       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
-        @board.url.should_not be_nil
+        board.url.should_not be_nil
       end
     end
 
     context "actions" do
       it "has a list of actions" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789/actions", {:filter => :all}).
+        client.stub(:get).with("/boards/abcdef123456789123456789/actions", {:filter => :all}).
           and_return actions_payload
 
-        @board.actions.count.should be > 0
+        board.actions.count.should be > 0
       end
     end
 
     context "cards" do
       it "gets its list of cards" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789/cards", { :filter => :open }).
+        client.stub(:get).with("/boards/abcdef123456789123456789/cards", { :filter => :open }).
           and_return cards_payload
 
-        @board.cards.count.should be > 0
+        board.cards.count.should be > 0
       end
     end
 
     context "find_card" do
       it "gets a card" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789/cards/1").
+        client.stub(:get).with("/boards/abcdef123456789123456789/cards/1").
           and_return card_payload
-        @board.find_card(1).should be_a(Card)
+        board.find_card(1).should be_a(Card)
       end
     end
 
     context "lists" do
       it "has a list of lists" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789/lists", hash_including(:filter => :open)).
+        client.stub(:get).with("/boards/abcdef123456789123456789/lists", hash_including(:filter => :open)).
           and_return lists_payload
 
-        @board.has_lists?.should be true
+        board.has_lists?.should be true
       end
     end
 
     context "members" do
       it "has a list of members" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789/members", hash_including(:filter => :all)).
+        client.stub(:get).with("/boards/abcdef123456789123456789/members", hash_including(:filter => :all)).
           and_return JSON.generate([user_details])
 
-        @board.members.count.should be > 0
+        board.members.count.should be > 0
       end
     end
 
     context "organization" do
       it "belongs to an organization" do
-        Client.stub(:get).with("/organizations/abcdef123456789123456789").
+        client.stub(:get).with("/organizations/abcdef123456789123456789").
           and_return JSON.generate(orgs_details.first)
 
-        @board.organization.should_not be_nil
+        board.organization.should_not be_nil
       end
     end
 
     it "is not closed" do
-      @board.closed?.should_not be_true
+      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
+    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.client = client
+
+        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
 
-      board.description.should == expected['desc']
-      board.organization_id.should == expected['idOrganization']
+      it "sets any attributes supplied in the fields argument"
     end
 
-    it "sets any attributes supplied in the fields argument"
-  end
+    describe "#save" do
+      let(:client) { Trello.client }
 
-  describe "#save" do
-    include Helpers
+      let(:any_board_json) do
+        JSON.generate(boards_details.first)
+      end
 
-    let(:any_board_json) do
-      JSON.generate(boards_details.first)
-    end
+      it "cannot currently save a new instance" do
+        client.should_not_receive :put
 
-    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
+      end
 
-      the_new_board = Board.new
-      lambda{the_new_board.save}.should raise_error
-    end
+      it "puts all fields except id" do
+        expected_fields = %w{name description closed}.map{|s| s.to_sym}
 
-    it "puts all fields except id" do
-      expected_fields = %w{name description closed}.map{|s| s.to_sym}
+        client.should_receive(:put) do |anything, body|
+          body.keys.should =~ expected_fields
+          any_board_json
+        end
 
-      Client.should_receive(:put) do |anything, body|
-        body.keys.should =~ expected_fields
-        any_board_json
+        the_new_board = Board.new 'id' => "xxx"
+        the_new_board.save
       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
 
-    it "mutates the current instance" do
-      Client.stub(:put).and_return any_board_json
+        board = Board.new 'id' => "xxx"
 
-      board = Board.new 'id' => "xxx"
+        the_result_of_save = board.save
 
-      the_result_of_save = board.save
+        the_result_of_save.should equal board
+      end
 
-      the_result_of_save.should equal board
-    end
+      it "uses the correct resource" do
+        expected_resource_id = "xxx_board_id_xxx"
 
-    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
 
-      Client.should_receive(:put) do |path, anything|
-        path.should =~ /#{expected_resource_id}\/$/
-        any_board_json
+        the_new_board = Board.new 'id' => expected_resource_id
+        the_new_board.save
       end
 
-      the_new_board = Board.new 'id' => expected_resource_id
-      the_new_board.save
+      it "saves OR updates depending on whether or not it has an id set"
     end
 
-    it "saves OR updates depending on whether or not it has an id set"
-  end
-
-  describe '#update!' do
-    include Helpers
+    describe '#update!' do
+      let(:client) { Trello.client }
 
-    let(:any_board_json) do
-      JSON.generate(boards_details.first)
-    end
+      let(:any_board_json) do
+        JSON.generate(boards_details.first)
+      end
 
-    it "puts basic attributes" do
-      board = Board.new 'id' => "board_id"
+      it "puts basic attributes" do
+        board = Board.new 'id' => "board_id"
 
-      board.name        = "new name"
-      board.description = "new description"
-      board.closed      = true
+        board.name        = "new name"
+        board.description = "new description"
+        board.closed      = true
 
-      Client.should_receive(:put).with("/boards/#{board.id}/", {
-        :name => "new name",
-        :description => "new description",
-        :closed => true
-      }).and_return any_board_json
-      board.update!
+        client.should_receive(:put).with("/boards/#{board.id}/", {
+          :name => "new name",
+          :description => "new description",
+          :closed => true
+        }).and_return any_board_json
+        board.update!
+      end
     end
-  end
 
-  describe "Repository" do
-    include Helpers
+    describe "Repository" do
+      include Helpers
 
-    let(:any_board_json) do
-      JSON.generate(boards_details.first)
-    end
+      let(:client) { Trello.client }
 
-    it "creates a new board with whatever attributes are supplied " do
-      expected_attributes = { :name => "Any new board name", :description => "Any new board desription" }
-      sent_attributes = { :name => expected_attributes[:name], :desc => expected_attributes[:description] }
+      let(:any_board_json) do
+        JSON.generate(boards_details.first)
+      end
 
-      Client.should_receive(:post).with("/boards", sent_attributes).and_return any_board_json
+      it "creates a new board with whatever attributes are supplied " do
+        expected_attributes = { :name => "Any new board name", :description => "Any new board desription" }
+        sent_attributes = { :name => expected_attributes[:name], :desc => expected_attributes[:description] }
 
-      Board.create expected_attributes
-    end
+        client.should_receive(:post).with("/boards", sent_attributes).and_return any_board_json
 
-    it "posts to the boards collection" do
-      Client.should_receive(:post).with("/boards", anything).and_return any_board_json
+        Board.create expected_attributes
+      end
 
-      Board.create :xxx => ""
-    end
+      it "posts to the boards collection" do
+        client.should_receive(:post).with("/boards", anything).and_return any_board_json
 
-    it "returns a board" do
-      Client.stub(:post).with("/boards", anything).and_return any_board_json
+        Board.create :xxx => ""
+      end
 
-      the_new_board = Board.create :xxx => ""
-      the_new_board.should be_a Board
-    end
+      it "returns a board" do
+        client.stub(:post).with("/boards", anything).and_return any_board_json
 
-    it "at least name is required"
+        the_new_board = Board.create :xxx => ""
+        the_new_board.should be_a Board
+      end
+
+      it "at least name is required"
+    end
   end
 end