restrack 1.1.1 → 1.1.2

data/bin/restrack

@@ -28,5 +28,6 @@ when :generate, :gen, :g
   puts 'Creation is complete.'
 when :server, :s
   options = { :Port => noun || 9292, :config => 'config.ru' }
+  options.merge { :environment => ARGV[2] } unless ARGV[2].nil?
   Rack::Server.start( options )
 end

data/lib/restrack/generator/config.ru.erb

@@ -1,3 +1,3 @@
-# Rails.root/config.ru
-require 'loader'
+# rackup config.ru
+require File.join(File.dirname(__FILE__),'loader')
 run <%= @service_name.camelize %>::WebService.new

data/lib/restrack/resource_request.rb

@@ -12,12 +12,12 @@ module RESTRack
       # Write input details to logs
       RESTRack.request_log.info "{#{@request_id}} #{@request.path_info} requested from #{@request.ip}"
     end
-    
+
     def fulfill
       self.prepare
       return self.response
     end
-    
+
     def prepare
       # Pull input data from POST body
       @input = parse_body( @request )
@@ -42,7 +42,7 @@ module RESTRack
       end
       if @active_resource_name.nil? or not RESTRack.controller_exists?(@active_resource_name)
         raise HTTP404ResourceNotFound unless RESTRack::CONFIG[:DEFAULT_RESOURCE]
-        @active_resource_name = RESTRack::CONFIG[:DEFAULT_RESOURCE] 
+        @active_resource_name = RESTRack::CONFIG[:DEFAULT_RESOURCE]
       end
       raise HTTP403Forbidden unless RESTRack::CONFIG[:ROOT_RESOURCE_ACCEPT].blank? or RESTRack::CONFIG[:ROOT_RESOURCE_ACCEPT].include?(@active_resource_name)
       raise HTTP403Forbidden if not RESTRack::CONFIG[:ROOT_RESOURCE_DENY].blank? and RESTRack::CONFIG[:ROOT_RESOURCE_DENY].include?(@active_resource_name)
@@ -89,7 +89,7 @@ module RESTRack
       RESTRack.log.debug "{#{@request_id}} #{request_mime_type.to_s} data in:\n" + input.pretty_inspect
       input
     end
-    
+
     def get_params(request)
       params = request.GET
     end
@@ -126,6 +126,8 @@ module RESTRack
       elsif @mime_type.like?( RESTRack.mime_type_for( :XML ) )
         if File.exists? builder_file
           @output = builder_up(data)
+        elsif data.respond_to?(:to_xml)
+          @output = data.to_xml
         else
           @output = XmlSimple.xml_out(data, 'AttrPrefix' => true, 'XmlDeclaration' => true, 'NoIndent' => true)
         end

data/lib/restrack/version.rb

@@ -1,3 +1,3 @@
 module RESTRack
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,125 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: restrack
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.2
   prerelease: 
-  version: 1.1.1
 platform: ruby
-authors: 
+authors:
 - Chris St. John
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-17 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17758880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17758880
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &17758460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *17758460
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &17758040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *17758040
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &17757620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *17757620
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: &17757120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.13
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *17757120
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &17756700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *17756700
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &17756240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *17756240
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &17755820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-description: "\n\
-  RESTRack is a Rack-based MVC framework that makes it extremely easy to develop RESTful data services. It is inspired by\n\
-  Rails, and follows a few of its conventions.  But it has no routes file, routing relationships are done through\n\
-  supplying custom code blocks to class methods such as \"has_relationship_to\" or \"has_mapped_relationships_to\".\n\n\
-  RESTRack aims at being lightweight and easy to use.  It will automatically render JSON and XML for the data\n\
-  structures you return in your actions (any structure parsable by the \"json\" and\n\
-  \"xml-simple\" gems, respectively).\n\n\
-  If you supply a view for a controller action, you do that using a builder file.  Builder files are stored in the\n\
-  view directory grouped by controller name subdirectories (`view/<controller>/<action>.xml.builder`).  XML format\n\
-  requests will then render the view template with the builder gem, rather than generating XML with XmlSimple.\n  "
-email: 
+  prerelease: false
+  version_requirements: *17755820
+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
+  custom code blocks to class methods such as \"has_relationship_to\" or \"has_mapped_relationships_to\".\n\nRESTRack
+  aims at being lightweight and easy to use.  It will automatically render JSON and
+  XML for the data\nstructures you return in your actions (any structure parsable
+  by the \"json\" and\n\"xml-simple\" gems, respectively).\n\nIf you supply a view
+  for a controller action, you do that using a builder file.  Builder files are stored
+  in the\nview directory grouped by controller name subdirectories (`view/<controller>/<action>.xml.builder`).
+  \ XML format\nrequests will then render the view template with the builder gem,
+  rather than generating XML with XmlSimple.\n  "
+email:
 - chris@stjohnstudios.com
-executables: 
+executables:
 - restrack
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - README.markdown
 - README.markdown.html
@@ -139,7 +136,6 @@ files:
 - lib/restrack/version.rb
 - lib/restrack/web_service.rb
 - restrack.gemspec
-- restrack.komodoproject
 - test/sample_app_1/config.ru
 - test/sample_app_1/config/constants.yaml
 - test/sample_app_1/controllers/bat_controller.rb
@@ -185,77 +181,29 @@ files:
 - test/sample_app_4/views/alphatest.png
 - test/test_support.rb
 - test/test_web_service.rb
-has_rdoc: true
 homepage: http://github.com/stjohncj/RESTRack
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: restrack
-rubygems_version: 1.5.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: A lightweight MVC framework developed specifically for JSON (and XML) REST services.
-test_files: 
-- test/sample_app_1/config.ru
-- test/sample_app_1/config/constants.yaml
-- test/sample_app_1/controllers/bat_controller.rb
-- test/sample_app_1/controllers/bata_controller.rb
-- test/sample_app_1/controllers/baz_controller.rb
-- test/sample_app_1/controllers/baza_controller.rb
-- test/sample_app_1/controllers/bazu_controller.rb
-- test/sample_app_1/controllers/foo_bar_controller.rb
-- test/sample_app_1/loader.rb
-- test/sample_app_1/test/test_controller_actions.rb
-- test/sample_app_1/test/test_controller_inputs.rb
-- test/sample_app_1/test/test_controller_modifiers.rb
-- test/sample_app_1/test/test_formats.rb
-- test/sample_app_1/test/test_resource_request.rb
-- test/sample_app_1/test/test_web_service.rb
-- test/sample_app_1/views/foo_bar/show.xml.builder
-- test/sample_app_2/config/constants.yaml
-- test/sample_app_2/controllers/bat_controller.rb
-- test/sample_app_2/controllers/baz_controller.rb
-- test/sample_app_2/controllers/baza_controller.rb
-- test/sample_app_2/controllers/bazu_controller.rb
-- test/sample_app_2/controllers/foo_bar_controller.rb
-- test/sample_app_2/loader.rb
-- test/sample_app_2/test/test_controller_modifiers.rb
-- test/sample_app_2/test/test_resource_request.rb
-- test/sample_app_2/views/foo_bar/show.xml.builder
-- test/sample_app_3/config/constants.yaml
-- test/sample_app_3/controllers/bat_controller.rb
-- test/sample_app_3/controllers/baz_controller.rb
-- test/sample_app_3/controllers/baza_controller.rb
-- test/sample_app_3/controllers/bazu_controller.rb
-- test/sample_app_3/controllers/foo_bar_controller.rb
-- test/sample_app_3/loader.rb
-- test/sample_app_3/test/test_resource_request.rb
-- test/sample_app_3/views/foo_bar/show.xml.builder
-- test/sample_app_4/config/constants.yaml
-- test/sample_app_4/controllers/bar_controller.rb
-- test/sample_app_4/controllers/baz_controller.rb
-- test/sample_app_4/controllers/foo_controller.rb
-- test/sample_app_4/loader.rb
-- test/sample_app_4/test/test_controller_modifiers.rb
-- test/sample_app_4/test/test_formats.rb
-- test/sample_app_4/views/alphatest.png
-- test/test_support.rb
-- test/test_web_service.rb
+summary: A lightweight MVC framework developed specifically for JSON (and XML) REST
+  services.
+test_files: []

data/restrack.komodoproject

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Komodo Project File - DO NOT EDIT -->
-<project id="1b07bef2-e0ab-1142-afc9-806da10889c5" kpf_version="5" name="restrack.komodoproject">
-<preference-set idref="1b07bef2-e0ab-1142-afc9-806da10889c5">
-  <boolean id="import_live">1</boolean>
-</preference-set>
-</project>