restrack 0.0.5 → 0.0.6

data/test/sample_app_1/test/test_formats.rb

@@ -30,7 +30,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    test_val = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><data><foo>bar</foo><baz>123</baz></data>"
+    test_val = XmlSimple.xml_out([1,2,3,4,5,6,7], 'AttrPrefix' => true, 'XmlDeclaration' => true)
     assert_equal test_val, output[2]
 
     env = Rack::MockRequest.env_for('/foo_bar.xml', {
@@ -40,7 +40,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    test_val = XmlSimple.xml_out([1,2,3,4,5,6,7])
+    test_val = XmlSimple.xml_out([1,2,3,4,5,6,7], 'AttrPrefix' => true, 'XmlDeclaration' => true)
     assert_equal test_val, output[2]
   end
 
@@ -55,65 +55,68 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     test_val = { :foo => 'bar', :baz => 123 }.to_json
     assert_equal test_val, output[2]
   end
-  #
-  #def test_complex_data_structure
-  #  env = Rack::MockRequest.env_for('/foo_bar/1234567890', {
-  #    :method => 'GET'
-  #  })
-  #  output = ''
-  #  assert_nothing_raised do
-  #    output = @ws.call(env)
-  #  end
-  #  test_val = "{\"foo\":\"abc\",\"baz\":456,\"bar\":\"123\",\"more\":{\"two\":[1,2],\"three\":\"deep_fu\",\"one\":1}}"
-  #  assert_equal test_val, output[2]
-  #  
-  #  env = Rack::MockRequest.env_for('/foo_bar/1234567890.xml', {
-  #    :method => 'GET'
-  #  })
-  #  output = ''
-  #  assert_nothing_raised do
-  #    output = @ws.call(env)
-  #  end
-  #  test_val = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><data><foo>abc</foo><baz>456</baz><bar>123</bar><more><two></data>"
-  #  assert_equal test_val, output[2]
-  #  
-  #  #env = Rack::MockRequest.env_for('/foo_bar/42', {
-  #  #  :method => 'GET'
-  #  #})
-  #  #output = ''
-  #  #assert_nothing_raised do
-  #  #  output = @ws.call(env)
-  #  #end
-  #  ##test_val = {
-  #  ##  :foo => 'abc',
-  #  ##  :bar => 123,
-  #  ##  :baz => {
-  #  ##    'one' => [1],
-  #  ##    'two' => ['1','2'],
-  #  ##    'three' => ['1', 2, {:three => 3}],
-  #  ##    4 => :four
-  #  ##  }
-  #  ##}.to_json
-  #  #assert_equal test_val, output[2]
-  #  #
-  #  #env = Rack::MockRequest.env_for('/foo_bar/42.xml', {
-  #  #  :method => 'GET'
-  #  #})
-  #  #output = ''
-  #  #assert_nothing_raised do
-  #  #  output = @ws.call(env)
-  #  #end
-  #  ##test_val = {
-  #  ##  :foo => 'abc',
-  #  ##  :bar => 123,
-  #  ##  :baz => {
-  #  ##    'one' => [1],
-  #  ##    'two' => ['1','2'],
-  #  ##    'three' => ['1', 2, {:three => 3}],
-  #  ##    4 => :four
-  #  ##  }
-  #  ##}
-  #  #assert_equal test_val, output[2]
-  #end
+  
+  def test_complex_data_structure_json
+    env = Rack::MockRequest.env_for('/foo_bar/1234567890', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    test_val = "{\"foo\":\"abc\",\"bar\":\"123\",\"baz\":456,\"more\":{\"one\":1,\"two\":[1,2],\"three\":\"deep_fu\"}}"
+    assert_equal test_val, output[2]
+    
+    env = Rack::MockRequest.env_for('/foo_bar/42', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    test_val = {
+      :foo => 'abc',
+      :bar => 123,
+      :baz => {
+        'one' => [1],
+        'two' => ['1','2'],
+        'three' => ['1', 2, {:three => 3}],
+        4 => :four
+      }
+    }.to_json
+    assert_equal test_val, output[2]
+  end
+    
+  def test_complex_data_structure_xml
+    skip
+    env = Rack::MockRequest.env_for('/foo_bar/1234567890.xml', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    test_val = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><data><foo>abc</foo><baz>456</baz><bar>123</bar><more><two></data>"
+    assert_equal test_val, output[2]
+    
+    env = Rack::MockRequest.env_for('/foo_bar/42.xml', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    test_val = {
+      :foo => 'abc',
+      :bar => 123,
+      :baz => {
+        'one' => [1],
+        'two' => ['1','2'],
+        'three' => ['1', 2, {:three => 3}],
+        4 => :four
+      }
+    }
+    assert_equal test_val, output[2]
+  end
 
 end

data/test/sample_app_1/test/test_resource_request.rb

@@ -9,22 +9,6 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     @ws = SampleApp::WebService.new # init logs
   end
 
-  def test_locate
-    env = Rack::MockRequest.env_for('/foo_bar', {
-      :method => 'POST',
-      :params => %Q|[
-        {
-          "bar": ""
-        }
-      ]|
-    })
-    request = Rack::Request.new(env)
-    assert_nothing_raised do
-      resource_request = RESTRack::ResourceRequest.new(:request => request)
-      resource_request.locate
-    end
-  end
-
   def test_initialize
     env = Rack::MockRequest.env_for('/foo_bar', {
       :method => 'POST',

data/test/sample_app_2/controllers/bazu_controller.rb

@@ -1,5 +1,7 @@
 class SampleApp::BazuController < RESTRack::ResourceController
 
+  keyed_with_type Fixnum
+
   def show(id)
     return 1 if id == 1
     return 0

data/test/sample_app_2/controllers/foo_bar_controller.rb

@@ -1,6 +1,6 @@
 class SampleApp::FooBarController < RESTRack::ResourceController
 
-  has_direct_relationship_to( :baz ) do |id|
+  has_relationship_to( :baz ) do |id|
     if id =='144'
       output = '777'
     else
@@ -9,7 +9,7 @@ class SampleApp::FooBarController < RESTRack::ResourceController
     output # You can't "return" from a Proc!  It will do a "return" in the outer method.  Remember a "Proc" is not a Method.
   end
 
-  has_direct_relationship_to( :bat, :as => :slugger ) do |id|
+  has_relationship_to( :bat, :as => :slugger ) do |id|
     if id =='144'
       output = '777'
     else
@@ -18,8 +18,8 @@ class SampleApp::FooBarController < RESTRack::ResourceController
     output # You can't "return" from a Proc!  It will do a "return" in the outer method.  Remember a "Proc" is not a Method.
   end
 
-  has_direct_relationships_to( :baza, :as => :children ) do |id|
-    [1,2,3,4,5,6,7,8,9]
+  has_relationships_to( :baza, :as => :children ) do |id|
+    [0,1,2,3,4,5,6,7,8,9]
   end
 
   has_mapped_relationships_to( :bazu, :as => :maps ) do |id|

data/test/sample_app_2/test/test_controller_modifiers.rb

@@ -9,8 +9,8 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
   def setup
     @ws = SampleApp::WebService.new
   end
-
-  def test_has_direct_relationship_to
+  
+  def test_has_relationship_to
     env = Rack::MockRequest.env_for('/foo_bar/144/baz', {
       :method => 'GET'
     })
@@ -18,9 +18,9 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    test_val = { :BAZ => 'HOLA!' }.to_json
+    test_val = { :BAZ => 'ALOHA!' }.to_json
     assert_equal test_val, output[2]
-
+  
     env = Rack::MockRequest.env_for('/foo_bar/133/baz', {
       :method => 'GET'
     })
@@ -30,7 +30,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     end
     test_val = { :OTHER => 'YUP' }.to_json
     assert_equal test_val, output[2]
-
+  
     env = Rack::MockRequest.env_for('/foo_bar/144/baz/', {
       :method => 'GET'
     })
@@ -38,11 +38,11 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    test_val = { :BAZ => 'HOLA!' }.to_json
+    test_val = { :BAZ => 'ALOHA!' }.to_json
     assert_equal test_val, output[2]
   end
-
-  def test_has_direct_relationships_to
+  
+  def test_has_relationships_to
     env = Rack::MockRequest.env_for('/foo_bar/133/children/1', {
       :method => 'GET'
     })
@@ -52,7 +52,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     end
     test_val = { :BAZA => 'YESSIR' }.to_json
     assert_equal test_val, output[2]
-
+  
     env = Rack::MockRequest.env_for('/foo_bar/133/children/8', {
       :method => 'GET'
     })
@@ -62,7 +62,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     end
     test_val = { :NOWAY => 'JOSE' }.to_json
     assert_equal test_val, output[2]
-
+  
     env = Rack::MockRequest.env_for('/foo_bar/133/children/11', {
       :method => 'GET'
     })
@@ -72,7 +72,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     end
     assert_equal 404, output[0]
   end
-
+  
   def test_has_mapped_relationships_to
     env = Rack::MockRequest.env_for('/foo_bar/133/maps/first', {
       :method => 'GET'
@@ -81,9 +81,9 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    test_val = '1'
+    test_val = 1.to_json
     assert_equal test_val, output[2]
-
+  
     env = Rack::MockRequest.env_for('/foo_bar/133/maps/second', {
       :method => 'GET'
     })
@@ -91,9 +91,9 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    test_val = '0'
+    test_val = 0.to_json
     assert_equal test_val, output[2]
-
+  
     env = Rack::MockRequest.env_for('/foo_bar/133/maps/third', {
       :method => 'GET'
     })
@@ -101,20 +101,20 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    test_val = '0'
+    test_val = 0.to_json
     assert_equal test_val, output[2]
   end
-
+  
   def test_keyed_with_type
     # baza controller exercises this option
-    env = Rack::MockRequest.env_for('/foo_bar/133/children/1', {
+    env = Rack::MockRequest.env_for('/bazu/1', {
       :method => 'GET'
     })
     output = ''
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    test_val = { :BAZA => 'YESSIR' }.to_json
+    test_val = 1.to_json
     assert_equal test_val, output[2]
   end
 

data/test/sample_app_3/controllers/foo_bar_controller.rb

@@ -1,6 +1,6 @@
 class SampleApp::FooBarController < RESTRack::ResourceController
 
-  has_direct_relationship_to( :baz, :as => :baz ) do |id|
+  has_relationship_to( :baz, :as => :baz ) do |id|
     if id =='144'
       output = '777'
     else
@@ -9,7 +9,7 @@ class SampleApp::FooBarController < RESTRack::ResourceController
     output # You can't "return" from a Proc!  It will do a "return" in the outer method.  Remember a "Proc" is not a Method.
   end
 
-  has_direct_relationship_to( :bat, :as => :slugger ) do |id|
+  has_relationship_to( :bat, :as => :slugger ) do |id|
     if id =='144'
       output = '777'
     else
@@ -18,7 +18,7 @@ class SampleApp::FooBarController < RESTRack::ResourceController
     output # You can't "return" from a Proc!  It will do a "return" in the outer method.  Remember a "Proc" is not a Method.
   end
 
-  has_direct_relationships_to( :baza, :as => :children ) do |id|
+  has_relationships_to( :baza, :as => :children ) do |id|
     [1,2,3,4,5,6,7,8,9]
   end
 

data/test/sample_app_4/controllers/foo_controller.rb

@@ -1,7 +1,7 @@
 class SampleApp::FooController < RESTRack::ResourceController
 
-  has_relationship_to( :bar )
-  has_relationship_to( :baz, :as => :bazzz )
+  pass_through_to( :bar )
+  pass_through_to( :baz, :as => :bazzz )
 
   def show_yaml(id)
     @resource_request.mime_type = RESTRack.mime_type_for('yaml')

data/test/sample_app_4/test/test_controller_modifiers.rb

@@ -10,7 +10,7 @@ class SampleApp::TestControllerModifiers < Test::Unit::TestCase
     @ws = SampleApp::WebService.new
   end
 
-  def test_has_relationship_to
+  def test_pass_through_to
     env = Rack::MockRequest.env_for('/foo/123/bar', {
       :method => 'GET'
     })

data/test/sample_app_4/test/test_formats.rb

@@ -10,7 +10,6 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     @ws = SampleApp::WebService.new
   end
 
-  # Test YAML, text, and an image format
   def test_yaml
     env = Rack::MockRequest.env_for('/foo/123/show_yaml', {
       :method => 'GET'
@@ -19,6 +18,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
+    assert_equal 'text/x-yaml', output[1]['Content-Type']
     test_val = YAML.dump( { :foo => '123', :baz => 'bat' } )
     assert_equal test_val, output[2]
   end
@@ -31,6 +31,7 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
+    assert_equal 'text/plain', output[1]['Content-Type']
     test_val = 'Hello 123!'
     assert_equal test_val, output[2]
   end
@@ -43,7 +44,8 @@ class SampleApp::TestFormats < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal output[2].length, 26529
+    assert_equal 'image/png', output[1]['Content-Type']
+    assert output[2].length
   end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: restrack
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Chris St. John
@@ -15,81 +14,115 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
+  name: rack-test
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
-        - 1
         - 0
-        - 13
-        version: 1.0.13
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: i18n
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: xml-simple
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 13
+        version: 1.0.13
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: |-
   RESTRack is a Rack based MVC framework that makes it extremely easy to
     develop RESTful data services. It is inspired by Rails, and follows a few of
@@ -123,6 +156,7 @@ files:
 - lib/restrack/generator/config.ru.erb
 - lib/restrack/generator/constants.yaml.erb
 - lib/restrack/generator/controller.rb.erb
+- lib/restrack/generator/descendant_controller.rb.erb
 - lib/restrack/generator/loader.rb.erb
 - lib/restrack/http_status.rb
 - lib/restrack/resource_controller.rb
@@ -133,12 +167,14 @@ files:
 - restrack.gemspec
 - 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
@@ -174,7 +210,7 @@ files:
 - test/test_support.rb
 - test/test_web_service.rb
 has_rdoc: true
-homepage: http://github.com/stjohncj
+homepage: http://github.com/stjohncj/RESTRack
 licenses: []
 
 post_install_message: 
@@ -187,7 +223,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -196,7 +231,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -210,12 +244,14 @@ summary: A lightweight MVC framework developed specifically for JSON and XML RES
 test_files: 
 - 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