ananke 1.0.5 → 1.0.6

data/lib/ananke/routing.rb

@@ -33,7 +33,8 @@ module Ananke
   def make_response_item(path, mod, link_list, link_to_list, obj, key)
     id = get_id(obj, key)
     out :info, "#{path} - Cannot find key(#{key}) on object #{obj}" if !id
-    dic = {path.to_sym => obj}
+    #dic = {path.to_sym => obj}
+    dic = Serialize.to_h(obj)
     links = build_links(link_list, link_to_list, path, id, mod) if Ananke.settings[:links]
     dic[:links] = links if links && !links.empty?
     dic
@@ -45,8 +46,8 @@ module Ananke
 
       #dic = result_list.empty? ? {} : {"#{path}_list".to_sym => result_list}
       dic = result_list.empty? ? {} : {"items".to_sym => result_list}
-      link_self = build_link_self(path, '') if Ananke.settings[:links]
-      dic[:links] = link_self if link_self
+      #link_self = build_link_self(path, '') if Ananke.settings[:links]
+      #dic[:links] = link_self if link_self
 
       Serialize.to_j(dic)
     else

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ananke
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/lib/ananke_spec.rb

@@ -70,7 +70,7 @@ describe 'Basic Ananke REST' do
   """ do
     get "/user"
     check_status(200)
-    last_response.body.should == '{"items":[{"user":{"user_id":1,"username":"one"}},{"user":{"user_id":2,"username":"two"}}]}'
+    last_response.body.should == '{"items":[{"user_id":1,"username":"one"},{"user_id":2,"username":"two"}]}'
   end
 
   it """
@@ -81,7 +81,7 @@ describe 'Basic Ananke REST' do
   """ do
     get "/user/1"
     check_status(200)
-    last_response.body.should == '{"user":{"user_id":1,"username":"one"}}'
+    last_response.body.should == '{"user_id":1,"username":"one"}'
   end
 
   it """

data/spec/lib/link_to_spec.rb

@@ -26,6 +26,6 @@ describe 'Link-To Resource' do
 
     get "/link_to/1"
     check_status(200)
-    last_response.body.should == '{"link_to":{"link_id":"1"},"links":[{"rel":"self","uri":"/link_to/1"},{"rel":"to","uri":"/to/link_to/1"}]}'
+    last_response.body.should == '{"link_id":"1","links":[{"rel":"self","uri":"/link_to/1"},{"rel":"to","uri":"/to/link_to/1"}]}'
   end
 end

data/spec/lib/linked_spec.rb

@@ -26,7 +26,7 @@ describe 'Resource' do
 
     post "/self", body={:user_id => 1, :username => '1234'}
     check_status(201)
-    last_response.body.should == '{"self":{"user_id":1},"links":[{"rel":"self","uri":"/self/1"}]}'
+    last_response.body.should == '{"user_id":1,"links":[{"rel":"self","uri":"/self/1"}]}'
 
     hash = JSON.parse(last_response.body)
     uri = hash['links'].map{|l| l['uri'] if l['rel'] == 'self'}[0]
@@ -69,7 +69,7 @@ describe 'Resource' do
   """ do
     post "/linked", body={:user_id => 1, :username => '1234'}
     check_status(201)
-    last_response.body.should == '{"linked":{"user_id":1},"links":[{"rel":"self","uri":"/linked/1"},{"rel":"line","uri":"/line/1"},{"rel":"line","uri":"/line/2"}]}'
+    last_response.body.should == '{"user_id":1,"links":[{"rel":"self","uri":"/linked/1"},{"rel":"line","uri":"/line/1"},{"rel":"line","uri":"/line/2"}]}'
 
     hash = JSON.parse(last_response.body)
     hash['links'].each do |l|
@@ -81,7 +81,7 @@ describe 'Resource' do
   it "Should return links on Get One" do
     get "/linked/1"
     check_status(200)
-    last_response.body.should == '{"linked":{"user_id":1},"links":[{"rel":"self","uri":"/linked/1"},{"rel":"line","uri":"/line/1"},{"rel":"line","uri":"/line/2"}]}'
+    last_response.body.should == '{"user_id":1,"links":[{"rel":"self","uri":"/linked/1"},{"rel":"line","uri":"/line/1"},{"rel":"line","uri":"/line/2"}]}'
   end
 
   it """
@@ -102,6 +102,6 @@ describe 'Resource' do
 
     post "/linked_fail", body={:user_id => 1, :username => '1234'}
     check_status(201)
-    last_response.body.should == '{"linked_fail":{"user_id":1},"links":[{"rel":"self","uri":"/linked_fail/1"}]}'
+    last_response.body.should == '{"user_id":1,"links":[{"rel":"self","uri":"/linked_fail/1"}]}'
   end
 end

data/spec/lib/route_for_spec.rb

@@ -26,7 +26,7 @@ describe 'Resource Route-For' do
 
     get "/route_for/custom/1"
     check_status(200)
-    last_response.body.should == '{"items":[{"route_for":{"route_for_id":"1","content":"Test"},"links":[{"rel":"self","uri":"/route_for/1"}]}],"links":[{"rel":"self","uri":"/route_for/custom/1"}]}'
+    last_response.body.should == '{"items":[{"route_for_id":"1","content":"Test","links":[{"rel":"self","uri":"/route_for/1"}]}]}'
   end
 
   it """
@@ -46,7 +46,7 @@ describe 'Resource Route-For' do
 
     post "/route_for/multi", body={:id => 1, :name => 'some name'}
     check_status(200)
-    last_response.body.should == '{"items":[{"route_for":{"route_for_id":"1","content":"Test"},"links":[{"rel":"self","uri":"/route_for/1"}]}],"links":[{"rel":"self","uri":"/route_for/multi"}]}'
+    last_response.body.should == '{"items":[{"route_for_id":"1","content":"Test","links":[{"rel":"self","uri":"/route_for/1"}]}]}'
   end
 
   it """

metadata

@@ -2,7 +2,7 @@
 name: ananke
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Andries Coetzee
@@ -130,7 +130,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing ananke-1.0.5
+    Thank you for installing ananke-1.0.6
   
     Please be sure to look at README.rdoc to see what might have changed
     since the last release and how to use this GEM.
@@ -159,7 +159,7 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: ananke-1.0.5
+summary: ananke-1.0.6
 test_files: 
 - spec/dumping.rb
 - spec/cov_adapter.rb