zendesk_api 0.3.2 → 0.3.3

data/Gemfile

@@ -5,8 +5,7 @@ source 'https://rubygems.org'
 
 gem "simplecov", :platforms => :ruby_19, :group => :development
 gem "jruby-openssl", :platforms => :jruby
-gem "hashie", :git => "git://github.com/intridea/hashie.git"
-gem "multipart-post", :git => "git://github.com/steved555/multipart-post.git"
+gem "multipart-post", :git => "https://github.com/steved555/multipart-post.git"
 gem "multi_json", :group => :test
 
 group :server do

data/Gemfile.lock

@@ -1,11 +1,5 @@
 GIT
-  remote: git://github.com/intridea/hashie.git
-  revision: f7adbf6b6e29bfcd3efbc33695fe0e018d62e66e
-  specs:
-    hashie (2.0.0.beta)
-
-GIT
-  remote: git://github.com/steved555/multipart-post.git
+  remote: https://github.com/steved555/multipart-post.git
   revision: 57c66998c05143a684c13694937c8adfd335cae1
   specs:
     multipart-post (1.1.5)
@@ -13,10 +7,10 @@ GIT
 PATH
   remote: .
   specs:
-    zendesk_api (0.3.2)
+    zendesk_api (0.3.3)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
-      hashie
+      hashie (~> 2.0.0)
       inflection
       json
       mime-types
@@ -25,24 +19,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.2)
-    backports (2.8.2)
+    addressable (2.3.3)
+    backports (3.1.1)
     bond (0.4.3)
     bond (0.4.3-java)
-    bootstrap-sass (2.2.2.0)
+    bootstrap-sass (2.3.1.0)
       sass (~> 3.2)
-    bouncy-castle-java (1.5.0146.1)
+    bouncy-castle-java (1.5.0147)
     builder (3.0.4)
-    bump (0.3.9)
-    chunky_png (1.2.7)
-    coderay (1.0.8)
-    coderay_bash (1.0.4)
+    bump (0.4.0)
+    chunky_png (1.2.8)
+    coderay (1.0.9)
+    coderay_bash (1.0.5)
       coderay (>= 1.0)
     compass (0.12.2)
       chunky_png (~> 1.2)
@@ -51,54 +45,56 @@ GEM
     crack (0.3.2)
     daemons (1.1.9)
     database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
-    eventmachine (1.0.0)
-    eventmachine (1.0.0-java)
-    faraday (0.8.6)
+    diff-lcs (1.2.2)
+    eventmachine (1.0.3)
+    eventmachine (1.0.3-java)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     fssm (0.2.10)
-    haml (3.1.7)
+    haml (4.0.1)
+      tilt
+    hashie (2.0.0)
     i18n (0.6.1)
     inflection (1.0.0)
-    jruby-openssl (0.8.2)
-      bouncy-castle-java (>= 1.5.0146.1)
+    jruby-openssl (0.8.7)
+      bouncy-castle-java (>= 1.5.0147)
     json (1.7.7)
-    mime-types (1.21)
-    mongoid (3.0.21)
-      activemodel (~> 3.1)
-      moped (~> 1.2)
+    mime-types (1.22)
+    mongoid (3.1.2)
+      activemodel (~> 3.2)
+      moped (~> 1.4.2)
       origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    moped (1.3.2)
-    multi_json (1.5.0)
-    newrelic_rpm (3.5.3.25)
+    moped (1.4.5)
+    multi_json (1.7.2)
+    newrelic_rpm (3.6.0.78)
     origin (1.0.11)
     rack (1.5.2)
-    rack-protection (1.3.2)
+    rack-protection (1.5.0)
       rack
     rack-ssl-enforcer (0.2.5)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.3)
+    rake (10.0.4)
     redcarpet (2.2.2)
     ripl (0.7.0)
       bond (~> 0.4.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    sass (3.2.5)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    sass (3.2.7)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.4)
+    sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
@@ -109,17 +105,17 @@ GEM
       rack-test
       sinatra (~> 1.3.0)
       tilt (~> 1.3)
-    thin (1.5.0)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.3.3)
-    tzinfo (0.3.35)
+    tilt (1.3.6)
+    tzinfo (0.3.37)
     vcr (2.4.0)
-    webmock (1.9.0)
+    webmock (1.9.3)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yard (0.8.4.1)
+      crack (>= 0.3.2)
+    yard (0.8.5.2)
 
 PLATFORMS
   java
@@ -133,7 +129,6 @@ DEPENDENCIES
   compass
   database_cleaner
   haml
-  hashie!
   jruby-openssl
   mongoid
   multi_json
@@ -149,6 +144,6 @@ DEPENDENCIES
   sinatra-contrib
   thin
   vcr
-  webmock
+  webmock (~> 1.9.0)
   yard
   zendesk_api!

data/lib/zendesk_api/actions.rb

@@ -25,6 +25,8 @@ module ZendeskAPI
         else
           {self.class.singular_resource_name.to_sym => attributes.changes}
         end
+
+        req.body.merge!(@global_params)
       end
 
       @attributes.replace @attributes.deep_merge(@response.body[self.class.singular_resource_name] || {})
@@ -189,10 +191,10 @@ module ZendeskAPI
 
       # Updates  a resource given the id passed in.
       # @param [Client] client The {Client} object to be used
-      # @param [Hash] attributes The attributes to update. Default to {} 
+      # @param [Hash] attributes The attributes to update. Default to {}
       def update(client, attributes = {})
         ZendeskAPI::Client.check_deprecated_namespace_usage attributes, singular_resource_name
-        resource = new(client, :id => attributes.delete(:id))
+        resource = new(client, {:id => attributes.delete(:id), :global => attributes.delete(:global)})
         resource.attributes.merge!(attributes)
         resource.save
       end

data/lib/zendesk_api/client.rb

@@ -36,7 +36,7 @@ module ZendeskAPI
 
       @resource_cache[method] ||= {}
 
-      if !options[:reload] && (cached = @resource_cache[method][options.hash])
+      if !options.delete(:reload) && (cached = @resource_cache[method][options.hash])
         cached
       else
         @resource_cache[method][options.hash] = ZendeskAPI::Collection.new(self, ZendeskAPI.const_get(ZendeskAPI::Helpers.modulize_string(Inflection.singular(method))), options)

data/lib/zendesk_api/middleware/response/callback.rb

@@ -10,9 +10,10 @@ module ZendeskAPI
           @client = client
         end
 
-        def on_complete(env)
-          super(env)
-          @client.callbacks.each {|c| c.call(env)}
+        def call(env)
+          @app.call(env).on_complete do |env|
+            @client.callbacks.each {|c| c.call(env)}
+          end
         end
       end
     end

data/lib/zendesk_api/middleware/response/logger.rb

@@ -8,6 +8,7 @@ module ZendeskAPI
       class Logger < Faraday::Response::Middleware
         def initialize(app, logger = nil)
           super(app)
+
           @logger = logger || begin
             require 'logger'
             ::Logger.new(STDOUT)
@@ -17,12 +18,11 @@ module ZendeskAPI
         def call(env)
           @logger.info "#{env[:method]} #{env[:url].to_s}"
           @logger.debug dump_debug(env, :request_headers)
-          super
-        end
 
-        def on_complete(env)
-          @logger.info("Status #{env[:status].to_s}")
-          @logger.debug dump_debug(env, :response_headers)
+          @app.call(env).on_complete do |env|
+            @logger.info("Status #{env[:status].to_s}")
+            @logger.debug dump_debug(env, :response_headers)
+          end
         end
 
         private

data/lib/zendesk_api/middleware/response/parse_iso_dates.rb

@@ -8,9 +8,9 @@ module ZendeskAPI
       # @private
       class ParseIsoDates < Faraday::Response::Middleware
         def call(env)
-          response = @app.call(env)
-          parse_dates! response.env[:body]
-          response
+          @app.call(env).on_complete do |env|
+            parse_dates!(env[:body])
+          end
         end
 
         private

data/lib/zendesk_api/resource.rb

@@ -57,6 +57,7 @@ module ZendeskAPI
     def initialize(client, attributes = {})
       raise "Expected a Hash for attributes, got #{attributes.inspect}" unless attributes.is_a?(Hash)
       @association = attributes.delete(:association) || Association.new(:class => self.class)
+      @global_params = attributes.delete(:global) || {}
       @client = client
       @attributes = ZendeskAPI::Trackie.new(attributes)
 

data/lib/zendesk_api/track_changes.rb

@@ -21,7 +21,15 @@ module ZendeskAPI
     module InstanceMethods
       def clear_changes
         each do |k, v|
-          v.clear_changes if v.respond_to?(:clear_changes)
+          if v.respond_to?(:clear_changes)
+            v.clear_changes
+          elsif v.is_a?(Array)
+            v.each do |val|
+              if val.respond_to?(:clear_changes)
+                val.clear_changes
+              end
+            end
+          end
         end
 
         changes.clear
@@ -59,6 +67,8 @@ module ZendeskAPI
           each do |k, v|
             if v.respond_to?(:changed?) && v.changed?
               changes[k] = v.changes
+            elsif v.is_a?(Array) && v.any? {|val| val.respond_to?(:changed?) && val.changed?}
+              changes[k] = v
             end
           end
         end
@@ -71,6 +81,7 @@ module ZendeskAPI
           changes.key?(key)
         end
       end
+
       alias :dirty? :changed?
     end
   end

data/lib/zendesk_api/version.rb

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

data/spec/core/client_spec.rb

@@ -165,6 +165,15 @@ describe ZendeskAPI::Client do
       subject.search(:query => 'abc').should_not == subject.search(:query => '123')
     end
 
+    it "should not cache calls with :reload => true options" do
+      subject.search(:query => 'abc').should_not == subject.search(:query => 'abc', :reload => true)
+    end
+
+    it "should not pass reload to the underlying collection" do
+      collection = subject.search(:query => 'abc', :reload => true)
+      collection.options.key?(:reload).should be_false
+    end
+
     it "should cache calls with the same options" do
       subject.search(:query => 'abc').should == subject.search(:query => 'abc')
     end

data/spec/core/resource_spec.rb

@@ -1,6 +1,15 @@
 require 'core/spec_helper'
 
 describe ZendeskAPI::Resource do
+  context "initialize" do
+    context "with :global as part of attributes" do
+      it "should set @global_params" do
+        resource = ZendeskAPI::TestResource.new(client, { :global => { :something => 'hey' }})
+        resource.instance_variable_get(:@global_params).should == { :something => 'hey' }
+      end
+    end
+  end
+
   context "#update" do
     context "class method" do
       let(:id) { 1 }
@@ -14,6 +23,16 @@ describe ZendeskAPI::Resource do
         subject.update(client, :id => id, :test => :hello).should be_true
       end
 
+      context "with global params" do
+        before(:each) do
+          stub_json_request(:put, %r{test_resources/#{id}}).with(:body => json({ :test_resource => { :test => :hello }, :something => "something"}))
+        end
+
+        it "should return instance of resource" do
+          subject.update(client, :id => id, :test => :hello, :global => {:something => "something"}).should be_true
+        end
+      end
+
       context "with client error" do
         before(:each) do
           stub_request(:put, %r{test_resources/#{id}}).to_return(:status => 500)

data/spec/core/trackie_spec.rb

@@ -55,6 +55,50 @@ describe ZendeskAPI::Trackie do
     end
   end
 
+=begin TODO
+  context "nested arrays" do
+    before(:each) do
+      subject[:key] = []
+      subject.clear_changes
+      subject[:key] << :test
+    end
+
+    it "should include changes from nested array" do
+      subject.changes[:key].should == [:test]
+    end
+
+    specify "subject should be changed" do
+      subject.changed?.should be_true
+    end
+  end
+=end
+
+  context "nested hashes in arrays" do
+    before(:each) do
+      subject[:key] = [ZendeskAPI::Trackie.new]
+      subject.clear_changes
+      subject[:key].first[:test] = true
+    end
+
+    it "should include changes from nested array" do
+      subject.changes[:key].first[:test].should be_true
+    end
+
+    specify "subject should be changed" do
+      subject.changed?.should be_true
+    end
+
+    context "clearing" do
+      before(:each) do
+        subject.clear_changes
+      end
+
+      it "should not have any changes" do
+        subject.changes.should be_empty
+      end
+    end
+  end
+
   describe "#size" do
     before do
       subject[:size] = 42

data/spec/fixtures/zendesk.rb

@@ -82,10 +82,5 @@ module ZendeskAPI
         @organization ||= current_user.organization
       end
     end
-
-    # Global default options, overwritten if using under
-    def default_options
-      {}
-    end
   end
 end

data/spec/live/collection_spec.rb

@@ -10,7 +10,7 @@ describe ZendeskAPI::Collection do
       ZendeskAPI::Collection.new(client, ZendeskAPI::User)
     end
 
-    before(:all) do
+    before(:each) do
       VCR.use_cassette('collection_fetch_users') do
         subject.per_page(1).page(2)
         subject.fetch(true)
@@ -41,15 +41,15 @@ describe ZendeskAPI::Collection do
       before(:each) { subject.per_page(1).page(2) }
 
       it "should increase page option and not call fetch" do
-        subject.next.should == 3 
+        subject.next.should == 3
       end
 
       it "should decrease page option and not call fetch" do
-        subject.prev.should == 1 
+        subject.prev.should == 1
       end
 
       context "with page == 1" do
-        before do 
+        before do
           subject.page(1)
           subject.clear_cache
           subject.should_not_receive(:fetch)

data/spec/live/group_spec.rb

@@ -14,7 +14,9 @@ describe ZendeskAPI::Group, :delete_after do
   context "with a membership" do
     before(:each) do
       VCR.use_cassette("read_ZendeskAPI::User_groups_create") do
-        @object = described_class.create!(client, valid_attributes.merge(default_options))
+        attrs = valid_attributes
+        attrs.merge!(@default_options) if @default_options
+        @object = described_class.create!(client, attrs)
         @membership = agent.group_memberships.create(:group_id => @object.id, :user_id => agent.id)
       end
     end

data/spec/live/ticket_spec.rb

@@ -76,7 +76,7 @@ describe ZendeskAPI::Ticket do
 
   it "can upload while creating" do
     VCR.use_cassette("ticket_inline_uploads") do
-      ticket = ZendeskAPI::Ticket.new(client, valid_attributes.merge(default_options))
+      ticket = ZendeskAPI::Ticket.new(client, valid_attributes)
       ticket.comment.uploads << "spec/fixtures/Argentina.gif"
       ticket.comment.uploads << File.new("spec/fixtures/Argentina.gif")
 
@@ -88,7 +88,7 @@ describe ZendeskAPI::Ticket do
 
   it "can comment while creating" do
     VCR.use_cassette("ticket_inline_comments") do
-      ticket = ZendeskAPI::Ticket.new(client, valid_attributes.merge(default_options))
+      ticket = ZendeskAPI::Ticket.new(client, valid_attributes)
       ticket.comment = ZendeskAPI::Ticket::Comment.new(client, :value => "My comment", :public => false)
       ticket.save!
 

data/spec/macros/resource_macros.rb

@@ -1,7 +1,14 @@
 module ResourceMacros
+  def self.extended(klass)
+    klass.define_method(:default_options) {{}}
+  end
+
   def under(object, &blk)
     context "under a #{object.class.singular_resource_name}" do
-      let(:default_options) { { "#{object.class.singular_resource_name}_id" => object.id } }
+      define_method(:default_options) do
+        { "#{object.class.singular_resource_name}_id" => object.id }
+      end
+
       instance_eval(&blk)
     end
   end

data/zendesk_api.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "vcr"
-  s.add_development_dependency "webmock"
+  s.add_development_dependency "webmock", "~> 1.9.0"
   s.add_development_dependency "yard"
 
 # Optional. Only used for uploads testing.
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "faraday", ">= 0.8.0"
   s.add_runtime_dependency "faraday_middleware", ">= 0.8.7"
-  s.add_runtime_dependency "hashie"
+  s.add_runtime_dependency "hashie", "~> 2.0.0"
   s.add_runtime_dependency "inflection"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "mime-types"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -81,17 +81,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -145,17 +145,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: inflection
   requirement: !ruby/object:Gem::Requirement