restrack 1.4.1 → 1.4.2

data/lib/restrack/resource_controller.rb

@@ -158,6 +158,12 @@ module RESTRack
         @id = self.methods.include?(@resource_request.url_chain[0]) ? nil : @resource_request.url_chain.shift
         @action = term.to_sym
       else
+        begin
+          self.class.format_string_id(term)
+        rescue
+          # if this isn't a valid id then it must be a request for an action that doesn't exist (we tested it as an action name above)
+          raise HTTP405MethodNotAllowed, 'Action not provided or found and unknown HTTP request method.'
+        end
         @id = term
         term = @resource_request.url_chain.shift
         if term.nil?
@@ -180,9 +186,9 @@ module RESTRack
       self.key_type ||= String
       unless self.key_type.blank? or self.key_type.ancestors.include?(String)
         if self.key_type.ancestors.include?(Integer)
-          id = id.to_i
+          id = Integer(id)
         elsif self.key_type.ancestors.include?(Float)
-          id = id.to_f
+          id = Float(id)
         else
           raise HTTP500ServerError, "Invalid key identifier type specified on resource #{self.class.to_s}."
         end

data/lib/restrack/version.rb

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

data/lib/restrack/web_service.rb

@@ -55,11 +55,7 @@ module RESTRack
         when exception.is_a?( HTTP502BadGateway )
           return [502, {'Content-Type' => 'text/plain'}, [exception.message || "The server was acting as a gateway or proxy and received an invalid response from the upstream server."] ]
         else # HTTP500ServerError
-          if resource_request && resource_request.request_id
-            RESTRack.log.error "(#{resource_request.request_id}) #{exception.class.to_s} " + exception.message + "\n" + exception.backtrace.join("\n")
-          else
-            RESTRack.log.error "(<nil-reqid>) #{exception.class.to_s} " + exception.message + "\n" + exception.backtrace.join("\n")
-          end
+          log_server_error( resource_request, exception )
           msg = ''
           if RESTRack::CONFIG[:SHOW_STACK]
             msg = (exception.message == exception.class.to_s) ? exception.backtrace.join("\n") : exception.message + "\nstack trace:\n" + exception.backtrace.join("\n")
@@ -70,5 +66,13 @@ module RESTRack
       end # case Exception
     end # method caught
 
+    def log_server_error( resource_request, exception )
+      if resource_request && resource_request.request_id
+        RESTRack.log.error "(#{resource_request.request_id}) #{exception.class.to_s} " + exception.message + "\n" + exception.backtrace.join("\n")
+      else
+        RESTRack.log.error "(<nil-reqid>) #{exception.class.to_s} " + exception.message + "\n" + exception.backtrace.join("\n")
+      end
+    end
+
   end # class WebService
 end # module RESTRack

data/test/sample_app_2/controllers/bazu_controller.rb

@@ -2,6 +2,14 @@ class SampleApp::BazuController < RESTRack::ResourceController
 
   keyed_with_type Fixnum
 
+  def index
+    [
+      { :id => 1, :val => 111 },
+      { :id => 2, :val => 222 },
+      { :id => 3, :val => 333 }
+    ]
+  end
+
   def show(id)
     return 1 if id == 1
     return 0

data/test/sample_app_2/test/test_resource_request.rb

@@ -48,14 +48,14 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
 
   def test_default_resource
     # This should be handled by bazu_controller
-    env = Rack::MockRequest.env_for('/', {
+    env = Rack::MockRequest.env_for('/bad_request', {
       :method => 'GET'
     })
     output = ''
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    # no index method defined/allowed
+    # no bad_request method defined/allowed
     assert_equal 405, output[0]
 
     # This should be handled by bazu_controller
@@ -67,5 +67,20 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
       output = @ws.call(env)
     end
     assert_equal 200, output[0]
+
+    # the following request should hit the default controller's index method (BazuController)
+    env = Rack::MockRequest.env_for('', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    test_val = [
+      { :id => 1, :val => 111 },
+      { :id => 2, :val => 222 },
+      { :id => 3, :val => 333 }
+    ].to_json
+    assert_equal test_val, output[2][0]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restrack
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12274540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12274540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &12273680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12273680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &12272300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12272300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &12271880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12271880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &12271240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *12271240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.13
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &12270460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12270460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &12269560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12269560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &12268400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12268400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -204,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: restrack
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A lightweight MVC framework developed specifically for JSON (and XML) REST