zendesk2 0.3.2 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODU3ZjQzNTA5Y2UzYzM5NmEwZDEyM2QyNjk1NmRmYjFhZDliMTkwNg==
+  data.tar.gz: !binary |-
+    NTJjNmY4MTVmN2UwYjM5MmY0YmIzODA3YzNiNDI5MWYzNTAxZjdhNw==
+SHA512:
+  metadata.gz: !binary |-
+    YzA2Y2E0MmI2NzA5MDZmMmRhZjZlNmY3MDQyZDM5YzY4NGU2NWI3NDJjNWNj
+    MTkyYjJhNzllMDgyNjMxZjAzZGYyMDA5ODVlM2QzNThlNmQ3NjdjNTM1ZWI4
+    OTFmODQyODVlOTYwNTkzNTE3ODJmZjA2NzlmMGVjMzY1MDhhMTk=
+  data.tar.gz: !binary |-
+    MGNkMjE0M2M4OGFmOTQ4MjM2YTU2Y2M1NzRmMTg4NDFmMGEzZDE0YWM0NDA4
+    N2I3MjE2YTNmMTAzM2ViOTVkYjgxMDJkOWNkZTUzNTM2ZWQ1ZWJjN2EzOGFl
+    MGZhOTQ2MWY0NDI4OGFhMjM2MGExZDM1ZThlOWU0ZGExZDhjNjA=

data/Guardfile

@@ -3,9 +3,9 @@ guard 'bundler' do
   watch(/^.+\.gemspec/)
 end
 
-guard 'rspec' do
+guard 'rspec', cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { "spec" }
   watch('spec/spec_helper.rb')  { "spec" }
-  watch(%r{^spec/(support|matchers|shared)/(.+)\.rb$})       { "spec" }
+  watch(%r{^spec/(support|matchers|shared)/(.+)\.rb$}) { "spec" }
 end

data/lib/zendesk2/client/models/organization.rb

@@ -1,19 +1,35 @@
 class Zendesk2::Client::Organization < Zendesk2::Model
-  PARAMS = %w[id details domain_names external_id group_id shared_comments shared_tickets tags name notes]
-
-  identity :id,               type: :integer
-  attribute :url,             type: :string
-  attribute :created_at,      type: :time
-  attribute :details,         type: :string
-  attribute :domain_names,    type: :array
-  attribute :external_id,     type: :string
-  attribute :group_id,        type: :integer
-  attribute :shared_comments, type: :boolean
-  attribute :shared_tickets,  type: :boolean
-  attribute :tags,            type: :array
-  attribute :name,            type: :string
-  attribute :notes,           type: :string
-  attribute :updated_at,      type: :time
+  PARAMS = %w[id details domain_names external_id group_id organization_fields shared_comments shared_tickets tags name notes]
+
+  # @return [integer] Automatically assigned when creating organization
+  identity :id, type: :integer # ro[yes] required[no]
+
+  # @return [Date] The time the organization was created
+  attribute :created_at, type: :date # ro[yes] required[no]
+  # @return [String] In this field you can store any details obout the organization. e.g. the address
+  attribute :details, type: :string # ro[no] required[no]
+  # @return [Array] An array of domain names associated with this organization
+  attribute :domain_names, type: :array # ro[no] required[no]
+  # @return [String] A unique external id, you can use this to associate organizations to an external record
+  attribute :external_id, type: :string # ro[no] required[no]
+  # @return [Integer] New tickets from users in this organization will automatically be put in this group
+  attribute :group_id, type: :integer # ro[no] required[no]
+  # @return [String] The name of the organization
+  attribute :name, type: :string # ro[no] required[yes]
+  # @return [String] In this field you can store any notes you have about the organization
+  attribute :notes, type: :string # ro[no] required[no]
+  # @return [Hash] Custom fields for this organization
+  attribute :organization_fields, type: :hash # ro[no] required[no]
+  # @return [Boolean] End users in this organization are able to see each other's comments on tickets
+  attribute :shared_comments, type: :boolean # ro[no] required[no]
+  # @return [Boolean] End users in this organization are able to see each other's tickets
+  attribute :shared_tickets, type: :boolean # ro[no] required[no]
+  # @return [Array] The tags of the organization
+  attribute :tags, type: :array # ro[no] required[no]
+  # @return [Date] The time of the last update of the organization
+  attribute :updated_at, type: :date # ro[yes] required[no]
+  # @return [String] The API url of this organization
+  attribute :url, type: :string # ro[yes] required[no]
 
   def destroy!
     requires :identity
@@ -56,4 +72,4 @@ class Zendesk2::Client::Organization < Zendesk2::Model
     writable_attributes.delete("group_id") if writable_attributes["group_id"].to_s == "0"
     writable_attributes
   end
-end
+  end

data/lib/zendesk2/client/requests/get_topic_comments.rb

@@ -14,9 +14,10 @@ class Zendesk2::Client
     def get_topic_comments(params={})
       topic_id = params["topic_id"]
       topic    = self.data[:topics][topic_id] # TODO: 404 if !topic
-      filter   = lambda{|comments| comments.select{|c| c["topic_id"] == topic_id}}
+      filter   = lambda { |comments| comments.select { |c| c["topic_id"] == topic_id } }
 
-      page(params, :topic_comments, "/topics/#{topic_id}/comments.json", "topic_comments", filter: filter)
+      page(params, :topic_comments, "/topics/#{topic_id}/comments.json", "topic_comments", filter: filter).tap do
+      end
     end
   end
 end

data/lib/zendesk2/collection.rb

@@ -13,12 +13,19 @@ class Zendesk2::Collection < Cistern::Collection
   def model_method; self.class.model_method; end
   def model_root; self.class.model_root; end
 
+  def new_page
+    page = self.clone
+    %w[count next_page_link previous_page_link].each { |k| page.attributes.delete(k) }
+    page.records = []
+    page
+  end
+
   def next_page
-    clone.clear.all("url" => next_page_link) if next_page_link
+    new_page.all("url" => next_page_link) if next_page_link
   end
 
   def previous_page
-    clone.clear.all("url" => previous_page_link) if previous_page_link
+    new_page.all("url" => previous_page_link) if previous_page_link
   end
 
   # Attempt creation of resource and explode if unsuccessful
@@ -39,13 +46,12 @@ class Zendesk2::Collection < Cistern::Collection
 
   # Fetch a collection of resources
   def all(params={})
-    scoped_attributes = self.class.scopes.inject({}){|r,k| r.merge(k.to_s => send(k))}
-    scoped_attributes.merge!(params)
+    scoped_attributes = self.class.scopes.inject({}){|r,k| r.merge(k.to_s => send(k))}.merge(params)
     body = connection.send(collection_method, scoped_attributes).body
 
-    collection = self.load(body[collection_root])
-    collection.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))
-    collection
+    self.load(body[collection_root])
+    self.merge_attributes(Cistern::Hash.slice(body, "count", "next_page", "previous_page"))
+    self
   end
 
   # Fetch a single of resource

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/zendesk2.rb

@@ -6,6 +6,7 @@ require 'cistern'
 require 'faraday'
 require 'faraday_middleware'
 require 'jwt'
+
 # stdlib
 require 'forwardable'
 require 'logger'

data/spec/shared/resource.rb

@@ -17,7 +17,7 @@ shared_examples "a resource" do |_collection, _params, _update_params, _options|
 
   context "that is paged" do
     before(:each) do
-      2.times.each { collection.create(instance_exec(&_params)) }
+      3.times.each { collection.create(instance_exec(&_params)) }
     end
 
     it "by retrieving the first page" do
@@ -44,7 +44,7 @@ shared_examples "a resource" do |_collection, _params, _update_params, _options|
     update_params.each {|k,v| record.send(k).should == v}
   end
 
-  it "by destroy a record" do
+  it "by destroying a record" do
     pending if _collection == :forums
     record = collection.create(params)
     record.identity.should_not be_nil

data/zendesk2.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.version       = Zendesk2::VERSION
 
   gem.add_dependency "addressable"
-  gem.add_dependency "cistern", "~> 0.3.0"
-  gem.add_dependency "faraday"
+  gem.add_dependency "cistern", "~> 0.5.1"
+  gem.add_dependency "faraday", "~> 0.8.8"
   gem.add_dependency "faraday_middleware"
   gem.add_dependency "jwt"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cistern
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -226,27 +215,26 @@ files:
 homepage: http://joshualane.com/zendesk2
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Zendesk V2 API client
 test_files:
 - spec/categories_spec.rb