zendesk_api 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ffe4c8d58e8f4e587f813afee1b867cc8e15a6
-  data.tar.gz: 12bee85ee43c5d1af6fda0a4f069c6f2cfe57334
+  metadata.gz: a7021e19badde0fd416969c1bc4be207caaf5834
+  data.tar.gz: ea01dab8e9c693b241f54f5041d2c7ce99f9a8a9
 SHA512:
-  metadata.gz: 03cea5cefaecc99504fdf12040b4dc1fc7b1bb12465d2804aec05f794da7c12b0148b196affcdedc3a77b07d97034e24983a0e4d958a716d07673132e78295dd
-  data.tar.gz: 0fd99e6c20b86d84b5703282fdb2d9d09a5d4a41d62fbda52b7ccb5b43d038d59b3eefdec02ae7a1d6e14a1fd48940cb135578479f0d15c1c0a0d9965de73203
+  metadata.gz: 6d873f7e34fded76987026be01fa1150d04985928c1a56a349f8e58aabe3fcbc00af0d1e5cafdaaa7bad4833bc60775b26d3d5892559377b0c30633353478397
+  data.tar.gz: a1237c1049bcafe8331e6ed6e2e1c7eeeaf88c6ce59e548e874035dd2ff72e823c0f89e3534a01f164a8d83971d1a09ec198af63a4159b914fd71745ffbe732b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zendesk_api (1.4.4)
+    zendesk_api (1.4.5)
       faraday (~> 0.9)
       hashie (>= 1.2, < 4.0)
       inflection

data/lib/zendesk_api/association.rb

@@ -4,6 +4,31 @@ module ZendeskAPI
   # Represents an association between two resources
   # @private
   class Association
+    class << self
+      def namespaces
+        [ZendeskAPI] + ZendeskAPI::DataNamespace.descendants
+      end
+
+      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
+    end
+
     # @return [Hash] Options passed into the association
     attr_reader :options
 
@@ -39,10 +64,10 @@ module ZendeskAPI
       has_parent = namespace.size > 1 || (options[:with_parent] && @options.parent)
 
       if has_parent
-        parent_class = @options.parent ? @options.parent.class : ZendeskAPI.const_get(ZendeskAPI::Helpers.modulize_string(namespace[0]))
+        parent_class = @options.parent ? @options.parent.class : Association.class_from_namespace(ZendeskAPI::Helpers.modulize_string(namespace[0]))
         parent_namespace = build_parent_namespace(parent_class, instance, options, original_options)
         namespace[1..1] = parent_namespace if parent_namespace
-        namespace[0] = parent_class.resource_name
+        namespace[0] = parent_class.resource_path
       else
         namespace[0] = @options.path || @options[:class].resource_path
       end

data/lib/zendesk_api/client.rb

@@ -116,8 +116,11 @@ module ZendeskAPI
       end
     end
 
-    def voice
-      Delegator.new(self)
+    ZendeskAPI::DataNamespace.descendants.each do |namespace|
+      delegator = ZendeskAPI::Helpers.snakecase_string(namespace.to_s.split("::").last)
+      define_method delegator do |*| # takes arguments, but doesn't do anything with them
+        Delegator.new(self)
+      end
     end
 
     protected
@@ -171,32 +174,9 @@ module ZendeskAPI
 
     private
 
-    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)
+      ZendeskAPI::Association.class_from_namespace(klass_as_string)
     end
 
     def check_url

data/lib/zendesk_api/resources.rb

@@ -1,6 +1,7 @@
 module ZendeskAPI
 # @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
@@ -102,21 +103,9 @@ module ZendeskAPI
     end
   end
 
-  # @internal This isn't a real resource, it is used by ticket and request comments
-  module CommentMixin
-    include Save
-
-    def self.included(klass)
-      klass.has_many :uploads, :class => Attachment, :inline => true
-      klass.has :author, :class => User
-    end
-
-    def save
-      save_associations
-      true
-    end
-
-    alias :save! :save
+  class MobileDevice < Resource
+    # Clears this devices' badge
+    put :clear_badge
   end
 
   class Organization < Resource
@@ -302,7 +291,17 @@ module ZendeskAPI
 
   class Request < Resource
     class Comment < DataResource
-      include CommentMixin
+      include Save
+
+      has_many :uploads, :class => Attachment, :inline => true
+      has :author, :class => User
+
+      def save
+        save_associations
+        true
+      end
+
+      alias :save! :save
     end
 
     has Comment, :inline => true
@@ -344,7 +343,17 @@ module ZendeskAPI
     end
 
     class Comment < DataResource
-      include CommentMixin
+      include Save
+
+      has_many :uploads, :class => Attachment, :inline => true
+      has :author, :class => User
+
+      def save
+        save_associations
+        true
+      end
+
+      alias :save! :save
     end
 
     put :mark_as_spam
@@ -738,4 +747,17 @@ module ZendeskAPI
       @attributes.replace(response.body) if response.body
     end
   end
+
+  module DynamicContent
+    include DataNamespace
+
+    class Item < ZendeskAPI::Resource
+      namespace 'dynamic_content'
+
+      class Variant < ZendeskAPI::Resource
+      end
+
+      has_many Variant
+    end
+  end
 end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

data/spec/core/association_spec.rb

@@ -180,6 +180,20 @@ describe ZendeskAPI::Association do
       end
     end
 
+    context "when parent has a namespace" do
+      before(:each) do
+        instance.class.namespace 'hello'
+      end
+
+      after(:each) do
+        instance.class.namespace nil
+      end
+
+      it "should generate a specific nested resource path" do
+        expect(subject.generate_path(child)).to eq("hello/test_resources/1/children/1")
+      end
+    end
+
     context "with a specified path" do
       before(:each) { subject.options[:path] = "blergh" }
 

data/spec/fixtures/zendesk.rb

@@ -98,5 +98,12 @@ module ZendeskAPI
         end
       end
     end
+
+    def dynamic_content_item
+      VCR.use_cassette('valid_brand') do
+        @item ||= client.dynamic_content.items.first
+        @item ||= client.dynamic_content.items.create!(:name => 'Test Item', :content => 'Testing')
+      end
+    end
   end
 end

data/spec/live/dynamic_content/item_spec.rb

@@ -0,0 +1,16 @@
+require 'core/spec_helper'
+
+describe ZendeskAPI::DynamicContent::Item, :delete_after do
+  def valid_attributes
+    {
+      :name => "Snowboard Problem",
+      :default_locale_id => 1,
+      :content => "Snowboard Problem variant"
+    }
+  end
+
+  it_should_be_readable :dynamic_content, :items, :create => true
+  it_should_be_creatable
+  it_should_be_updatable :name
+  it_should_be_deletable
+end

data/spec/live/dynamic_content/variant_spec.rb

@@ -0,0 +1,19 @@
+require 'core/spec_helper'
+
+describe ZendeskAPI::DynamicContent::Item::Variant, :delete_after do
+  def valid_attributes
+    {
+      :locale_id => 127,
+      :active => true,
+      :default => false,
+      :content => 'Mon dieu!'
+    }
+  end
+
+  under dynamic_content_item do
+    it_should_be_readable dynamic_content_item, :variants, :create => true
+    it_should_be_creatable
+    it_should_be_updatable :content
+    it_should_be_deletable
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -285,6 +285,8 @@ files:
 - spec/live/category_spec.rb
 - spec/live/collection_spec.rb
 - spec/live/custom_role_spec.rb
+- spec/live/dynamic_content/item_spec.rb
+- spec/live/dynamic_content/variant_spec.rb
 - spec/live/forum_spec.rb
 - spec/live/forum_subscription_spec.rb
 - spec/live/group_membership_spec.rb
@@ -292,7 +294,6 @@ files:
 - spec/live/identity_spec.rb
 - spec/live/locale_spec.rb
 - spec/live/macro_spec.rb
-- spec/live/mobile_device_spec.rb
 - spec/live/organization_field_spec.rb
 - spec/live/organization_spec.rb
 - spec/live/request_spec.rb
@@ -397,6 +398,8 @@ test_files:
 - spec/live/category_spec.rb
 - spec/live/collection_spec.rb
 - spec/live/custom_role_spec.rb
+- spec/live/dynamic_content/item_spec.rb
+- spec/live/dynamic_content/variant_spec.rb
 - spec/live/forum_spec.rb
 - spec/live/forum_subscription_spec.rb
 - spec/live/group_membership_spec.rb
@@ -404,7 +407,6 @@ test_files:
 - spec/live/identity_spec.rb
 - spec/live/locale_spec.rb
 - spec/live/macro_spec.rb
-- spec/live/mobile_device_spec.rb
 - spec/live/organization_field_spec.rb
 - spec/live/organization_spec.rb
 - spec/live/request_spec.rb

data/spec/live/mobile_device_spec.rb

@@ -1,11 +0,0 @@
-require 'core/spec_helper'
-
-describe ZendeskAPI::MobileDevice do
-  def valid_attributes
-    { :device_type => "iPhone", :token => "5D41402ABC4B2A76B9719D911017C592" }
-  end
-
-  it_should_be_creatable
-  it_should_be_deletable
-  it_should_be_readable :mobile_devices, :create => true
-end