zendesk_api 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2d51cee7bc52d69cb3651b8d34be2f657fd0b0
-  data.tar.gz: 79d21d20ccc25babe632b13f92e88f63205e119a
+  metadata.gz: e08c78d51da14faeccebcd04694a6e70281946a3
+  data.tar.gz: 62b948f0e1abd8f218000bc1715bf21f3e76bd6b
 SHA512:
-  metadata.gz: 1496843f0c0507408cbf14ccba8fd49b5122502d28bdbf16e40a6e61d02dcfca79eac6dcc8f623ee1bd52157e0588538aee416c53547ad4f45ab6314fe2e5fd8
-  data.tar.gz: 910905c0701802ad489d7101fbc8de61382b4f4ed3058f0915b148589d4a039e9a9dcd31f9b6b58cd16fd868c630f09b5b82d72fc458254df4314a044f4aecf8
+  metadata.gz: 960691a181fa66cfe3fd1ea3859001ec3f13340e93963a962863dd6efaaca24ffff35e0fcf57e936813c8c0006a12e850b40e60dfdf9c498bd9ec0d5cda24a0c
+  data.tar.gz: 589a1292ab9fa3d4064346be770c47c1aa46e90136744ecc1d7212f15e1e15877c9cf1a241d95c0c6668d317d5075d05fa44923d089f6b0310c9b74e14f277aa

data/.travis.yml

@@ -1,6 +1,8 @@
 rvm:
   - ree
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
   - jruby
 bundler_args: --without=server console
+cache: bundler

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    zendesk_api (1.2.3)
+    zendesk_api (1.2.4)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie (>= 1.2)

data/README.md

@@ -386,7 +386,7 @@ ZendeskAPI::App::Installation.destroy!(client, :id => 123)
 
 ## Supported Ruby Versions
 
-Tested with Ruby 1.8.7 and 1.9.3
+Tested with Ruby 1.8.7, 1.9.3, 2.0.0, 2.1.0, and jRuby.
 [![Build Status](https://secure.travis-ci.org/zendesk/zendesk_api_client_rb.png?branch=master)](http://travis-ci.org/zendesk/zendesk_api_client_rb)
 
 ## Copyright and license

data/lib/zendesk_api/collection.rb

@@ -328,7 +328,7 @@ module ZendeskAPI
       result = true
 
       @resources.map! do |item|
-        if item.respond_to?(method) && item.changed?
+        if item.respond_to?(method) && !item.destroyed? && item.changed?
           result &&= item.send(method)
         end
 

data/lib/zendesk_api/resources.rb

@@ -52,7 +52,7 @@ module ZendeskAPI
         return self unless @resources
 
         @client.connection.post(path) do |req|
-          req.body = { :tags => @resources.map(&:id) }
+          req.body = { :tags => @resources.reject(&:destroyed?).map(&:id) }
         end
 
         true

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/core/collection_spec.rb

@@ -391,7 +391,7 @@ describe ZendeskAPI::Collection do
     end
 
     context "with a hash" do
-      let(:object) { mock('ZendeskAPI::TestResource', :changes => [:xxx], :changed? => true) }
+      let(:object) { mock('ZendeskAPI::TestResource', :changes => [:xxx], :changed? => true, :destroyed? => false) }
 
       it "should call create with those options" do
         ZendeskAPI::TestResource.should_receive(:new).
@@ -425,7 +425,7 @@ describe ZendeskAPI::Collection do
 
     context "with everything else" do
       it "should pass to new, since this is how attachment handles it" do
-        attachment = mock(:changes => [:xxx], :changed? => true)
+        attachment = mock(:changes => [:xxx], :changed? => true, :destroyed? => false)
         ZendeskAPI::TestResource.should_receive(:new).
           with(client, :id => "img.jpg", :association => instance_of(ZendeskAPI::Association)).
           and_return attachment
@@ -436,6 +436,25 @@ describe ZendeskAPI::Collection do
         subject.save
       end
     end
+
+    context "with a destroyed object" do
+      let(:object) { ZendeskAPI::TestResource.new(client, options) }
+
+      before(:each) do
+        subject << object
+      end
+
+      it "should not save object" do
+        object.should_receive(:destroyed?).and_return(true)
+        object.should_not_receive(:save)
+
+        subject.save
+      end
+
+      it "should have object in collection" do
+        subject.should include(object)
+      end
+    end
   end
 
   context "without real data" do

data/spec/live/tag_spec.rb

@@ -20,6 +20,13 @@ describe ZendeskAPI::Tag, :vcr, :not_findable do
         tags.should == %w{tag3}
       end
 
+      it "shouldn't re-save destroyed tags" do
+        parent.tags.first.destroy!
+        parent.tags.save!
+
+        tags.should == %w{tag3}
+      end
+
       it "should be updatable" do
         parent.tags.update!(:id => "tag4")
 

data/zendesk_api.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://developer.zendesk.com"
   s.summary     = %q{Zendesk REST API Client}
   s.description = %q{Ruby wrapper for the REST API at http://www.zendesk.com. Documentation at http://developer.zendesk.com.}
-  s.license = 'Apache License Version 2.0'
+  s.license     = 'Apache License Version 2.0'
 
   s.required_ruby_version     = ">= 1.8.7"
   s.required_rubygems_version = ">= 1.3.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Steven Davidovitz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump