zendesk_api 0.3.3 → 0.3.4

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    zendesk_api (0.3.3)
+    zendesk_api (0.3.4)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie (~> 2.0.0)
@@ -55,7 +55,7 @@ GEM
     fssm (0.2.10)
     haml (4.0.1)
       tilt
-    hashie (2.0.0)
+    hashie (2.0.3)
     i18n (0.6.1)
     inflection (1.0.0)
     jruby-openssl (0.8.7)

data/Readme.md

@@ -12,6 +12,7 @@ Additional documentation can be found on our [documentation site](https://zendes
 
 * Version 0.0.5 brings with it a change to the top-level namespace. All references to Zendesk should now use ZendeskAPI.
 * Version 0.3.0 changed the license from MIT to Apache Version 2.
+* Version 0.3.2 introduced a regression when side-loading roles on users. This was fixed in 0.3.4.
 
 ## Installation
 

data/lib/zendesk_api/associations.rb

@@ -13,7 +13,7 @@ module ZendeskAPI
       base.extend ClassMethods
     end
 
-    def wrap_resource(resource, class_level_association)
+    def wrap_resource(resource, class_level_association, options = {})
       instance_association = Association.new(class_level_association.merge(:parent => self))
       klass = class_level_association[:class]
 
@@ -21,7 +21,7 @@ module ZendeskAPI
       when Hash
         klass.new(@client, resource.merge(:association => instance_association))
       when String, Fixnum
-        klass.new(@client, :id => resource, :association => instance_association)
+        klass.new(@client, (options[:include_key] || :id) => resource, :association => instance_association)
       else
         resource.association = instance_association
         resource
@@ -110,7 +110,7 @@ module ZendeskAPI
             resource = if klass.respond_to?(:find) && resource_id = method_missing(association[:id_column])
               klass.find(@client, :id => resource_id, :association => instance_association)
             elsif found = method_missing(association[:name].to_sym)
-              wrap_resource(found, association)
+              wrap_resource(found, association, :include_key => association[:include_key])
             elsif klass.superclass == DataResource && !association[:inline]
               rescue_client_error do
                 response = @client.connection.get(instance_association.generate_path(:with_parent => true))

data/lib/zendesk_api/resources.rb

@@ -331,6 +331,13 @@ module ZendeskAPI
       put :request_verification
     end
 
+    def initialize(*)
+      super
+
+      # Needed for proper Role sideloading
+      self.role_id = role.name if key?(:role)
+    end
+
     has Organization
 
     has CustomRole, :inline => true, :include => :roles

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/live/ticket_spec.rb

@@ -34,14 +34,16 @@ describe ZendeskAPI::Ticket do
   end
 
   describe ".incremental_export" do
-    let(:results){ ZendeskAPI::Ticket.incremental_export(client, Time.at(1023059503)) } # ~ 10 years ago
+    let(:results) { ZendeskAPI::Ticket.incremental_export(client, Time.at(1023059503)) } # ~ 10 years ago
 
     around do |example|
       # 1 request every 5 minutes allowed <-> you can only test 1 call ...
       VCR.use_cassette("incremental_export") do
-        Timeout.timeout(5) do # fail if we get rate-limited
-          example.call
-        end
+        client.config.retry = false
+
+        example.call
+
+        client.config.retry = true
       end
     end
 

data/spec/live/user_spec.rb

@@ -16,4 +16,42 @@ describe ZendeskAPI::User, :delete_after do
       client.users.search(:query => current_user.email).to_a.should == [current_user]
     end
   end
+
+  context "side-loading" do
+    context "no permission set" do
+      subject do
+        VCR.use_cassette("user_admin_role") { client.users.find(:id => 20014182, :include => :roles) }
+      end
+
+      it "should include role" do
+        if subject
+          subject.role.should_not be_nil
+          subject.role.id.should be_nil
+          subject.role.name.should == "admin"
+          subject.role.configuration.should_not be_nil
+
+          subject.custom_role.should be_nil
+        end
+      end
+    end
+
+    context "permission set" do
+      subject do
+        VCR.use_cassette("user_permission_set") { client.users.find(:id => 20014327, :include => :roles) }
+      end
+
+      it "should include role" do
+        if subject
+          subject.role.should_not be_nil
+          subject.role.id.should be_nil
+          subject.role.name.should == "agent"
+
+          subject.custom_role.should_not be_nil
+          subject.custom_role.id.should == 3692
+          subject.custom_role.name.should == "Staff"
+          subject.custom_role.configuration.should_not be_nil
+        end
+      end
+    end
+  end
 end

data/spec/macros/resource_macros.rb

@@ -1,6 +1,6 @@
 module ResourceMacros
   def self.extended(klass)
-    klass.define_method(:default_options) {{}}
+    klass.send(:define_method, :default_options) {{}}
   end
 
   def under(object, &blk)

metadata

@@ -1,233 +1,223 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: zendesk_api
-version: !ruby/object:Gem::Version
-  version: 0.3.3
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 4
+  version: 0.3.4
 platform: ruby
-authors:
+authors: 
 - Steven Davidovitz
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bump
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: vcr
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.9.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 1
+        - 9
+        - 0
         version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: faraday_middleware
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: hashie
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: inflection
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: inflection
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: mime-types
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: multipart-post
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: multipart-post
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Ruby wrapper for the REST API at http://www.zendesk.com. Documentation
-  at http://developer.zendesk.com.
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id013
+description: Ruby wrapper for the REST API at http://www.zendesk.com. Documentation at http://developer.zendesk.com.
+email: 
 - support@zendesk.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -507,31 +497,43 @@ files:
 - util/verb_handler.rb
 - zendesk_api.gemspec
 homepage: http://developer.zendesk.com
-licenses:
+licenses: 
 - Apache License Version 2.0
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Zendesk REST API Client
-test_files:
+test_files: 
 - spec/core/association_spec.rb
 - spec/core/client_spec.rb
 - spec/core/collection_spec.rb