zendesk_api 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c3a7d321889f60c5c4d0f0c2c4170351b271c6b
-  data.tar.gz: 2de81c86986e49e8f925fb52ee77eee475bf18e7
+  metadata.gz: 558412300c43c0e2ce45a0c149261bd0a6d60568
+  data.tar.gz: e64f115c5aa31ada40ff8084bbf2059ac6d53d2b
 SHA512:
-  metadata.gz: 7127ae993715fe0b818ba71e55f0287847d671bd08d0920a2188e58211dac67643a1b09b5647790cca95e225c35f75bd7f0d030dcb72cff98a27d1f37358d9dd
-  data.tar.gz: fdf856dbb4229b36059b96cce96bc1db1037482ced53b33eed92f161ed7ed6dc9e18aad7abd6da880ca196b4c60c95e7c581723699f4b9aca43f14bf8131a958
+  metadata.gz: f4476bfb5fd72707b5e14a62114d60b30f70e585b59cbc9b695512a666834c55ed3f60367067a0ab39cac12153c88053e53cea913b54a79804279ed9bee3c664
+  data.tar.gz: 7af9a7e1816ad64d83d525e29a5893cc2b0551bb588fb48953412ab41d461af1a3ed648841317d6a767d0d5c8b4bf7948d79e44d2b6f515de7c0571f5ff9bc16

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    zendesk_api (1.4.2)
+    zendesk_api (1.4.3)
       faraday (~> 0.9)
-      hashie (>= 1.2)
+      hashie (>= 1.2, < 4.0)
       inflection
       mime-types (~> 1.0)
       multi_json

data/README.md

@@ -324,7 +324,8 @@ client.apps.update!(:id => 123, :upload_id => upload.id)
 
 # Or
 
-app = ZendeskAPI::App.new(client, :id => 123, :upload_id => upload.id)
+app = ZendeskAPI::App.new(client, :id => 123)
+app.upload_id = upload.id
 app.save!
 
 # Or

data/lib/zendesk_api/association.rb

@@ -34,7 +34,8 @@ module ZendeskAPI
       namespace = @options[:class].to_s.split("::")
       namespace[-1] = @options[:class].resource_path
 
-      %w(ZendeskAPI Voice).each { |ns| namespace.delete(ns) }
+      # Remove components without path information
+      ignorable_namespace_strings.each { |ns| namespace.delete(ns) }
       has_parent = namespace.size > 1 || (options[:with_parent] && @options.parent)
 
       if has_parent
@@ -71,6 +72,11 @@ module ZendeskAPI
 
     private
 
+    # @return [Array<String>] ['ZendeskAPI', 'Voice', etc.. ]
+    def ignorable_namespace_strings
+      ZendeskAPI::DataNamespace.descendants.map { |klass| klass.to_s.split('::') }.flatten.uniq
+    end
+
     def _side_load(resource, side_loads)
       side_loads.map! do |side_load|
         resource.send(:wrap_resource, side_load, options)

data/lib/zendesk_api/client.rb

@@ -39,14 +39,15 @@ module ZendeskAPI
       if !options.delete(:reload) && (cached = @resource_cache[method][:cache].read(options.hash))
         cached
       else
-        klass_as_const = ZendeskAPI::Helpers.modulize_string(Inflection.singular(method))
-        klass = class_from_namespace(klass_as_const)
-
-        @resource_cache[method][:class] ||= klass
+        @resource_cache[method][:class] ||= method_as_class(method)
         @resource_cache[method][:cache].write(options.hash, ZendeskAPI::Collection.new(self, @resource_cache[method][:class], options))
       end
     end
 
+    def respond_to?(method, *args)
+      ((cache = @resource_cache[method]) && cache[:class]) || !method_as_class(method).nil? || super
+    end
+
     # Returns the current user (aka me)
     # @return [ZendeskAPI::User] Current user or nil
     def current_user(reload = false)
@@ -169,16 +170,34 @@ module ZendeskAPI
 
     private
 
-    def class_from_namespace(klass_as_const)
-      [ZendeskAPI, ZendeskAPI::Voice].each do |ns|
-        if ns.const_defined?(klass_as_const)
-          return ns.const_get(klass_as_const)
+    def class_from_namespace(klass_as_string)
+      namespaces.each do |ns|
+        if module_defines_class?(ns, klass_as_string)
+          return ns.const_get(klass_as_string)
         end
       end
 
       nil
     end
 
+    # 1.9+ changed default to search ancestors, added flag to disable behavior.
+    def module_defines_class?(mod, klass_as_string)
+      if RUBY_VERSION < '1.9'
+        mod.const_defined?(klass_as_string)
+      else
+        mod.const_defined?(klass_as_string, false)
+      end
+    end
+
+    def namespaces
+      [ZendeskAPI] + ZendeskAPI::DataNamespace.descendants
+    end
+
+    def method_as_class(method)
+      klass_as_string = ZendeskAPI::Helpers.modulize_string(Inflection.singular(method.to_s))
+      class_from_namespace(klass_as_string)
+    end
+
     def check_url
       if !config.allow_http && config.url !~ /^https/
         raise ArgumentError, "zendesk_api is ssl only; url must begin with https://"

data/lib/zendesk_api/resource.rb

@@ -179,4 +179,17 @@ module ZendeskAPI
       { self.class.resource_name.to_sym => attributes.changes }
     end
   end
+
+  # Namespace parent class for Data/Resource classes
+  module DataNamespace
+    class << self
+      def included(base)
+        @descendants ||= []
+        @descendants << base
+      end
+      def descendants
+        @descendants || []
+      end
+    end
+  end
 end

data/lib/zendesk_api/resources.rb

@@ -604,6 +604,7 @@ module ZendeskAPI
   class Target < Resource; end
 
   module Voice
+    include DataNamespace
     class PhoneNumber < Resource
       namespace "channels/voice"
     end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/spec/core/client_spec.rb

@@ -222,6 +222,33 @@ describe ZendeskAPI::Client do
     it "should cache calls with the same options" do
       expect(subject.search(:query => 'abc')).to eq(subject.search(:query => 'abc'))
     end
+
+    it "should respond_to? for valid resources" do
+      expect(subject.respond_to?(:tickets)).to eq(true)
+    end
+
+    it "should respond_to? for valid cached resources" do
+      subject.tickets
+
+      expect(subject.respond_to?(:tickets)).to eq(true)
+    end
+
+    it "should respond_to? for actual instance methods" do
+      expect(subject.respond_to?(:set_default_logger, true)).to eq(true)
+      expect(subject.respond_to?(:set_default_logger)).to eq(false)
+    end
+
+    it "should not respond_to? invalid resources" do
+      expect(subject.respond_to?(:nope)).to eq(false)
+    end
+
+    it "delegates voice correctly" do
+      expect(subject.voice.greetings).to be_instance_of(ZendeskAPI::Collection)
+    end
+
+    it "looks in the appropriate namespaces" do
+      expect(subject.greetings.association.options['class']).to eq(ZendeskAPI::Voice::Greeting)
+    end
   end
 
   it "can be subclassed" do

data/spec/core/data_namespace_spec.rb

@@ -0,0 +1,15 @@
+require 'core/spec_helper'
+
+class ZendeskAPI::DataNamespaceTest; end
+
+describe ZendeskAPI::DataNamespace do
+  describe "descendants" do
+    let(:target_klass) { ZendeskAPI::DataNamespaceTest }
+    it "adds class to its descendants list when included" do
+      expect(ZendeskAPI::DataNamespace.descendants).not_to include(target_klass)
+      expect { target_klass.send(:include, ZendeskAPI::DataNamespace) }.
+        to change { ZendeskAPI::DataNamespace.descendants.count }.by(1)
+      expect(ZendeskAPI::DataNamespace.descendants).to include(target_klass)
+    end
+  end
+end

data/spec/fixtures/test_resources.rb

@@ -10,3 +10,7 @@ end
 class ZendeskAPI::NilResource < ZendeskAPI::Data; end
 class ZendeskAPI::NilDataResource < ZendeskAPI::DataResource; end
 class ZendeskAPI::SingularTestResource < ZendeskAPI::SingularResource; end
+
+# `client.greetings` should ignore this class, as it's not in the right namespace
+class Greeting; end
+

data/spec/fixtures/zendesk.rb

@@ -55,7 +55,7 @@ module ZendeskAPI
 
     def ticket
       VCR.use_cassette('valid_ticket') do
-        @ticket ||= client.tickets.first
+        @ticket ||= client.tickets.detect {|t| t.status != 'closed'}
         @ticket ||= client.tickets.create(
           :subject => "Test Ticket",
           :description => "This is a test of the emergency alert system.",

data/zendesk_api.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard"
 
   s.add_runtime_dependency "faraday", "~> 0.9"
-  s.add_runtime_dependency "hashie", ">= 1.2"
+  s.add_runtime_dependency "hashie", ">= 1.2", "< 4.0"
   s.add_runtime_dependency "inflection"
   s.add_runtime_dependency "multi_json"
   s.add_runtime_dependency "mime-types", "~> 1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -116,6 +116,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,6 +126,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: inflection
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +238,7 @@ files:
 - spec/core/collection_spec.rb
 - spec/core/configuration_spec.rb
 - spec/core/create_resource_spec.rb
+- spec/core/data_namespace_spec.rb
 - spec/core/data_resource_spec.rb
 - spec/core/inflection_spec.rb
 - spec/core/lru_cache_spec.rb
@@ -343,6 +350,7 @@ test_files:
 - spec/core/collection_spec.rb
 - spec/core/configuration_spec.rb
 - spec/core/create_resource_spec.rb
+- spec/core/data_namespace_spec.rb
 - spec/core/data_resource_spec.rb
 - spec/core/inflection_spec.rb
 - spec/core/lru_cache_spec.rb