restrack 1.4.0 → 1.4.1

data/lib/restrack/resource_request.rb

@@ -23,7 +23,7 @@ module RESTRack
       @post_params = parse_body( @request )
       @get_params = parse_query_string( @request )
       @params = {}
-      # TODO: Test this!
+      # TODO: symbolize!
       if @post_params.respond_to?(:merge)
         @params = @post_params.merge( @get_params )
       else
@@ -107,6 +107,12 @@ module RESTRack
     def parse_body(request)
       post_params = request.body.read
       RESTRack.log.debug "{#{@request_id}} #{request.content_type} raw POST data in:\n" + post_params
+      if RESTRack::CONFIG[:TRANSCODE]
+        post_params.encode!( RESTRack::CONFIG[:TRANSCODE] )
+      end
+      if RESTRack::CONFIG[:FORCE_ENCODING]
+        post_params = post_params.force_encoding( RESTRack::CONFIG[:FORCE_ENCODING] )
+      end
       unless request.content_type.blank?
         request_mime_type = MIME::Type.new( request.content_type )
         if request_mime_type.like?( RESTRack.mime_type_for( :JSON ) )

data/lib/restrack/version.rb

@@ -1,3 +1,3 @@
 module RESTRack
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/test/sample_app_1/config/constants.yaml

@@ -24,4 +24,10 @@
 # These are the resources which cannot be accessed from the root of your web service. Use either this or ROOT_RESOURCE_ACCEPT as a blacklist or whitelist to establish routing (relationships defined in resource controllers define further routing).
 :ROOT_RESOURCE_DENY:      [ baz ]
 
-:SHOW_STACK:              true
+# The stack trace will not be added to 500 response body by default, set to true to enable.
+:SHOW_STACK:              true
+
+# String#encode will be called when this value is set
+#:TRANSCODE:               ISO-8859-1  # UTF-8
+# String#force_encoding will be called when this value is set
+#:FORCE_ENCODING:          ISO-8859-1  # UTF-8

data/test/sample_app_1/controllers/foo_bar_controller.rb

@@ -112,4 +112,8 @@ class SampleApp::FooBarController < RESTRack::ResourceController
     return [1,1,2,3,5,8,13,21,34]
   end
 
+  def show_encoding
+    return @post_params.encoding.to_s
+  end
+
 end

data/test/sample_app_1/test/test_resource_request.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
 require 'rubygems'
 require 'test/unit'
 require 'rack/test'
@@ -141,4 +143,138 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     assert_equal 403, output[0]
   end
 
+  def test_transcode_defined
+    RESTRack::CONFIG.delete(:TRANSCODE)
+    RESTRack::CONFIG.delete(:FORCE_ENCODING)
+    RESTRack::CONFIG[:TRANSCODE] = 'ISO-8859-1'
+
+    env = Rack::MockRequest.env_for('/foo_bar/show_encoding', {
+      :method => 'POST',
+      :params => %Q|[
+        {
+          "bar": "baz"
+        }
+      ]|
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal ["\"ISO-8859-1\""], output[2]
+
+    env = Rack::MockRequest.env_for('/foo_bar/show_encoding', {
+      :method => 'POST',
+      :params => %Q|[
+        {
+          "bar": "€"
+        }
+      ]|
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal 500, output[0]
+  end
+
+  def test_transcode_not_defined
+    RESTRack::CONFIG.delete(:TRANSCODE)
+    RESTRack::CONFIG.delete(:FORCE_ENCODING)
+
+    env = Rack::MockRequest.env_for('/foo_bar/show_encoding', {
+      :method => 'POST',
+      :params => %Q|[
+        {
+          "bar": "baz"
+        }
+      ]|
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal ["\"ASCII-8BIT\""], output[2]
+
+    env = Rack::MockRequest.env_for('/foo_bar/show_encoding', {
+      :method => 'POST',
+      :params => %Q|[
+        {
+          "bar": "€"
+        }
+      ]|
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal 200, output[0]
+  end
+
+  def test_force_encoding_defined
+    RESTRack::CONFIG.delete(:TRANSCODE)
+    RESTRack::CONFIG.delete(:FORCE_ENCODING)
+    RESTRack::CONFIG[:FORCE_ENCODING] = 'ISO-8859-1'
+
+    env = Rack::MockRequest.env_for('/foo_bar/show_encoding', {
+      :method => 'POST',
+      :params => %Q|[
+        {
+          "bar": "baz"
+        }
+      ]|
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal ["\"ISO-8859-1\""], output[2]
+
+    env = Rack::MockRequest.env_for('/foo_bar/show_encoding', {
+      :method => 'POST',
+      :params => %Q|[
+        {
+          "bar": "€"
+        }
+      ]|
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal 200, output[0]
+  end
+
+  def test_force_encoding_not_defined
+    RESTRack::CONFIG.delete(:TRANSCODE)
+    RESTRack::CONFIG.delete(:FORCE_ENCODING)
+
+    env = Rack::MockRequest.env_for('/foo_bar/show_encoding', {
+      :method => 'POST',
+      :params => %Q|[
+        {
+          "bar": "baz"
+        }
+      ]|
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal ["\"ASCII-8BIT\""], output[2]
+
+    env = Rack::MockRequest.env_for('/foo_bar/show_encoding', {
+      :method => 'POST',
+      :params => %Q|[
+        {
+          "bar": "€"
+        }
+      ]|
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    assert_equal 200, output[0]
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restrack
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2012-03-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &20404520 !ruby/object:Gem::Requirement
+  requirement: &12274540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20404520
+  version_requirements: *12274540
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &20404080 !ruby/object:Gem::Requirement
+  requirement: &12273680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20404080
+  version_requirements: *12273680
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &20403480 !ruby/object:Gem::Requirement
+  requirement: &12272300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20403480
+  version_requirements: *12272300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20402860 !ruby/object:Gem::Requirement
+  requirement: &12271880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20402860
+  version_requirements: *12271880
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &20402080 !ruby/object:Gem::Requirement
+  requirement: &12271240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *20402080
+  version_requirements: *12271240
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &20384600 !ruby/object:Gem::Requirement
+  requirement: &12270460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20384600
+  version_requirements: *12270460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &20383940 !ruby/object:Gem::Requirement
+  requirement: &12269560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20383940
+  version_requirements: *12269560
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &20383300 !ruby/object:Gem::Requirement
+  requirement: &12268400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20383300
+  version_requirements: *12268400
 description: ! "\nRESTRack is a Rack-based MVC framework that makes it extremely easy
   to develop RESTful data services. It is inspired by\nRails, and follows a few of
   its conventions.  But it has no routes file, routing relationships are done through\nsupplying