cowtech-rails 2.2.3.1 → 2.2.3.2

data/app/helpers/cowtech/ruby_on_rails/helpers/application_helper.rb

@@ -52,11 +52,7 @@ module Cowtech
         end
 
         def _normalize_type(format = nil)
-          if format != nil then
-            request.format = format
-          else
-            request.format = :text if request.format != :json
-          end
+          format = :text if !([:text, :json, :jsonp].include?(format))
         end
 
         def setup_json_response(type = :base)
@@ -66,13 +62,14 @@ module Cowtech
         def custom_respond_with(data, format = nil, status = :ok)
           return if performed?
 
-          self._normalize_type(format)
+          format = request.format if format.blank?
+          format = self._normalize_type(format)
 
-          if request.format == :text then
+          if format == :text then
               render :text => data, :status => status
-          elsif request.format == :json then
+          elsif format == :json then
               render :json => data, :status => status
-          elsif request.format == :jsonp then
+          elsif format == :jsonp then
               render :json => data, :status => status, :callback => params[:callback]
           end
         end

data/lib/cowtech/version.rb

@@ -10,7 +10,7 @@ module Cowtech
       MAJOR = 2
       MINOR = 2
       PATCH = 3
-      BUILD = 1
+      BUILD = 2
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cowtech-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.3.1
+  version: 2.2.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cowtech-extensions
-  requirement: &70133297661680 !ruby/object:Gem::Requirement
+  requirement: &70116894281020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133297661680
+  version_requirements: *70116894281020
 description: A general purpose Rails utility plugin.
 email: shogun_panda@me.com
 executables: []