ruby-trello 0.4.0 → 0.4.1

data/lib/trello/net.rb

@@ -12,8 +12,10 @@ module Trello
 
       def try_execute(request)
         begin
-          result = execute_core request
-          Response.new(200, {}, result)
+          if request
+            result = execute_core request
+            Response.new(200, {}, result)
+          end
         rescue Exception => e
           Response.new(e.http_code, {}, e.http_body)
         end

data/lib/trello/notification.rb

@@ -1,6 +1,7 @@
 module Trello
   class Notification < BasicData
-    register_attributes :id, :unread, :type, :date, :data, :member_creator_id
+    register_attributes :id, :unread, :type, :date, :data, :member_creator_id,
+      :read_only => [ :id, :unread, :type, :date, :member_creator_id ]
     validates_presence_of :id, :type, :date, :member_creator_id
 
     class << self
@@ -22,9 +23,7 @@ module Trello
 
     alias :unread? :unread
 
-    def member_creator
-      Member.find(member_creator_id)
-    end
+    one :member_creator, :via => Member, :using => :member_creator_id
 
     def board
       Client.get("/notifications/#{id}/board").json_into(Board)

data/lib/trello/organization.rb

@@ -1,7 +1,8 @@
 module Trello
   # Organizations are useful for linking members together.
   class Organization < BasicData
-    register_attributes :id, :name, :display_name, :description, :url
+    register_attributes :id, :name, :display_name, :description, :url,
+      :readonly => [ :id, :name, :display_name, :description, :url ]
     validates_presence_of :id, :name
 
     include HasActions
@@ -28,12 +29,14 @@ module Trello
 
     # Returns a list of boards under this organization.
     def 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
-      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
 
     # :nodoc:

data/lib/trello/string.rb

@@ -25,10 +25,11 @@ class String
     end
   rescue JSON::ParserError => json_error
     if json_error.message =~ /model not found/
-      logger.error "Could not find that record."
+      Trello.logger.error "Could not find that record."
       raise Trello::Error, "Request could not be found."
+    elsif json_error.message =~ /A JSON text must at least contain two octets/
     else
-      logger.error "Unknown error."
+      Trello.logger.error "Unknown error."
       raise
     end
   end

data/lib/trello/token.rb

@@ -0,0 +1,24 @@
+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)
+      end
+    end
+
+    # :nodoc:
+    def update_fields(fields)
+      attributes[:id]          = fields['id']
+      attributes[:member_id]   = fields['idMember']
+      attributes[:created_at]  = Time.iso8601(fields['dateCreated'])
+      attributes[:permissions] = fields['permissions'] || {}
+    end
+
+    # Returns a reference to the user who authorized the token.
+    one :member, :using => :member_id
+  end
+end

data/lib/trello.rb

@@ -26,21 +26,25 @@ require 'active_model'
 #
 # Feel free to {peruse and participate in our Trello board}[https://trello.com/board/ruby-trello/4f092b2ee23cb6fe6d1aaabd]. It's completely open to the public.
 module Trello
-  autoload :Action,       'trello/action'
-  autoload :BasicData,    'trello/basic_data'
-  autoload :Board,        'trello/board'
-  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'
-  autoload :Member,       'trello/member'
-  autoload :Notification, 'trello/notification'
-  autoload :Organization, 'trello/organization'
-  autoload :Request,      'trello/net'
-  autoload :TInternet,    'trello/net'
+  autoload :Action,            'trello/action'
+  autoload :Association,       'trello/association'
+  autoload :AssociationProxy,  'trello/association_proxy'
+  autoload :BasicData,         'trello/basic_data'
+  autoload :Board,             'trello/board'
+  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'
+  autoload :Member,            'trello/member'
+  autoload :MultiAssociation,  'trello/multi_association'
+  autoload :Notification,      'trello/notification'
+  autoload :Organization,      'trello/organization'
+  autoload :Request,           'trello/net'
+  autoload :TInternet,         'trello/net'
+  autoload :Token,             'trello/token'
 
   module Authorization
     autoload :AuthPolicy,      'trello/authorization'

data/spec/action_spec.rb

@@ -29,7 +29,7 @@ module Trello
       end
 
       it "gets the date" do
-        @action.date.should == @detail['date']
+        @action.date.utc.iso8601.should == @detail['date']
       end
     end
 

data/spec/board_spec.rb

@@ -44,7 +44,7 @@ module Trello
 
     context "cards" do
       it "gets its list of cards" do
-        Client.stub(:get).with("/boards/abcdef123456789123456789/cards").
+        Client.stub(:get).with("/boards/abcdef123456789123456789/cards", { :filter => :open }).
           and_return cards_payload
 
         @board.cards.count.should be > 0

data/spec/card_spec.rb

@@ -40,18 +40,29 @@ module Trello
         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", :broken => true 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"
+        payload = {
+          :name      => expected_new_name,
+          :desc      => "Awesome things are awesome.",
+          :due       => nil,
+          :closed    => false,
+          :idList    => "abcdef123456789123456789",
+          :idBoard   => "abcdef123456789123456789",
+          :idMembers => ["abcdef123456789123456789"]
+        }
 
-        Client.should_receive(:put).once.with expected_resource, :value => expected_new_name
-        @card.name = expected_new_name
+        Client.should_receive(:put).once.with("/cards/abcdef123456789123456789", payload)
+        card = @card.dup
+        card.name = expected_new_name
+        card.save
       end
     end
 
@@ -133,5 +144,35 @@ module Trello
         @card.add_comment "testing"
       end
     end
+
+    context "labels" do
+      it "can add a label" do
+        Client.stub(:post).with("/cards/abcdef123456789123456789/labels", { :value => 'green' }).
+          and_return "not important"
+        @card.add_label('green')
+        @card.errors.should be_empty
+      end
+
+      it "can remove a label" do
+        Client.stub(:delete).with("/cards/abcdef123456789123456789/labels/green").
+          and_return "not important"
+        @card.remove_label('green')
+        @card.errors.should be_empty
+      end
+
+      it "throws an error when trying to add a label with an unknown colour" do
+        Client.stub(:post).with("/cards/abcdef123456789123456789/labels", { :value => 'green' }).
+          and_return "not important"
+        @card.add_label('mauve')
+        @card.errors.full_messages.to_sentence.should == "Label colour 'mauve' does not exist"
+      end
+
+      it "throws an error when trying to remove a label with an unknown colour" do
+        Client.stub(:delete).with("/cards/abcdef123456789123456789/labels/mauve").
+          and_return "not important"
+        @card.remove_label('mauve')
+        @card.errors.full_messages.to_sentence.should == "Label colour 'mauve' does not exist"
+      end
+    end
   end
 end

data/spec/member_spec.rb

@@ -7,21 +7,21 @@ module Trello
     include Helpers
 
     before(:each) do
-      Client.stub(:get).with("/members/me").and_return user_payload
+      Client.stub(:get).with("/members/abcdef123456789012345678").and_return user_payload
 
-      @member = Member.find('me')
+      @member = Member.find('abcdef123456789012345678')
     end
 
     context "actions" do
       it "retrieves a list of actions", :refactor => true do
-        Client.stub(:get).with("/members/me/actions", { :filter => :all }).and_return actions_payload
+        Client.stub(:get).with("/members/abcdef123456789012345678/actions", { :filter => :all }).and_return actions_payload
         @member.actions.count.should be > 0
       end
     end
 
     context "boards" do
       it "has a list of boards" do
-        Client.stub(:get).with("/members/me/boards", { :filter => :all }).and_return boards_payload
+        Client.stub(:get).with("/members/abcdef123456789012345678/boards", { :filter => :all }).and_return boards_payload
         boards = @member.boards
         boards.count.should be > 0
       end
@@ -29,7 +29,7 @@ module Trello
 
     context "cards" do
       it "has a list of cards" do
-        Client.stub(:get).with("/members/me/cards", { :filter => :open }).and_return cards_payload
+        Client.stub(:get).with("/members/abcdef123456789012345678/cards", { :filter => :open }).and_return cards_payload
         cards = @member.cards
         cards.count.should be > 0
       end
@@ -37,7 +37,7 @@ module Trello
 
     context "organizations" do
       it "has a list of organizations" do
-        Client.stub(:get).with("/members/me/organizations", { :filter => :all }).and_return orgs_payload
+        Client.stub(:get).with("/members/abcdef123456789012345678/organizations", { :filter => :all }).and_return orgs_payload
         orgs = @member.organizations
         orgs.count.should be > 0
       end
@@ -45,7 +45,7 @@ module Trello
 
     context "notifications" do
       it "has a list of notifications" do
-        Client.stub(:get).with("/members/me/notifications").and_return "[" << notification_payload << "]"
+        Client.stub(:get).with("/members/abcdef123456789012345678/notifications", {}).and_return "[" << notification_payload << "]"
         @member.notifications.count.should be 1
       end
     end
@@ -83,6 +83,10 @@ module Trello
         @member.bio = "New and amazing"
         @member.changed?.should be_true
       end
+
+      it "doesn't understand the #id= method" do
+        lambda { @member.id = "42" }.should raise_error NoMethodError
+      end
     end
   end
 end

data/spec/notification_spec.rb

@@ -5,9 +5,10 @@ module Trello
     include Helpers
 
     before(:each) do
-      Client.stub(:get).with("/members/me").and_return user_payload
-      Client.stub(:get).with("/members/me/notifications").and_return "[" << notification_payload << "]"
-      @notification = Member.find("me").notifications.first
+      Client.stub(:get).with("/members/abcdef123456789012345678").and_return user_payload
+      member = Member.find("abcdef123456789012345678")
+      Client.stub(:get).with("/members/abcdef123456789012345678/notifications", {}).and_return "[" << notification_payload << "]"
+      @notification = member.notifications.first
     end
 
     context "finding" do

data/spec/oauth_policy_spec.rb

@@ -9,74 +9,85 @@ describe OAuthPolicy do
     OAuthPolicy.token = nil
   end
 
-  it "adds an authorization header" do 
-    uri = Addressable::URI.parse("https://xxx/")
+  context "2-legged" do
+    it "adds an authorization header" do 
+      uri = Addressable::URI.parse("https://xxx/")
 
-    request = Request.new :get, uri
+      request = Request.new :get, uri
 
-    authorized_request = OAuthPolicy.authorize request
-    
-    authorized_request.headers.keys.should include "Authorization"
-  end
-  
-  it "preserves query parameters" do
-    uri = Addressable::URI.parse("https://xxx/?name=Riccardo")
-    request = Request.new :get, uri
+      OAuthPolicy.token               = OAuthCredential.new "token", nil
 
-    authorized_request = OAuthPolicy.authorize request
+      authorized_request = OAuthPolicy.authorize request
+      
+      authorized_request.headers.keys.should include "Authorization"
+    end
     
-    the_query_parameters = Addressable::URI.parse(authorized_request.uri).query_values
-    the_query_parameters.should == {"name" => "Riccardo"}
-  end
+    it "preserves query parameters" do
+      uri = Addressable::URI.parse("https://xxx/?name=Riccardo")
+      request = Request.new :get, uri
 
-  it "adds the correct signature as part of authorization header" do 
-    Clock.stub(:timestamp).and_return "1327048592"
-    Nonce.stub(:next).and_return "b94ff2bf7f0a5e87a326064ae1dbb18f"
+      Clock.stub(:timestamp).and_return "1327048592"
+      Nonce.stub(:next).and_return "b94ff2bf7f0a5e87a326064ae1dbb18f"
+      OAuthPolicy.consumer_credential = OAuthCredential.new "consumer_key", "consumer_secret"
+      OAuthPolicy.token               = OAuthCredential.new "token", nil
 
-    OAuthPolicy.consumer_credential = OAuthCredential.new "consumer_key", "consumer_secret"
+      authorized_request = OAuthPolicy.authorize request
+      
+      the_query_parameters = Addressable::URI.parse(authorized_request.uri).query_values
+      the_query_parameters.should == {"name" => "Riccardo"}
+    end
 
-    request = Request.new :get, Addressable::URI.parse("http://xxx/")
+    it "adds the correct signature as part of authorization header" do 
+      Clock.stub(:timestamp).and_return "1327048592"
+      Nonce.stub(:next).and_return "b94ff2bf7f0a5e87a326064ae1dbb18f"
 
-    authorized_request = OAuthPolicy.authorize request
-    
-    authorized_request.headers["Authorization"].should =~ /oauth_signature="u7CmId4WEDUqPdHnWVf1JVChFmg%3D"/
-  end
+      OAuthPolicy.consumer_credential = OAuthCredential.new "consumer_key", "consumer_secret"
+      OAuthPolicy.token               = OAuthCredential.new "token", nil
 
-  it "adds correct signature for uri with parameters" do
-    Clock.stub(:timestamp).and_return "1327351010"
-    Nonce.stub(:next).and_return "f5474aaf44ca84df0b09870044f91c69"
+      request = Request.new :get, Addressable::URI.parse("http://xxx/")
 
-    OAuthPolicy.consumer_credential = OAuthCredential.new "consumer_key", "consumer_secret"
+      authorized_request = OAuthPolicy.authorize request
+      
+      authorized_request.headers["Authorization"].should =~ /oauth_signature="kLcSxrCTd4ATHcLmTp8q%2Foa%2BFMA%3D"/
+    end
 
-    request = Request.new :get, Addressable::URI.parse("http://xxx/?a=b")
+    it "adds correct signature for uri with parameters" do
+      Clock.stub(:timestamp).and_return "1327351010"
+      Nonce.stub(:next).and_return "f5474aaf44ca84df0b09870044f91c69"
 
-    authorized_request = OAuthPolicy.authorize request
-    
-    authorized_request.headers["Authorization"].should =~ /oauth_signature="ABL%2FcOSGJSbvvLt1gW2nV9i%2FDyA%3D"/
-  end
+      OAuthPolicy.consumer_credential = OAuthCredential.new "consumer_key", "consumer_secret"
+      OAuthPolicy.token               = OAuthCredential.new "token", nil
 
-  it "fails if consumer_credential is unset" do
-    OAuthPolicy.consumer_credential = nil
+      request = Request.new :get, Addressable::URI.parse("http://xxx/?a=b")
 
-    request = Request.new :get, Addressable::URI.parse("http://xxx/")
+      authorized_request = OAuthPolicy.authorize request
+      
+      authorized_request.headers["Authorization"].should =~ /oauth_signature="xm%2FJ1swxxPb6mnuR1Q1ucJMdGRk%3D"/
+    end
 
-    lambda{OAuthPolicy.authorize request}.should raise_error "The consumer_credential has not been supplied."
-  end
+    it "fails if consumer_credential is unset" do
+      OAuthPolicy.consumer_credential = nil
 
-  it "can sign with token" do
-    Clock.stub(:timestamp).and_return "1327360530"
-    Nonce.stub(:next).and_return "4f610cb28e7aa8711558de5234af1f0e"
+      request = Request.new :get, Addressable::URI.parse("http://xxx/")
 
-    OAuthPolicy.consumer_credential = OAuthCredential.new "consumer_key", "consumer_secret"
-    OAuthPolicy.token  = OAuthCredential.new "token_key", "token_secret"
+      lambda{OAuthPolicy.authorize request}.should raise_error "The consumer_credential has not been supplied."
+    end
 
-    request = Request.new :get, Addressable::URI.parse("http://xxx/")
+    it "can sign with token" do
+      Clock.stub(:timestamp).and_return "1327360530"
+      Nonce.stub(:next).and_return "4f610cb28e7aa8711558de5234af1f0e"
 
-    authorized_request = OAuthPolicy.authorize request
+      OAuthPolicy.consumer_credential = OAuthCredential.new "consumer_key", "consumer_secret"
+      OAuthPolicy.token  = OAuthCredential.new "token_key", "token_secret"
 
-    authorized_request.headers["Authorization"].should =~ /oauth_signature="1Boj4fo6KiXA4xGD%2BKF5QOD36PI%3D"/
-  end
+      request = Request.new :get, Addressable::URI.parse("http://xxx/")
 
-  it "adds correct signature for https uri"
-  it "adds correct signature for verbs other than get"
+      authorized_request = OAuthPolicy.authorize request
+
+      authorized_request.headers["Authorization"].should =~ /oauth_signature="3JeZSzsLCYnGNdVALZMgbzQKN44%3D"/
+    end
+
+    it "adds correct signature for https uri"
+    it "adds correct signature for verbs other than get"
+  end
 end

data/spec/spec_helper.rb

@@ -140,7 +140,7 @@ module Helpers
           "name"        => "Assembler"
         }
       },
-      "date"            => "2012-02-10T11:32:17.447Z",
+      "date"            => "2012-02-10T11:32:17Z",
       "type"            => "createCard"
     }]
   end
@@ -198,4 +198,36 @@ module Helpers
   def organization_payload
     JSON.generate(organization_details)
   end
+
+  def token_details
+    {
+      "id"            => "4f2c10c7b3eb95a45b294cd5",
+      "idMember"      => "abcdef123456789123456789",
+      "dateCreated"   => "2012-02-03T16:52:23.661Z",
+      "permissions"   => [
+        {
+          "idModel"   => "me",
+          "modelType" => "Member",
+          "read"      => true,
+          "write"     => true
+        },
+        {
+          "idModel"   => "*",
+          "modelType" => "Board",
+          "read"      => true,
+          "write"     => true
+        },
+        {
+          "idModel"   => "*",
+          "modelType" => "Organization",
+          "read"      => true,
+          "write"     => true
+        }
+      ]
+    }
+  end
+
+  def token_payload
+    JSON.generate(token_details)
+  end
 end

data/spec/token_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Trello
+  describe Token do
+    include Helpers
+
+    before(:each) do
+      Client.stub(:get).with("/tokens/1234").and_return token_payload
+      @token = Token.find("1234")
+    end
+
+    context "attributes" do
+      it "has an id" do
+        @token.id.should == "4f2c10c7b3eb95a45b294cd5"
+      end
+
+      it "gets its created_at date" do
+        @token.created_at.should == Time.iso8601("2012-02-03T16:52:23.661Z")
+      end
+
+      it "has a permission grant" do
+        @token.permissions.count.should be 3
+      end
+    end
+
+    context "members" do
+      it "retrieves the member who authorized the token" do
+        Client.stub(:get).with("/members/abcdef123456789123456789").and_return user_payload
+        @token.member.should == Member.find("abcdef123456789123456789")
+      end
+    end
+  end
+end