zendesk_api 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    zendesk_api (0.3.0)
+    zendesk_api (0.3.1)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie
@@ -54,7 +54,7 @@ GEM
     diff-lcs (1.1.3)
     eventmachine (1.0.0)
     eventmachine (1.0.0-java)
-    faraday (0.8.5)
+    faraday (0.8.6)
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
@@ -75,7 +75,7 @@ GEM
     multi_json (1.5.0)
     newrelic_rpm (3.5.3.25)
     origin (1.0.11)
-    rack (1.5.1)
+    rack (1.5.2)
     rack-protection (1.3.2)
       rack
     rack-ssl-enforcer (0.2.5)

data/lib/zendesk_api/actions.rb

@@ -61,7 +61,7 @@ module ZendeskAPI
           self.send("#{association_name}=", association) # set id/ids columns
         end
 
-        if association_data[:inline] == true || inline_creation
+        if (association_data[:inline] == true || inline_creation) && association.changed?
           attributes[association_name] = (association.is_a?(Collection) ? association.map(&:to_param) : association.to_param)
         end
       end

data/lib/zendesk_api/associations.rb

@@ -111,7 +111,7 @@ module ZendeskAPI
               klass.find(@client, :id => resource_id, :association => instance_association)
             elsif found = method_missing(association[:name].to_sym)
               wrap_resource(found, association)
-            elsif klass.superclass == DataResource
+            elsif klass.superclass == DataResource && !association[:inline]
               rescue_client_error do
                 response = @client.connection.get(instance_association.generate_path(:with_parent => true))
                 klass.new(@client, response.body[klass.singular_resource_name].merge(:association => instance_association))

data/lib/zendesk_api/collection.rb

@@ -169,8 +169,8 @@ module ZendeskAPI
 
     # Calls #each on every page with the passed in block
     # @param [Block] block Passed to #each
-    def each_page(&block)
-      page(nil)
+    def each_page(start_page = @options["page"], &block)
+      page(start_page)
       clear_cache
 
       while !empty?

data/lib/zendesk_api/resources.rb

@@ -48,6 +48,9 @@ module ZendeskAPI
 
   class Upload < Data
     include Create
+    include Destroy
+
+    def id; token; end
 
     only_send_unnested_params
 
@@ -328,16 +331,9 @@ module ZendeskAPI
       put :request_verification
     end
 
-    def initialize(*)
-      super
-
-      # Needed for side-loading to work
-      self.role_id = role.id if self.key?(:role)
-    end
-
     has Organization
 
-    has CustomRole, :include => :roles
+    has CustomRole, :inline => true, :include => :roles
     has Role, :inline => true, :include_key => :name
     has Ability, :inline => true
 

data/lib/zendesk_api/track_changes.rb

@@ -41,8 +41,12 @@ module ZendeskAPI
       end
 
       def regular_writer(key, value)
-        changes[key] = value
-        defined?(_store) ? _store(key, value) : super(key, value)
+        if self.has_key?(key) && self[key] == value
+          value
+        else
+          changes[key] = value
+          defined?(_store) ? _store(key, value) : super(key, value)
+        end
       end
 
       def delete(key)

data/lib/zendesk_api/trackie.rb

@@ -5,5 +5,10 @@ module ZendeskAPI
   # @private
   class Trackie < Hashie::Mash
     include ZendeskAPI::TrackChanges
+
+    def size
+      self['size']
+    end
+
   end
 end

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/core/collection_spec.rb

@@ -166,49 +166,86 @@ describe ZendeskAPI::Collection do
   end
 
   context "each_page" do
-    before(:each) do
-      stub_json_request(:get, %r{test_resources$}, json(
-        :test_resources => [{:id => 1}],
-        :next_page => "/test_resources?page=2"
-      ))
+    context "Faraday errors" do
+      before(:each) do
+        stub_json_request(:get, %r{test_resources$}, json(
+          :test_resources => [{:id => 1}], :next_page => "/test_resources?page=2"
+        ))
 
-      stub_json_request(:get, %r{test_resources\?page=2}, json(
-        :test_resources => [{:id => 2}],
-        :next_page => "/test_resources?page=3"
-      ))
+        stub_request(:get, %r{test_resources\?page=2}).to_return(:status => 500).then.to_return(
+          :headers => { :content_type => "application/json" }, :status => 200,
+          :body => json(:test_resources => [{:id => 2}], :next_page => "/test_resources?page=3"))
 
-      stub_request(:get, %r{test_resources\?page=3}).to_return(:status => 404)
-    end
+        stub_request(:get, %r{test_resources\?page=3}).to_return(:status => 404)
+      end
 
-    it "should yield resource if arity == 1" do
-      expect do |block|
-        # Needed to make sure the arity == 1
-        block.instance_eval do
-          def to_proc
-            @used = true
+      it "should retry from the same page" do
+        class SearchError < Exception; end
 
-            probe = self
-            Proc.new do |arg|
-              probe.num_yields += 1
-              probe.yielded_args << [arg]
+        expect do |b|
+          client.insert_callback do |env|
+            if env[:status] == 500 && env[:url].request_uri =~ /test_resources/
+              raise SearchError
             end
           end
-        end
 
-        silence_logger { subject.each_page(&block) }
-      end.to yield_successive_args(
-        ZendeskAPI::TestResource.new(client, :id => 1),
-        ZendeskAPI::TestResource.new(client, :id => 2)
-      )
+          begin
+            silence_logger { subject.each_page(&b) }
+          rescue SearchError
+            retry
+          end
+        end.to yield_successive_args(
+          [ZendeskAPI::TestResource.new(client, :id => 1), 1],
+          [ZendeskAPI::TestResource.new(client, :id => 2), 2]
+        )
+      end
     end
 
-    it "should yield resource and page" do
-      expect do |b|
-        silence_logger { subject.each_page(&b) }
-      end.to yield_successive_args(
-        [ZendeskAPI::TestResource.new(client, :id => 1), 1],
-        [ZendeskAPI::TestResource.new(client, :id => 2), 2]
-      )
+    context "successful requests" do
+      before(:each) do
+        stub_json_request(:get, %r{test_resources$}, json(
+          :test_resources => [{:id => 1}],
+          :next_page => "/test_resources?page=2"
+        ))
+
+        stub_json_request(:get, %r{test_resources\?page=2}, json(
+          :test_resources => [{:id => 2}],
+          :next_page => "/test_resources?page=3"
+        ))
+
+        stub_request(:get, %r{test_resources\?page=3}).to_return(:status => 404)
+      end
+
+      it "should yield resource if arity == 1" do
+        expect do |block|
+          # Needed to make sure the arity == 1
+          block.instance_eval do
+            def to_proc
+              @used = true
+
+              probe = self
+              Proc.new do |arg|
+                probe.num_yields += 1
+                probe.yielded_args << [arg]
+              end
+            end
+          end
+
+          silence_logger { subject.each_page(&block) }
+        end.to yield_successive_args(
+          ZendeskAPI::TestResource.new(client, :id => 1),
+          ZendeskAPI::TestResource.new(client, :id => 2)
+        )
+      end
+
+      it "should yield resource and page" do
+        expect do |b|
+          silence_logger { subject.each_page(&b) }
+        end.to yield_successive_args(
+          [ZendeskAPI::TestResource.new(client, :id => 1), 1],
+          [ZendeskAPI::TestResource.new(client, :id => 2), 2]
+        )
+      end
     end
   end
 

data/spec/core/data_resource_spec.rb

@@ -12,6 +12,29 @@ describe ZendeskAPI::DataResource do
     ZendeskAPI::Category.resource_name.should == "categories"
   end
 
+  context "association" do
+    subject { ZendeskAPI::TestResource.new(client, :id => 1) }
+    let(:options) {{}}
+
+    before(:each) do
+      ZendeskAPI::TestResource.has :nil, options.merge(:class => ZendeskAPI::NilDataResource)
+    end
+
+    it "should try and find non-existant object" do
+      stub_json_request(:get, %r{test_resources/1/nil}, json(:nil_data_resource => {}))
+
+      subject.nil.should be_instance_of(ZendeskAPI::NilDataResource)
+    end
+
+    context "inline => true" do
+      let(:options) {{ :inline => true }}
+
+      it "should not try and find non-existant object" do
+        subject.nil
+      end
+    end
+  end
+
   context "user" do
     context "with first order attributes" do
       subject { ZendeskAPI::TestResource.new(client) }

data/spec/core/resource_spec.rb

@@ -239,12 +239,20 @@ describe ZendeskAPI::Resource do
             ZendeskAPI::TestResource.has :nil, :class => ZendeskAPI::NilResource, :inline => true
 
             subject.nil = { :abc => :def }
-            subject.save_associations
           end
 
           it "should save param data" do
+            subject.save_associations
+
             subject.attributes[:nil].should == "TESTDATA"
           end
+
+          it "should not save param data when unchanged" do
+            subject.nil.clear_changes
+            subject.save_associations
+
+            subject.attributes[:nil].should be_nil
+          end
         end
 
         context "create" do

data/spec/core/trackie_spec.rb

@@ -9,7 +9,7 @@ describe ZendeskAPI::Trackie do
   end
 
   context "adding keys" do
-    before(:each) { subject[:key] = true } 
+    before(:each) { subject[:key] = true }
 
     it "should include key in changes" do
       subject.changes[:key].should be_true
@@ -21,6 +21,24 @@ describe ZendeskAPI::Trackie do
     end
   end
 
+  context "adding identical keys" do
+    before(:each) do
+      subject[:key] = "foo"
+      subject.clear_changes
+
+      subject[:key] = "foo"
+    end
+
+    it "should not include key in changes" do
+      subject.changes[:key].should be_false
+    end
+
+    specify "key should not be changed" do
+      subject.changed?(:key).should be_false
+      subject.changed?.should be_false
+    end
+  end
+
   context "nested hashes" do
     before(:each) do
       subject[:key] = ZendeskAPI::Trackie.new
@@ -36,4 +54,14 @@ describe ZendeskAPI::Trackie do
       subject.changed?.should be_true
     end
   end
+
+  describe "#size" do
+    before do
+      subject[:size] = 42
+    end
+
+    it "returns the value corresponding to the :size key" do
+      subject.size.should == 42
+    end
+  end
 end

data/spec/fixtures/test_resources.rb

@@ -8,5 +8,5 @@ class ZendeskAPI::TestResource < ZendeskAPI::Resource
 end
 
 class ZendeskAPI::NilResource < ZendeskAPI::Data; end
-
+class ZendeskAPI::NilDataResource < ZendeskAPI::DataResource; end
 class ZendeskAPI::SingularTestResource < ZendeskAPI::SingularResource; end

data/spec/live/upload_spec.rb

@@ -5,5 +5,6 @@ describe ZendeskAPI::Upload, :not_findable do
     { :file => "spec/fixtures/Argentina.gif" }
   end
 
-  it_should_be_creatable :id => :token
+  it_should_be_creatable
+  it_should_be_deletable
 end

data/spec/macros/resource_macros.rb

@@ -18,7 +18,7 @@ module ResourceMacros
 
       it "should have an id" do
         @object.should_not be_nil
-        @object.send(options[:id] || :id).should_not be_nil
+        @object.send(:id).should_not be_nil
       end
 
       it "should be findable", :unless => metadata[:not_findable] do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -527,7 +527,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Zendesk REST API Client