ruby-trello 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 129649aadb5faffaa3dd64361d4eeffc6f46dd8d
-  data.tar.gz: 2ec4ff6b8555542d5006e24557c776cf28aca1fa
+  metadata.gz: 15e12149591973e1e515f0b8c510dc3718bddd7a
+  data.tar.gz: 7702c5ee26e57d7684581a4ccf465d3a99df3214
 SHA512:
-  metadata.gz: 3b3388b34a9830bf26cb48a705b45bb0e67a8c4314108b2013a389cf71ae607aba2a7bdde48cdf8a095f126c01eacf545f15177cc39a3e3c99b59d46a2086071
-  data.tar.gz: 7c5dc7a800406537edbbaab5f79eab36f11f73e84137562125775b8173896887d0762ecc3fb27f101e70d5ddb360e5a6ba9c35af8913a32d62f4c80bacbdfa56
+  metadata.gz: e689031f702357536e227cfe2d806af95f9222ce61baecc1548654d0d5255f25384f5d0adedc0205fceb164fc88e1c397bb00c7420ef02b28ac5ff521c401642
+  data.tar.gz: 58a9f2cf4a51385de17a23e60ba9b168c514e52d98b28eb0e8eb282e260f501ccba622c9639866420ac60c5bfcf5117a1f4659ba859ba7c03146e2b84044ca91

data/README.md

@@ -1,7 +1,8 @@
 # Ruby Trello API
 
-[![Stories in Ready](http://badge.waffle.io/jeremytregunna/ruby-trello.png)](http://waffle.io/jeremytregunna/ruby-trello)  
+[![Stories in Ready](http://badge.waffle.io/jeremytregunna/ruby-trello.png)](http://waffle.io/jeremytregunna/ruby-trello)
 [![Build Status](https://secure.travis-ci.org/jeremytregunna/ruby-trello.png)](http://travis-ci.org/jeremytregunna/ruby-trello) [![Dependency Status](https://gemnasium.com/jeremytregunna/ruby-trello.png)](https://gemnasium.com/jeremytregunna/ruby-trello.png)
+[![Code Climate](https://codeclimate.com/github/jeremytregunna/ruby-trello/badges/gpa.svg)](https://codeclimate.com/github/jeremytregunna/ruby-trello)
 
 This library implements the [Trello](http://www.trello.com/) [API](http://trello.com/api).
 
@@ -19,23 +20,23 @@ Seriously, [check it out](http://www.trello.com/).
 Full Disclosure: This library is mostly complete, if you do find anything missing or not functioning as you expect it
 to, please [let us know](https://trello.com/card/spot-a-bug-report-it/4f092b2ee23cb6fe6d1aaabd/17).
 
-While this library still does function on ruby 1.8 as of version 1.0.2 with activemodel < 4.0, this notice services to
-illustrate that future versions may include ruby 1.9.3+ specific features.
+Supports Ruby 2.0 or newer. Version 1.3.0 is the last version that supports Ruby that is older than 1.9.3. 
 
 ## Configuration
 
 ####Basic authorization:
 
-1. Get your API keys from [trello.com/app-key](https://trello.com/app-key).
-2. Visit the URL [trello.com/1/authorize], with the following GET parameters:
-    - `key`: the API key you got in step 1.
-    - `response_type`: "token"
-    - `expiration`: "never" if you don't want your token to ever expire. If you leave this blank,
-       your generated token will expire after 30 days.
-    - `scope`: "read,write" (optional) by default the API key will only give read access.  You must set the scope to "read,write" if you would like ruby-trello to have permissions to create and delete.
-    - The URL will look like this:
-      `https://trello.com/1/authorize?key=YOURAPIKEY&response_type=token&expiration=never&scope=read,write`
-3. You should see a page asking you to authorize your Trello application. Click "allow" and you should see a second page with a long alphanumeric string. This is your member token.
+1. Get your API public key from Trello via the irb console:
+
+```
+$ gem install ruby-trello
+$ irb -rubygems
+irb> require 'trello'
+irb> Trello.open_public_key_url                         # copy your public key
+irb> Trello.open_authorization_url key: 'yourpublickey' # copy your member token
+```
+
+2. You can now use the public key and member token in your app code:
 
 ```ruby
 require 'trello'

data/lib/trello.rb

@@ -1,8 +1,8 @@
-
 require 'oauth'
 require 'json'
 require 'logger'
 require 'active_model'
+require 'addressable/uri'
 
 # Ruby wrapper around the Trello[http://trello.com] API
 #
@@ -62,6 +62,7 @@ module Trello
   autoload :TInternet,         'trello/net'
   autoload :Token,             'trello/token'
   autoload :Webhook,           'trello/webhook'
+  autoload :JsonUtils,         'trello/json_utils'
 
   module Authorization
     autoload :AuthPolicy,      'trello/authorization'
@@ -104,4 +105,57 @@ module Trello
 
   def self.auth_policy; client.auth_policy; end
   def self.configuration; client.configuration; end
+
+  # Url to Trello API public key page
+  def self.public_key_url
+    'https://trello.com/app-key'
+  end
+
+  # 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
+  # @option options [String] :response_type 'token'
+  # @option options [String] :callback_method 'postMessage' or 'fragment'
+  # @option options [String] :return_url URL the token should be returned to
+  # @option options [String] :scope Comma-separated list of one or more of 'read', 'write', 'account'
+  # @option options [String] :expiration '1hour', '1day', '30days', 'never'
+  # @see https://developers.trello.com/authorize
+  def self.authorize_url(options = {})
+    params = options.dup
+    params[:key] ||= configuration.developer_public_key or
+      raise ArgumentError, 'Please configure your Trello public key'
+    params[:name] ||= 'Ruby Trello'
+    params[:scope] = 'read,write,account'
+    params[:expiration] ||= 'never'
+    params[:response_type] ||= 'token'
+    uri = Addressable::URI.parse 'https://trello.com/1/authorize'
+    uri.query_values = params
+    uri
+  end
+
+  # Visit the Trello API public key page
+  #
+  # @see https://trello.com/app-key
+  def self.open_public_key_url
+    open_url public_key_url
+  end
+
+  # Visit the Trello authorized token page
+  #
+  # @see https://developers.trello.com/authorize
+  def self.open_authorization_url(options = {})
+    open_url authorize_url(options)
+  end
+
+  # @private
+  def self.open_url(url)
+    require 'launchy'
+    Launchy.open(url.to_s)
+  rescue LoadError
+    warn 'Please install the launchy gem to open the url automatically.'
+    url
+  end
 end

data/lib/trello/action.rb

@@ -26,8 +26,9 @@ module Trello
 
       def search(query, opts={})
         response = client.get("/search/", { query: query }.merge(opts))
-        JSON.parse(response).except("options").inject({}) do |res, key|
-          res.merge({ key.first => key.last.jsoned_into("Trello::#{key.first.singularize.capitalize}".constantize) })
+        parse_json(response).except("options").each_with_object({}) do |(key, data), result|
+          klass = "Trello::#{key.singularize.capitalize}".constantize
+          result[key] = klass.from_json(data)
         end
       end
     end
@@ -48,17 +49,17 @@ module Trello
 
     # Returns the board this action occurred on.
     def board
-      client.get("/actions/#{id}/board").json_into(Board)
+      Board.from_response client.get("/actions/#{id}/board")
     end
 
     # Returns the card the action occurred on.
     def card
-      client.get("/actions/#{id}/card").json_into(Card)
+      Card.from_response client.get("/actions/#{id}/card")
     end
 
     # Returns the list the action occurred on.
     def list
-      client.get("/actions/#{id}/list").json_into(List)
+      List.from_response client.get("/actions/#{id}/list")
     end
 
     # Returns the member who created the action.

data/lib/trello/attachment.rb

@@ -16,20 +16,21 @@ module Trello
   # @!attribute mime_type
   #   @return [String]
   class Attachment < BasicData
-    register_attributes :name, :id, :url, :bytes, :member_id, :date, :is_upload, :mime_type
+    register_attributes :name, :id, :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[:id] = fields['id']
-      attributes[:url] = fields['url']
-      attributes[:bytes] = fields['bytes'].to_i
+      attributes[:name]      = fields['name']
+      attributes[:id]        = fields['id']
+      attributes[:url]       = fields['url']
+      attributes[:bytes]     = fields['bytes'].to_i
       attributes[:member_id] = fields['idMember']
-      attributes[:date] = Time.parse(fields['date'])
+      attributes[:date]      = Time.parse(fields['date'])
       attributes[:is_upload] = fields['isUpload']
       attributes[:mime_type] = fields['mimeType']
+      attributes[:previews]  = fields['previews']
       self
     end
   end

data/lib/trello/basic_data.rb

@@ -1,6 +1,3 @@
-require 'trello/core_ext/array'
-require 'trello/core_ext/hash'
-require 'trello/core_ext/string'
 require 'active_support/inflector'
 
 module Trello
@@ -9,6 +6,8 @@ module Trello
     include ActiveModel::Dirty
     include ActiveModel::Serializers::JSON
 
+    include Trello::JsonUtils
+
     class << self
       def path_name
         name.split("::").last.underscore
@@ -29,13 +28,13 @@ module Trello
       end
 
       def parse(response)
-        response.json_into(self).tap do |basic_data|
+        from_response(response).tap do |basic_data|
           yield basic_data if block_given?
         end
       end
 
       def parse_many(response)
-        response.json_into(self).map do |data|
+        from_response(response).map do |data|
           data.tap do |d|
             yield d if block_given?
           end

data/lib/trello/board.rb

@@ -17,8 +17,8 @@ module Trello
   # @!attribute [r] prefs
   #   @return [Hash] A 24-character hex string
   class Board < BasicData
-    register_attributes :id, :name, :description, :closed, :starred, :url, :organization_id, :prefs,
-      readonly: [ :id, :url ]
+    register_attributes :id, :name, :description, :closed, :starred, :url, :organization_id, :prefs, :last_activity_date,
+      readonly: [ :id, :url, :last_activity_date ]
     validates_presence_of :id, :name
     validates_length_of   :name,        in: 1..16384
     validates_length_of   :description, maximum: 16384
@@ -53,7 +53,7 @@ module Trello
 
       # @return [Array<Trello::Board>] all boards for the current user
       def all
-        client.get("/members/#{Member.find(:me).username}/boards").json_into(self)
+        from_response client.get("/members/#{Member.find(:me).username}/boards")
       end
     end
 
@@ -65,7 +65,7 @@ module Trello
       fields.merge!(idOrganization: organization_id) if organization_id
       fields.merge!(flat_prefs)
 
-      client.post("/boards", fields).json_into(self)
+      from_response(client.post("/boards", fields))
     end
 
     def update!
@@ -83,7 +83,7 @@ module Trello
       }
       fields.merge!(flat_prefs)
 
-      client.put("/boards/#{self.id}/", fields).json_into(self)
+      from_response client.put("/boards/#{self.id}/", fields)
     end
 
     def update_fields(fields)
@@ -95,6 +95,7 @@ module Trello
       attributes[:url]             = fields['url']             if fields['url']
       attributes[:organization_id] = fields['idOrganization']  if fields['idOrganization']
       attributes[:prefs]           = fields['prefs'] || {}
+      attributes[:last_activity_date]   = Time.iso8601(fields['dateLastActivity']) rescue nil
       self
     end
 
@@ -107,7 +108,7 @@ module Trello
     def starred?
       attributes[:starred]
     end
-    
+
     # @return [Boolean]
     def has_lists?
       lists.size > 0
@@ -116,7 +117,7 @@ module Trello
     # Find a card on this Board with the given ID.
     # @return [Trello::Card]
     def find_card(card_id)
-      client.get("/boards/#{self.id}/cards/#{card_id}").json_into(Card)
+      Card.from_response client.get("/boards/#{self.id}/cards/#{card_id}")
     end
 
     # Add a member to this Board.
@@ -154,10 +155,15 @@ module Trello
     # Returns a reference to the organization this board belongs to.
     one :organization, path: :organizations, using: :organization_id
 
-    many :labels
+    def labels(params={})
+      # Set the limit to as high as possible given there is no pagination in this API.
+      params[:limit] = 1000 unless params[:limit]
+      labels = Label.from_response client.get("/boards/#{id}/labels", params)
+      MultiAssociation.new(self, labels).proxy
+    end
 
     def label_names
-      label_names = client.get("/boards/#{id}/labelnames").json_into(LabelName)
+      label_names = LabelName.from_response client.get("/boards/#{id}/labelnames")
       MultiAssociation.new(self, label_names).proxy
     end
 

data/lib/trello/card.rb

@@ -78,7 +78,8 @@ module Trello
 
       # Create a new card and save it on Trello.
       #
-      # @param [Hash] options # @option options [String] :name The name of the new card.
+      # @param [Hash] options
+      # @option options [String] :name The name of the new card.
       # @option options [String] :list_id ID of the list that the card should
       #     be added to.
       # @option options [String] :desc A string with a
@@ -157,6 +158,7 @@ module Trello
       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
 
@@ -173,12 +175,12 @@ module Trello
     many :checklists, filter: :all
 
     def check_item_states
-      states = client.get("/cards/#{self.id}/checkItemStates").json_into(CheckItemState)
+      states = CheckItemState.from_response client.get("/cards/#{self.id}/checkItemStates")
       MultiAssociation.new(self, states).proxy
     end
 
     many :labels
-    
+
     # Returns a reference to the list this card is currently in.
     one :list, path: :lists, using: :list_id
 
@@ -187,7 +189,7 @@ module Trello
     # @return [Array<Trello::Member>]
     def members
       members = member_ids.map do |member_id|
-        client.get("/members/#{member_id}").json_into(Member)
+        Member.from_response client.get("/members/#{member_id}")
       end
       MultiAssociation.new(self, members).proxy
     end
@@ -202,7 +204,7 @@ module Trello
       # If we have an id, just update our fields.
       return update! if id
 
-      client.post("/cards", {
+      from_response client.post("/cards", {
         name:   name,
         desc:   desc,
         idList: list_id,
@@ -210,7 +212,7 @@ module Trello
         labels: card_labels,
         pos: pos,
         due: due
-      }).json_into(self)
+      })
     end
 
     # Update an existing record.
@@ -232,7 +234,6 @@ module Trello
       client.put("/cards/#{id}", payload)
     end
 
-
     # Delete this card
     #
     # @return [String] the JSON response from the Trello API
@@ -315,7 +316,7 @@ module Trello
     def remove_member(member)
       client.delete("/cards/#{id}/members/#{member.id}")
     end
-    
+
     # Add a label
     def add_label(label)
       unless label.valid?
@@ -327,11 +328,11 @@ module Trello
 
     # Remove a label
     def remove_label(label)
-        unless label.valid?
-          errors.add(:label, "is not valid.")
-          return Trello.logger.warn "Label is not valid." unless label.valid?
-        end
-        client.delete("/cards/#{id}/idLabels/#{label.id}")
+      unless label.valid?
+        errors.add(:label, "is not valid.")
+        return Trello.logger.warn "Label is not valid." unless label.valid?
+      end
+      client.delete("/cards/#{id}/idLabels/#{label.id}")
     end
 
     # Add an attachment to this card
@@ -351,7 +352,7 @@ module Trello
 
     # Retrieve a list of attachments
     def attachments
-      attachments = client.get("/cards/#{id}/attachments").json_into(Attachment)
+      attachments = Attachment.from_response client.get("/cards/#{id}/attachments")
       MultiAssociation.new(self, attachments).proxy
     end
 

data/lib/trello/checklist.rb

@@ -22,8 +22,8 @@ module Trello
   # @!attribute [r] member_ids
   #   @return [Array<String>] An array of 24-character hex strings
   class Checklist < BasicData
-    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]
+    register_attributes :id, :name, :description, :closed, :position, :url, :check_items, :board_id, :list_id, :card_id, :member_ids,
+                        readonly: [:id, :description, :closed, :url, :check_items, :board_id, :list_id, :card_id, :member_ids]
     validates_presence_of :id, :board_id, :list_id
     validates_length_of :name, in: 1..16384
 
@@ -36,7 +36,7 @@ module Trello
       def create(options)
         client.create(:checklist,
                       'name' => options[:name],
-                      'idBoard' => options[:board_id])
+                      'idCard'  => options[:card_id])
       end
     end
 
@@ -53,6 +53,7 @@ module Trello
       attributes[:check_items] = fields['checkItems']
       attributes[:position] = fields['pos']
       attributes[:board_id] = fields['idBoard']
+      attributes[:card_id] = fields['idCard']
       attributes[:list_id] = fields['idList']
       attributes[:member_ids] = fields['idMembers']
       self
@@ -67,14 +68,14 @@ module Trello
     def save
       return update! if id
 
-      client.post("/checklists", {
-          name: name,
-          idBoard: board_id
-      }).json_into(self)
+      from_response(client.post("/checklists", {
+        name: name,
+        idCard: card_id
+      }))
     end
 
     def update!
-      client.put("/checklists/#{id}", {name: name, pos: position}).json_into(self)
+      from_response(client.put("/checklists/#{id}", {name: name, pos: position}))
     end
 
     # Return a list of items on the checklist.
@@ -87,6 +88,9 @@ module Trello
     # Return a reference to the board the checklist is on.
     one :board, path: :checklists, using: :board_id
 
+    # Return a reference to the card the checklist is on.
+    one :card, path: :checklists, using: :card_id
+
     # Return a reference to the list the checklist is on.
     one :list, path: :lists, using: :list_id
 

data/lib/trello/core_ext/array.rb

@@ -1,5 +1,6 @@
+warn "Use of trello/core_ext/array is deprecated. Use Trello::JsonUtils instead"
 class Array
   def jsoned_into(obj)
-    self.map { |element| element.jsoned_into(obj) }
+    obj.from_json(self)
   end
-end
+end

data/lib/trello/core_ext/hash.rb

@@ -1,6 +1,6 @@
+warn "Use of trello/core_ext/hash is deprecated. Use Trello::JsonUtils instead"
 class Hash
   def jsoned_into(obj)
-    action = obj.kind_of?(Class) ? :new : :update_fields
-    obj.send(action, self)
+    obj.from_json(self)
   end
-end
+end

data/lib/trello/core_ext/string.rb

@@ -1,31 +1,6 @@
+warn "Use of trello/core_ext/string is deprecated. Use Trello::JsonUtils instead"
 class String
-  # Decodes some JSON text in the receiver, and marshals it into a class specified
-  # in _obj_. If _obj_ is not a class, then we marshall the data into that instance
-  # via _update_fields_.
-  #
-  # For instance:
-  #
-  #   class Stuff
-  #     attr_reader :a, :b
-  #     def initialize(values)
-  #       @a = values['a']
-  #       @b = values['b']
-  #     end
-  #   end
-  #   thing = '{"a":42,"b":"foo"}'.json_into(Stuff)
-  #   thing.a == 42
-  #   thing.b == "foo"
   def json_into(obj, encoding = 'UTF-8')
-    data = JSON.parse(self.force_encoding(encoding))
-    data.jsoned_into(obj)
-  rescue JSON::ParserError => json_error
-    if json_error.message =~ /model not found/
-      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
-      Trello.logger.error "Unknown error."
-      raise
-    end
+    obj.from_response(self, encoding)
   end
-end
+end

data/lib/trello/has_actions.rb

@@ -2,7 +2,7 @@ module Trello
   module HasActions
     # Returns a list of the actions associated with this object.
     def actions(options = {})
-      actions = client.get("#{request_prefix}/actions", { filter: :all }.merge(options)).json_into(Action)
+      actions = Action.from_response client.get("#{request_prefix}/actions", { filter: :all }.merge(options))
       MultiAssociation.new(self, actions).proxy
     end
   end

data/lib/trello/json_utils.rb

@@ -0,0 +1,64 @@
+module Trello
+  module JsonUtils
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.send :extend, ClassMethods
+    end
+
+    module InstanceMethods
+      def from_response(*args)
+        update_fields parse_json(*args)
+      end
+
+      def parse_json(*args)
+        self.class.parse_json(*args)
+      end
+    end
+
+    module ClassMethods
+      # Public - Decodes some JSON text in the receiver, and marshals it into a class specified
+      # in _obj_.
+      #
+      # For instance:
+      #
+      #   class Stuff
+      #     attr_reader :a, :b
+      #     def initialize(values)
+      #       @a = values['a']
+      #       @b = values['b']
+      #     end
+      #   end
+      #   thing = Stuff.from_response '{"a":42,"b":"foo"}'
+      #   thing.a == 42
+      #   thing.b == "foo"
+      #
+      def from_response(data, encoding = 'UTF-8')
+        from_json(parse_json(data, encoding))
+      end
+
+      def from_json(json)
+        case json
+        when Array
+          json.map { |element| from_json(element) }
+        when Hash
+          self.new(json)
+        else
+          json
+        end
+      end
+
+      def parse_json(string, encoding = 'UTF-8')
+        JSON.parse(string.force_encoding(encoding))
+      rescue JSON::ParserError => json_error
+        if json_error.message =~ /model not found/
+          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
+          Trello.logger.error "Unknown error."
+          raise
+        end
+      end
+    end
+  end
+end

data/lib/trello/label.rb

@@ -21,6 +21,8 @@ module Trello
     }
 
     class << self
+      VALID_LABEL_COLOURS = %w{green yellow orange red purple blue sky lime pink black} << ''
+
       # Find a specific card by its id.
       def find(id, params = {})
         client.find(:label, id, params)
@@ -37,7 +39,7 @@ module Trello
 
       # Label colours
       def label_colours
-        %w{green yellow orange red purple blue sky lime pink black}
+        VALID_LABEL_COLOURS
       end
     end
 
@@ -78,11 +80,11 @@ module Trello
       # If we have an id, just update our fields.
       return update! if id
 
-      client.post("/labels", {
+      from_response client.post("/labels", {
         name:   name,
         color:   color,
         idBoard: board_id,
-      }).json_into(self)
+      })
     end
 
     # Update an existing record.

data/lib/trello/list.rb

@@ -51,12 +51,12 @@ module Trello
     def save
       return update! if id
 
-      client.post("/lists", {
+      from_response client.post("/lists", {
         name: name,
         closed: closed || false,
         idBoard: board_id,
         pos: pos
-      }).json_into(self)
+      })
     end
 
     def update!

data/lib/trello/member.rb

@@ -98,10 +98,10 @@ module Trello
     end
 
     def update!
-      client.put(request_prefix, {
+      from_response client.put(request_prefix, {
         fullName: full_name,
         bio: bio
-      }).json_into(self)
+      })
     end
 
     # :nodoc:

data/lib/trello/notification.rb

@@ -39,23 +39,23 @@ module Trello
     one :member_creator, path: :members, via: Member, using: :member_creator_id
 
     def board
-      client.get("/notifications/#{id}/board").json_into(Board)
+      Board.from_response client.get("/notifications/#{id}/board")
     end
 
     def list
-      client.get("/notifications/#{id}/list").json_into(List)
+      List.from_response client.get("/notifications/#{id}/list")
     end
 
     def card
-      client.get("/notifications/#{id}/card").json_into(Card)
+      Card.from_response client.get("/notifications/#{id}/card")
     end
 
     def member
-      client.get("/notifications/#{id}/member").json_into(Member)
+      Member.from_response client.get("/notifications/#{id}/member")
     end
 
     def organization
-      client.get("/notifications/#{id}/organization").json_into(Organization)
+      Organization.from_response client.get("/notifications/#{id}/organization")
     end
   end
 end

data/lib/trello/organization.rb

@@ -14,8 +14,10 @@ module Trello
   class Organization < BasicData
     register_attributes :id, :name, :display_name, :description, :url, :invited,
       :website, :logo_hash, :billable_member_count, :active_billable_member_count,
+      :memberships,
       readonly: [ :id, :name, :display_name, :description, :url, :invited,
-        :website, :logo_hash, :billable_member_count, :active_billable_member_count ]
+        :website, :logo_hash, :billable_member_count, :active_billable_member_count,
+        :memberships ]
     validates_presence_of :id, :name
 
     include HasActions
@@ -42,18 +44,19 @@ module Trello
       attributes[:logo_hash]                    = fields['logoHash']
       attributes[:billable_member_count]        = fields['billableMemberCount']
       attributes[:active_billable_member_count] = fields['activeBillableMemberCount']
+      attributes[:memberships]                  = fields['memberships']
       self
     end
 
     # Returns a list of boards under this organization.
     def boards
-      boards = client.get("/organizations/#{id}/boards/all").json_into(Board)
+      boards = Board.from_response client.get("/organizations/#{id}/boards/all")
       MultiAssociation.new(self, boards).proxy
     end
 
     # Returns an array of members associated with the organization.
     def members(params = {})
-      members = client.get("/organizations/#{id}/members/all", params).json_into(Member)
+      members = Member.from_response client.get("/organizations/#{id}/members/all", params)
       MultiAssociation.new(self, members).proxy
     end
 

data/lib/trello/webhook.rb

@@ -65,11 +65,11 @@ module Trello
       # If we have an id, just update our fields.
       return update! if id
 
-      client.post("/webhooks", {
+      from_response client.post("/webhooks", {
         description: description,
         idModel: id_model,
         callbackURL: callback_url
-      }).json_into(self)
+      })
     end
 
     # Update the webhook.

data/spec/board_spec.rb

@@ -74,6 +74,14 @@ module Trello
       it "gets its url" do
         expect(board.url).to_not be_nil
       end
+
+      it "gets its last_activity_date" do
+        expect(board.last_activity_date).to_not be_nil
+      end
+
+      it "gets a Time object for last_activity_date" do
+        expect(board.last_activity_date).to be_a(Time)
+      end
     end
 
     context "actions" do
@@ -116,11 +124,11 @@ module Trello
       end
 
       it "gets the specific labels for the board" do
-        client.stub(:get).with("/boards/abcdef123456789123456789/labels", {}).
+        allow(client).to receive(:get).with("/boards/abcdef123456789123456789/labels", {:limit => 1000}).
           and_return label_payload
         labels = board.labels
-        labels.count.should eq(4)
 
+        expect(labels.count).to eq(4)
         expect(labels[2].color).to  eq('red')
         expect(labels[2].id).to  eq('abcdef123456789123456789')
         expect(labels[2].board_id).to  eq('abcdef123456789123456789')
@@ -132,6 +140,12 @@ module Trello
         expect(labels[3].name).to  eq('on hold')
         expect(labels[3].uses).to  eq(6)
       end
+
+      it "passes the label limit" do
+        allow(client).to receive(:get).with("/boards/abcdef123456789123456789/labels", {:limit => 50}).
+          and_return label_payload
+        labels = board.labels(:limit => 50)
+      end
     end
 
     context "find_card" do
@@ -278,7 +292,7 @@ module Trello
         expect(client).to_not receive(:put)
         expect {
           Board.new.save
-        }.to raise_error
+        }.to raise_error(Trello::ConfigurationError)
       end
 
       it "puts all fields except id" do

data/spec/card_spec.rb

@@ -99,7 +99,7 @@ module Trello
           desc: expected_new_desc,
         }
 
-        client.should_receive(:put).once.with("/cards/abcdef123456789123456789", payload)
+        expect(client).to receive(:put).once.with("/cards/abcdef123456789123456789", payload)
 
         card.desc = expected_new_desc
         card.save
@@ -367,7 +367,8 @@ module Trello
           .and_return "not important"
       end
       it "can retrieve labels" do
-        client.stub(:get).with("/cards/abcdef123456789123456789/labels", {}).
+        allow(client).to receive(:get).
+          with("/cards/abcdef123456789123456789/labels", {}).
           and_return label_payload
         labels = card.labels
         expect(labels.size).to  eq(4)
@@ -384,19 +385,19 @@ module Trello
       end
 
       it "can remove a label" do
-        client.should_receive(:delete).once.with("/cards/abcdef123456789123456789/idLabels/abcdef123456789123456789")
+        expect(client).to receive(:delete).once.with("/cards/abcdef123456789123456789/idLabels/abcdef123456789123456789")
         label = Label.new(label_details.first)
         card.remove_label(label)
       end
 
       it "can add a label" do
-        client.should_receive(:post).once.with("/cards/abcdef123456789123456789/idLabels", {:value => "abcdef123456789123456789"})
+        expect(client).to receive(:post).once.with("/cards/abcdef123456789123456789/idLabels", {:value => "abcdef123456789123456789"})
         label = Label.new(label_details.first)
         card.add_label label
       end
 
       it "throws an error when trying to add a invalid label" do
-        client.stub(:post).with("/cards/abcdef123456789123456789/idLabels", { value: 'abcdef123456789123456789' }).
+        allow(client).to receive(:post).with("/cards/abcdef123456789123456789/idLabels", { value: 'abcdef123456789123456789' }).
           and_return "not important"
         label = Label.new(label_details.first)
         label.name = nil
@@ -405,7 +406,7 @@ module Trello
       end
 
       it "throws an error when trying to remove a invalid label" do
-        client.stub(:delete).with("/cards/abcdef123456789123456789/idLabels/abcdef123456789123456789").
+        allow(client).to receive(:delete).with("/cards/abcdef123456789123456789/idLabels/abcdef123456789123456789").
           and_return "not important"
         label = Label.new(label_details.first)
         label.name = nil
@@ -455,6 +456,10 @@ module Trello
         expect(first_attachment.date).to eq Time.parse(attachments_details[0]["date"])
         expect(first_attachment.is_upload).to eq attachments_details[0]["isUpload"]
         expect(first_attachment.mime_type).to eq attachments_details[0]["mimeType"]
+        expect(first_attachment.previews).to eq attachments_details[0]["previews"]
+
+        second_attachment = card.attachments[1]
+        expect(second_attachment.previews).to eq nil
       end
 
       it "can remove an attachment" do

data/spec/checklist_spec.rb

@@ -37,18 +37,21 @@ module Trello
         payload = {
             name: 'Test Checklist',
             desc: '',
+            card_id: cards_details.first['id']
         }
 
-        result = JSON.generate(checklists_details.first.merge(payload.merge(idBoard: boards_details.first['id'])))
+        attributes = checklists_details.first.merge(payload).except("idBoard")
+        result = JSON.generate(attributes)
+        
 
-        expected_payload = {name: "Test Checklist", idBoard: "abcdef123456789123456789"}
+        expected_payload = {name: "Test Checklist", idCard: cards_details.first['id']}
 
         expect(client)
           .to receive(:post)
           .with("/checklists", expected_payload)
           .and_return result
 
-        checklist = Checklist.create(checklists_details.first.merge(payload.merge(board_id: boards_details.first['id'])))
+        checklist = Checklist.create(attributes)
 
         expect(checklist).to be_a Checklist
       end
@@ -166,7 +169,7 @@ module Trello
 
     context "making a copy" do
       let(:client) { Trello.client }
-      let(:copy_options) { { :name => checklist.name, :idBoard => checklist.board_id } }
+      let(:copy_options) { { :name => checklist.name, :idCard => checklist.card_id } }
       let(:copied_checklist) { checklist.copy }
 
       before(:each) do

data/spec/integration/how_to_use_boards_spec.rb

@@ -42,7 +42,7 @@ describe "how to use boards", broken: true do
     end
 
     it "can list all boards" do
-      Client.get("/members/me/boards/").json_into(Board).should be_an Array
+      Board.from_response(Client.get("/members/me/boards/")).should be_an Array
     end
   end
 end

data/spec/json_utils_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+module Trello
+  RSpec.describe JsonUtils do
+    include Helpers
+
+    describe ".from_json" do
+      describe "Trello::Card" do
+        it "should convert an array of parsed json into cards" do
+          cards = Trello::Card.from_json(cards_details)
+
+          expect(cards.size).to eq(cards_details.size)
+
+          card = cards.first
+          expect(card).to be_a(Trello::Card)
+          expect(card.name).to eq(cards_details.first['name'])
+        end
+
+        it "should convert a single parsed json into card" do
+          card_details = cards_details.first
+          card = Trello::Card.from_json(card_details)
+
+          expect(card).to be_a(Trello::Card)
+          expect(card.name).to eq(cards_details.first['name'])
+        end
+      end
+    end
+
+    describe ".from_response" do
+      def example_class
+        @example_class ||= Class.new do
+          include Trello::JsonUtils
+
+          attr_accessor :name, :description
+
+          def initialize(options = {})
+            @name = options['name']
+            @description = options['description']
+          end
+        end
+      end
+
+      it 'converts json into an instance of a class' do
+        expect(example_class.from_response('{}')).to be_a example_class
+      end
+
+      it 'supplies the parsed json to the class ctor as a hash' do
+        json_text = '{"name" : "Jazz Kang", "description": "Plonker"}'
+
+        result = example_class.from_response json_text
+        expect(result.name).to eq("Jazz Kang")
+        expect(result.description).to eq("Plonker")
+      end
+
+      it 'can also handle arrays of instances of a class' do
+        json_text = <<-JSON
+      [
+       {"name" : "Jazz Kang", "description": "Plonker"},
+       {"name" : "Phil Murphy", "description": "Shoreditch hipster"}
+      ]
+        JSON
+
+        result = example_class.from_response json_text
+
+        expect(result).to be_an Array
+        expect(result.size).to eq 2
+        result.each do |parsed|
+          expect(parsed).to be_a example_class
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -35,6 +35,13 @@ RSpec.configure do |rspec|
   rspec.before :each do
     Trello.reset!
   end
+
+  rspec.around(:each, :silence_warnings) do |example|
+    verbose = $VERBOSE
+    $VERBOSE = nil
+    example.run
+    $VERBOSE = verbose
+  end
 end
 
 module Helpers
@@ -57,13 +64,14 @@ module Helpers
 
   def boards_details
     [{
-      'id'             => 'abcdef123456789123456789',
-      'name'           => 'Test',
-      'desc'           => 'This is a test board',
-      'closed'         => false,
-      'starred'         => false,
-      'idOrganization' => 'abcdef123456789123456789',
-      'url'            => 'https://trello.com/board/test/abcdef123456789123456789'
+      'id'               => 'abcdef123456789123456789',
+      'name'             => 'Test',
+      'desc'             => 'This is a test board',
+      'closed'           => false,
+      'starred'          => false,
+      'idOrganization'   => 'abcdef123456789123456789',
+      'url'              => 'https://trello.com/board/test/abcdef123456789123456789',
+      'dateLastActivity' => '2012-12-08T18:40:24.314Z'
     }]
   end
 
@@ -155,6 +163,7 @@ module Helpers
        'idMember'     => 'abcdef123456789123456781',
        'isUpload'     => false,
        'date'         => '2013-02-28T17:12:28.497Z',
+       'previews'     => 'previews'
      },
      {
        'id'           => 'abcdef123456789123456781',

data/spec/string_spec.rb

@@ -6,6 +6,8 @@ describe String, '#json_into' do
 
   def example_class
     @example_class ||= Class.new do
+      include Trello::JsonUtils
+
       attr_accessor :name, :description
 
       def initialize(options = {})

data/spec/trello_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'launchy'
 
 include Trello
 include Trello::Authorization
@@ -75,6 +76,53 @@ describe Trello do
       it { expect(Trello.auth_policy).to be_a(AuthPolicy) }
       it { expect { Trello.client.get(:member) }.to raise_error(Trello::ConfigurationError) }
     end
+  end
+
+  context 'client authorization helpers' do
+    before do
+      allow(Launchy).to receive(:open)
+    end
+
+    it { expect(Trello.public_key_url).to eq('https://trello.com/app-key') }
+    it { expect(Trello.authorize_url(key: 'foo')).to match(%r{^https://trello.com/1/authorize}) }
+
+    describe '.open_public_key_url' do
+      it 'launches app key endpoint' do
+        expect(Launchy).to receive(:open).with('https://trello.com/app-key')
 
+        Trello.open_public_key_url
+      end
+
+      it 'rescues LoadError', :silence_warnings do
+        allow(Launchy).to receive(:open).and_raise(LoadError)
+
+        expect { Trello.open_public_key_url }.to_not raise_error(LoadError)
+      end
+    end
+
+    describe '.open_authorization_url' do
+      it 'launches authorize endpoint with configured public key' do
+        app_key = 'abcd1234'
+        allow(Trello.configuration).to receive(:developer_public_key).and_return(app_key)
+        authorize_url = "https://trello.com/1/authorize?expiration=never&key=#{app_key}&name=Ruby%20Trello&response_type=token&scope=read%2Cwrite%2Caccount"
+        expect(Launchy).to receive(:open).with(authorize_url)
+
+        Trello.open_authorization_url
+      end
+
+      it 'launches authorize endpoint with given public key' do
+        app_key = 'wxyz6789'
+        authorize_url = "https://trello.com/1/authorize?expiration=never&key=#{app_key}&name=Ruby%20Trello&response_type=token&scope=read%2Cwrite%2Caccount"
+        expect(Launchy).to receive(:open).with(authorize_url)
+
+        Trello.open_authorization_url(key: 'wxyz6789')
+      end
+
+      it 'raises an error if key not configured' do
+        expect(Launchy).to_not receive(:open)
+
+        expect { Trello.open_authorization_url }.to raise_error(ArgumentError)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-trello
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jeremy Tregunna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -105,6 +105,7 @@ files:
 - lib/trello/has_actions.rb
 - lib/trello/item.rb
 - lib/trello/item_state.rb
+- lib/trello/json_utils.rb
 - lib/trello/label.rb
 - lib/trello/label_name.rb
 - lib/trello/list.rb
@@ -131,6 +132,7 @@ files:
 - spec/integration/how_to_use_boards_spec.rb
 - spec/integration/integration_test.rb
 - spec/item_spec.rb
+- spec/json_utils_spec.rb
 - spec/label_spec.rb
 - spec/list_spec.rb
 - spec/member_spec.rb
@@ -155,12 +157,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: ruby-trello
 rubygems_version: 2.0.14
@@ -182,6 +184,7 @@ test_files:
 - spec/integration/how_to_use_boards_spec.rb
 - spec/integration/integration_test.rb
 - spec/item_spec.rb
+- spec/json_utils_spec.rb
 - spec/label_spec.rb
 - spec/list_spec.rb
 - spec/member_spec.rb