Fixed provider image callbacks

aeolus-incubator · Oct 11, 2012 · 7cda868 · 7cda868
1 parent afaeeda
commit 7cda868
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/app/filters/tim/user_keys_filter.rb b/app/filters/tim/user_keys_filter.rb
@@ -7,13 +7,15 @@ class UserKeysFilter
     @@user_keys = YAML.load(File.read(File.join(Tim::Engine.root, "config", "user_keys.yml")))
 
     def self.before(controller)
-      begin
-        @controller = controller
-        resource_name = @controller.controller_name.singularize.to_sym
-        set_template_params(resource_name)
-        @controller.params[resource_name] = replace_user_keys(@controller.params[resource_name], @@user_keys[resource_name])
-      rescue => e
-        @controller.head :unprocessable_entity
+      if controller.request.format == "application/xml"
+        begin
+          @controller = controller
+          resource_name = @controller.controller_name.singularize.to_sym
+          set_template_params(resource_name)
+          @controller.params[resource_name] = replace_user_keys(@controller.params[resource_name], @@user_keys[resource_name])
+        rescue => e
+          @controller.head :unprocessable_entity
+        end
       end
     end
 

diff --git a/spec/filters/user_keys_filter_spec.rb b/spec/filters/user_keys_filter_spec.rb
@@ -24,7 +24,10 @@ module Tim
 
     describe "replace user keys" do
       it 'should get the correct hash from params via controller name' do
+         request = mock("Request")
+         request.stub(:format).and_return "application/xml"
          controller = double("ApplicationController")
+         controller.stub(:request).and_return request
          controller.stub(:controller_name).and_return "resources"
          controller.stub(:params).and_return({:resource => {:k1 => {:k2 => :v2}}})