zendesk_api 1.13.4 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 929e97f4f95119eb52613dd21e7bcdfdf812d880
-  data.tar.gz: f6befca8e106dc2946d431ec7dbefafaca698db6
+  metadata.gz: 4a64888213cb6c8abea4f1edbb5274eb6b607dab
+  data.tar.gz: 78a77dc586781b4a0c252e72714cf1cdb6f575db
 SHA512:
-  metadata.gz: 03043ac68eb0208d90dbf7757200270e29ea7e8e5341fc0dac9a1ca5b739c662ebff110ebd2a2bfbce0dad79e2b11aab0a0b6559e16105b41d7ca65733a9902d
-  data.tar.gz: 462327e6ac915c8bc83f7e921d4198366ea2484c1b9d8e3958870c56e0fc97adf9ca9162537f2a1bf84c9fddc0b1c1fc0aa37cce1938d9f774dff89bd7e98def
+  metadata.gz: 2b84ca74868e867d1673389ac6ae2ee74f74b7d770dfbbc0c945091aac2423c5eb831e6ca994b571cad94a7fdcfac7e8758fac04eb8b25871e3f31d91a10284b
+  data.tar.gz: 5c895345dd76d401224fd7e78a12c3fea2e7ac768fcb7ce6be6a630ff4918de1f7723f4ccc0aa5a90eabf55c22c1ff5f7cc17dfd6d1e90e45b0ca8820c7be9e2

data/lib/zendesk_api/actions.rb

@@ -72,7 +72,7 @@ module ZendeskAPI
         changed = association.is_a?(Collection) || association.changed?
 
         if association.respond_to?(:save) && changed && !inline_creation && association.save
-          self.send("#{association_name}=", association) # set id/ids columns
+          send("#{association_name}=", association) # set id/ids columns
         end
 
         if (association_data[:inline] == true || inline_creation) && changed
@@ -129,7 +129,7 @@ module ZendeskAPI
       # @param [Hash] options Any additional GET parameters to be added
       def find(client, options = {}, &block)
         find!(client, options, &block)
-      rescue ZendeskAPI::Error::ClientError => e
+      rescue ZendeskAPI::Error::ClientError
         nil
       end
     end

data/lib/zendesk_api/association.rb

@@ -150,7 +150,7 @@ module ZendeskAPI
     def build_parent_namespace(parent_class, instance, options, original_options)
       path = @options.path
 
-      association_on_parent = parent_class.associations.detect {|a| a[:name] == @options[:name]}
+      association_on_parent = parent_class.associations.detect { |a| a[:name] == @options[:name] }
       association_on_parent ||= parent_class.associations.detect do |a|
         !a[:inline] && a[:class] == @options[:class]
       end

data/lib/zendesk_api/associations.rb

@@ -20,7 +20,7 @@ module ZendeskAPI
       case resource
       when Hash
         klass.new(@client, resource.merge(:association => instance_association))
-      when String, Fixnum
+      when String, Integer
         klass.new(@client, (options[:include_key] || :id) => resource, :association => instance_association)
       else
         resource.association = instance_association
@@ -172,7 +172,7 @@ module ZendeskAPI
                 klass.find(@client, :id => id, :association => instance_association)
               end.compact
             elsif (resources = method_missing(association[:name].to_sym)) && resources.any?
-              resources.map {|res| wrap_resource(res, association)}
+              resources.map { |res| wrap_resource(res, association) }
             else
               []
             end

data/lib/zendesk_api/client.rb

@@ -172,7 +172,7 @@ module ZendeskAPI
         builder.use ZendeskAPI::Middleware::Request::EncodeJson
         builder.use ZendeskAPI::Middleware::Request::Retry, :logger => config.logger if config.retry # Should always be first in the stack
 
-        builder.adapter *adapter
+        builder.adapter(*adapter)
       end
     end
 

data/lib/zendesk_api/collection.rb

@@ -48,7 +48,7 @@ module ZendeskAPI
 
     # Methods that take a Hash argument
     methods = %w{create find update update_many destroy}
-    methods += methods.map {|method| method + "!"}
+    methods += methods.map { |method| method + "!" }
     methods.each do |deferrable|
       # Passes arguments and the proper path to the resource class method.
       # @param [Hash] options Options or attributes to pass
@@ -152,7 +152,7 @@ module ZendeskAPI
     # Adds an item (or items) to the list of side-loaded resources to request
     # @option sideloads [Symbol or String] The item(s) to sideload
     def include(*sideloads)
-      self.tap { @includes.concat(sideloads.map(&:to_s)) }
+      tap { @includes.concat(sideloads.map(&:to_s)) }
     end
 
     # Adds an item to this collection
@@ -186,7 +186,7 @@ module ZendeskAPI
         return (@resources = [])
       end
 
-      @response = get_response(@query || self.path)
+      @response = get_response(@query || path)
       handle_response(@response.body)
 
       @resources
@@ -236,7 +236,7 @@ module ZendeskAPI
     # @option collection [Array] The collection to replace this one with
     # @raise [ArgumentError] if any resources passed in don't belong in this collection
     def replace(collection)
-      raise "this collection is for #{@resource_class}" if collection.any?{|r| !r.is_a?(@resource_class) }
+      raise "this collection is for #{@resource_class}" if collection.any? { |r| !r.is_a?(@resource_class) }
       @resources = collection
     end
 
@@ -309,7 +309,7 @@ module ZendeskAPI
         inspect = []
         inspect << "options=#{@options.inspect}" if @options.any?
         inspect << "path=#{path}"
-        "#{Inflection.singular(@resource)} collection [#{inspect.join(",")}]"
+        "#{Inflection.singular(@resource)} collection [#{inspect.join(',')}]"
       end
     end
 
@@ -398,7 +398,7 @@ module ZendeskAPI
     def get_response(path)
       @error = nil
       @response = @client.connection.send(@verb || "get", path) do |req|
-        opts = @options.delete_if {|_, v| v.nil?}
+        opts = @options.delete_if { |_, v| v.nil? }
 
         req.params.merge!(:include => @includes.join(",")) if @includes.any?
 

data/lib/zendesk_api/helpers.rb

@@ -3,18 +3,18 @@ module ZendeskAPI
   module Helpers
     # From https://github.com/rubyworks/facets/blob/master/lib/core/facets/string/modulize.rb
     def self.modulize_string(string)
-      #gsub('__','/').  # why was this ever here?
-      string.gsub(/__(.?)/){ "::#{$1.upcase}" }.
-        gsub(/\/(.?)/){ "::#{$1.upcase}" }.
-        gsub(/(?:_+|-+)([a-z])/){ $1.upcase }.
-        gsub(/(\A|\s)([a-z])/){ $1 + $2.upcase }
+      # gsub('__','/').  # why was this ever here?
+      string.gsub(/__(.?)/) { "::#{$1.upcase}" }.
+        gsub(/\/(.?)/) { "::#{$1.upcase}" }.
+        gsub(/(?:_+|-+)([a-z])/) { $1.upcase }.
+        gsub(/(\A|\s)([a-z])/) { $1 + $2.upcase }
     end
 
     # From https://github.com/rubyworks/facets/blob/master/lib/core/facets/string/snakecase.rb
     def self.snakecase_string(string)
-      #gsub(/::/, '/').
-      string.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      # gsub(/::/, '/').
+      string.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+        gsub(/([a-z\d])([A-Z])/, '\1_\2').
         tr('-', '_').
         gsub(/\s/, '_').
         gsub(/__+/, '_').

data/lib/zendesk_api/middleware/request/retry.rb

@@ -10,7 +10,7 @@ module ZendeskAPI
         DEFAULT_RETRY_AFTER = 10
         ERROR_CODES = [429, 503]
 
-        def initialize(app, options={})
+        def initialize(app, options = {})
           super(app)
           @logger = options[:logger]
         end

data/lib/zendesk_api/middleware/response/callback.rb

@@ -12,7 +12,7 @@ module ZendeskAPI
 
         def call(env)
           @app.call(env).on_complete do |env|
-            @client.callbacks.each {|c| c.call(env)}
+            @client.callbacks.each { |c| c.call(env) }
           end
         end
       end

data/lib/zendesk_api/middleware/response/parse_iso_dates.rb

@@ -17,7 +17,7 @@ module ZendeskAPI
 
         def parse_dates!(value)
           case value
-          when Hash then value.each { |key,element| value[key] = parse_dates!(element) }
+          when Hash then value.each { |key, element| value[key] = parse_dates!(element) }
           when Array then value.each_with_index { |element, index| value[index] = parse_dates!(element) }
           when /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z\Z/m then Time.parse(value)
           else

data/lib/zendesk_api/middleware/response/raise_error.rb

@@ -4,7 +4,6 @@ module ZendeskAPI
   module Middleware
     module Response
       class RaiseError < Faraday::Response::RaiseError
-
         def call(env)
           super
         rescue Faraday::Error::TimeoutError, Faraday::Error::ConnectionFailed => e

data/lib/zendesk_api/resource.rb

@@ -59,7 +59,7 @@ module ZendeskAPI
       @client = client
       @attributes = ZendeskAPI::Trackie.new(attributes)
 
-      if self.class.associations.none? {|a| a[:name] == self.class.singular_resource_name}
+      if self.class.associations.none? { |a| a[:name] == self.class.singular_resource_name }
         ZendeskAPI::Client.check_deprecated_namespace_usage @attributes, self.class.singular_resource_name
       end
 
@@ -117,7 +117,7 @@ module ZendeskAPI
 
     # Compares resources by class and id. If id is nil, then by object_id
     def ==(other)
-      return true if other.object_id == self.object_id
+      return true if other.object_id == object_id
 
       if other && !(other.is_a?(Data) || other.is_a?(Integer))
         warn "Trying to compare #{other.class} to a Resource from #{caller.first}"
@@ -195,6 +195,7 @@ module ZendeskAPI
         @descendants ||= []
         @descendants << base
       end
+
       def descendants
         @descendants || []
       end

data/lib/zendesk_api/resources.rb

@@ -1,14 +1,14 @@
 module ZendeskAPI
-# @internal The following are redefined later, but needed by some circular resources (e.g. Ticket -> User, User -> Ticket)
-
+  # @internal The following are redefined later, but needed by some circular resources (e.g. Ticket -> User, User -> Ticket)
 
   class Ticket < Resource; end
   class Forum < Resource; end
   class User < Resource; end
   class Category < Resource; end
   class OrganizationMembership < ReadResource; end
+  class OrganizationSubscription < ReadResource; end
 
-# @internal Begin actual Resource definitions
+  # @internal Begin actual Resource definitions
 
   class Locale < ReadResource; end
 
@@ -97,7 +97,9 @@ module ZendeskAPI
     include Create
     include Destroy
 
-    def id; token; end
+    def id
+      token
+    end
 
     has_many Attachment
 
@@ -121,6 +123,7 @@ module ZendeskAPI
     has_many User
     has_many Tag, :extend => Tag::Update, :inline => :create
     has_many OrganizationMembership
+    has_many :subscriptions, class: OrganizationSubscription
 
     # Gets a incremental export of organizations from the start_time until now.
     # @param [Client] client The {Client} object to be used
@@ -156,6 +159,14 @@ module ZendeskAPI
     has Organization
   end
 
+  class OrganizationSubscription < ReadResource
+    include Create
+    include Destroy
+
+    has User
+    has Organization
+  end
+
   class Forum < Resource
     has Category
     has Organization
@@ -518,7 +529,7 @@ module ZendeskAPI
     private
 
     def attributes_for_save
-      to_save = [:conditions, :actions, :output].inject({}) {|h,k| h.merge(k => send(k))}
+      to_save = [:conditions, :actions, :output].inject({}) { |h, k| h.merge(k => send(k)) }
       { self.class.singular_resource_name.to_sym => attributes.changes.merge(to_save) }
     end
   end
@@ -617,7 +628,7 @@ module ZendeskAPI
     # @param [Ticket] ticket Optional {Ticket} to apply this macro to
     def apply(ticket = nil)
       apply!(ticket)
-    rescue Faraday::Error::ClientError => e
+    rescue Faraday::Error::ClientError
       Hashie::Mash.new
     end
   end
@@ -737,6 +748,7 @@ module ZendeskAPI
     has_many GroupMembership
     has_many Topic
     has_many OrganizationMembership
+    has_many OrganizationSubscription
 
     has_many ForumSubscription
     has_many TopicSubscription
@@ -956,7 +968,7 @@ module ZendeskAPI
   class PushNotificationDevice < DataResource
     def self.destroy_many(client, tokens)
       ZendeskAPI::Collection.new(
-        client, self,"push_notification_devices" => tokens,
+        client, self, "push_notification_devices" => tokens,
         :path => "push_notification_devices/destroy_many",
         :verb => :post
       )

data/lib/zendesk_api/sideloading.rb

@@ -25,7 +25,6 @@ module ZendeskAPI
       end
     end
 
-
     private
 
     # Traverses the resource looking for associations

data/lib/zendesk_api/track_changes.rb

@@ -10,7 +10,7 @@ module ZendeskAPI
           base.send :alias_method, :store, :regular_writer
           base.send :alias_method, :[]=, :store
           base.send :define_method, :update do |other|
-            other.each{|key, value| store key, value}
+            other.each { |key, value| store key, value }
           end
           base.send :alias_method, :merge!, :update
         end
@@ -41,11 +41,11 @@ module ZendeskAPI
       end
 
       def clear
-        keys.each{|key| delete key}
+        keys.each { |key| delete key }
       end
 
       def regular_writer(key, value)
-        if self.has_key?(key) && self[key] == value
+        if has_key?(key) && self[key] == value
           value
         else
           changes[key] = value
@@ -64,7 +64,7 @@ module ZendeskAPI
           each do |k, v|
             if v.respond_to?(:changed?) && v.changed?
               changes[k] = v.changes
-            elsif v.is_a?(Array) && v.any? {|val| val.respond_to?(:changed?) && val.changed?}
+            elsif v.is_a?(Array) && v.any? { |val| val.respond_to?(:changed?) && val.changed? }
               changes[k] = v
             end
           end
@@ -73,7 +73,7 @@ module ZendeskAPI
 
       def changed?(key = nil)
         if key.nil?
-          !changes.empty? || any? {|_, v| v.respond_to?(:changed?) && v.changed?}
+          !changes.empty? || any? { |_, v| v.respond_to?(:changed?) && v.changed? }
         else
           changes.key?(key)
         end

data/lib/zendesk_api/trackie.rb

@@ -9,6 +9,5 @@ module ZendeskAPI
     def size
       self['size']
     end
-
   end
 end

data/lib/zendesk_api/verbs.rb

@@ -33,7 +33,7 @@ module ZendeskAPI
 
             if @response.body.is_a?(Hash)
               resource = @response.body[self.class.singular_resource_name]
-              resource ||= @response.body.fetch(self.class.resource_name, []).detect {|res| res["id"] == id}
+              resource ||= @response.body.fetch(self.class.resource_name, []).detect { |res| res["id"] == id }
             end
 
             @attributes.replace @attributes.deep_merge(resource || {})

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.13.4"
+  VERSION = "1.14.0"
 end

data/util/resource_handler.rb

@@ -10,7 +10,7 @@ class ResourceHandler < YARD::Handlers::Ruby::Base
 
     if klass
       begin
-        klass = klass.split("::").inject(ZendeskAPI) do |p,k|
+        klass = klass.split("::").inject(ZendeskAPI) do |p, k|
           p.const_get(k)
         end
       rescue NameError
@@ -61,7 +61,7 @@ class ResourceHandler < YARD::Handlers::Ruby::Base
   def get_klass(statement)
     statement.traverse do |node|
       if node.type == :assoc && node.jump(:kw).source == "class"
-        classes = node.traverse do |value|
+        node.traverse do |value|
           if value.type == :const_path_ref || value.type == :var_ref
             return value.source
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.14.0
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,92 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bump
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -167,16 +83,16 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: scrub_rb
   requirement: !ruby/object:Gem::Requirement
@@ -253,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Zendesk REST API Client