ruby-trello 2.3.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e7396e189c2f3b43af4bf1eacbdd78ec358ef684d2526d7c3537c1af1ca4abd
-  data.tar.gz: c8e2c74d10eaedb521829b3598e4500119c8fbfdd8c8cd71758254580eee1079
+  metadata.gz: ae677a6fcb06809e76e329d2c56422280e7c6168f9c6951adb615b6e440fe3c5
+  data.tar.gz: 75bc42af47d3dd45252193f58fc120d6cf94d85984764a15e50c6fe4ad1c82da
 SHA512:
-  metadata.gz: 1d441be6f124b3dd47ff332da22ccbf71eb201ff90ddf82775fc3f208eb6621dd10acc2cff21c81d30231d9b50f4aa9cf867cf66d26e9c894e16f1a1596a11fa
-  data.tar.gz: 647e16d5104ba1cf8dc3a7811117f168d6e132503e4b0989e8316a8abd9b30f3401cc04814da202cb4fc74846c5b9dee88a80fc36358fa0cd9c5f65340aba97b
+  metadata.gz: da8feef2065ee82cb1c0b6ec35d6dd3be9dbca5e498cb1b1068360d985e91c1303c159b7c106b0f2bb0dfce3a109e6997ee19e31033d0e4e0ec22b53ccd5c00d
+  data.tar.gz: 955fe07038772f2419ff85d3eb126f45dc6ee454057aaba7fcbc5cbe240d322832a5eab8ab40082921d3c76f2b23d6e05d31a8737389d737ea56a28d4d75fcc8

data/README.md

@@ -16,9 +16,12 @@ to, please just [create an issue](https://github.com/jeremytregunna/ruby-trello/
 
 ## Requirements
 
-Use the newest version for Ruby 2.5.0 or newer support.
+Use the newest version for Ruby 2.5.0 or newer support. (Ruby 3 only works with ActiveModel 6 for now.)
+
 Use version 2.2.1 or earlier for Ruby 2.1 ~ 2.4 support.
+
 Use version 1.3.0 or earlier for Ruby 1.9.3 support.
+
 Use version 1.4.x or earlier for Ruby 2.0.0 support.
 
 ## Installation
@@ -209,6 +212,7 @@ Run tests for each Ruby versions individual
 make test:ruby_2_5
 make test:ruby_2_6
 make test:ruby_2_7
+make test:ruby_3_0
 make test:jruby_9_2
 ```
 
@@ -218,5 +222,12 @@ Do development for each Ruby versions individual
 make dev:ruby_2_5
 make dev:ruby_2_6
 make dev:ruby_2_7
+make dev:ruby_3_0
 make dev:jruby_9_2
-```
+```
+
+Recreate all Gemfile.lock.*
+
+```bash
+make gemfile:refresh
+```

data/lib/trello.rb

@@ -1,12 +1,15 @@
+# frozen_string_literal: true
+
 require 'oauth'
 require 'json'
 require 'logger'
 require 'active_model'
 require 'addressable/uri'
+require 'active_support/core_ext/hash/indifferent_access'
 
-# Ruby wrapper around the Trello[http://trello.com] API
+# Ruby wrapper around the [Trello] API
 #
-# First, set up your key information. You can get this information by {clicking here}[https://trello.com/1/appKey/generate].
+# First, set up your key information. You can get this information by [clicking here][trello-app-key].
 #
 # You can get the key by going to this url in your browser:
 # https://trello.com/1/authorize?key=TRELLO_CONSUMER_KEY_FROM_ABOVE&name=MyApp&response_type=token&scope=read,write,account&expiration=never
@@ -35,7 +38,11 @@ require 'addressable/uri'
 #
 # And so much more. Consult the rest of the documentation for more information.
 #
-# Feel free to {peruse and participate in our Trello board}[https://trello.com/board/ruby-trello/4f092b2ee23cb6fe6d1aaabd]. It's completely open to the public.
+# Feel free to [peruse and participate in our Trello board][ruby-trello-board]. It's completely open to the public.
+#
+# [trello]: http://trello.com
+# [trello-app-key]: https://trello.com/app-key
+# [ruby-trello-board]: https://trello.com/board/ruby-trello/4f092b2ee23cb6fe6d1aaabd
 module Trello
   autoload :Error,                'trello/error'
   autoload :Action,               'trello/action'
@@ -70,7 +77,7 @@ module Trello
   autoload :Webhook,              'trello/webhook'
   autoload :JsonUtils,            'trello/json_utils'
   autoload :AssociationInferTool, 'trello/association_infer_tool'
-  autoload :RegisterAttributes,   'trello/register_attributes'
+  autoload :Schema,               'trello/schema'
 
   module Authorization
     autoload :AuthPolicy,         'trello/authorization'
@@ -80,12 +87,12 @@ module Trello
 
   module AssociationFetcher
     autoload :HasMany,            'trello/association_fetcher/has_many'
-    autoload :HasOne,            'trello/association_fetcher/has_one'
+    autoload :HasOne,             'trello/association_fetcher/has_one'
   end
 
   module AssociationBuilder
     autoload :HasMany,            'trello/association_builder/has_many'
-    autoload :HasOne,            'trello/association_builder/has_one'
+    autoload :HasOne,             'trello/association_builder/has_one'
   end
 
   # Version of the Trello API that we use by default.
@@ -128,7 +135,6 @@ module Trello
 
   # Url to token for making authorized requests to the Trello API
   #
-  # @param [String, #read] contents the contents to reverse
   # @param options [Hash] Repository information to update
   # @option options [String] :name Name of the application
   # @option options [String] :key Application key

data/lib/trello/action.rb

@@ -3,20 +3,40 @@ module Trello
   #
   # @!attribute [r] id
   #   @return [String]
-  # @!attribute [r] type
+  # @!attribute [r] creator_id
   #   @return [String]
   # @!attribute [r] data
   #   @return [Hash]
+  # @!attribute [r] type
+  #   @return [String]
   # @!attribute [r] date
   #   @return [Datetime]
-  # @!attribute [r] member_creator_id
+  # @!attribute [r] limits
+  #   @return [Hash]
+  # @!attribute [r] app_creator
+  #   @return [String]
+  # @!attribute [r] display
+  #   @return [Hash]
+  # @!attribute [w] text
   #   @return [String]
-  # @!attribute [r] member_participant
-  #   @return [Object]
   class Action < BasicData
-    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
+
+    schema do
+      # Readonly
+      attribute :id, readonly: true, primary_key: true
+      attribute :creator_id, readonly: true, remote_key: 'idMemberCreator'
+      attribute :data, readonly: true
+      attribute :type, readonly: true
+      attribute :date, readonly: true, serializer: 'Time'
+      attribute :limits, readonly: true
+      attribute :app_creator, readonly: true, remote_key: 'appCreator'
+      attribute :display, readonly: true
+
+      # Writable
+      attribute :text, update_only: true
+    end
+
+    validates_presence_of :id, :type, :date, :creator_id
 
     class << self
       # Locate a specific action and return a new Action object.
@@ -33,20 +53,6 @@ module Trello
       end
     end
 
-    # Update the attributes of an action
-    #
-    # Supply a hash of string keyed data retrieved from the Trello API representing
-    # an Action.
-    def update_fields(fields)
-      attributes[:id]                 = fields['id'] || attributes[:id]
-      attributes[:type]               = fields['type'] || attributes[:type]
-      attributes[:data]               = fields['data'] || attributes[:data]
-      attributes[:date]               = Time.iso8601(fields['date']) rescue nil if fields.has_key?('date')
-      attributes[:member_creator_id]  = fields['idMemberCreator'] || attributes[:member_creator_id]
-      attributes[:member_participant] = fields['member'] || attributes[:member_participant]
-      self
-    end
-
     # Returns the board this action occurred on.
     def board
       Board.from_response client.get("/actions/#{id}/board")

data/lib/trello/attachment.rb

@@ -1,40 +1,53 @@
 module Trello
   # A file or url that is linked to a Trello card
   #
-  # @!attribute id
+  # @!attribute [r] id
   #   @return [String]
-  # @!attribute name
-  #   @return [String]
-  # @!attribute url
-  #   @return [String]
-  # @!attribute pos
+  # @!attribute [r] position
   #   @return [Float]
-  # @!attribute bytes
+  # @!attribute [r] bytes
   #   @return [Fixnum]
-  # @!attribute date
+  # @!attribute [r] member_id
+  #   @return [String]
+  # @!attribute [r] date
   #   @return [Datetime]
-  # @!attribute is_upload
+  # @!attribute [r] is_upload
   #   @return [Boolean]
-  # @!attribute mime_type
+  # @!attribute [r] previews
+  #   @return [Array]
+  # @!attribute [r] file_name
+  #   @return [String]
+  # @!attribute [r] edge_color
+  #   @return [String]
+  # @!attribute [rw] name
   #   @return [String]
+  # @!attribute [rw] url
+  #   @return [String]
+  # @!attribute [rw] mime_type
+  #   @return [String]
+  # @!attribute [w] file
+  #   @return [String]
+  # @!attribute [w] set_as_cover
+  #   @return [Boolean]
   class Attachment < BasicData
-    register_attributes :name, :id, :pos, :url, :bytes, :member_id, :date, :is_upload, :mime_type, :previews
-    # Update the fields of an attachment.
-    #
-    # Supply a hash of stringkeyed data retrieved from the Trello API representing
-    # an attachment.
-    def update_fields(fields)
-      attributes[:name]      = fields['name'] || attributes[:name]
-      attributes[:id]        = fields['id'] || attributes[:id]
-      attributes[:pos]       = fields['pos'] || attributes[:pos]
-      attributes[:url]       = fields['url'] || attributes[:url]
-      attributes[:bytes]     = fields['bytes'].to_i || attributes[:bytes]
-      attributes[:member_id] = fields['idMember'] || attributes[:member_id]
-      attributes[:date]      = Time.parse(fields['date']).presence || attributes[:date]
-      attributes[:is_upload] = fields['isUpload'] if fields.has_key?('isUpload')
-      attributes[:mime_type] = fields['mimeType'] || attributes[:mime_type]
-      attributes[:previews]  = fields['previews'] if fields.has_key?('previews')
-      self
+    schema do
+      # Readonly
+      attribute :id, readonly: true, primary_key: true
+      attribute :position, readonly: true, remote_key: 'pos'
+      attribute :bytes, readonly: true
+      attribute :member_id, remote_key: 'idMember', readonly: true
+      attribute :date, serializer: 'Time', readonly: true
+      attribute :is_upload, remote_key: 'isUpload', readonly: true
+      attribute :previews, readonly: true
+      attribute :file_name, remote_key: 'fileName', readonly: true
+      attribute :edge_color, remote_key: 'edgeColor', readonly: true
+
+      # Writable but create only
+      attribute :name, create_only: true
+      attribute :url, create_only: true
+      attribute :mime_type, remote_key: 'mimeType', create_only: true
+      attribute :file, create_only: true
+      attribute :set_as_cover, remote_key: 'setCover', create_only: true
     end
   end
 end

data/lib/trello/basic_data.rb

@@ -42,12 +42,21 @@ module Trello
       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
+    def self.schema(&block)
+      @schema ||= Schema.new
+      return @schema unless block_given?
 
-      RegisterAttributes.execute(self, attributes, readonly_attributes)
+      @schema.instance_eval(&block)
+
+      register_attrs
+
+      @schema
+    end
+
+    def self.register_attrs
+      schema.attrs.values.each do |attribute|
+        attribute.register(self)
+      end
     end
 
     def self.one(name, opts = {})
@@ -62,16 +71,72 @@ module Trello
       Trello.client
     end
 
-    register_attributes :id, readonly: [ :id ]
-
     attr_writer :client
 
     def initialize(fields = {})
-      update_fields(fields)
+      initialize_fields(fields)
+    end
+
+    def save
+      return update! if id
+
+      payload = {}
+
+      schema.attrs.each do |_, attribute|
+        payload = attribute.build_payload_for_create(attributes, payload)
+      end
+
+      post(collection_path, payload)
+    end
+
+    def update!
+      fail "Cannot save new instance." unless id
+
+      @previously_changed = changes
+
+      payload = {}
+      changed_attrs = attributes.select {|name, _| changed.include?(name.to_s)}
+
+      schema.attrs.each do |_, attribute|
+        payload = attribute.build_payload_for_update(changed_attrs, payload)
+      end
+
+      from_response client.put(element_path, payload)
+
+      @changed_attributes.clear if @changed_attributes.respond_to?(:clear)
+      changes_applied if respond_to?(:changes_applied)
+
+      self
     end
 
     def update_fields(fields)
-      raise NotImplementedError, "#{self.class} does not implement update_fields."
+      attrs = {}
+
+      schema.attrs.each do |_, attribute|
+        attrs = attribute.build_pending_update_attributes(fields, attrs)
+      end
+
+      attrs.each do |name, value|
+        send("#{name}=", value)
+      end
+
+      self
+    end
+
+    def collection_path
+      "/#{collection_name}"
+    end
+
+    def element_path
+      "/#{collection_name}/#{id}"
+    end
+
+    def collection_name
+      @collection_path ||= ActiveSupport::Inflector.pluralize(element_name)
+    end
+
+    def element_name
+      @element_name ||= model_name.element
     end
 
     # Refresh the contents of our object.
@@ -95,5 +160,35 @@ module Trello
     def client
       @client ||= self.class.client
     end
+
+    def schema
+      self.class.schema
+    end
+
+    def attributes
+      @__attributes ||= ActiveSupport::HashWithIndifferentAccess.new
+    end
+
+    private
+
+    def attributes=(attrs)
+      @__attributes = attrs
+    end
+
+    def initialize_fields(fields)
+      schema.attrs.each do |_, attribute|
+        self.attributes = attribute.build_attributes(fields, attributes)
+      end
+
+      self
+    end
+
+    def post(path, body)
+      from_response client.post(path, body)
+    end
+
+    def put(path, body)
+      from_response client.put(path, body)
+    end
   end
 end

data/lib/trello/board.rb

@@ -4,21 +4,100 @@ module Trello
   #
   # @!attribute [r] id
   #   @return [String]
-  # @!attribute [r] name
+  # @!attribute [r] starred
+  #   @return [Boolean]
+  # @!attribute [r] pinned
+  #   @return [Boolean]
+  # @!attribute [r] url
+  #   @return [String]
+  # @!attribute [r] short_url
+  #   @return [String]
+  # @!attribute [r] prefs
+  #   @return [Hash]
+  # @!attribute [r] last_activity_date
+  #   @return [Datetime]
+  # @!attribute [r] description_data
+  #   @return [Datetime]
+  # @!attribute [r] enterprise_id
+  #   @return [String]
+  # @!attribute [rw] name
   #   @return [String]
   # @!attribute [rw] description
   #   @return [String]
-  # @!attribute [rw] closed
+  # @!attribute [rw] organization_id
+  #   @return [String]
+  # @!attribute [rw] visibility_level
+  #   @return [String]
+  # @!attribute [rw] voting_permission_level
+  #   @return [String]
+  # @!attribute [rw] comment_permission_level
+  #   @return [String]
+  # @!attribute [rw] invitation_permission_level
+  #   @return [String]
+  # @!attribute [rw] enable_self_join
   #   @return [Boolean]
-  # @!attribute [r] url
+  # @!attribute [rw] enable_card_covers
+  #   @return [Boolean]
+  # @!attribute [rw] background_color
   #   @return [String]
-  # @!attribute [rw] organization_id
-  #   @return [String] A 24-character hex string
-  # @!attribute [r] prefs
-  #   @return [Hash] A 24-character hex string
+  # @!attribute [rw] background_image
+  #   @return [String]
+  # @!attribute [rw] card_aging_type
+  #   @return [String]
+  # @!attribute [w] use_default_labels
+  #   @return [Boolean]
+  # @!attribute [w] use_default_lists
+  #   @return [Boolean]
+  # @!attribute [w] source_board_id
+  #   @return [String]
+  # @!attribute [w] keep_cards_from_source
+  #   @return [String]
+  # @!attribute [w] power_ups
+  #   @return [String]
+  # @!attribute [rw] closed
+  #   @return [Boolean]
+  # @!attribute [w] subscribed
+  #   @return [Boolean]
   class Board < BasicData
-    register_attributes :id, :name, :description, :closed, :starred, :url, :organization_id, :prefs, :last_activity_date,
-      readonly: [ :id, :url, :last_activity_date ]
+    schema do
+      attribute :id, readonly: true, primary_key: true
+
+      # Readonly
+      attribute :starred, readonly: true
+      attribute :pinned, readonly: true
+      attribute :url, readonly: true
+      attribute :short_url, readonly: true, remote_key: 'shortUrl'
+      attribute :prefs, readonly: true, default: {}
+      attribute :last_activity_date, readonly: true, remote_key: 'dateLastActivity', serializer: 'Time'
+      attribute :description_data, readonly: true, remote_key: 'descData'
+      attribute :enterprise_id, readonly: true, remote_key: 'idEnterprise'
+
+      # Writable
+      attribute :name
+      attribute :description, remote_key: 'desc'
+      attribute :organization_id, remote_key: 'idOrganization'
+      attribute :visibility_level, remote_key: 'permissionLevel', class_name: 'BoardPref'
+      attribute :voting_permission_level, remote_key: 'voting', class_name: 'BoardPref'
+      attribute :comment_permission_level, remote_key: 'comments', class_name: 'BoardPref'
+      attribute :invitation_permission_level, remote_key: 'invitations', class_name: 'BoardPref'
+      attribute :enable_self_join, remote_key: 'selfJoin', class_name: 'BoardPref'
+      attribute :enable_card_covers, remote_key: 'cardCovers', class_name: 'BoardPref'
+      attribute :background_color, remote_key: 'background', class_name: 'BoardPref'
+      attribute :background_image, remote_key: 'backgroundImage', class_name: 'BoardPref'
+      attribute :card_aging_type, remote_key: 'cardAging', class_name: 'BoardPref'
+
+      # Writable but for create only
+      attribute :use_default_labels, create_only: true, remote_key: 'defaultLabels'
+      attribute :use_default_lists, create_only: true, remote_key: 'defaultLists'
+      attribute :source_board_id, create_only: true, remote_key: 'idBoardSource'
+      attribute :keep_cards_from_source, create_only: true, remote_key: 'keepFromSource'
+      attribute :power_ups, create_only: true, remote_key: 'powerUps'
+
+      # Writable but for update only
+      attribute :closed, update_only: true
+      attribute :subscribed, update_only: true
+    end
+
     validates_presence_of :id, :name
     validates_length_of   :name,        in: 1..16384
     validates_length_of   :description, maximum: 16384
@@ -26,82 +105,12 @@ module Trello
     include HasActions
 
     class << self
-      # Finds a board.
-      #
-      # @param [String] id Either the board's short ID (an alphanumeric string,
-      #     found e.g. in the board's URL) or its long ID (a 24-character hex
-      #     string.)
-      # @param [Hash] params
-      #
-      # @raise  [Trello::Board] if a board with the given ID could not be found.
-      #
-      # @return [Trello::Board]
-      def find(id, params = {})
-        client.find(:board, id, params)
-      end
-
-      def create(fields)
-        data = {
-          'name'   => fields[:name],
-          'desc'   => fields[:description],
-          'closed' => fields[:closed] || false,
-          'starred' => fields[:starred] || false }
-        data.merge!('idOrganization' => fields[:organization_id]) if fields[:organization_id]
-        data.merge!('prefs' => fields[:prefs]) if fields[:prefs]
-        client.create(:board, data)
-      end
-
       # @return [Array<Trello::Board>] all boards for the current user
       def all
         from_response client.get("/members/#{Member.find(:me).username}/boards")
       end
     end
 
-    def save
-      return update! if id
-
-      fields = { name: name }
-      fields.merge!(desc: description) if description
-      fields.merge!(idOrganization: organization_id) if organization_id
-      fields.merge!(flat_prefs)
-
-      from_response(client.post("/boards", fields))
-    end
-
-    def update!
-      fail "Cannot save new instance." unless self.id
-
-      @previously_changed = changes
-      @changed_attributes.clear if @changed_attributes.respond_to?(:clear)
-      changes_applied if respond_to?(:changes_applied)
-
-      fields = {
-        name: attributes[:name],
-        desc: attributes[:description],
-        closed: attributes[:closed],
-        starred: attributes[:starred],
-        idOrganization: attributes[:organization_id]
-      }
-      fields.merge!(flat_prefs)
-
-      from_response client.put("/boards/#{self.id}/", fields)
-    end
-
-    def update_fields(fields)
-      attributes[:id]              = fields['id'] || fields[:id]                          if fields['id']   || fields[:id]
-      attributes[:name]            = fields['name'] || fields[:name]                      if fields['name'] || fields[:name]
-      attributes[:description]     = fields['desc'] || fields[:desc]                      if fields['desc'] || fields[:desc]
-      attributes[:closed]          = fields['closed']                                     if fields.has_key?('closed')
-      attributes[:closed]          = fields[:closed]                                      if fields.has_key?(:closed)
-      attributes[:starred]         = fields['starred']                                    if fields.has_key?('starred')
-      attributes[:starred]         = fields[:starred]                                     if fields.has_key?(:starred)
-      attributes[:url]             = fields['url']                                        if fields['url']
-      attributes[:organization_id] = fields['idOrganization'] || fields[:organization_id] if fields['idOrganization'] || fields[:organization_id]
-      attributes[:prefs]           = fields['prefs'] || fields[:prefs] || {}
-      attributes[:last_activity_date] = Time.iso8601(fields['dateLastActivity']) rescue nil
-      self
-    end
-
     # @return [Boolean]
     def closed?
       attributes[:closed]
@@ -188,28 +197,5 @@ module Trello
       "/boards/#{id}"
     end
 
-    private
-
-    # On creation
-    # https://trello.com/docs/api/board/#post-1-boards
-    # - permissionLevel
-    # - voting
-    # - comments
-    # - invitations
-    # - selfJoin
-    # - cardCovers
-    # - background
-    # - cardAging
-    #
-    # On update
-    # https://trello.com/docs/api/board/#put-1-boards-board-id
-    # Same as above plus:
-    # - calendarFeedEnabled
-    def flat_prefs
-      separator = id ? "/" : "_"
-      attributes[:prefs].inject({}) do |hash, (pref, v)|
-        hash.merge("prefs#{separator}#{pref}" => v)
-      end
-    end
   end
 end