zendesk_api 1.3.5 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a38c30bb79c695637d397682d18f4bcad759e04a
-  data.tar.gz: 7a9c3754599b4326995b7b7567561f57b1ff3cce
+  metadata.gz: a8b73e0b2eea3b49827b9c51e491844b3b1c8aaa
+  data.tar.gz: 2fc0ef98f91e5e7b72233f60cd486975b099f830
 SHA512:
-  metadata.gz: a6599cae801cf71f177e2b6110d6200a8dc623eae347bcea7341c0afdc1fd5c4e6686311645aeabe15ecffc6dc7ae0ee1503941571ef70321da5a4f7c69dc387
-  data.tar.gz: 63d41052bf169196d521f833295e5b6fd46a2f5253e53fa314133bc65e4502ff29ce7c2534854a92928f89acf2b5e6877953825fdd3ce545e2f81adca60aebee
+  metadata.gz: 7914bfee9601f839db64cd49a025f27f693ba0ffee305db7e259494da1664f8837c56e1434738b2be972283ebdf381b9dc11bd227d334faaa32d4d8cff18c89a
+  data.tar.gz: 6a847c4d6996077966632fd9d07cf2568c93180246d2561707b61b617dca9161e0833d8baf402eaa82b8c62bedcd8359f4cd2b6c0bbc57f7b6019c69442c9d4f

data/.travis.yml

@@ -2,7 +2,7 @@ rvm:
   - ree
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - jruby
-bundler_args: --without=server console
+before_install: gem i bundler
 cache: bundler

data/.yardopts

@@ -5,8 +5,6 @@
 --embed-mixins
 --load ./util/resource_handler.rb
 --load ./util/verb_handler.rb
---exclude lib/zendesk_api/console
---exclude lib/zendesk_api/server
 -r Readme.md
 lib/**/*.rb
 -

data/Gemfile

@@ -1,39 +1,13 @@
 source 'https://rubygems.org'
 
-# gem "bundler", "~> 1.2.0"
-# ruby "1.9.3"
-
 gem "simplecov", :platforms => :ruby_19, :group => :test
 gem "jruby-openssl", :platforms => :jruby
 
-group :server do
-  gem "thin"
-
-  gem "rack-ssl-enforcer"
-
-  gem "sinatra"
-  gem "sinatra-contrib"
-
-  gem "haml"
-
-  gem "compass"
-  gem "bootstrap-sass"
-
-  gem "coderay"
-  gem "coderay_bash"
+group :test do
+  gem "json", :platform => :ruby_18
 
-  gem "redcarpet"
-
-  gem "mongoid"
-  gem "database_cleaner"
-
-  gem "newrelic_rpm"
+  # only used for uploads testing
+  gem "actionpack", "~> 3.2"
 end
 
-group :console do
-  gem "ripl"
-end
-
-gem "json", :group => :test, :platform => :ruby_18
-
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zendesk_api (1.3.5)
+    zendesk_api (1.3.7)
       faraday (~> 0.9)
       hashie (>= 1.2)
       inflection
@@ -12,127 +12,85 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activesupport (3.2.16)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
+      builder (~> 3.0.0)
+    activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
-    backports (3.5.0)
-    bond (0.4.3)
-    bootstrap-sass (3.1.0.2)
-      sass (~> 3.2)
+    addressable (2.3.6)
     builder (3.0.4)
     bump (0.5.0)
-    chunky_png (1.3.0)
-    coderay (1.1.0)
-    coderay_bash (1.0.5)
-      coderay (>= 1.0)
-    compass (0.12.2)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    daemons (1.1.9)
-    database_cleaner (1.2.0)
     diff-lcs (1.2.5)
     docile (1.1.3)
-    eventmachine (1.0.3)
+    erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    fssm (0.2.10)
-    haml (4.0.5)
-      tilt
-    hashie (2.1.0)
+    hashie (2.1.1)
+    hike (1.2.3)
     i18n (0.6.9)
     inflection (1.0.0)
+    journey (1.0.4)
     json (1.8.1)
     mime-types (1.25.1)
-    mongoid (3.1.6)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.29)
-    moped (1.5.2)
-    multi_json (1.8.4)
+    multi_json (1.10.0)
     multipart-post (2.0.0)
-    newrelic_rpm (3.7.2.192)
-    origin (1.1.0)
-    rack (1.5.2)
-    rack-protection (1.5.2)
-      rack
-    rack-ssl-enforcer (0.2.6)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.1)
-    redcarpet (3.0.0)
-    ripl (0.7.0)
-      bond (~> 0.4.2)
+    rake (10.3.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    safe_yaml (1.0.1)
-    sass (3.2.14)
+    rspec-mocks (2.14.6)
+    safe_yaml (1.0.3)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.2)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-    thin (1.6.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     tilt (1.4.1)
-    tzinfo (0.3.38)
-    vcr (2.8.0)
-    webmock (1.9.3)
-      addressable (>= 2.2.7)
+    vcr (2.9.0)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    yard (0.8.7.3)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootstrap-sass
+  actionpack (~> 3.2)
   bump
-  coderay
-  coderay_bash
-  compass
-  database_cleaner
-  haml
   jruby-openssl
   json
-  mongoid
-  newrelic_rpm
-  rack-ssl-enforcer
   rake
-  redcarpet
-  ripl
   rspec
   simplecov
-  sinatra
-  sinatra-contrib
-  thin
   vcr
-  webmock (~> 1.9.0)
+  webmock
   yard
   zendesk_api!

data/Rakefile

@@ -13,11 +13,6 @@ if defined?(RSpec)
     t.pattern = "spec/core/**/*_spec.rb"
   end
 
-  desc "Run server specs"
-  RSpec::Core::RakeTask.new("spec:server") do |t|
-    t.pattern = "spec/server/**/*_spec.rb"
-  end
-
   desc "Run live specs"
   RSpec::Core::RakeTask.new("spec:live") do |t|
     t.pattern = "spec/live/**/*_spec.rb"

data/lib/zendesk_api/actions.rb

@@ -55,6 +55,7 @@ module ZendeskAPI
     def save_associations
       self.class.associations.each do |association_data|
         association_name = association_data[:name]
+
         next unless send("#{association_name}_used?") && association = send(association_name)
 
         inline_creation = association_data[:inline] == :create && new_record?
@@ -64,8 +65,8 @@ module ZendeskAPI
           self.send("#{association_name}=", association) # set id/ids columns
         end
 
-        if (association_data[:inline] == true || inline_creation) && association.changed?
-          attributes[association_name] = (association.is_a?(Collection) ? association.map(&:to_param) : association.to_param)
+        if (association_data[:inline] == true || inline_creation) && changed
+          attributes[association_name] = association.to_param
         end
       end
     end

data/lib/zendesk_api/client.rb

@@ -9,6 +9,7 @@ require 'zendesk_api/middleware/request/etag_cache'
 require 'zendesk_api/middleware/request/retry'
 require 'zendesk_api/middleware/request/upload'
 require 'zendesk_api/middleware/request/encode_json'
+require 'zendesk_api/middleware/request/url_based_access_token'
 require 'zendesk_api/middleware/response/callback'
 require 'zendesk_api/middleware/response/deflate'
 require 'zendesk_api/middleware/response/gzip'
@@ -145,8 +146,10 @@ module ZendeskAPI
         end
 
         # request
-        if config.access_token
+        if config.access_token && !config.url_based_access_token
           builder.authorization("Bearer", config.access_token)
+        elsif config.access_token
+          builder.use ZendeskAPI::Middleware::Request::UrlBasedAccessToken, config.access_token
         else
           builder.use Faraday::Request::BasicAuthentication, config.username, config.password
         end

data/lib/zendesk_api/collection.rb

@@ -288,6 +288,10 @@ module ZendeskAPI
 
     alias :to_str :to_s
 
+    def to_param
+      map(&:to_param)
+    end
+
     private
 
     def set_page_and_count(body)

data/lib/zendesk_api/configuration.rb

@@ -31,6 +31,8 @@ module ZendeskAPI
     # @return [String] OAuth2 access_token
     attr_accessor :access_token
 
+    attr_accessor :url_based_access_token
+
     # Use this cache instead of default ZendeskAPI::LRUCache.new
     # - must respond to read/write/fetch e.g. ActiveSupport::Cache::MemoryStore.new)
     # - pass false to disable caching

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

@@ -58,7 +58,7 @@ module ZendeskAPI
               File.basename(path)
             end
 
-            hash[:uploaded_data] = Faraday::UploadIO.new(path, mime_type)
+            hash[:uploaded_data] = Faraday::UploadIO.new(path, mime_type, hash[:filename])
           end
         end
 

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

@@ -0,0 +1,26 @@
+module ZendeskAPI
+  # @private
+  module Middleware
+    # @private
+    module Request
+      class UrlBasedAccessToken < Faraday::Middleware
+        def initialize(app, token)
+          super(app)
+          @token = token
+        end
+
+        def call(env)
+          if env[:url].query
+            env[:url].query += '&'
+          else
+            env[:url].query = ''
+          end
+
+          env[:url].query += "access_token=#{@token}"
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/zendesk_api/resources.rb

@@ -289,6 +289,7 @@ module ZendeskAPI
     has_many Comment
 
     has Organization
+    has Group
     has :requester, :class => User
   end
 
@@ -334,7 +335,13 @@ module ZendeskAPI
     has :requester, :class => User, :inline => :create
     has :submitter, :class => User
     has :assignee, :class => User
-    has_many :collaborators, :class => User, :inline => true
+
+    has_many :collaborators, :class => User, :inline => true, :extend => (Module.new do
+      def to_param
+        map(&:id)
+      end
+    end)
+
     has_many Audit
     has :metrics, :class => TicketMetric
     has Group
@@ -388,6 +395,13 @@ module ZendeskAPI
     put :recover
   end
 
+  class UserViewRow < DataResource
+    has User
+    def self.model_key
+      "rows"
+    end
+  end
+
   class ViewRow < DataResource
     has Ticket
 
@@ -466,6 +480,12 @@ module ZendeskAPI
     end
   end
 
+  class UserView < Rule
+    def self.preview(client, options = {})
+      Collection.new(client, UserViewRow, options.merge!(:path => "user_views/preview", :verb => :post))
+    end
+  end
+
   class GroupMembership < Resource
     has User
     has Group
@@ -578,6 +598,10 @@ module ZendeskAPI
       namespace "channels/voice"
     end
 
+    class CertificationAddress < Resource
+      namespace "channels/voice"
+    end
+
     class Greeting < Resource
       namespace "channels/voice"
     end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.3.5"
+  VERSION = "1.3.7"
 end

data/spec/core/client_spec.rb

@@ -240,6 +240,7 @@ describe ZendeskAPI::Client do
     end
 
     it "manages namespace correctly" do
+      client.certification_addresses.path.should match(/channels\/voice\/certification_addresses/)
       client.phone_numbers.path.should match(/channels\/voice\/phone_numbers/)
       client.greetings.path.should match(/channels\/voice\/greetings/)
       client.greeting_categories.path.should match(/channels\/voice\/greeting_categories/)

data/spec/core/middleware/request/upload_spec.rb

@@ -1,5 +1,6 @@
 require 'core/spec_helper'
 require 'tempfile'
+require 'action_dispatch'
 
 describe ZendeskAPI::Middleware::Request::Upload do
   subject { ZendeskAPI::Middleware::Request::Upload.new(lambda {|env| env}) }
@@ -45,41 +46,39 @@ describe ZendeskAPI::Middleware::Request::Upload do
     end
   end
 
-  begin
-    require 'action_dispatch'
-  rescue LoadError
-    warn "Could not load ActionDispatch; not running ActionDispatch::Http::UploadedFile tests"
-  end
+  context "with an ActionDispatch::Http::UploadedFile" do
+    before(:each) do
+      @upload = ActionDispatch::Http::UploadedFile.new(:filename => "hello.jpg", :tempfile => Tempfile.new(['hello', '.jpg']))
+      @env = subject.call(:body => { :file => @upload })
+    end
 
-  if defined?(ActionDispatch)
-    class String
-      def encoding_aware?; false; end
+    it "should convert file string to UploadIO" do
+      @env[:body][:uploaded_data].should be_instance_of(Faraday::UploadIO)
     end
 
-    context "with an ActionDispatch::Http::UploadedFile" do
-      before(:each) do
-        @upload = ActionDispatch::Http::UploadedFile.new(:filename => "hello.jpg", :tempfile => Tempfile.new(File.basename(filename)))
-        @env = subject.call(:body => { :file => @upload })
-      end
+    it "should remove file string" do
+      @env[:body][:file].should be_nil
+    end
 
-      it "should convert file string to UploadIO" do
-        @env[:body][:uploaded_data].should be_instance_of(Faraday::UploadIO)
-      end
+    it "should add filename if none exist" do
+      @env[:body][:filename].should == "hello.jpg"
+    end
 
-      it "should remove file string" do
-        @env[:body][:file].should be_nil
-      end
+    it "should use the content type of the tempfile" do
+      @env[:body][:uploaded_data].content_type.should == "image/jpeg"
+    end
 
-      it "should add filename if none exist" do
-        @env[:body][:filename].should == "hello"
+    context "when path does not resolve a mime_type" do
+      it "should pass correct filename to Faraday::UploadIO" do
+        @env[:body][:filename].should == "hello.jpg"
+        @env[:body][:uploaded_data].original_filename.should == @env[:body][:filename]
       end
 
-      context "when path does not resolve a mime_type" do
-        it "should use the content_type of ActionDispatch::Http::UploadedFile " do
-          @upload.tempfile.path = "XXX"
-          @env = subject.call(:body => { :file => @upload })
-          @env[:body][:uploaded_data][:content_type].should == "image/jpeg"
-        end
+      it "should use the content_type of ActionDispatch::Http::UploadedFile " do
+        @upload.content_type = 'application/random'
+
+        env = subject.call(:body => { :file => @upload })
+        env[:body][:uploaded_data].content_type.should == 'application/random'
       end
     end
   end