ruby-trello 0.4.4.3 → 0.5.0

data/lib/trello/board.rb

@@ -11,17 +11,18 @@ module Trello
     class << self
       # Finds a board.
       def find(id)
-        super(:boards, id)
+        client.find(:board, id)
       end
 
       def create(fields)
-        new('name'   => fields[:name],
-            'desc'   => fields[:description],
-            'closed' => fields[:closed] || false).save
+        client.create(:board,
+          'name'   => fields[:name],
+          'desc'   => fields[:description],
+          'closed' => fields[:closed] || false)
       end
 
       def all
-        Client.get("/members/#{Member.find(:me).username}/boards").json_into(self)
+        client.get("/members/#{Member.find(:me).username}/boards").json_into(self)
       end
     end
 
@@ -32,7 +33,7 @@ module Trello
       fields.merge!(:desc => description) if description
       fields.merge!(:idOrganization => organization_id) if organization_id
 
-      Client.post("/boards", fields).json_into(self)
+      client.post("/boards", fields).json_into(self)
     end
 
     def update!
@@ -41,7 +42,7 @@ module Trello
       @previously_changed = changes
       @changed_attributes.clear
 
-      Client.put("/boards/#{self.id}/", {
+      client.put("/boards/#{self.id}/", {
         :name        => attributes[:name],
         :description => attributes[:description],
         :closed      => attributes[:closed]
@@ -68,7 +69,7 @@ module Trello
     end
 
     def find_card(card_id)
-      Client.get("/boards/#{self.id}/cards/#{card_id}").json_into(Card)
+      client.get("/boards/#{self.id}/cards/#{card_id}").json_into(Card)
     end
 
     # Return all the cards on this board.
@@ -93,7 +94,7 @@ module Trello
     many :members, :filter => :all
 
     # Returns a reference to the organization this board belongs to.
-    one :organization, :using => :organization_id
+    one :organization, :path => :organizations, :using => :organization_id
 
     # :nodoc:
     def request_prefix

data/lib/trello/card.rb

@@ -12,14 +12,15 @@ module Trello
     class << self
       # Find a specific card by its id.
       def find(id)
-        super(:cards, id)
+        client.find(:card, id)
       end
 
       # Create a new card and save it on Trello.
       def create(options)
-        new('name'   => options[:name],
+        client.create(:card,
+            'name' => options[:name],
             'idList' => options[:list_id],
-            'desc'   => options[:description]).save
+            'desc'   => options[:description])
       end
     end
 
@@ -43,7 +44,7 @@ module Trello
     end
 
     # Returns a reference to the board this card is part of.
-    one :board, :using => :board_id
+    one :board, :path => :boards, :using => :board_id
 
     # Returns a list of checklists associated with the card.
     #
@@ -53,18 +54,18 @@ module Trello
     many :checklists, :filter => :all
 
     def check_item_states
-      states = Client.get("/cards/#{self.id}/checkItemStates").json_into(CheckItemState)
+      states = client.get("/cards/#{self.id}/checkItemStates").json_into(CheckItemState)
       MultiAssociation.new(self, states).proxy
     end
 
 
     # Returns a reference to the list this card is currently in.
-    one :list, :using => :list_id
+    one :list, :path => :lists, :using => :list_id
 
     # Returns a list of members who are assigned to this card.
     def members
       members = member_ids.map do |member_id|
-        Client.get("/members/#{member_id}").json_into(Member)
+        client.get("/members/#{member_id}").json_into(Member)
       end
       MultiAssociation.new(self, members).proxy
     end
@@ -74,7 +75,7 @@ module Trello
       # If we have an id, just update our fields.
       return update! if id
 
-      Client.post("/cards", {
+      client.post("/cards", {
         :name   => name,
         :desc   => description,
         :idList => list_id
@@ -87,18 +88,16 @@ module Trello
     # this object before making your changes, and before updating the record.
     def update!
       @previously_changed = changes
+      # extract only new values to build payload
+      payload = Hash[changes.map { |key, values| [key.to_sym, values[1]] }]
       @changed_attributes.clear
 
-      Client.put("/cards/#{id}", {
-        :name      => name,
-        :desc      => description,
-        :due       => due && due.utc.iso8601,
-        :closed    => closed,
-        :idList    => list_id,
-        :idBoard   => board_id,
-        :idMembers => member_ids,
-        :pos => pos
-      })
+      client.put("/cards/#{id}", payload)
+    end
+
+    # Delete this card
+    def delete
+      client.delete("/cards/#{id}")
     end
 
     # Check if the card is not active anymore.
@@ -122,45 +121,49 @@ module Trello
 
     # Add a comment with the supplied text.
     def add_comment(text)
-      Client.post("/cards/#{id}/actions/comments", :text => text)
+      client.post("/cards/#{id}/actions/comments", :text => text)
     end
 
     # Add a checklist to this card
     def add_checklist(checklist)
-      Client.post("/cards/#{id}/checklists", {
+      client.post("/cards/#{id}/checklists", {
         :value => checklist.id
       })
     end
 
     # Move this card to the given list
     def move_to_list(list)
-      Client.put("/cards/#{id}/idList", {
-        :value => list.id
-      })
+      unless list_id == list.id
+        client.put("/cards/#{id}/idList", {
+          :value => list.id
+        })
+      end
     end
 
     # Move this card to the given board (and optional list on this board)
     def move_to_board(new_board, new_list = nil)
-      payload = { :value => new_board.id }
-      payload[:idList] = new_list.id if new_list
-      Client.put("/cards/#{id}/idBoard", payload)
+      unless board_id == new_board.id
+        payload = { :value => new_board.id }
+        payload[:idList] = new_list.id if new_list
+        client.put("/cards/#{id}/idBoard", payload)
+      end
     end
 
     # Add a member to this card
     def add_member(member)
-      Client.post("/cards/#{id}/members", {
+      client.post("/cards/#{id}/members", {
         :value => member.id
       })
     end
 
     # Remove a member from this card
     def remove_member(member)
-      Client.delete("/cards/#{id}/members/#{member.id}")
+      client.delete("/cards/#{id}/members/#{member.id}")
     end
 
     # Retrieve a list of labels
     def labels
-      labels = Client.get("/cards/#{id}/labels").json_into(Label)
+      labels = client.get("/cards/#{id}/labels").json_into(Label)
       MultiAssociation.new(self, labels).proxy
     end
 
@@ -170,7 +173,7 @@ module Trello
         errors.add(:label, "colour '#{colour}' does not exist")
         return Trello.logger.warn "The label colour '#{colour}' does not exist."
       end
-      Client.post("/cards/#{id}/labels", { :value => colour })
+      client.post("/cards/#{id}/labels", { :value => colour })
     end
 
     # Remove a label
@@ -179,18 +182,18 @@ module Trello
         errors.add(:label, "colour '#{colour}' does not exist")
         return Trello.logger.warn "The label colour '#{colour}' does not exist." unless %w{green yellow orange red purple blue}.include? colour
       end
-      Client.delete("/cards/#{id}/labels/#{colour}")
+      client.delete("/cards/#{id}/labels/#{colour}")
     end
 
     # Add an attachment to this card
     def add_attachment(attachment, name='')
       if attachment.is_a? File
-        Client.post("/cards/#{id}/attachments", {
+        client.post("/cards/#{id}/attachments", {
             :file => attachment,
             :name => name
           })
       else
-        Client.post("/cards/#{id}/attachments", {
+        client.post("/cards/#{id}/attachments", {
             :url => attachment,
             :name => name
           })
@@ -199,13 +202,13 @@ module Trello
 
     # Retrieve a list of attachments
     def attachments
-      attachments = Client.get("/cards/#{id}/attachments").json_into(Attachment)
+      attachments = client.get("/cards/#{id}/attachments").json_into(Attachment)
       MultiAssociation.new(self, attachments).proxy
     end
 
       # Remove an attachment from this card
     def remove_attachment(attachment)
-      Client.delete("/cards/#{id}/attachments/#{attachment.id}")
+      client.delete("/cards/#{id}/attachments/#{attachment.id}")
     end
 
     # :nodoc:

data/lib/trello/checklist.rb

@@ -9,12 +9,13 @@ module Trello
     class << self
       # Locate a specific checklist by its id.
       def find(id)
-        super(:checklists, id)
+        client.find(:checklist, id)
       end
 
       def create(options)
-        new('name'       => options[:name],
-            'idBoard'    => options[:board_id]).save
+        client.create(:checklist,
+          'name'       => options[:name],
+          'idBoard'    => options[:board_id])
       end
     end
 
@@ -30,6 +31,7 @@ module Trello
       attributes[:url]         = fields['url']
       attributes[:check_items] = fields['checkItems']
       attributes[:board_id]    = fields['idBoard']
+      attributes[:list_id]     = fields['idList']
       attributes[:member_ids]  = fields['idMembers']
       self
     end
@@ -43,14 +45,14 @@ module Trello
     def save
       return update! if id
 
-      Client.post("/checklists", {
+      client.post("/checklists", {
         :name    => name,
         :idBoard => board_id
       }).json_into(self)
     end
 
     def update!
-      Client.put("/checklists/#{id}", { :name => name }).json_into(self)
+      client.put("/checklists/#{id}", { :name => name }).json_into(self)
     end
 
     # Return a list of items on the checklist.
@@ -61,10 +63,10 @@ module Trello
     end
 
     # Return a reference to the board the checklist is on.
-    one :board, :using => :board_id
+    one :board, :path => :checklists, :using => :board_id
 
     # Return a reference to the list the checklist is on.
-    one :list, :using => :list_id
+    one :list, :path => :lists, :using => :list_id
 
     # Return a list of members active in this checklist.
     def members
@@ -76,7 +78,7 @@ module Trello
 
     # Add an item to the checklist
     def add_item(name)
-      Client.post("/checklists/#{id}/checkItems", { :name => name })
+      client.post("/checklists/#{id}/checkItems", { :name => name })
     end
   end
 end

data/lib/trello/client.rb

@@ -2,48 +2,117 @@ require 'addressable/uri'
 
 module Trello
   class Client
-    extend Authorization
+    extend Forwardable
+    include Authorization
 
-    class << self
-      def get(path, params = {})
-        uri = Addressable::URI.parse("https://api.trello.com/#{API_VERSION}#{path}")
-        uri.query_values = params unless params.empty?
-        invoke_verb(:get, uri)
-      end
+    def_delegators :configuration, :credentials, *Configuration.configurable_attributes
+
+    def initialize(attrs = {})
+      self.configuration.attributes = attrs
+    end
+
+    def get(path, params = {})
+      uri = Addressable::URI.parse("https://api.trello.com/#{API_VERSION}#{path}")
+      uri.query_values = params unless params.empty?
+      invoke_verb(:get, uri)
+    end
+
+    def post(path, body = {})
+      uri = Addressable::URI.parse("https://api.trello.com/#{API_VERSION}#{path}")
+      invoke_verb(:post, uri, body)
+    end
 
-      def post(path, body = {})
-        uri = Addressable::URI.parse("https://api.trello.com/#{API_VERSION}#{path}")
-        invoke_verb(:post, uri, body)
+    def put(path, body = {})
+      uri = Addressable::URI.parse("https://api.trello.com/#{API_VERSION}#{path}")
+      invoke_verb(:put, uri, body)
+    end
+
+    def delete(path)
+      uri = Addressable::URI.parse("https://api.trello.com/#{API_VERSION}#{path}")
+      invoke_verb(:delete, uri)
+    end
+
+    # Finds given resource by id
+    #
+    # Examples:
+    #   client.find(:board, "board1234")
+    #   client.find(:member, "user1234")
+    #
+    def find(path, id)
+      response = get("/#{path.to_s.pluralize}/#{id}")
+      trello_class = class_from_path(path)
+      trello_class.parse response do |data|
+        data.client = self
       end
+    end
 
-      def put(path, body = {})
-        uri = Addressable::URI.parse("https://api.trello.com/#{API_VERSION}#{path}")
-        invoke_verb(:put, uri, body)
+    # Finds given resource by path with params
+    def find_many(trello_class, path, params = {})
+      response = get(path, params)
+      trello_class.parse_many response do |data|
+        data.client = self
       end
+    end
 
-      def delete(path)
-        uri = Addressable::URI.parse("https://api.trello.com/#{API_VERSION}#{path}")
-        invoke_verb(:delete, uri)
+    # Creates resource with given options (attributes)
+    #
+    # Examples:
+    #   client.create(:member, options)
+    #   client.create(:board, options)
+    #
+    def create(path, options)
+      trello_class = class_from_path(path)
+      trello_class.save options do |data|
+        data.client = self
       end
+    end
 
-      def invoke_verb(name, uri, body = nil)
-        request = Request.new name, uri, {}, body
-        response = TInternet.execute AuthPolicy.authorize(request)
+    def configure
+      yield configuration if block_given?
+    end
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
 
-        return '' unless response
+    def auth_policy
+      @auth_policy ||= auth_policy_class.new(credentials)
+    end
 
-        if response.code.to_i == 401 && response.body =~ /expired token/
-          Trello.logger.error("[401 #{name.to_s.upcase} #{uri}]: Your access token has expired.")
-          raise InvalidAccessToken, response.body
-        end
+    private
 
-        unless [200, 201].include? response.code
-          Trello.logger.error("[#{response.code} #{name.to_s.upcase} #{uri}]: #{response.body}")
-          raise Error, response.body
-        end
+    def invoke_verb(name, uri, body = nil)
+      request = Request.new name, uri, {}, body
+      response = TInternet.execute auth_policy.authorize(request)
+
+      return '' unless response
+
+      if response.code.to_i == 401 && response.body =~ /expired token/
+        Trello.logger.error("[401 #{name.to_s.upcase} #{uri}]: Your access token has expired.")
+        raise InvalidAccessToken, response.body
+      end
 
-        response.body
+      unless [200, 201].include? response.code
+        Trello.logger.error("[#{response.code} #{name.to_s.upcase} #{uri}]: #{response.body}")
+        raise Error, response.body
       end
+
+      response.body
+    end
+
+    def auth_policy_class
+      if configuration.oauth?
+        OAuthPolicy
+      elsif configuration.basic?
+        BasicAuthPolicy
+      else
+        AuthPolicy
+      end
+    end
+
+    def class_from_path(path_or_class)
+      return path_or_class if path_or_class.is_a?(Class)
+      Trello.const_get(path_or_class.to_s.singularize.camelize)
     end
   end
 end