toast 0.8.0 → 0.8.1

data/lib/toast/association.rb

@@ -3,8 +3,8 @@ module Toast
 
     attr_reader :model
 
-    def initialize model, id, subresource_name, format, config, assoc_model, assoc_config_in, assoc_config_out
-      
+    def initialize model, id, subresource_name, params, format, config, assoc_model, assoc_config_in, assoc_config_out
+
       unless config.exposed_associations.include? subresource_name
         raise ResourceNotFound
       end
@@ -18,7 +18,7 @@ module Toast
       @associate_model = assoc_model
       @associate_config_in = assoc_config_in
       @associate_config_out = assoc_config_out
-
+      @params = params
     end
 
     def get
@@ -27,11 +27,16 @@ module Toast
         raise "Toast Error: Association '#{@assoc}' not found in model '#{@record.class}'"
       end
 
-      result = @record.send(@assoc)
+      result =
+        if @config.pass_params_to.include?(@assoc)
+          @record.send(@assoc).find_by_params(@params)
+        else
+          @record.send(@assoc)
+        end
 
       raise ResourceNotFound if result.nil?
 
-      if result.is_a? Array
+      if result.is_a? ActiveRecord::Relation or result.is_a? Array
         {
           :json => result.map{|r|
             r.represent( @associate_config_out.in_collection.exposed_attributes,

data/lib/toast/resource.rb

@@ -64,7 +64,7 @@ module Toast
                   (assoc_config_out.namespace ? "/" + assoc_config_out.namespace : "")
 
 
-                Toast::Association.new(model, id, subresource_name, format, config_assoc_src,
+                Toast::Association.new(model, id, subresource_name, params.clone, format, config_assoc_src,
                                        assoc_model, assoc_config_in, assoc_config_out)
 
               else

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toast
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - "robokopp (Robert Anni\xC3\xA9s)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-20 00:00:00 Z
+date: 2012-08-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails