ruby-trello 0.3.2 → 0.4.0

data/lib/trello.rb

@@ -1,6 +1,7 @@
 require 'oauth'
 require 'json'
 require 'logger'
+require 'active_model'
 
 # Ruby wrapper around the Trello[http://trello.com] API
 #
@@ -31,6 +32,7 @@ module Trello
   autoload :Card,         'trello/card'
   autoload :Checklist,    'trello/checklist'
   autoload :Client,       'trello/client'
+  autoload :HasActions,   'trello/has_actions'
   autoload :Item,         'trello/item'
   autoload :ItemState,    'trello/item_state'
   autoload :List,         'trello/list'
@@ -61,4 +63,4 @@ module Trello
   def self.logger=(logger)
     @logger = logger
   end
-end
+end

data/lib/trello/action.rb

@@ -1,7 +1,8 @@
 module Trello
   # Action represents some event that occurred. For instance, when a card is created.
   class Action < BasicData
-    attr_reader :id, :type, :data, :member_creator_id
+    register_attributes :id, :type, :data, :date, :member_creator_id
+    validates_presence_of :id, :type, :date, :member_creator_id
 
     class << self
       # Locate a specific action and return a new Action object.
@@ -15,35 +16,32 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an Action.
     def update_fields(fields)
-      @id                = fields['id']
-      @type              = fields['type']
-      @data              = fields['data']
-      @member_creator_id = fields['idMemberCreator']
+      attributes[:id]                = fields['id']
+      attributes[:type]              = fields['type']
+      attributes[:data]              = fields['data']
+      attributes[:date]              = fields['date']
+      attributes[:member_creator_id] = fields['idMemberCreator']
       self
     end
 
     # Returns the board this action occurred on.
     def board
-      return @board if @board
-      @board = Client.get("/actions/#{id}/board").json_into(Board)
+      Client.get("/actions/#{id}/board").json_into(Board)
     end
 
     # Returns the card the action occurred on.
     def card
-      return @card if @card
-      @card = Client.get("/actions/#{id}/card").json_into(Card)
+      Client.get("/actions/#{id}/card").json_into(Card)
     end
 
     # Returns the list the action occurred on.
     def list
-      return @list if @list
-      @list = Client.get("/actions/#{id}/list").json_into(List)
+      Client.get("/actions/#{id}/list").json_into(List)
     end
 
     # Returns the member who created the action.
     def member_creator
-      return @member_creator if @member_creator
-      @member_creator = Member.find(member_creator_id)
+      Member.find(member_creator_id)
     end
   end
 end

data/lib/trello/basic_data.rb

@@ -2,7 +2,9 @@ require 'trello/string'
 
 module Trello
   class BasicData
-    attr_reader :id
+    include ActiveModel::Validations
+    include ActiveModel::Dirty
+    include ActiveModel::Serializers::JSON
 
     class << self
       def find(path, id)
@@ -10,6 +12,27 @@ module Trello
       end
     end
 
+    def self.register_attributes(*names)
+      # Defines the attribute getter and setters.
+      class_eval do
+        define_method :attributes do
+          @attributes ||= names.inject({}) { |hash,k| hash.merge(k.to_sym => nil) }
+        end
+
+        names.each do |key|
+          define_method(:"#{key}") { @attributes[key] }
+
+          define_method :"#{key}=" do |val|
+            send(:"#{key}_will_change!") unless val == @attributes[key]
+            @attributes[key] = val
+          end
+        end
+        define_attribute_methods names
+      end
+    end
+
+    register_attributes :id
+
     def initialize(fields = {})
       update_fields(fields)
     end

data/lib/trello/board.rb

@@ -1,34 +1,40 @@
 module Trello
 
   class Board < BasicData
-    attr_reader :id, :name, :description, :url, :organization_id
+    register_attributes :id, :name, :description, :url, :organization_id
+    validates_presence_of :id, :name
 
-    class << self
+    include HasActions
 
+    class << self
+      # Finds a board.
       def find(id)
         super(:boards, id)
       end
 
-      def create(attributes)
-        new('name'   => attributes[:name],
-            'desc'   => attributes[:description],
-            'closed' => attributes[:closed] || false).save!
+      def create(fields)
+        new('name'   => fields[:name],
+            'desc'   => fields[:description],
+            'closed' => fields[:closed] || false).save
       end
     end
 
-    def save!
+    def save
       return update! if id
 
-      attributes = { :name => name }
-      attributes.merge!(:desc => description) if description
-      attributes.merge!(:idOrganization => organization_id) if organization_id
+      fields = { :name => name }
+      fields.merge!(:desc => description) if description
+      fields.merge!(:idOrganization => organization_id) if organization_id
 
-      Client.post("/boards", attributes).json_into(self)
+      Client.post("/boards", fields).json_into(self)
     end
 
     def update!
       fail "Cannot save new instance." unless self.id
 
+      @previously_changed = changes
+      @changed_attributes.clear
+
       Client.put("/boards/#{self.id}/", {
         :name        => @name,
         :description => @description,
@@ -37,24 +43,18 @@ module Trello
     end
 
     def update_fields(fields)
-      @id              = fields['id']              if fields['id']
-      @name            = fields['name']            if fields['name']
-      @description     = fields['desc']            if fields['desc']
-      @closed          = fields['closed']          if fields.has_key?('closed')
-      @url             = fields['url']             if fields['url']
-      @organization_id = fields['idOrganization']  if fields['idOrganization']
+      attributes[:id]              = fields['id']              if fields['id']
+      attributes[:name]            = fields['name']            if fields['name']
+      attributes[:description]     = fields['desc']            if fields['desc']
+      attributes[:closed]          = fields['closed']          if fields.has_key?('closed')
+      attributes[:url]             = fields['url']             if fields['url']
+      attributes[:organization_id] = fields['idOrganization']  if fields['idOrganization']
 
       self
     end
 
     def closed?
-      @closed
-    end
-
-    # Return a timeline of actions related to this board.
-    def actions
-      return @actions if @actions
-      @actions = Client.get("/boards/#{id}/actions").json_into(Action)
+      @attributes[:closed]
     end
 
     # Return all the cards on this board.
@@ -63,8 +63,7 @@ module Trello
     # of the following values:
     #    :filter => [ :none, :open, :closed, :all ] # default :open
     def cards(options = { :filter => :open })
-      return @cards if @cards
-      @cards = Client.get("/boards/#{id}/cards").json_into(Card)
+      Client.get("/boards/#{id}/cards").json_into(Card)
     end
 
     def has_lists?
@@ -77,8 +76,7 @@ module Trello
     # of the following values:
     #    :filter => [ :none, :open, :closed, :all ] # default :open
     def lists(options = { :filter => :open })
-      return @lists if @lists
-      @lists = Client.get("/boards/#{id}/lists", options).json_into(List)
+      Client.get("/boards/#{id}/lists", options).json_into(List)
     end
 
     # Returns an array of members who are associated with this board.
@@ -87,14 +85,17 @@ module Trello
     # of the following values:
     #    :filter => [ :none, :normal, :owners, :all ] # default :all
     def members(options = { :filter => :all })
-      return @members if @members
-      @members = Client.get("/boards/#{id}/members", options).json_into(Member)
+      Client.get("/boards/#{id}/members", options).json_into(Member)
     end
 
     # Returns a reference to the organization this board belongs to.
     def organization
-      return @organization if @organization
-      @organization = Organization.find(organization_id)
+      Organization.find(organization_id)
+    end
+
+    # :nodoc:
+    def request_prefix
+      "/boards/#{id}"
     end
   end
 end

data/lib/trello/card.rb

@@ -1,8 +1,10 @@
 module Trello
   # A Card is a container that can house checklists and comments; it resides inside a List.
   class Card < BasicData
-    attr_reader   :id
-    attr_accessor :name, :description, :closed, :url, :board_id, :member_ids, :list_id
+    register_attributes :id, :short_id, :name, :description, :closed, :url, :board_id, :member_ids, :list_id
+    validates_presence_of :id, :name, :list_id
+
+    include HasActions
 
     class << self
       # Find a specific card by its id.
@@ -14,7 +16,7 @@ module Trello
       def create(options)
         new('name'   => options[:name],
             'idList' => options[:list_id],
-            'desc'   => options[:description]).save!
+            'desc'   => options[:description]).save
       end
     end
 
@@ -23,27 +25,21 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # a card.
     def update_fields(fields)
-      @id          = fields['id']
-      @name        = fields['name']
-      @description = fields['desc']
-      @closed      = fields['closed']
-      @url         = fields['url']
-      @board_id    = fields['idBoard']
-      @member_ids  = fields['idMembers']
-      @list_id     = fields['idList']
+      attributes[:id]          = fields['id']
+      attributes[:short_id]    = fields['idShort']
+      attributes[:name]        = fields['name']
+      attributes[:description] = fields['desc']
+      attributes[:closed]      = fields['closed']
+      attributes[:url]         = fields['url']
+      attributes[:board_id]    = fields['idBoard']
+      attributes[:member_ids]  = fields['idMembers']
+      attributes[:list_id]     = fields['idList']
       self
     end
 
-    # Returns a list of the actions associated with this card.
-    def actions
-      return @actions if @actions
-      @actions = Client.get("/cards/#{id}/actions").json_into(Action)
-    end
-
     # Returns a reference to the board this card is part of.
     def board
-      return @board if @board
-      @board = Board.find(board_id)
+      Board.find(board_id)
     end
 
     # Returns a list of checklists associated with the card.
@@ -52,52 +48,30 @@ module Trello
     # of the following values:
     #    :filter => [ :none, :all ] # default :all
     def checklists(options = { :filter => :all })
-      return @checklists if @checklists
-      @checklists = Client.get("/cards/#{id}/checklists", options).json_into(Checklist)
+      Client.get("/cards/#{id}/checklists", options).json_into(Checklist)
     end
 
     # Returns a reference to the list this card is currently in.
     def list
-      return @list if @list
-      @list = List.find(list_id)
+      List.find(list_id)
     end
 
     # Returns a list of members who are assigned to this card.
     def members
-      return @members if @members
-      @members = member_ids.map do |member_id|
+      member_ids.map do |member_id|
         Client.get("/members/#{member_id}").json_into(Member)
       end
     end
 
-    # Change the name of the card
-    def name=(val)
-      Client.put("/card/#{id}/name", :value => val)
-      @name = val
-    end
-
-    # Change the description of the card
-    def description=(val)
-      Client.put("/card/#{id}/desc", :value => val)
-      @description = val
-    end
-
-    # Change the list this card is a part of
-    def list=(other)
-      Client.put("/card/#{id}/idList", :value => other.id)
-      @list_id = other.id
-      other
-    end
-
     # Saves a record.
-    def save!
+    def save
       # If we have an id, just update our fields.
       return update! if id
 
       Client.post("/cards", {
-        :name   => @name,
-        :desc   => @description,
-        :idList => @list_id
+        :name   => name,
+        :desc   => description,
+        :idList => list_id
       }).json_into(self)
     end
 
@@ -106,19 +80,22 @@ module Trello
     # an external resource has updated these fields, you should refresh!
     # this object before making your changes, and before updating the record.
     def update!
+      @previously_changed = changes
+      @changed_attributes.clear
+
       Client.put("/cards/#{@id}", {
-        :name      => @name,
-        :desc      => @description,
-        :closed    => @closed,
-        :idList    => @list_id,
-        :idBoard   => @board_id,
-        :idMembers => @member_ids
+        :name      => name,
+        :desc      => description,
+        :closed    => closed,
+        :idList    => list_id,
+        :idBoard   => board_id,
+        :idMembers => member_ids
       }).json_into(self)
     end
 
     # Is the record valid?
     def valid?
-      @name && @list_id
+      name && list_id
     end
 
     # Add a comment with the supplied text.
@@ -144,5 +121,11 @@ module Trello
       return logger.warn "The label colour '#{colour}' does not exist." unless %w{green yellow orange red purple blue}.include? colour
       Client.delete("/cards/#{id}/labels/#{colour}")
     end
+
+    # :nodoc:
+    def request_prefix
+      "/cards/#{id}"
+    end
+
   end
 end

data/lib/trello/checklist.rb

@@ -1,7 +1,8 @@
 module Trello
   # A Checklist holds items which are like a "task" list. Checklists are linked to a card.
   class Checklist < BasicData
-    attr_reader :id, :name, :description, :closed, :url, :check_items, :board_id, :list_id, :member_ids
+    register_attributes :id, :name, :description, :closed, :url, :check_items, :board_id, :list_id, :member_ids
+    validates_presence_of :id, :board_id, :list_id
 
     class << self
       # Locate a specific checklist by its id.
@@ -20,14 +21,14 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # a checklist.
     def update_fields(fields)
-      @id          = fields['id']
-      @name        = fields['name']
-      @description = fields['desc']
-      @closed      = fields['closed']
-      @url         = fields['url']
-      @check_items = fields['checkItems']
-      @board_id    = fields['idBoard']
-      @member_ids  = fields['idMembers']
+      attributes[:id]          = fields['id']
+      attributes[:name]        = fields['name']
+      attributes[:description] = fields['desc']
+      attributes[:closed]      = fields['closed']
+      attributes[:url]         = fields['url']
+      attributes[:check_items] = fields['checkItems']
+      attributes[:board_id]    = fields['idBoard']
+      attributes[:member_ids]  = fields['idMembers']
       self
     end
 
@@ -37,7 +38,7 @@ module Trello
     end
 
     # Save a record.
-    def save!
+    def save
       return update! if id
 
       Client.post("/checklists", {
@@ -52,30 +53,24 @@ module Trello
 
     # Return a list of items on the checklist.
     def items
-     return @items if @items
-
-      @items = check_items.map do |item_fields|
+      check_items.map do |item_fields|
         Item.new(item_fields)
       end
     end
 
     # Return a reference to the board the checklist is on.
     def board
-      return @board if @board
-      @board = Board.find(board_id)
+      Board.find(board_id)
     end
 
     # Return a reference to the list the checklist is on.
     def list
-      return @list if @list
-      @list = List.find(list_id)
+      List.find(list_id)
     end
 
     # Return a list of members active in this checklist.
     def members
-      return @members if @members
-
-      @members = member_ids.map do |member_id|
+      member_ids.map do |member_id|
         Member.find(member_id)
       end
     end

data/lib/trello/client.rb

@@ -35,8 +35,8 @@ module Trello
           raise InvalidAccessToken, response.body
         end
 
-        unless response.code.to_i == 200
-          Trello.logger.error("[#{response.code.to_i} #{name.to_s.upcase} #{uri}]: #{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
 

data/lib/trello/has_actions.rb

@@ -0,0 +1,8 @@
+module Trello
+  module HasActions
+    # Returns a list of the actions associated with this object.
+    def actions(options = {})
+      Client.get("#{request_prefix}/actions", { :filter => :all }.merge(options)).json_into(Action)
+    end
+  end
+end

data/lib/trello/item.rb

@@ -1,16 +1,17 @@
 module Trello
   # An Item is a basic task that can be checked off and marked as completed.
   class Item < BasicData
-    attr_reader :id, :name, :type
+    register_attributes :id, :name, :type
+    validates_presence_of :id, :type
 
     # Updates the fields of an item.
     #
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an item.
     def update_fields(fields)
-      @id   = fields['id']
-      @name = fields['name']
-      @type = fields['type']
+      attributes[:id]   = fields['id']
+      attributes[:name] = fields['name']
+      attributes[:type] = fields['type']
       self
     end
   end

data/lib/trello/item_state.rb

@@ -1,22 +1,23 @@
 module Trello
   # Represents the state of an item.
   class ItemState < BasicData
-    attr_reader :id, :state, :item_id
+    register_attributes :id, :state, :item_id
+    validates_presence_of :id, :item_id
 
     # Update the fields of an item state.
     #
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an item state.
     def update_fields(fields)
-      @id      = fields['id']
-      @state   = fields['state']
-      @item_id = fields['idItem']
+      attributes[:id]      = fields['id']
+      attributes[:state]   = fields['state']
+      attributes[:item_id] = fields['idItem']
       self
     end
 
     # Return the item this state belongs to.
     def item
-      Item.find(@item_id)
+      Item.find(item_id)
     end
   end
 end

data/lib/trello/list.rb

@@ -1,7 +1,10 @@
 module Trello
   # A List is a container which holds cards. Lists are items on a board.
   class List < BasicData
-    attr_reader :id, :name, :closed, :board_id
+    register_attributes :id, :name, :closed, :board_id
+    validates_presence_of :id, :name, :board_id
+
+    include HasActions
 
     class << self
       # Finds a specific list, given an id.
@@ -20,14 +23,14 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # a List.
     def update_fields(fields)
-      @id       = fields['id']
-      @name     = fields['name']
-      @closed   = fields['closed']
-      @board_id = fields['idBoard']
+      attributes[:id]       = fields['id']
+      attributes[:name]     = fields['name']
+      attributes[:closed]   = fields['closed']
+      attributes[:board_id] = fields['idBoard']
       self
     end
 
-    def save!
+    def save
       return update! if id
 
       Client.post("/lists", {
@@ -49,16 +52,9 @@ module Trello
       closed
     end
 
-    # Return a timeline of events related to this list.
-    def actions
-      return @actions if @actions
-      @actions = Client.get("/lists/#{id}/actions").json_into(Action)
-    end
-
     # Return the board the list is connected to.
     def board
-      return @board if @board
-      @board = Board.find(board_id)
+      Board.find(board_id)
     end
 
     # Returns all the cards on this list.
@@ -67,8 +63,12 @@ module Trello
     # of the following values:
     #    :filter => [ :none, :open, :closed, :all ] # default :open
     def cards(options = { :filter => :open })
-      return @cards if @cards
-      @cards = Client.get("/lists/#{id}/cards", options).json_into(Card)
+      Client.get("/lists/#{id}/cards", options).json_into(Card)
+    end
+
+    # :nodoc:
+    def request_prefix
+      "/lists/#{id}"
     end
   end
 end

data/lib/trello/member.rb

@@ -1,8 +1,10 @@
 module Trello
   # A Member is a user of the Trello service.
   class Member < BasicData
-    attr_reader   :id
-    attr_accessor :full_name, :username, :gravatar_id, :bio, :url
+    register_attributes :id, :username, :full_name, :avatar_id, :bio, :url
+    validates_presence_of :id, :username
+
+    include HasActions
 
     class << self
       # Finds a user
@@ -18,19 +20,23 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an Member.
     def update_fields(fields)
-      @id          = fields['id']
-      @full_name   = fields['fullName']
-      @username    = fields['username']
-      @gravatar_id = fields['gravatar']
-      @bio         = fields['bio']
-      @url         = fields['url']
+      attributes[:id]        = fields['id']
+      attributes[:full_name] = fields['fullName']
+      attributes[:username]  = fields['username']
+      attributes[:avatar_id] = fields['avatarHash']
+      attributes[:bio]       = fields['bio']
+      attributes[:url]       = fields['url']
       self
     end
 
-    # Returns a list of the users actions.
-    def actions
-      return @actions if @actions
-      @actions = Client.get("/members/#{username}/actions").json_into(Action)
+    # Retrieve a URL to the avatar.
+    # 
+    # Valid values for options are:
+    #   :large (170x170)
+    #   :small (30x30)
+    def avatar_url(options = { :size => :large })
+      size = options[:size] == :small ? 30 : 170
+      "https://trello-avatars.s3.amazonaws.com/#{avatar_id}/#{size}.png"
     end
 
     # Returns a list of the boards a member is a part of.
@@ -39,8 +45,7 @@ module Trello
     # of the following values:
     #   :filter => [ :none, :members, :organization, :public, :open, :closed, :all ] # default: :all
     def boards(options = { :filter => :all })
-      return @boards if @boards
-      @boards = Client.get("/members/#{username}/boards", options).json_into(Board)
+      Client.get("/members/#{username}/boards", options).json_into(Board)
     end
 
     # Returns a list of cards the member is assigned to.
@@ -49,8 +54,7 @@ module Trello
     # of the following values:
     #    :filter => [ :none, :open, :closed, :all ] # default :open
     def cards(options = { :filter => :open })
-      return @cards if @cards
-      @cards = Client.get("/members/#{username}/cards", options).json_into(Card)
+      Client.get("/members/#{username}/cards", options).json_into(Card)
     end
 
     # Returns a list of the organizations this member is a part of.
@@ -59,8 +63,7 @@ module Trello
     # of the following values:
     #   :filter => [ :none, :members, :public, :all ] # default: all
     def organizations(options = { :filter => :all })
-      return @organizations if @organizations
-      @organizations = Client.get("/members/#{username}/organizations", options).json_into(Organization)
+      Client.get("/members/#{username}/organizations", options).json_into(Organization)
     end
 
     # Returns a list of notifications for the user
@@ -68,16 +71,16 @@ module Trello
       Client.get("/members/#{username}/notifications").json_into(Notification)
     end
 
-    # Returns a hash of the items that would be returned by Trello.
-    def to_hash
-      {
-        'id'       => id,
-        'fullName' => full_name,
-        'username' => username,
-        'gravatar' => gravatar_id,
-        'bio'      => bio,
-        'url'      => url
-      }
+    def save
+      @previously_changed = changes
+      @changed_attributes.clear
+
+      # TODO: updating attributes.
+    end
+
+    # :nodoc:
+    def request_prefix
+      "/members/#{username}"
     end
   end
 end

data/lib/trello/notification.rb

@@ -1,6 +1,7 @@
 module Trello
   class Notification < BasicData
-    attr_reader :id, :unread, :type, :date, :data, :member_creator_id
+    register_attributes :id, :unread, :type, :date, :data, :member_creator_id
+    validates_presence_of :id, :type, :date, :member_creator_id
 
     class << self
       # Locate a notification by its id
@@ -10,12 +11,12 @@ module Trello
     end
 
     def update_fields(fields)
-      @id                = fields['id']
-      @unread            = fields['unread']
-      @type              = fields['type']
-      @date              = fields['date']
-      @data              = fields['data']
-      @member_creator_id = fields['idMemberCreator']
+      attributes[:id]                = fields['id']
+      attributes[:unread]            = fields['unread']
+      attributes[:type]              = fields['type']
+      attributes[:date]              = fields['date']
+      attributes[:data]              = fields['data']
+      attributes[:member_creator_id] = fields['idMemberCreator']
       self
     end
 

data/lib/trello/organization.rb

@@ -1,7 +1,10 @@
 module Trello
   # Organizations are useful for linking members together.
   class Organization < BasicData
-    attr_reader :id, :name, :display_name, :description, :url
+    register_attributes :id, :name, :display_name, :description, :url
+    validates_presence_of :id, :name
+
+    include HasActions
 
     class << self
       # Find an organization by its id.
@@ -15,30 +18,27 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an Organization.
     def update_fields(fields)
-      @id           = fields['id']
-      @name         = fields['name']
-      @display_name = fields['displayName']
-      @description  = fields['description']
-      @url          = fields['url']
+      attributes[:id]           = fields['id']
+      attributes[:name]         = fields['name']
+      attributes[:display_name] = fields['displayName']
+      attributes[:description]  = fields['description']
+      attributes[:url]          = fields['url']
       self
     end
 
-    # Returns a timeline of actions.
-    def actions
-      return @actions if @actions
-      @actions = Client.get("/organizations/#{id}/actions").json_into(Action)
-    end
-
     # Returns a list of boards under this organization.
     def boards
-      return @boards if @boards
-      @boards = Client.get("/organizations/#{id}/boards/all").json_into(Board)
+      Client.get("/organizations/#{id}/boards/all").json_into(Board)
     end
 
     # Returns an array of members associated with the organization.
     def members
-      return @members if @members
-      @members = Client.get("/organizations/#{id}/members/all").json_into(Member)
+      Client.get("/organizations/#{id}/members/all").json_into(Member)
+    end
+
+    # :nodoc:
+    def request_prefix
+      "/organizations/#{id}"
     end
   end
 end

data/spec/action_spec.rb

@@ -27,6 +27,10 @@ module Trello
       it "has the same data" do
         @action.data.should == @detail['data']
       end
+
+      it "gets the date" do
+        @action.date.should == @detail['date']
+      end
     end
 
     context "boards" do

data/spec/board_spec.rb

@@ -35,7 +35,7 @@ module Trello
 
     context "actions" do
       it "has a list of actions" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789/actions").
+        Client.stub(:get).with("/boards/abcdef123456789123456789/actions", {:filter => :all}).
           and_return actions_payload
 
         @board.actions.count.should be > 0
@@ -56,7 +56,7 @@ module Trello
         Client.stub(:get).with("/boards/abcdef123456789123456789/lists", hash_including(:filter => :open)).
           and_return lists_payload
 
-        @board.lists.count.should be > 0
+        @board.has_lists?.should be true
       end
     end
 
@@ -111,7 +111,7 @@ module Trello
     it "sets any attributes supplied in the fields argument"
   end
 
-  describe "#save!" do
+  describe "#save" do
     include Helpers
 
     let(:any_board_json) do
@@ -122,7 +122,7 @@ module Trello
       Client.should_not_receive :put
       
       the_new_board = Board.new
-      lambda{the_new_board.save!}.should raise_error
+      lambda{the_new_board.save}.should raise_error
     end
 
     it "puts all fields except id" do
@@ -134,7 +134,7 @@ module Trello
       end
       
       the_new_board = Board.new 'id' => "xxx"
-      the_new_board.save!
+      the_new_board.save
     end
 
     it "mutates the current instance" do
@@ -142,7 +142,7 @@ module Trello
       
       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
@@ -156,7 +156,7 @@ module Trello
       end
       
       the_new_board = Board.new 'id' => expected_resource_id
-      the_new_board.save!
+      the_new_board.save
     end 
 
     it "saves OR updates depending on whether or not it has an id set"

data/spec/card_spec.rb

@@ -46,7 +46,7 @@ module Trello
     end
 
     context "updating" do
-      it "updating name does a put on the correct resource with the correct value" do
+      it "updating name does a put on the correct resource with the correct value", :broken => true do
         expected_new_name = "xxx"
         expected_resource = "/card/#{@card.id}/name"
 
@@ -60,6 +60,10 @@ module Trello
         @card.id.should_not be_nil
       end
 
+      it "gets its short id" do
+        @card.short_id.should_not be_nil
+      end
+
       it "gets its name" do
         @card.name.should_not be_nil
       end
@@ -78,10 +82,15 @@ module Trello
     end
 
     context "actions" do
-      it "has a list of actions" do
-        Client.stub(:get).with("/cards/abcdef123456789123456789/actions").and_return actions_payload
+      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
       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
+      end
     end
 
     context "boards" do

data/spec/client_spec.rb

@@ -45,7 +45,7 @@ describe Client, "and how it handles authorization" do
   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", 
-      :code => 201,
+      :code => 404,
       :body => expected_error_message
 
     TInternet.stub(:execute).and_return response_with_non_200_status

data/spec/integration/how_to_use_boards_spec.rb

@@ -14,7 +14,7 @@ describe "how to use boards", :broken => true do
     after do
       if @new_board and false == @new_board.closed? 
         @new_board.update_fields 'closed' => true
-        @new_board.save!
+        @new_board.save
       end
     end
 
@@ -36,7 +36,7 @@ describe "how to use boards", :broken => true do
       @new_board = Board.create(:name => "[#{Time.now}, CLOSED] An example")
 
       @new_board.update_fields 'closed' => true
-      @new_board.save!
+      @new_board.save
       
       Board.find(@new_board.id).should be_closed
     end

data/spec/list_spec.rb

@@ -31,7 +31,7 @@ module Trello
 
     context "actions" do
       it "has a list of actions" do
-        Client.stub(:get).with("/lists/abcdef123456789123456789/actions").and_return actions_payload
+        Client.stub(:get).with("/lists/abcdef123456789123456789/actions", { :filter => :all }).and_return actions_payload
         @list.actions.count.should be > 0
       end
     end

data/spec/member_spec.rb

@@ -14,7 +14,7 @@ module Trello
 
     context "actions" do
       it "retrieves a list of actions", :refactor => true do
-        Client.stub(:get).with("/members/me/actions").and_return actions_payload
+        Client.stub(:get).with("/members/me/actions", { :filter => :all }).and_return actions_payload
         @member.actions.count.should be > 0
       end
     end
@@ -43,6 +43,13 @@ module Trello
       end
     end
 
+    context "notifications" do
+      it "has a list of notifications" do
+        Client.stub(:get).with("/members/me/notifications").and_return "[" << notification_payload << "]"
+        @member.notifications.count.should be 1
+      end
+    end
+
     context "personal" do
       it "gets the members bio" do
         @member.bio.should == user_details['bio']
@@ -52,8 +59,13 @@ module Trello
         @member.full_name.should == user_details['fullName']
       end
 
-      it "gets the gravatar id" do
-        @member.gravatar_id.should == user_details['gravatar']
+      it "gets the avatar id" do
+        @member.avatar_id.should == user_details['avatarHash']
+      end
+
+      it "returns a valid url for the avatar" do
+        @member.avatar_url(:size => :large).should == "https://trello-avatars.s3.amazonaws.com/abcdef1234567890abcdef1234567890/170.png"
+        @member.avatar_url(:size => :small).should == "https://trello-avatars.s3.amazonaws.com/abcdef1234567890abcdef1234567890/30.png"
       end
 
       it "gets the url" do
@@ -64,5 +76,13 @@ module Trello
         @member.username.should == user_details['username']
       end
     end
+
+    context "modification" do
+      it "lets us know a field has changed without committing it" do
+        @member.changed?.should be_false
+        @member.bio = "New and amazing"
+        @member.changed?.should be_true
+      end
+    end
   end
 end

data/spec/organization_spec.rb

@@ -0,0 +1,26 @@
+
+require 'spec_helper'
+
+module Trello
+  describe Organization do
+    include Helpers
+
+    before(:each) do
+      Client.stub(:get).with("/organizations/4ee7e59ae582acdec8000291").
+        and_return organization_payload
+
+      @organization = Organization.find('4ee7e59ae582acdec8000291')
+    end
+
+    context "actions" do
+      it "retrieves actions" do
+        Client.stub(:get).with("/organizations/4ee7e59ae582acdec8000291/actions", { :filter => :all }).and_return actions_payload
+        @organization.actions.count.should be > 0
+      end
+
+    end
+
+  end
+
+end
+

data/spec/spec_helper.rb

@@ -19,6 +19,10 @@ Bundler.require(:spec)
 
 require 'trello'
 require 'webmock/rspec'
+require 'stringio'
+
+$strio = StringIO.new
+Trello.logger = Logger.new($strio)
 
 RSpec.configure do |c|
   c.filter_run_excluding :broken => true
@@ -27,12 +31,12 @@ end
 module Helpers
   def user_details
     {
-      "id"       => "abcdef123456789012345678",
-      "fullName" => "Test User",
-      "username" => "me",
-      "gravatar" => "abcdef1234567890abcdef1234567890",
-      "bio"      => "a rather dumb user",
-      "url"      => "https://trello.com/me"
+      "id"         => "abcdef123456789012345678",
+      "fullName"   => "Test User",
+      "username"   => "me",
+      "avatarHash" => "abcdef1234567890abcdef1234567890",
+      "bio"        => "a rather dumb user",
+      "url"        => "https://trello.com/me"
     }
   end
 
@@ -89,6 +93,7 @@ module Helpers
   def cards_details
     [{
       "id"        => "abcdef123456789123456789",
+      "idShort"   => "1",
       "name"      => "Do something awesome",
       "desc"      => "Awesome things are awesome.",
       "closed"    => false,
@@ -135,6 +140,7 @@ module Helpers
           "name"        => "Assembler"
         }
       },
+      "date"            => "2012-02-10T11:32:17.447Z",
       "type"            => "createCard"
     }]
   end
@@ -167,4 +173,29 @@ module Helpers
   def notification_payload
     JSON.generate(notification_details)
   end
+
+  def organization_details
+    {
+        "id" => "4ee7e59ae582acdec8000291",
+        "name" => "publicorg",
+        "desc" => "This is a test organization",
+        "members" => [{
+            "id" => "4ee7df3ce582acdec80000b2",
+            "username" => "alicetester",
+            "fullName" => "Alice Tester"
+        }, {
+            "id" => "4ee7df74e582acdec80000b6",
+            "username" => "davidtester",
+            "fullName" => "David Tester"
+        }, {
+            "id" => "4ee7e2e1e582acdec8000112",
+            "username" => "edtester",
+            "fullName" => "Ed Tester"
+        }]
+    }
+  end
+
+  def organization_payload
+    JSON.generate(organization_details)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-trello
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70172866550100 !ruby/object:Gem::Requirement
+  requirement: &70158442213940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70172866550100
+  version_requirements: *70158442213940
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70172866549140 !ruby/object:Gem::Requirement
+  requirement: &70158442213480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70172866549140
+  version_requirements: *70158442213480
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70172866548200 !ruby/object:Gem::Requirement
+  requirement: &70158442213020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70172866548200
+  version_requirements: *70158442213020
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70172866546920 !ruby/object:Gem::Requirement
+  requirement: &70158442212560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,21 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70172866546920
+  version_requirements: *70158442212560
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70158442212180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70158442212180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70172866545720 !ruby/object:Gem::Requirement
+  requirement: &70158442211640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70172866545720
+  version_requirements: *70158442211640
 description: A wrapper around the trello.com API.
 email: jeremy@tregunna.ca
 executables: []
@@ -80,6 +91,7 @@ files:
 - lib/trello/card.rb
 - lib/trello/checklist.rb
 - lib/trello/client.rb
+- lib/trello/has_actions.rb
 - lib/trello/item.rb
 - lib/trello/item_state.rb
 - lib/trello/list.rb