ruby-trello 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4d52816b20573e0e428d30639952518f52c303e
-  data.tar.gz: ba52ccc7483b34f53d018cdef8be47565959c1b0
+  metadata.gz: 646b1425d617c5840facf57bee4cf7b52a7ef4a7
+  data.tar.gz: 805feb33ce7d86288b20612451bbe523fce80e91
 SHA512:
-  metadata.gz: 64d9ab9659f109dca082bf07764aa695c6487e294c6b5fd9e3e951ffc8492d24ab26e80a676648a2dd3f877f7d2c2b3c00e4bf7b8fab742d7caae67f1e1a4511
-  data.tar.gz: 06941e4963b76afb942927c2657e07544fa44e698655bb1d4a6d74c6457b53fec9aa695615076ff3b544bafe9a7e679918f510111358bf5c690f246254530bf4
+  metadata.gz: d5c21fc97bbfe409dadf87336190dd6ec1c875bae9f4154ae761529a1dae50c17fe7757af4b9cb66c6bf40498c8a2f9a9085da1978ddfba279486c93bdb09baa
+  data.tar.gz: 74655e09b8a6fb6ed6a00e10a63b5e4f4d9e9b7d4014aaf74575e8a473f9644e9759f75b6f9722800b8af2852de8e2a75dbd706afc1404c3f50c778120dc9cf7

data/lib/trello.rb

@@ -41,6 +41,7 @@ module Trello
   autoload :Association,       'trello/association'
   autoload :AssociationProxy,  'trello/association_proxy'
   autoload :Attachment,        'trello/attachment'
+  autoload :CoverImage,        'trello/cover_image'
   autoload :BasicData,         'trello/basic_data'
   autoload :Board,             'trello/board'
   autoload :Card,              'trello/card'

data/lib/trello/action.rb

@@ -1,8 +1,8 @@
 module Trello
   # Action represents some event that occurred. For instance, when a card is created.
   class Action < BasicData
-    register_attributes :id, :type, :data, :date, :member_creator_id,
-      :readonly => [ :id, :type, :data, :date, :member_creator_id ]
+    register_attributes :id, :type, :data, :date, :member_creator_id, :member_participant,
+      :readonly => [ :id, :type, :data, :date, :member_creator_id, :member_participant ]
     validates_presence_of :id, :type, :date, :member_creator_id
 
     class << self
@@ -10,6 +10,14 @@ module Trello
       def find(id, params = {})
         client.find(:action, id, params)
       end
+
+      def search(query, opts={})
+        response = client.get("/search/", { query: query }.merge(opts))
+        formatted_response = JSON.parse(response).except("options").inject({}) do |res, key|
+          res.merge!({ key.first => key.last.jsoned_into("Trello::#{key.first.singularize.capitalize}".constantize) })
+          res
+        end
+      end
     end
 
     # Update the attributes of an action
@@ -17,11 +25,12 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an Action.
     def update_fields(fields)
-      attributes[:id]                = fields['id']
-      attributes[:type]              = fields['type']
-      attributes[:data]              = fields['data']
-      attributes[:date]              = Time.iso8601(fields['date'])
-      attributes[:member_creator_id] = fields['idMemberCreator']
+      attributes[:id]                 = fields['id']
+      attributes[:type]               = fields['type']
+      attributes[:data]               = fields['data']
+      attributes[:date]               = Time.iso8601(fields['date'])
+      attributes[:member_creator_id]  = fields['idMemberCreator']
+      attributes[:member_participant] = fields['member']
       self
     end
 

data/lib/trello/basic_data.rb

@@ -1,4 +1,7 @@
-require 'trello/string'
+require 'trello/core_ext/array'
+require 'trello/core_ext/hash'
+require 'trello/core_ext/string'
+require 'active_support/inflector'
 
 module Trello
   class BasicData

data/lib/trello/board.rb

@@ -1,7 +1,7 @@
 module Trello
   class Board < BasicData
     register_attributes :id, :name, :description, :closed, :url, :organization_id, :prefs,
-      :readonly => [ :id, :url, :organization_id, :prefs ]
+      :readonly => [ :id, :url, :prefs ]
     validates_presence_of :id, :name
     validates_length_of   :name,        :in      => 1..16384
     validates_length_of   :description, :maximum => 16384
@@ -15,10 +15,12 @@ module Trello
       end
 
       def create(fields)
-        client.create(:board,
+        data = {
           'name'   => fields[:name],
           'desc'   => fields[:description],
-          'closed' => fields[:closed] || false)
+          'closed' => fields[:closed] || false }
+        data.merge!('idOrganization' => fields[:organization_id]) if fields[:organization_id]
+        client.create(:board, data)
       end
 
       def all

data/lib/trello/card.rb

@@ -1,14 +1,36 @@
 module Trello
   # A Card is a container that can house checklists and comments; it resides inside a List.
   class Card < BasicData
-    register_attributes :id, :short_id, :name, :desc, :due, :closed, :url, :board_id, :member_ids, :list_id, :pos, :last_activity_date,
-      :readonly => [ :id, :short_id, :url, :board_id, :member_ids, :last_activity_date ]
+    register_attributes :id, :short_id, :name, :desc, :due, :closed, :url, :short_url,
+      :board_id, :member_ids, :list_id, :pos, :last_activity_date, :card_labels, 
+      :cover_image_id, :badges, :card_members,
+      :readonly => [ :id, :short_id, :url, :short_url, :last_activity_date, :badges, :card_members ]
     validates_presence_of :id, :name, :list_id
     validates_length_of   :name,        :in => 1..16384
     validates_length_of   :desc, :in => 0..16384
 
     include HasActions
 
+    SYMBOL_TO_STRING = {
+      id: 'id',
+      short_id: 'idShort',
+      name: 'name',
+      desc: 'desc',
+      due: 'due',
+      closed: 'closed',
+      url: 'url',
+      short_url: 'shortUrl',
+      board_id: 'idBoard',
+      member_ids: 'idMembers',
+      cover_image_id: 'idAttachmentCover',
+      list_id: 'idList',
+      pos: 'pos',
+      last_activity_date: 'dateLastActivity',
+      card_labels: 'labels',
+      badges: 'badges',
+      card_members: 'members'
+    }
+
     class << self
       # Find a specific card by its id.
       def find(id, params = {})
@@ -18,9 +40,12 @@ module Trello
       # Create a new card and save it on Trello.
       def create(options)
         client.create(:card,
-            'name' => options[:name],
-            'idList' => options[:list_id],
-            'desc'   => options[:desc])
+          'name' => options[:name],
+          'idList' => options[:list_id],
+          'desc'   => options[:desc],
+          'idMembers' => options[:member_ids],
+          'labels' => options[:card_labels]
+        )
       end
     end
 
@@ -29,23 +54,30 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # a card.
     def update_fields(fields)
-      attributes[:id]                 = fields['id']
-      attributes[:short_id]           = fields['idShort']
-      attributes[:name]               = fields['name']
-      attributes[:desc]               = fields['desc']
-      attributes[:due]                = Time.iso8601(fields['due']) rescue nil
-      attributes[:closed]             = fields['closed']
-      attributes[:url]                = fields['url']
-      attributes[:board_id]           = fields['idBoard']
-      attributes[:member_ids]         = fields['idMembers']
-      attributes[:list_id]            = fields['idList']
-      attributes[:pos]                = fields['pos']
-      attributes[:last_activity_date] = Time.iso8601(fields['dateLastActivity']) rescue nil
+      attributes[:id]                 = fields[SYMBOL_TO_STRING[:id]]
+      attributes[:short_id]           = fields[SYMBOL_TO_STRING[:short_id]]
+      attributes[:name]               = fields[SYMBOL_TO_STRING[:name]]
+      attributes[:desc]               = fields[SYMBOL_TO_STRING[:desc]]
+      attributes[:due]                = Time.iso8601(fields[SYMBOL_TO_STRING[:due]]) rescue nil
+      attributes[:closed]             = fields[SYMBOL_TO_STRING[:closed]]
+      attributes[:url]                = fields[SYMBOL_TO_STRING[:url]]
+      attributes[:short_url]          = fields[SYMBOL_TO_STRING[:short_url]]
+      attributes[:board_id]           = fields[SYMBOL_TO_STRING[:board_id]]
+      attributes[:member_ids]         = fields[SYMBOL_TO_STRING[:member_ids]]
+      attributes[:list_id]            = fields[SYMBOL_TO_STRING[:list_id]]
+      attributes[:pos]                = fields[SYMBOL_TO_STRING[:post]]
+      attributes[:card_labels]        = fields[SYMBOL_TO_STRING[:card_labels]]
+      attributes[:last_activity_date] = Time.iso8601(fields[SYMBOL_TO_STRING[:last_activity_date]]) rescue nil
+      attributes[:cover_image_id]     = fields[SYMBOL_TO_STRING[:cover_image_id]]
+      attributes[:badges]             = fields[SYMBOL_TO_STRING[:badges]]
+      attributes[:card_members]       = fields[SYMBOL_TO_STRING[:card_members]]
       self
     end
 
     # Returns a reference to the board this card is part of.
     one :board, :path => :boards, :using => :board_id
+    # Returns a reference to the cover image attachment
+    one :cover_image, :path => :attachments, :using => :cover_image_id
 
     # Returns a list of checklists associated with the card.
     #
@@ -77,9 +109,11 @@ module Trello
       return update! if id
 
       client.post("/cards", {
-        :name   => name,
-        :desc   => desc,
-        :idList => list_id
+        name:   name,
+        desc:   desc,
+        idList: list_id,
+        idMembers: member_ids,
+        labels: card_labels
       }).json_into(self)
     end
 
@@ -90,7 +124,7 @@ module Trello
     def update!
       @previously_changed = changes
       # extract only new values to build payload
-      payload = Hash[changes.map { |key, values| [key.to_sym.eql?(:list_id) ? :idList : key.to_sym, values[1]] }]
+      payload = Hash[changes.map { |key, values| [SYMBOL_TO_STRING[key.to_sym].to_sym, values[1]] }]
       @changed_attributes.clear
 
       client.put("/cards/#{id}", payload)

data/lib/trello/checklist.rb

@@ -1,7 +1,7 @@
 module Trello
   # A Checklist holds items which are like a "task" list. Checklists are linked to a card.
   class Checklist < BasicData
-    register_attributes :id, :name, :description, :closed, :url, :check_items, :board_id, :list_id, :member_ids,
+    register_attributes :id, :name, :description, :closed, :position, :url, :check_items, :board_id, :list_id, :member_ids,
                         :readonly => [:id, :description, :closed, :url, :check_items, :board_id, :list_id, :member_ids]
     validates_presence_of :id, :board_id, :list_id
     validates_length_of :name, :in => 1..16384
@@ -30,6 +30,7 @@ module Trello
       attributes[:closed] = fields['closed']
       attributes[:url] = fields['url']
       attributes[:check_items] = fields['checkItems']
+      attributes[:position] = fields['position']
       attributes[:board_id] = fields['idBoard']
       attributes[:list_id] = fields['idList']
       attributes[:member_ids] = fields['idMembers']
@@ -52,7 +53,7 @@ module Trello
     end
 
     def update!
-      client.put("/checklists/#{id}", {:name => name}).json_into(self)
+      client.put("/checklists/#{id}", {:name => name, :pos => position}).json_into(self)
     end
 
     # Return a list of items on the checklist.

data/lib/trello/client.rb

@@ -1,5 +1,6 @@
 require 'addressable/uri'
 require 'forwardable'
+require 'active_support/inflector'
 
 module Trello
   class Client

data/lib/trello/core_ext/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def jsoned_into(obj)
+    self.map { |element| element.jsoned_into(obj) }
+  end
+end

data/lib/trello/core_ext/hash.rb

@@ -0,0 +1,6 @@
+class Hash
+  def jsoned_into(obj)
+    action = obj.kind_of?(Class) ? :new : :update_fields
+    obj.send(action, self)
+  end
+end

data/lib/trello/{string.rb → core_ext/string.rb}

@@ -17,12 +17,7 @@ class String
   #   thing.b == "foo"
   def json_into(obj)
     data = JSON.parse(self)
-    action = obj.kind_of?(Class) ? :new : :update_fields
-    if data.kind_of? Hash
-      obj.send(action, JSON.parse(self))
-    else
-      data.map { |element| obj.send(action, element) }
-    end
+    data.jsoned_into(obj)
   rescue JSON::ParserError => json_error
     if json_error.message =~ /model not found/
       Trello.logger.error "Could not find that record."

data/lib/trello/cover_image.rb

@@ -0,0 +1,8 @@
+module Trello
+  # The trello cover image
+  #
+  # This is normally an attachment that the user (or trello) has set
+  # as the cover image
+  class CoverImage < Attachment
+  end
+end

data/lib/trello/organization.rb

@@ -34,8 +34,8 @@ module Trello
     end
 
     # Returns an array of members associated with the organization.
-    def members
-      members = client.get("/organizations/#{id}/members/all").json_into(Member)
+    def members(params = {})
+      members = client.get("/organizations/#{id}/members/all", params).json_into(Member)
       MultiAssociation.new(self, members).proxy
     end
 

data/spec/action_spec.rb

@@ -25,6 +25,15 @@ module Trello
       end
     end
 
+    context 'search' do
+      let(:client) { Trello.client }
+
+      it "should search and get back a card object" do
+        client.should_receive(:get).with("/search/", { query: "something"}).and_return(JSON.generate({ "cards" => cards_details }))
+        Action.search("something").should eq({ "cards" => cards_details.jsoned_into(Card) })
+      end
+    end
+
     context 'fields' do
       let(:detail) { actions_details.first }
 

data/spec/array_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+require 'trello/core_ext/array'
+
+describe Array, '#jsoned_into' do
+  include Helpers
+
+  it "should convert an array of parsed json into cards" do
+    cards_details.jsoned_into(Trello::Card).should eq([cards_details.first.jsoned_into(Trello::Card)])
+  end
+end

data/spec/card_spec.rb

@@ -51,7 +51,7 @@ module Trello
 
         result = JSON.generate(cards_details.first.merge(payload.merge(:idList => lists_details.first['id'])))
 
-        expected_payload = {:name => "Test Card", :desc => nil, :idList => "abcdef123456789123456789"}
+        expected_payload = {name: "Test Card", desc: nil, idList: "abcdef123456789123456789", idMembers: nil, labels: nil }
 
         client.should_receive(:post).with("/cards", expected_payload).and_return result
 
@@ -108,9 +108,17 @@ module Trello
         card.url.should_not be_nil
       end
 
+      it "gets its short url" do
+        card.short_url.should_not be_nil
+      end
+
       it "gets its last active date" do
         card.last_activity_date.should_not be_nil
       end
+
+      it "gets its cover image id" do
+        card.cover_image_id.should_not be_nil
+      end
     end
 
     context "actions" do
@@ -132,6 +140,13 @@ module Trello
       end
     end
 
+    context "cover image" do
+      it "has a cover image" do
+        client.stub(:get).with("/attachments/abcdef123456789123456789", {}).and_return JSON.generate(attachments_details.first)
+        card.cover_image.should_not be_nil
+      end
+    end
+
     context "checklists" do
       it "has a list of checklists" do
         client.stub(:get).with("/cards/abcdef123456789123456789/checklists", { :filter => :all }).and_return checklists_payload

data/spec/checklist_spec.rb

@@ -66,7 +66,8 @@ module Trello
         expected_new_name = "xxx"
         expected_resource = "/checklists/abcdef123456789123456789"
         payload = {
-            :name => expected_new_name
+            :name => expected_new_name,
+            :pos => checklist.position
         }
 
         result = JSON.generate(checklists_details.first)
@@ -76,6 +77,21 @@ module Trello
         checklist.save
       end
 
+      it "updating position does a put on the correct resource with the correct value" do
+        expected_new_position = 33
+        expected_resource = "/checklists/abcdef123456789123456789"
+        payload = {
+            :name => checklist.name,
+            :pos => expected_new_position
+        }
+
+        result = JSON.generate(checklists_details.first)
+        client.should_receive(:put).once.with(expected_resource, payload).and_return result
+
+        checklist.position = expected_new_position
+        checklist.save
+      end
+
       it "adds an item" do
         expected_item_name = "item1"
         expected_checked = true

data/spec/hash_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'trello/core_ext/hash'
+
+describe Hash, '#jsoned_into' do
+  include Helpers
+
+  it "should convert a single parsed json into card" do
+    Trello::Card.should_receive(:new).once.with(cards_details.first)
+    cards_details.first.jsoned_into(Trello::Card)
+  end
+end

data/spec/spec_helper.rb

@@ -70,6 +70,7 @@ module Helpers
       'name'       => 'Test Checklist',
       'desc'       => 'A marvelous little checklist',
       'closed'     => false,
+      'position'   => 16384,
       'url'        => 'https://trello.com/blah/blah',
       'idBoard'    => 'abcdef123456789123456789',
       'idList'     => 'abcdef123456789123456789',
@@ -105,8 +106,10 @@ module Helpers
       'closed'            => false,
       'idList'            => 'abcdef123456789123456789',
       'idBoard'           => 'abcdef123456789123456789',
+      'idAttachmentCover' => 'abcdef123456789123456789',
       'idMembers'         => ['abcdef123456789123456789'],
       'url'               => 'https://trello.com/card/board/specify-the-type-and-scope-of-the-jit-in-a-lightweight-spec/abcdef123456789123456789/abcdef123456789123456789',
+      'shortUrl'          => 'https://trello.com/c/abcdef12',
       'pos'               => 12,
       'dateLastActivity'  => '2012-12-07T18:40:24.314Z'
     }]

data/spec/string_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'trello/string'
+require 'trello/core_ext/string'
 
 describe String, '#json_into' do
   include Helpers
@@ -24,9 +24,9 @@ describe String, '#json_into' do
       "name"        => "Jazz Kang",
       "description" => "Plonker"
     })
-    
+
     json_text = '{"name" : "Jazz Kang", "description": "Plonker"}'
-    
+
     json_text.json_into example_class
   end
 
@@ -37,7 +37,7 @@ describe String, '#json_into' do
        {"name" : "Phil Murphy", "description": "Shoreditch hipster"}
       ]
     JSON
-    
+
     result = json_text.json_into example_class
 
     result.should be_an Array
@@ -47,4 +47,4 @@ describe String, '#json_into' do
     end
   end
 end
- 
+

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ruby-trello
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jeremy Tregunna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
@@ -98,6 +98,10 @@ files:
 - lib/trello/checklist.rb
 - lib/trello/client.rb
 - lib/trello/configuration.rb
+- lib/trello/core_ext/array.rb
+- lib/trello/core_ext/hash.rb
+- lib/trello/core_ext/string.rb
+- lib/trello/cover_image.rb
 - lib/trello/has_actions.rb
 - lib/trello/item.rb
 - lib/trello/item_state.rb
@@ -109,12 +113,12 @@ files:
 - lib/trello/net.rb
 - lib/trello/notification.rb
 - lib/trello/organization.rb
-- lib/trello/string.rb
 - lib/trello/token.rb
 - lib/trello/webhook.rb
 - lib/trello.rb
 - README.md
 - spec/action_spec.rb
+- spec/array_spec.rb
 - spec/association_spec.rb
 - spec/basic_auth_policy_spec.rb
 - spec/board_spec.rb
@@ -122,6 +126,7 @@ files:
 - spec/checklist_spec.rb
 - spec/client_spec.rb
 - spec/configuration_spec.rb
+- spec/hash_spec.rb
 - spec/integration/how_to_authorize_spec.rb
 - spec/integration/how_to_use_boards_spec.rb
 - spec/integration/integration_test.rb
@@ -164,6 +169,7 @@ specification_version: 4
 summary: A wrapper around the trello.com API.
 test_files:
 - spec/action_spec.rb
+- spec/array_spec.rb
 - spec/association_spec.rb
 - spec/basic_auth_policy_spec.rb
 - spec/board_spec.rb
@@ -171,6 +177,7 @@ test_files:
 - spec/checklist_spec.rb
 - spec/client_spec.rb
 - spec/configuration_spec.rb
+- spec/hash_spec.rb
 - spec/integration/how_to_authorize_spec.rb
 - spec/integration/how_to_use_boards_spec.rb
 - spec/integration/integration_test.rb