ruby-trello 2.2.0 → 2.3.0

data/lib/trello/association_fetcher/has_one/params.rb

@@ -0,0 +1,36 @@
+module Trello
+  module AssociationFetcher
+    class HasOne
+      class Params
+        attr_reader :association_owner
+
+        def initialize(association_owner:, association_name:, association_options:)
+          @association_owner = association_owner
+          @association_name = association_name
+          @association_options = association_options || {}
+        end
+
+        def association_class
+          association_options[:via] || infer_class_on(association_name)
+        end
+
+        def association_restful_name
+          association_options[:path]
+        end
+
+        def association_restful_id
+          id_field = association_options[:using] || :id
+          association_owner.send(id_field)
+        end
+
+        private
+
+        attr_reader :association_name, :association_options
+
+        def infer_class_on(name)
+          AssociationInferTool.infer_class_on_name(name)
+        end
+      end
+    end
+  end
+end

data/lib/trello/association_infer_tool.rb

@@ -0,0 +1,13 @@
+module Trello
+  class AssociationInferTool
+    class << self
+      def infer_restful_resource_on_class(klass)
+        klass.to_s.split('::').last.downcase.pluralize
+      end
+
+      def infer_class_on_name(name)
+        Trello.const_get(name.to_s.singularize.camelize)
+      end
+    end
+  end
+end

data/lib/trello/association_proxy.rb

@@ -31,7 +31,7 @@ module Trello
     end
 
     def to_ary
-      proxy_assocation.dup
+      proxy_assocation.target.dup
     end
     alias_method :to_a, :to_ary
 

data/lib/trello/basic_data.rb

@@ -42,61 +42,20 @@ module Trello
       end
     end
 
-    def self.register_attributes(*names)
-      options = { readonly: [] }
-      options.merge!(names.pop) if names.last.kind_of? Hash
-
-      # Defines the attribute getter and setters.
-      class_eval do
-        define_method :attributes do
-          @__attributes ||= names.reduce({}) { |hash, k| hash.merge(k.to_sym => nil) }
-        end
-
-        names.each do |key|
-          define_method(:"#{key}") { @__attributes[key] }
-
-          unless options[:readonly].include?(key.to_sym)
-            define_method :"#{key}=" do |val|
-              send(:"#{key}_will_change!") unless val == @__attributes[key]
-              @__attributes[key] = val
-            end
-          end
-        end
+    def self.register_attributes(*names_and_options)
+      has_opts = names_and_options.last.kind_of?(Hash)
+      readonly_attributes = has_opts ? names_and_options.pop[:readonly] : []
+      attributes = names_and_options
 
-        define_attribute_methods names
-      end
+      RegisterAttributes.execute(self, attributes, readonly_attributes)
     end
 
     def self.one(name, opts = {})
-      class_eval do
-        define_method(:"#{name}") do |*args|
-          options = opts.dup
-          klass   = options.delete(:via) || Trello.const_get(name.to_s.camelize)
-          ident   = options.delete(:using) || :id
-          path    = options.delete(:path)
-
-          if path
-            client.find(path, self.send(ident))
-          else
-            klass.find(self.send(ident))
-          end
-        end
-      end
+      AssociationBuilder::HasOne.build(self, name, opts)
     end
 
     def self.many(name, opts = {})
-      class_eval do
-        define_method(:"#{name}") do |*args|
-          options   = opts.dup
-          resource  = options.delete(:in)  || self.class.to_s.split("::").last.downcase.pluralize
-          klass     = options.delete(:via) || Trello.const_get(name.to_s.singularize.camelize)
-          path = options.delete(:path) || name
-          params    = options.merge(args[0] || {})
-
-          resources = client.find_many(klass, "/#{resource}/#{id}/#{path}", params)
-          MultiAssociation.new(self, resources).proxy
-        end
-      end
+      AssociationBuilder::HasMany.build(self, name, opts)
     end
 
     def self.client

data/lib/trello/board.rb

@@ -72,7 +72,7 @@ module Trello
       fail "Cannot save new instance." unless self.id
 
       @previously_changed = changes
-      @changed_attributes.try(:clear)
+      @changed_attributes.clear if @changed_attributes.respond_to?(:clear)
       changes_applied if respond_to?(:changes_applied)
 
       fields = {

data/lib/trello/card.rb

@@ -169,36 +169,29 @@ module Trello
     #
     # @return [Trello::Card] self
     def update_fields(fields)
-      attributes[:id]                     = fields[SYMBOL_TO_STRING[:id]] || attributes[:id]
-      attributes[:short_id]               = fields[SYMBOL_TO_STRING[:short_id]] || attributes[:short_id]
-      attributes[:name]                   = fields[SYMBOL_TO_STRING[:name]] || fields[:name] || attributes[:name]
-      attributes[:desc]                   = fields[SYMBOL_TO_STRING[:desc]] || fields[:desc] || attributes[:desc]
-      attributes[:due]                    = Time.iso8601(fields[SYMBOL_TO_STRING[:due]]) rescue nil if fields.has_key?(SYMBOL_TO_STRING[:due])
-      attributes[:due]                    = fields[:due] if fields.has_key?(:due)
-      attributes[:due_complete]           = fields[SYMBOL_TO_STRING[:due_complete]] if fields.has_key?(SYMBOL_TO_STRING[:due_complete])
-      attributes[:due_complete]           ||= false
-      attributes[:closed]                 = fields[SYMBOL_TO_STRING[:closed]] if fields.has_key?(SYMBOL_TO_STRING[:closed])
-      attributes[:url]                    = fields[SYMBOL_TO_STRING[:url]] || attributes[:url]
-      attributes[:short_url]              = fields[SYMBOL_TO_STRING[:short_url]] || attributes[:short_url]
-      attributes[:board_id]               = fields[SYMBOL_TO_STRING[:board_id]] || attributes[:board_id]
-      attributes[:member_ids]             = fields[SYMBOL_TO_STRING[:member_ids]] || fields[:member_ids] || attributes[:member_ids]
-      attributes[:list_id]                = fields[SYMBOL_TO_STRING[:list_id]] || fields[:list_id] || attributes[:list_id]
-      attributes[:pos]                    = fields[SYMBOL_TO_STRING[:pos]] || fields[:pos] || attributes[:pos]
-      attributes[:labels]                 = (fields[SYMBOL_TO_STRING[:labels]] || []).map { |lbl| Trello::Label.new(lbl) }.presence || attributes[:labels].presence || []
-      attributes[:card_labels]            = fields[SYMBOL_TO_STRING[:card_labels]] || fields[:card_labels] || attributes[:card_labels]
-      attributes[:last_activity_date]     = Time.iso8601(fields[SYMBOL_TO_STRING[:last_activity_date]]) rescue nil if fields.has_key?(SYMBOL_TO_STRING[:last_activity_date])
-      attributes[:cover_image_id]         = fields[SYMBOL_TO_STRING[:cover_image_id]] || attributes[:cover_image_id]
-      attributes[:badges]                 = fields[SYMBOL_TO_STRING[:badges]] || attributes[:badges]
-      attributes[:card_members]           = fields[SYMBOL_TO_STRING[:card_members]] || attributes[:card_members]
-      attributes[:source_card_id]         = fields[SYMBOL_TO_STRING[:source_card_id]] || fields[:source_card_id] || attributes[:source_card_id]
-      attributes[:source_card_properties] = fields[SYMBOL_TO_STRING[:source_card_properties]] || fields[:source_card_properties] || attributes[:source_card_properties]
-      self
+      %i[
+        name desc due due_complete closed
+        board_id member_ids list_id pos
+        card_labels cover_image_id
+      ].each do |key|
+        send("#{key}_will_change!") if fields_has_key?(fields, key)
+      end
+
+      initialize_fields(fields)
+    end
+
+    def initialize(fields = {})
+      initialize_fields(fields)
     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
+    def cover_image(params = {})
+      response = client.get("/cards/#{id}/attachments/#{cover_image_id}", params)
+      CoverImage.from_response(response)
+    end
 
     # Returns a list of checklists associated with the card.
     #
@@ -271,16 +264,41 @@ module Trello
     #
     # @raise [Trello::Error] if the card could not be updated.
     #
-    # @return [String] The JSON representation of the updated card returned by
-    #     the Trello API.
+    # @return [Trello::Card] updated self
     def update!
       @previously_changed = changes
       # extract only new values to build payload
       payload = Hash[changes.map { |key, values| [SYMBOL_TO_STRING[key.to_sym].to_sym, values[1]] }]
-      @changed_attributes.try(:clear)
+
+      response = client.put("/cards/#{id}", payload)
+      updated_card = from_response(response)
+
+      @changed_attributes.clear if @changed_attributes.respond_to?(:clear)
       changes_applied if respond_to?(:changes_applied)
 
-      client.put("/cards/#{id}", payload)
+      attributes[:id]                     = updated_card.id
+      attributes[:short_id]               = updated_card.short_id
+      attributes[:name]                   = updated_card.name
+      attributes[:desc]                   = updated_card.desc
+      attributes[:due]                    = updated_card.due
+      attributes[:due_complete]           = updated_card.due_complete
+      attributes[:closed]                 = updated_card.closed
+      attributes[:url]                    = updated_card.url
+      attributes[:short_url]              = updated_card.short_url
+      attributes[:board_id]               = updated_card.board_id
+      attributes[:member_ids]             = updated_card.member_ids
+      attributes[:list_id]                = updated_card.list_id
+      attributes[:pos]                    = updated_card.pos
+      attributes[:labels]                 = updated_card.labels
+      attributes[:card_labels]            = updated_card.card_labels
+      attributes[:last_activity_date]     = updated_card.last_activity_date
+      attributes[:cover_image_id]         = updated_card.cover_image_id
+      attributes[:badges]                 = updated_card.badges
+      attributes[:card_members]           = updated_card.card_members
+      attributes[:source_card_id]         = updated_card.source_card_id
+      attributes[:source_card_properties] = updated_card.source_card_properties
+
+      self
     end
 
     # Delete this card
@@ -315,7 +333,7 @@ module Trello
 
     # Is the record valid?
     def valid?
-      name && list_id
+      !(name && list_id).nil?
     end
 
     # Add a comment with the supplied text.
@@ -324,10 +342,12 @@ module Trello
     end
 
     # Add a checklist to this card
-    def add_checklist(checklist)
-      client.post("/cards/#{id}/checklists", {
-        value: checklist.id
-      })
+    def add_checklist(checklist, name: nil, position: nil)
+      payload = { idChecklistSource: checklist.id }
+      payload[:name] = name if name 
+      payload[:pos] = position if position
+
+      client.post("/cards/#{id}/checklists", payload)
     end
 
     # create a new checklist and add it to this card
@@ -366,14 +386,14 @@ module Trello
 
     # Add a member to this card
     def add_member(member)
-      client.post("/cards/#{id}/members", {
+      client.post("/cards/#{id}/idMembers", {
         value: member.id
       })
     end
 
     # Remove a member from this card
     def remove_member(member)
-      client.delete("/cards/#{id}/members/#{member.id}")
+      client.delete("/cards/#{id}/idMembers/#{member.id}")
     end
 
     # Current authenticated user upvotes a card
@@ -465,5 +485,37 @@ module Trello
     def me
       @me ||= Member.find(:me)
     end
+
+    def fields_has_key?(fields, key)
+      fields.key?(SYMBOL_TO_STRING[key]) || fields.key?(key)
+    end
+
+    def initialize_fields(fields)
+      attributes[:id]                     = fields[SYMBOL_TO_STRING[:id]] || attributes[:id]
+      attributes[:short_id]               = fields[SYMBOL_TO_STRING[:short_id]] || attributes[:short_id]
+      attributes[:name]                   = fields[SYMBOL_TO_STRING[:name]] || fields[:name] || attributes[:name]
+      attributes[:desc]                   = fields[SYMBOL_TO_STRING[:desc]] || fields[:desc] || attributes[:desc]
+      attributes[:due]                    = Time.iso8601(fields[SYMBOL_TO_STRING[:due]]) rescue nil if fields.has_key?(SYMBOL_TO_STRING[:due])
+      attributes[:due]                    = fields[:due] if fields.has_key?(:due)
+      attributes[:due_complete]           = fields[SYMBOL_TO_STRING[:due_complete]] if fields.has_key?(SYMBOL_TO_STRING[:due_complete])
+      attributes[:due_complete]           ||= false
+      attributes[:closed]                 = fields[SYMBOL_TO_STRING[:closed]] if fields.has_key?(SYMBOL_TO_STRING[:closed])
+      attributes[:url]                    = fields[SYMBOL_TO_STRING[:url]] || attributes[:url]
+      attributes[:short_url]              = fields[SYMBOL_TO_STRING[:short_url]] || attributes[:short_url]
+      attributes[:board_id]               = fields[SYMBOL_TO_STRING[:board_id]] || attributes[:board_id]
+      attributes[:member_ids]             = fields[SYMBOL_TO_STRING[:member_ids]] || fields[:member_ids] || attributes[:member_ids]
+      attributes[:list_id]                = fields[SYMBOL_TO_STRING[:list_id]] || fields[:list_id] || attributes[:list_id]
+      attributes[:pos]                    = fields[SYMBOL_TO_STRING[:pos]] || fields[:pos] || attributes[:pos]
+      attributes[:labels]                 = (fields[SYMBOL_TO_STRING[:labels]] || []).map { |lbl| Trello::Label.new(lbl) }.presence || attributes[:labels].presence || []
+      attributes[:card_labels]            = fields[SYMBOL_TO_STRING[:card_labels]] || fields[:card_labels] || attributes[:card_labels]
+      attributes[:last_activity_date]     = Time.iso8601(fields[SYMBOL_TO_STRING[:last_activity_date]]) rescue nil if fields.has_key?(SYMBOL_TO_STRING[:last_activity_date])
+      attributes[:cover_image_id]         = fields[SYMBOL_TO_STRING[:cover_image_id]] || attributes[:cover_image_id]
+      attributes[:badges]                 = fields[SYMBOL_TO_STRING[:badges]] || attributes[:badges]
+      attributes[:card_members]           = fields[SYMBOL_TO_STRING[:card_members]] || attributes[:card_members]
+      attributes[:source_card_id]         = fields[SYMBOL_TO_STRING[:source_card_id]] || fields[:source_card_id] || attributes[:source_card_id]
+      attributes[:source_card_properties] = fields[SYMBOL_TO_STRING[:source_card_properties]] || fields[:source_card_properties] || attributes[:source_card_properties]
+      self
+    end
+
   end
 end

data/lib/trello/custom_field.rb

@@ -58,14 +58,14 @@ module Trello
     many :custom_field_options, path: 'options'
 
     def update_fields(fields)
-      attributes[:id]          = fields[SYMBOL_TO_STRING[:id]] || fields[:id] || attributes[:id]
-      attributes[:name]        = fields[SYMBOL_TO_STRING[:name]] || fields[:name] || attributes[:name]
-      attributes[:model_id]    = fields[SYMBOL_TO_STRING[:model_id]] || fields[:model_id] || attributes[:model_id]
-      attributes[:model_type]  = fields[SYMBOL_TO_STRING[:model_type]] || fields[:model_type] || attributes[:model_type]
-      attributes[:field_group] = fields[SYMBOL_TO_STRING[:field_group]] || fields[:field_group] || attributes[:field_group]
-      attributes[:type]        = fields[SYMBOL_TO_STRING[:type]] || fields[:type] || attributes[:type]
-      attributes[:pos]         = fields[SYMBOL_TO_STRING[:pos]] || fields[:pos] || attributes[:pos]
-      self
+      send('name_will_change!') if fields_has_key?(fields, :name)
+      send('pos_will_change!') if fields_has_key?(fields, :pos)
+
+      initialize_fields(fields)
+    end
+
+    def initialize(fields = {})
+      initialize_fields(fields)
     end
 
     # Saves a record.
@@ -88,7 +88,7 @@ module Trello
       @previously_changed = changes
       # extract only new values to build payload
       payload = Hash[changes.map { |key, values| [SYMBOL_TO_STRING[key.to_sym].to_sym, values[1]] }]
-      @changed_attributes.try(:clear)
+      @changed_attributes.clear if @changed_attributes.respond_to?(:clear)
       changes_applied if respond_to?(:changes_applied)
 
       client.put("/customFields/#{id}", payload)
@@ -110,5 +110,22 @@ module Trello
     def delete_option(option_id)
       client.delete("/customFields/#{id}/options/#{option_id}")
     end
+
+    private
+
+    def fields_has_key?(fields, key)
+      fields.key?(SYMBOL_TO_STRING[key]) || fields.key?(key)
+    end
+
+    def initialize_fields(fields)
+      attributes[:id]          = fields[SYMBOL_TO_STRING[:id]] || fields[:id] || attributes[:id]
+      attributes[:name]        = fields[SYMBOL_TO_STRING[:name]] || fields[:name] || attributes[:name]
+      attributes[:model_id]    = fields[SYMBOL_TO_STRING[:model_id]] || fields[:model_id] || attributes[:model_id]
+      attributes[:model_type]  = fields[SYMBOL_TO_STRING[:model_type]] || fields[:model_type] || attributes[:model_type]
+      attributes[:field_group] = fields[SYMBOL_TO_STRING[:field_group]] || fields[:field_group] || attributes[:field_group]
+      attributes[:type]        = fields[SYMBOL_TO_STRING[:type]] || fields[:type] || attributes[:type]
+      attributes[:pos]         = fields[SYMBOL_TO_STRING[:pos]] || fields[:pos] || attributes[:pos]
+      self
+    end
   end
 end

data/lib/trello/custom_field_item.rb

@@ -17,23 +17,24 @@ module Trello
     # Supply a hash of string keyed data retrieved from the Trello API representing
     # an item state.
     def update_fields(fields)
-      attributes[:id]               = fields['id'] || fields[:id] || attributes[:id]
-      attributes[:model_id]         = fields['idModel'] || fields[:model_id] || attributes[:model_id]
-      attributes[:custom_field_id]  = fields['idCustomField'] || fields[:custom_field_id] || attributes[:custom_field_id]
-      attributes[:model_type]       = fields['modelType'] || fields[:model_type] || attributes[:model_type]
-      # Dropdown custom field items do not have a value, they have an ID that maps to
-      # a different endpoint to get the value
-      attributes[:option_id]       = fields['idValue'] if fields.has_key?('idValue')
-      # value format: { "text": "hello world" }
-      attributes[:value]            = fields['value'] if fields.has_key?('value')
-      self
+      if fields_has_key?(fields, 'value')
+        send('value_will_change!')
+      elsif fields_has_key?(fields, 'idValue')
+        send('option_id_will_change!')
+      end
+
+      initialize_fields(fields)
+    end
+
+    def initialize(fields = {})
+      initialize_fields(fields)
     end
 
     def update!
       @previously_changed = changes
       # extract only new values to build payload
       payload = Hash[changes.map { |key, values| [key.to_sym, values[1]] }]
-      @changed_attributes.try(:clear)
+      @changed_attributes.clear if @changed_attributes.respond_to?(:clear)
       changes_applied if respond_to?(:changes_applied)
 
       client.put("/card/#{model_id}/customField/#{custom_field_id}/item", payload)
@@ -49,7 +50,7 @@ module Trello
       # If we have an id, just update our fields.
       return update! if id
 
-      from_response client.post("/card/#{model_id}/customField/#{custom_field_id}/item", {
+      from_response client.put("/card/#{model_id}/customField/#{custom_field_id}/item", {
         value: value
       })
     end
@@ -74,5 +75,24 @@ module Trello
         option.value
       end
     end
+
+    private
+
+    def fields_has_key?(fields, key)
+      fields.key?(key.to_s) || fields.key?(key.to_sym)
+    end
+
+    def initialize_fields(fields)
+      attributes[:id]               = fields['id'] || fields[:id] || attributes[:id]
+      attributes[:model_id]         = fields['idModel'] || fields[:model_id] || attributes[:model_id]
+      attributes[:custom_field_id]  = fields['idCustomField'] || fields[:custom_field_id] || attributes[:custom_field_id]
+      attributes[:model_type]       = fields['modelType'] || fields[:model_type] || attributes[:model_type]
+      # Dropdown custom field items do not have a value, they have an ID that maps to
+      # a different endpoint to get the value
+      attributes[:option_id]       = fields['idValue'] || fields[:idValue] if fields_has_key?(fields, 'idValue')
+      # value format: { "text": "hello world" }
+      attributes[:value]            = fields['value'] || fields[:value] if fields_has_key?(fields, 'value')
+      self
+    end
   end
 end

data/lib/trello/label.rb

@@ -64,12 +64,14 @@ module Trello
     # Supply a hash of stringkeyed data retrieved from the Trello API representing
     # a label.
     def update_fields(fields)
-      attributes[:id] = fields['id'] || attributes[:id]
-      attributes[:name]  = fields['name'] || fields[:name] || attributes[:name]
-      attributes[:color] = fields['color'] || fields[:color] || attributes[:color]
-      attributes[:board_id] = fields['idBoard'] || fields[:board_id] || attributes[:board_id]
-      attributes[:uses] = fields['uses'] if fields.has_key?('uses')
-      self
+      send('name_will_change!') if fields_has_key?(fields, :name)
+      send('color_will_change!') if fields_has_key?(fields, :color)
+
+      initialize_fields(fields)
+    end
+
+    def initialize(fields = {})
+      initialize_fields(fields)
     end
 
     # Returns a reference to the board this label is currently connected.
@@ -95,7 +97,7 @@ module Trello
       @previously_changed = changes
       # extract only new values to build payload
       payload = Hash[changes.map { |key, values| [SYMBOL_TO_STRING[key.to_sym].to_sym, values[1]] }]
-      @changed_attributes.try(:clear)
+      @changed_attributes.clear if @changed_attributes.respond_to?(:clear)
       changes_applied if respond_to?(:changes_applied)
 
       client.put("/labels/#{id}", payload)
@@ -105,5 +107,20 @@ module Trello
     def delete
       client.delete("/labels/#{id}")
     end
+
+    private
+
+    def fields_has_key?(fields, key)
+      fields.key?(SYMBOL_TO_STRING[key]) || fields.key?(key)
+    end
+
+    def initialize_fields(fields)
+      attributes[:id] = fields['id'] || attributes[:id]
+      attributes[:name]  = fields['name'] || fields[:name] || attributes[:name]
+      attributes[:color] = fields['color'] || fields[:color] || attributes[:color]
+      attributes[:board_id] = fields['idBoard'] || fields[:board_id] || attributes[:board_id]
+      attributes[:uses] = fields['uses'] if fields.has_key?('uses')
+      self
+    end
   end
 end