zendesk_api 0.1.8 → 0.1.9

data/Gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gem "simplecov", :platforms => :ruby_19, :group => :development
 gem "jruby-openssl", :platforms => :jruby
-gem "hashie", :git => "https://github.com/steved555/hashie.git"
+gem "hashie", :git => "git://github.com/intridea/hashie.git"
 
 gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 GIT
-  remote: https://github.com/steved555/hashie.git
-  revision: 2fa400b58956f3ae4c4eaaaa196084ffc659072f
+  remote: git://github.com/intridea/hashie.git
+  revision: f7adbf6b6e29bfcd3efbc33695fe0e018d62e66e
   specs:
     hashie (2.0.0.beta)
 
 PATH
   remote: .
   specs:
-    zendesk_api (0.1.8)
+    zendesk_api (0.1.9)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.7)
       hashie

data/lib/zendesk_api/association.rb

@@ -67,16 +67,16 @@ module ZendeskAPI
         # Either grab association from child_id field on resource or parent_id on child resource
           if resource.key?(key)
             id = resource.send(key)
-            key = options.include_key
+            include_key = options.include_key
           else
             id = resource.id
-            key = "#{resource.class.singular_resource_name}_id"
+            include_key = "#{resource.class.singular_resource_name}_id"
           end
 
           next unless id
 
           side_load = side_loads.detect do |side_load|
-            id == side_load[key]
+            id == side_load[include_key]
           end
 
           resource.send("#{options.name}=", side_load) if side_load

data/lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/collection_spec.rb

@@ -429,6 +429,45 @@ describe ZendeskAPI::Collection do
       end
     end
 
+
+    context "multiple resources" do
+      before(:each) do
+        ZendeskAPI::TestResource.has ZendeskAPI::NilResource
+
+        stub_json_request(:get, %r{test_resources\?include=nil_resources}, json(
+          :test_resources => [{ :id => 1, :nil_resource_id => 4 }, { :id => 2, :nil_resource_id => 1 }],
+          :nil_resources => [{ :id => 1, :name => :bye }, { :id => 4, :name => :hi }]
+        ))
+
+        subject.fetch(true)
+
+      end
+
+      context "first resource" do
+        before(:each) { @resource = subject.detect {|res| res.id == 1} }
+
+        it "should side load nil_resources" do
+          @resource.nil_resource.should_not be_nil
+        end
+
+        it "should side load the correct nil_resource" do
+          @resource.nil_resource.name.should == "hi"
+        end
+      end
+
+      context "second resource" do
+        before(:each) { @resource = subject.detect {|res| res.id == 2} }
+
+        it "should side load nil_resources" do
+          @resource.nil_resource.should_not be_nil
+        end
+
+        it "should side load the correct nil_resource" do
+          @resource.nil_resource.name.should == "bye"
+        end
+      end
+    end
+
     context "plural ids on resource" do
       before(:each) do
         ZendeskAPI::TestResource.has_many ZendeskAPI::NilResource

data/spec/spec_helper.rb

@@ -112,7 +112,7 @@ end
 
 VCR.configure do |c|
   c.cassette_library_dir = File.join(File.dirname(__FILE__), "fixtures", "cassettes")
-  c.default_cassette_options = { :record => :new_episodes, :decode_compressed_response => true }
+  c.default_cassette_options = { :record => :new_episodes, :decode_compressed_response => true, :serialize_with => :json, :preserve_exact_body_bytes => true }
   c.hook_into :webmock
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_api
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump