fix association passing from collections for resources except Tag - zendesk#108

Author: steved

lib/zendesk_api/collection.rb

@@ -126,7 +126,7 @@ def <<(item)
  raise "this collection is for #{@resource_class}"
  end
  else
- @resources << wrap_resource(item)
+ @resources << wrap_resource(item, true)
  end
  end
 
@@ -363,14 +363,17 @@ def handle_response(body)
  end
 
  # Simplified Associations#wrap_resource
- def wrap_resource(res)
+ def wrap_resource(res, with_association = @resource_class == Tag)
  case res
  when Array
  wrap_resource(Hash[*res])
  when Hash
- @resource_class.new(@client, res.merge(:association => association))
+ res = res.merge(:association => @association) if with_association
+ @resource_class.new(@client, res)
  else
- @resource_class.new(@client, :id => res, :association => association)
+ res = { :id => res }
+ res.merge!(:association => @association) if with_association
+ @resource_class.new(@client, res)
  end
  end
 

lib/zendesk_api/resource.rb

@@ -92,8 +92,8 @@ def loaded_associations
  end
 
  # Returns the path to the resource
- def path(*args)
- @association.generate_path(self, *args)
+ def path(options = {})
+ @association.generate_path(self, options)
  end
 
  # Passes #to_json to the underlying attributes hash

spec/core/collection_spec.rb

@@ -703,5 +703,21 @@ def to_proc
  subject.create
  end
  end
+
+ context "resources" do
+ before(:each) do
+ stub_json_request(:get, %r{test_resources/active},
+ json(:test_resources => [{ :id => 1 }]))
+
+ subject.fetch
+
+ stub_json_request(:put, %r{test_resources/1})
+ end
+
+ it "should not save using the collection path" do
+ resource = subject.first
+ resource.save
+ end
+ end
  end
 end