ruby-trello 2.0.0 → 2.3.1

data/lib/trello/label_name.rb

@@ -9,16 +9,16 @@ module Trello
     # Supply a hash of stringkeyed data retrieved from the Trello API representing
     # a label.
     def update_fields(fields)
-      attributes[:yellow]  = fields['yellow']
-      attributes[:red] = fields['red']
-      attributes[:orange] = fields['orange']
-      attributes[:green] = fields['green']
-      attributes[:purple] = fields['purple']
-      attributes[:blue] = fields['blue']
-      attributes[:sky] = fields['sky']
-      attributes[:pink] = fields['pink']
-      attributes[:lime] = fields['lime']
-      attributes[:black] = fields['black']
+      attributes[:yellow]  = fields['yellow'] || attributes[:yellow]
+      attributes[:red] = fields['red'] || attributes[:red]
+      attributes[:orange] = fields['orange'] || attributes[:orange]
+      attributes[:green] = fields['green'] || attributes[:green]
+      attributes[:purple] = fields['purple'] || attributes[:purple]
+      attributes[:blue] = fields['blue'] || attributes[:blue]
+      attributes[:sky] = fields['sky'] || attributes[:sky]
+      attributes[:pink] = fields['pink'] || attributes[:pink]
+      attributes[:lime] = fields['lime'] || attributes[:lime]
+      attributes[:black] = fields['black'] || attributes[:black]
 
       self
     end

data/lib/trello/list.rb

@@ -41,12 +41,12 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # a List.
     def update_fields(fields)
-      attributes[:id]             = fields['id']
-      attributes[:name]           = fields['name'] || fields[:name]
-      attributes[:closed]         = fields['closed']
-      attributes[:board_id]       = fields['idBoard'] || fields[:board_id]
-      attributes[:pos]            = fields['pos'] || fields[:pos]
-      attributes[:source_list_id] = fields['idListSource'] || fields[:source_list_id]
+      attributes[:id]             = fields['id'] || attributes[:id]
+      attributes[:name]           = fields['name'] || fields[:name] || attributes[:name]
+      attributes[:closed]         = fields['closed'] if fields.has_key?('closed')
+      attributes[:board_id]       = fields['idBoard'] || fields[:board_id] || attributes[:board_id]
+      attributes[:pos]            = fields['pos'] || fields[:pos] || attributes[:pos]
+      attributes[:source_list_id] = fields['idListSource'] || fields[:source_list_id] || attributes[:source_list_id]
       self
     end
 

data/lib/trello/member.rb

@@ -39,14 +39,14 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an Member.
     def update_fields(fields)
-      attributes[:id]        = fields['id']
-      attributes[:full_name] = fields['fullName']
-      attributes[:email]     = fields['email']
-      attributes[:username]  = fields['username']
-      attributes[:initials]  = fields['initials']
-      attributes[:avatar_id] = fields['avatarHash']
-      attributes[:bio]       = fields['bio']
-      attributes[:url]       = fields['url']
+      attributes[:id]        = fields['id'] || attributes[:id]
+      attributes[:full_name] = fields['fullName'] || attributes[:full_name]
+      attributes[:email]     = fields['email'] || attributes[:email]
+      attributes[:username]  = fields['username'] || attributes[:username]
+      attributes[:initials]  = fields['initials'] || attributes[:initials]
+      attributes[:avatar_id] = fields['avatarHash'] || attributes[:avatar_id]
+      attributes[:bio]       = fields['bio'] || attributes[:bio]
+      attributes[:url]       = fields['url'] || attributes[:url]
       self
     end
 
@@ -92,7 +92,8 @@ module Trello
 
     def save
       @previously_changed = changes
-      @changed_attributes.clear
+      @changed_attributes.clear if @changed_attributes.respond_to?(:clear)
+      changes_applied if respond_to?(:changes_applied)
 
       return update! if id
     end

data/lib/trello/notification.rb

@@ -25,12 +25,12 @@ module Trello
     end
 
     def update_fields(fields)
-      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']
+      attributes[:id]                = fields['id'] || attributes[:id]
+      attributes[:unread]            = fields['unread'] if fields.has_key?('unread')
+      attributes[:type]              = fields['type'] || attributes[:type]
+      attributes[:date]              = fields['date'] || attributes[:date]
+      attributes[:data]              = fields['data'] || attributes[:data]
+      attributes[:member_creator_id] = fields['idMemberCreator'] || attributes[:member_creator_id]
       self
     end
 

data/lib/trello/organization.rb

@@ -34,17 +34,17 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an Organization.
     def update_fields(fields)
-      attributes[:id]                           = fields['id']
-      attributes[:name]                         = fields['name']
-      attributes[:display_name]                 = fields['displayName']
-      attributes[:description]                  = fields['desc']
-      attributes[:url]                          = fields['url']
-      attributes[:invited]                      = fields['invited']
-      attributes[:website]                      = fields['website']
-      attributes[:logo_hash]                    = fields['logoHash']
-      attributes[:billable_member_count]        = fields['billableMemberCount']
-      attributes[:active_billable_member_count] = fields['activeBillableMemberCount']
-      attributes[:memberships]                  = fields['memberships']
+      attributes[:id]                           = fields['id'] || attributes[:id]
+      attributes[:name]                         = fields['name'] || attributes[:name]
+      attributes[:display_name]                 = fields['displayName'] || attributes[:display_name]
+      attributes[:description]                  = fields['desc'] || attributes[:description]
+      attributes[:url]                          = fields['url'] || attributes[:url]
+      attributes[:invited]                      = fields['invited'] if fields.has_key?('invited')
+      attributes[:website]                      = fields['website'] || attributes[:website]
+      attributes[:logo_hash]                    = fields['logoHash'] || attributes[:logo_hash]
+      attributes[:billable_member_count]        = fields['billableMemberCount'] || attributes[:billable_member_count]
+      attributes[:active_billable_member_count] = fields['activeBillableMemberCount'] || attributes[:active_billable_member_count]
+      attributes[:memberships]                  = fields['memberships'] || attributes[:memberships]
       self
     end
 

data/lib/trello/plugin_datum.rb

@@ -21,12 +21,12 @@ module Trello
     # Supply a hash of stringkeyed data retrieved from the Trello API representing
     # an attachment.
     def update_fields(fields)
-      attributes[:id]        = fields['id']
-      attributes[:idPlugin]  = fields['idPlugin']
-      attributes[:scope]     = fields['scope']
-      attributes[:value]     = JSON.parse fields['value']
-      attributes[:idModel]   = fields['idModel']
-      attributes[:access]    = fields['access']
+      attributes[:id]        = fields['id'] || attributes[:id]
+      attributes[:idPlugin]  = fields['idPlugin'] || attributes[:idPlugin]
+      attributes[:scope]     = fields['scope'] || attributes[:scope]
+      attributes[:value]     = JSON.parse(fields['value']).presence if fields.has_key?('value')
+      attributes[:idModel]   = fields['idModel'] || attributes[:idModel]
+      attributes[:access]    = fields['access'] || attributes[:access]
       self
     end
   end

data/lib/trello/register_attributes.rb

@@ -0,0 +1,54 @@
+module Trello
+  class RegisterAttributes
+    class << self
+      def execute(model_klass, names, readonly_names)
+        names ||= []
+        readonly_names ||= []
+
+        define_method_attributes(model_klass, names)
+        define_getters(model_klass, names)
+        define_setters(model_klass, names, readonly_names)
+        track_attributes_changes(model_klass, names)
+      end
+
+      private
+
+      def define_method_attributes(model_klass, names)
+        model_klass.class_eval do
+          define_method :attributes do
+            @__attributes ||= names.reduce({}) do |attrs, name|
+              attrs.merge(name.to_sym => nil)
+            end
+          end
+        end
+      end
+
+      def define_getters(model_klass, names)
+        model_klass.class_eval do
+          names.each do |key|
+            define_method(key) { @__attributes[key] }
+          end
+        end
+      end
+
+      def define_setters(model_klass, names, readonly_names)
+        model_klass.class_eval do
+          names.each do |key|
+            next if readonly_names.include?(key.to_sym)
+
+            define_method("#{key}=") do |value|
+              send("#{key}_will_change!") if value != @__attributes[key]
+              @__attributes[key] = value
+            end
+          end
+        end
+      end
+
+      def track_attributes_changes(model_klass, names)
+        model_klass.class_eval do
+          define_attribute_methods(names)
+        end
+      end
+    end
+  end
+end

data/lib/trello/token.rb

@@ -23,11 +23,12 @@ module Trello
 
     # :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'] || {}
-      attributes[:webhooks]    = fields['webhooks']
+      attributes[:id]          = fields['id'] || attributes[:id]
+      attributes[:member_id]   = fields['idMember'] || attributes[:member_id]
+      attributes[:created_at]  = Time.iso8601(fields['dateCreated']) rescue nil if fields.has_key?('dateCreated')
+      attributes[:permissions] = fields['permissions'] || attributes[:permissions]
+      attributes[:permissions] ||= {}
+      attributes[:webhooks]    = fields['webhooks'] || attributes[:webhooks]
     end
 
     # Returns a reference to the user who authorized the token.

data/lib/trello/webhook.rb

@@ -48,11 +48,11 @@ module Trello
 
     # @return [Trello::Webhook] self
     def update_fields(fields)
-      attributes[:id]              = fields['id']
-      attributes[:description]     = fields['description'] || fields[:description]
-      attributes[:id_model]        = fields['idModel'] || fields[:id_model]
-      attributes[:callback_url]    = fields['callbackURL'] || fields[:callback_url]
-      attributes[:active]          = fields['active']
+      attributes[:id]              = fields['id'] || attributes[:id]
+      attributes[:description]     = fields['description'] || fields[:description] || attributes[:description]
+      attributes[:id_model]        = fields['idModel'] || fields[:id_model] || attributes[:id_model]
+      attributes[:callback_url]    = fields['callbackURL'] || fields[:callback_url] || attributes[:callback_url]
+      attributes[:active]          = fields['active'] if fields.has_key?('active')
       self
     end
 

data/spec/action_spec.rb

@@ -116,7 +116,7 @@ module Trello
       before do
         allow(client)
           .to receive(:get)
-          .with('/members/abcdef123456789123456789', {})
+          .with('/actions/4ee2482134a81a757a08af47/memberCreator')
           .and_return user_payload
       end
 
@@ -124,5 +124,26 @@ module Trello
         expect(action.member_creator).to_not be_nil
       end
     end
+
+    describe "#update_fields" do
+      it "does not set any fields when the fields argument is empty" do
+        expected = {
+          'id' => 'id',
+          'type' => 'type',
+          'data' => 'data',
+          'idMemberCreator' => 'member_creator_id',
+          'member' => 'member_participant'
+        }
+
+        action = Action.new(expected)
+        action.client = client
+
+        action.update_fields({})
+
+        expected.each do |key, value|
+          expect(action.send(value)).to eq expected[key]
+        end
+      end
+    end
   end
 end

data/spec/basic_data_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+module Trello
+  describe BasicData do
+    describe "equality" do
+      specify "two objects of the same type are equal if their id values are equal" do
+        data_object = Card.new('id' => 'abc123')
+        other_data_object = Card.new('id' => 'abc123')
+
+        expect(data_object).to eq(other_data_object)
+      end
+
+      specify "two object of the samy type are not equal if their id values are different" do
+        data_object = Card.new('id' => 'abc123')
+        other_data_object = Card.new('id' => 'def456')
+
+        expect(data_object).not_to eq(other_data_object)
+      end
+
+      specify "two object of different types are not equal even if their id values are equal" do
+        card = Card.new('id' => 'abc123')
+        list = List.new('id' => 'abc123')
+
+        expect(card.id).to eq(list.id)
+        expect(card).to_not eq(list)
+      end
+    end
+
+    describe "hash equality" do
+      specify "two objects of the same type point to the same hash key" do
+        data_object = Card.new('id' => 'abc123')
+        other_data_object = Card.new('id' => 'abc123')
+
+        hash = {data_object => 'one'}
+
+        expect(hash[other_data_object]).to eq('one')
+      end
+
+      specify "two object of the same type with different ids do not point to the same hash key" do
+        data_object = Card.new('id' => 'abc123')
+        other_data_object = Card.new('id' => 'def456')
+
+        hash = {data_object => 'one'}
+
+        expect(hash[other_data_object]).to be_nil
+      end
+
+      specify "two object of different types with same ids do not point to the same hash key" do
+        card = Card.new('id' => 'abc123')
+        list = List.new('id' => 'abc123')
+
+        hash = {card => 'one'}
+
+        expect(hash[list]).to be_nil
+      end
+    end
+  end
+end

data/spec/board_spec.rb

@@ -225,6 +225,19 @@ module Trello
       end
     end
 
+    context "checklists" do
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/checklists", {filter: :all})
+          .and_return checklists_payload
+      end
+
+      it "has a list of checklists" do
+        expect(board.checklists.count).to be > 0
+      end
+    end
+
     context "organization" do
       before do
         allow(client)
@@ -238,6 +251,19 @@ module Trello
       end
     end
 
+    context "custom fields" do
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/boards/abcdef123456789123456789/customFields", {})
+          .and_return JSON.generate([custom_fields_details.first])
+      end
+
+      it "has custom fields" do
+        expect(board.custom_fields.count).to be > 0
+      end
+    end
+
     it "is not closed" do
       expect(board).not_to be_closed
     end
@@ -317,7 +343,7 @@ module Trello
       end
 
       it "puts all fields except id" do
-        expected_fields = %w{ name description closed starred idOrganization}.map { |s| s.to_sym }
+        expected_fields = %w{ name desc closed starred idOrganization}.map { |s| s.to_sym }
 
         expect(client).to receive(:put) do |anything, body|
           expect(body.keys).to match expected_fields
@@ -369,7 +395,7 @@ module Trello
           .to receive(:put)
           .with("/boards/#{board.id}/", {
             name: "new name",
-            description: "new description",
+            desc: "new description",
             closed: true,
             starred: true,
             idOrganization: nil })

data/spec/card_spec.rb

@@ -187,6 +187,7 @@ module Trello
           .to receive(:put)
           .once
           .with("/cards/abcdef123456789123456789", payload)
+          .and_return(payload.to_json)
 
         card.name = expected_new_name
         card.save
@@ -199,7 +200,10 @@ module Trello
           desc: expected_new_desc,
         }
 
-        expect(client).to receive(:put).once.with("/cards/abcdef123456789123456789", payload)
+        expect(client)
+          .to receive(:put).once
+          .with("/cards/abcdef123456789123456789", payload)
+          .and_return(payload.to_json)
 
         card.desc = expected_new_desc
         card.save
@@ -257,7 +261,6 @@ module Trello
         expect(card.pos).to_not be_nil
       end
 
-
       it 'gets its creation time' do
         expect(card.created_at).to be_kind_of Time
       end
@@ -308,7 +311,7 @@ module Trello
       before do
         allow(client)
           .to receive(:get)
-          .with("/attachments/abcdef123456789123456789", {})
+          .with("/cards/#{card.id}/attachments/abcdef123456789123456789", {})
           .and_return JSON.generate(attachments_details.first)
       end
 
@@ -338,6 +341,41 @@ module Trello
       end
     end
 
+    context "custom field items" do
+      before do
+        allow(client)
+          .to receive(:get)
+          .with("/cards/abcdef123456789123456789/customFieldItems", {})
+          .and_return JSON.generate([custom_field_item_details])
+      end
+
+      it "has a list of custom field items" do
+        expect(card.custom_field_items.count).to be > 0
+      end
+
+      it "clears the custom field value on a card" do
+        params = { value: {} }
+
+        expect(client)
+          .to receive(:put)
+          .with("/card/abcdef123456789123456789/customField/abcdef123456789123456789/item", params)
+
+        card.custom_field_items.last.remove
+      end
+
+      it "updates a custom field value" do
+        payload = { value: { text: 'Test Text' } }
+
+        expect(client)
+          .to receive(:put)
+          .with("/card/abcdef123456789123456789/customField/abcdef123456789123456789/item", payload)
+
+        text_custom_field = card.custom_field_items.last
+        text_custom_field.value = { text: 'Test Text' }
+        text_custom_field.save
+      end
+    end
+
     context "list" do
       before do
         allow(client)
@@ -345,6 +383,7 @@ module Trello
           .with("/lists/abcdef123456789123456789", {})
           .and_return JSON.generate(lists_details.first)
       end
+
       it 'has a list' do
         expect(card.list).to_not be_nil
       end
@@ -399,7 +438,46 @@ module Trello
         card.move_to_board(other_board, other_list)
       end
 
-      it 'should not be moved if new board is identical with old board', focus: true do
+      it 'can be moved to a list on the same board' do
+        current_board = double(id: 'abcdef123456789123456789')
+        other_list = double(
+          id: '987654321987654321fedcba',
+          board_id: 'abcdef123456789123456789'
+        )
+        allow(List).to receive(:find).with('987654321987654321fedcba').
+          and_return(other_list)
+        allow(card).to receive(:board).and_return(current_board)
+        payload = {value: other_list.id}
+
+        expect(client)
+          .to receive(:put)
+          .with('/cards/abcdef123456789123456789/idList', payload)
+
+        card.move_to_list_on_any_board(other_list.id)
+      end
+
+      it 'can be moved to a list on another board' do
+        current_board = double(id: 'abcdef123456789123456789')
+        other_board = double(id: '987654321987654321fedcba')
+        other_list = double(
+          id: '987654321987654321aalist',
+          board_id: '987654321987654321fedcba'
+        )
+        allow(List).to receive(:find).with('987654321987654321aalist').
+          and_return(other_list)
+        allow(card).to receive(:board).and_return(current_board)
+        allow(Board).to receive(:find).with('987654321987654321fedcba').
+          and_return(other_board)
+        payload = { value: other_board.id, idList: other_list.id }
+
+        expect(client)
+          .to receive(:put)
+          .with('/cards/abcdef123456789123456789/idBoard', payload)
+
+        card.move_to_list_on_any_board(other_list.id)
+      end
+
+      it 'should not be moved if new board is identical with old board' do
         other_board = double(id: 'abcdef123456789123456789')
         expect(client).to_not receive(:put)
         card.move_to_board(other_board)
@@ -415,7 +493,7 @@ module Trello
 
         allow(client)
           .to receive(:get)
-          .with("/members/abcdef123456789123456789")
+          .with("/cards/abcdef123456789123456789/members")
           .and_return user_payload
       end
 
@@ -432,7 +510,7 @@ module Trello
 
         expect(client)
           .to receive(:post)
-          .with("/cards/abcdef123456789123456789/members", payload)
+          .with("/cards/abcdef123456789123456789/idMembers", payload)
 
         card.add_member(new_member)
       end
@@ -442,7 +520,7 @@ module Trello
 
         expect(client)
           .to receive(:delete)
-          .with("/cards/abcdef123456789123456789/members/#{existing_member.id}")
+          .with("/cards/abcdef123456789123456789/idMembers/#{existing_member.id}")
 
         card.remove_member(existing_member)
       end
@@ -517,7 +595,6 @@ module Trello
       end
     end
 
-
     context "comments" do
       it "posts a comment" do
         expect(client)
@@ -715,6 +792,7 @@ module Trello
           .to receive(:put)
           .once
           .with("/cards/abcdef123456789123456789", payload)
+          .and_return(payload.to_json)
 
         card.close!
       end
@@ -732,6 +810,7 @@ module Trello
           .to receive(:put)
           .once
           .with("/cards/abcdef123456789123456789", payload)
+          .and_return(payload.to_json)
 
         card.due = due_date
         card.save
@@ -746,6 +825,7 @@ module Trello
           .to receive(:put)
           .once
           .with("/cards/abcdef123456789123456789", payload)
+          .and_return(payload.to_json)
 
         card.due_complete = true
         card.save
@@ -753,5 +833,100 @@ module Trello
         expect(card.due_complete).to be true
       end
     end
+
+    describe '#update_fields' do
+      context 'when the fields argument is empty' do
+        let(:fields) { {} }
+
+        it 'card does not set any fields' do
+          expected = cards_details.first
+
+          card = Card.new(expected)
+          card.client = client
+
+          card.update_fields(fields)
+
+          expected.each do |key, value|
+            if card.respond_to?(key) && key != 'labels'
+              expect(card.send(key)).to eq value
+            end
+
+            expect(card.labels).to eq expected['labels'].map { |lbl| Trello::Label.new(lbl) }
+            expect(card.short_id).to eq expected['idShort']
+            expect(card.short_url).to eq expected['shortUrl']
+            expect(card.board_id).to eq expected['idBoard']
+            expect(card.member_ids).to eq expected['idMembers']
+            expect(card.cover_image_id).to eq expected['idAttachmentCover']
+            expect(card.list_id).to eq expected['idList']
+            expect(card.card_labels).to eq expected['idLabels']
+          end
+        end
+      end
+
+      context 'when the fields argument has at least one field' do
+        let(:expected) { cards_details.first }
+        let(:card) {
+          card = Card.new(expected)
+          card.client = client
+          card
+        }
+
+        context 'and the field does changed' do
+          let(:fields) { { desc: 'Awesome things have changed.' } }
+
+          it 'card does set the changed fields' do
+            card.update_fields(fields)
+
+            expect(card.desc).to eq('Awesome things have changed.')
+          end
+
+          it 'card has been mark as changed' do
+            card.update_fields(fields)
+
+            expect(card.changed?).to be_truthy
+          end
+        end
+
+        context "and the field doesn't changed" do
+          let(:fields) { { desc: expected[:desc] } }
+
+          it "card attributes doesn't changed" do
+            card.update_fields(fields)
+
+            expect(card.desc).to eq(expected['desc'])
+          end
+
+          it "card hasn't been mark as changed", pending: true do
+            card.update_fields(fields)
+
+            expect(card.changed?).to be_falsy
+          end
+        end
+
+        context "and the field isn't a correct attributes of the card" do
+          let(:fields) { { abc: 'abc' } }
+
+          it "card attributes doesn't changed" do
+            card.update_fields(fields)
+
+            expect(card.labels).to eq expected['labels'].map { |lbl| Trello::Label.new(lbl) }
+            expect(card.short_id).to eq expected['idShort']
+            expect(card.short_url).to eq expected['shortUrl']
+            expect(card.board_id).to eq expected['idBoard']
+            expect(card.member_ids).to eq expected['idMembers']
+            expect(card.cover_image_id).to eq expected['idAttachmentCover']
+            expect(card.list_id).to eq expected['idList']
+            expect(card.card_labels).to eq expected['idLabels']
+            expect(card.desc).to eq expected['desc']
+          end
+
+          it "card hasn't been mark as changed" do
+            card.update_fields(fields)
+
+            expect(card.changed?).to be_falsy
+          end
+        end
+      end
+    end
   end
 end