ananke 0.1.1 → 1.0.0

data/lib/ananke/helpers.rb

@@ -1,3 +1,4 @@
+require 'json'
 module Ananke
 
   extend Colored
@@ -11,20 +12,12 @@ module Ananke
     mod
   end
 
-  def get_json(path, obj, links)
-    if obj.nil?
-      out :error, "#{path} - No return object"
-      ''
-    else
-      root_path = path.to_s.split('/')[0]
-      dic = {root_path.to_sym => obj}
-      dic[:links] = links unless links.nil?
-      dic.to_json
-    end
-  end
-
   def get_id(obj, key)
-    obj.respond_to?(key) ? obj.instance_variable_get(key) : obj.class == Hash && obj.has_key?(key) ? obj[key] : nil
+    if !key
+      out :error, "Cannot get id on object #{obj}, key is nil"
+      return nil
+    end
+    obj.class == Hash && obj.has_key?(key) ? obj[key] : obj.respond_to?(key) ? obj.instance_variable_get("@#{key}") : nil
   end
 
   def out(type, message)

data/lib/ananke/linking.rb

@@ -10,7 +10,9 @@ module Ananke
   end
   #===========================SELF===============================
   def build_link_self(path, id)
-    [{:rel => 'self', :uri => "/#{path}/#{id}"}]
+    uri = "/#{path.to_s}"
+    uri << "/#{id}" if id
+    [{:rel => 'self', :uri => uri}]#"/#{path}/#{id}"}]
   end
   #===========================LINKED=============================
   def build_link_list(path, id, mod, link_list)

data/lib/ananke/routing.rb

@@ -1,6 +1,7 @@
-require './lib/ananke/validation'
-require './lib/ananke/linking'
-require './lib/ananke/helpers'
+require 'ananke/linking'
+require 'ananke/helpers'
+require 'ananke/serialize'
+require 'ananke/validation'
 
 module Ananke
   public
@@ -28,12 +29,44 @@ module Ananke
     end
   end
 
+  def make_response_item(path, mod, link_list, link_to_list, obj, key)
+    item = nil
+    id = get_id(obj, key)
+    if !id.nil?
+      dic = {path.to_sym => obj}
+      links = build_links(link_list, link_to_list, path, id, mod) if Ananke.settings[:links]
+      dic[:links] = links if links
+      item = dic
+    else
+      out :info, "#{path} - Cannot find key(#{key}) on object #{obj}"
+    end
+    item
+  end
+
+  def make_response(path, mod, link_list, link_to_list, obj, key)
+    if obj.class == Array
+      result_list = []
+      obj.each{|i| result_list << make_response_item(path, mod, link_list, link_to_list, i, key)}
+
+      dic = result_list.empty? ? {} : {"#{path}_list".to_sym => result_list}
+      link_self = build_link_self(path, '') if Ananke.settings[:links]
+      dic[:links] = link_self if link_self
+
+      Serialize.to_j(dic)
+    else
+      Serialize.to_j(make_response_item(path, mod, link_list, link_to_list, obj, key))
+    end
+  end
+
   def build(path)
     mod = get_mod(path)
     if mod.nil?
       out(:error, "Repository for #{path} not found")
       return
     end
+    if @id.empty?
+      out :info, "No Id specified for #{path}"
+    end
     key = @id[:key]
     fields = @fields
     link_list = @link_list
@@ -45,36 +78,16 @@ module Ananke
       param_missing!(key) if params[key].nil?
       obj = mod.one(params[key])
 
-      links = build_links(link_list, link_to_list, path, params[key], mod)
-      json = get_json(path, obj, links)
-
       status 200
-      json
+      make_response(path, mod, link_list, link_to_list, obj, key)
     end
 
     #===========================GET================================
     build_route mod, :all, :get, "/#{path}/?" do
-      obj_list = mod.all
+      obj = mod.all
 
       status 200
-      #json_list = []
-      result_list = []
-      obj_list.each do |obj|
-        id = get_id(obj, key)
-        if !id.nil?
-          dic = {path.to_sym => obj}
-          links = build_links(link_list, link_to_list, path, id, mod) if Ananke.settings[:links]
-          dic[:links] = links unless links.nil?
-          result_list << dic
-        else
-          out :error, "#{path} - Cannot find key(#{key}) on object #{obj}"
-        end
-      end
-      dic = {"#{path}_list".to_sym => result_list}
-      link_self = build_link_self(path, '') if Ananke.settings[:links]
-      dic[:links] = link_self unless link_self.nil?
-
-      dic.to_json
+      make_response(path, mod, link_list, link_to_list, obj, key)
     end
 
     #===========================POST===============================
@@ -85,11 +98,8 @@ module Ananke
       
       obj = repository_call(mod, :add, new_params)
 
-      links = build_links(link_list, link_to_list, path, new_params[key], mod)
-      json = get_json(path, obj, links)
-
       status 201
-      json
+      make_response(path, mod, link_list, link_to_list, obj, key)
     end
 
     #===========================PUT================================
@@ -100,12 +110,9 @@ module Ananke
       error status, message unless status.nil?
 
       obj = repository_call(mod, :edit, new_params)
-
-      links = build_links(link_list, link_to_list, path, params[key], mod)
-      json = get_json(path, obj, links)
-
+      
       status 200
-      json
+      make_response(path, mod, link_list, link_to_list, obj, key)
     end
 
     build_route mod, :edit, :put, "/#{path}/?" do
@@ -134,12 +141,10 @@ module Ananke
         param_missing!(:key) if inputs.length == 1 && new_params[:key].nil?
 
         obj = repository_call(mod, r[:name], new_params)
-
-        links = build_links(link_list, link_to_list, "#{path}/#{r[:name]}", params[:key], mod)
-        json = get_json("#{path}/#{r[:name]}", obj, links)
+        obj_list = obj.class == Array ? obj : [obj]
 
         status 200
-        json
+        make_response(path, mod, link_list, link_to_list, obj_list, key).gsub("\"/#{path}/\"", "\"#{request.path}\"")
       end
     end
   end

data/lib/ananke/serialize.rb

@@ -0,0 +1,38 @@
+require 'json'
+module Serialize
+
+  def self.can_serialize?(obj)
+    obj.class != Array and !obj.to_json.start_with?('"#<')
+  end
+
+  def self.to_h(obj)
+    ret = {}
+
+    if obj.class == Hash
+      obj.each do |k, v|
+        ret[k.to_sym] = (can_serialize?(v) ? v : Serialize.to_h(v))
+      end
+    elsif obj.class == Array
+      ret = []
+      obj.each do |i|
+        #ret << (can_serialize?(i) ? i : Serialize.to_hash(i))
+        ret << Serialize.to_h(i)
+      end
+    else
+      obj.instance_variables.each do |e|
+        value = obj.instance_variable_get e.to_sym
+        ret[e[1..-1]] = (can_serialize?(value) ? value : Serialize.to_h(value))
+      end
+    end
+    ret
+  end
+
+  def self.to_j(obj)
+    Serialize.to_h(obj).to_json
+  end
+
+  def self.to_json_pretty(obj)
+    JSON.pretty_generate(Serialize.to_h(obj), opts = {:indent => '    '})
+  end
+
+end

data/lib/ananke.rb

@@ -2,13 +2,13 @@ libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'colored'
-require 'json'
 require 'sinatra/base'
 
 require 'ananke/helpers'
 require 'ananke/linking'
 require 'ananke/routing'
 require 'ananke/settings'
+require 'ananke/serialize'
 require 'ananke/validation'
 
 module Ananke

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ananke
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

data/spec/lib/route_for_spec.rb

@@ -15,18 +15,18 @@ describe 'Resource Route-For' do
     module Repository
       module Route_for
         def self.custom(id)
-          {:content => 'Test'}
+          {:route_for_id => id, :content => 'Test'}
         end
       end
     end
     route :route_for do
-      id :link_id
+      id :route_for_id
       route_for :custom
     end
 
     get "/route_for/custom/1"
     check_status(200)
-    last_response.body.should == '{"route_for":{"content":"Test"},"links":[{"rel":"self","uri":"/route_for/custom/1"}]}'
+    last_response.body.should == '{"route_for_list":[{"route_for":{"route_for_id":"1","content":"Test"},"links":[{"rel":"self","uri":"/route_for/1"}]}],"links":[{"rel":"self","uri":"/route_for/custom/1"}]}'
   end
 
   it """
@@ -35,17 +35,17 @@ describe 'Resource Route-For' do
     module Repository
       module Route_for
         def self.multi(id, name)
-          {:content => 'Test'}
+          {:route_for_id => id, :content => 'Test'}
         end
       end
     end
     route :route_for do
-      id :link_id
+      id :route_for_id
       route_for :multi, :post
     end
 
     post "/route_for/multi", body={:id => 1, :name => 'some name'}
     check_status(200)
-    last_response.body.should == '{"route_for":{"content":"Test"},"links":[{"rel":"self","uri":"/route_for/multi/"}]}'
+    last_response.body.should == '{"route_for_list":[{"route_for":{"route_for_id":"1","content":"Test"},"links":[{"rel":"self","uri":"/route_for/1"}]}],"links":[{"rel":"self","uri":"/route_for/multi"}]}'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: ananke
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Andries Coetzee
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +02:00
+date: 2011-02-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,24 +100,25 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/ananke.rb
-- lib/version.rb
 - lib/ananke/settings.rb
+- lib/ananke/helpers.rb
 - lib/ananke/linking.rb
-- lib/ananke/routing.rb
+- lib/ananke/serialize.rb
 - lib/ananke/validation.rb
-- lib/ananke/helpers.rb
+- lib/ananke/routing.rb
+- lib/version.rb
+- spec/nice_formatter.rb
+- spec/call_chain.rb
 - spec/dumping.rb
 - spec/cov_adapter.rb
-- spec/lib/ananke_spec.rb
-- spec/lib/validation_spec.rb
-- spec/lib/out_spec.rb
 - spec/lib/json_spec.rb
-- spec/lib/link_to_spec.rb
+- spec/lib/ananke_spec.rb
 - spec/lib/route_for_spec.rb
+- spec/lib/out_spec.rb
+- spec/lib/validation_spec.rb
 - spec/lib/linked_spec.rb
+- spec/lib/link_to_spec.rb
 - spec/spec_helper.rb
-- spec/call_chain.rb
-- spec/nice_formatter.rb
 - Gemfile
 - Rakefile
 - README.rdoc
@@ -128,7 +129,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing ananke-0.1.1
+    Thank you for installing ananke-1.0.0
   
     Please be sure to look at README.rdoc to see what might have changed
     since the last release and how to use this GEM.
@@ -157,17 +158,17 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: ananke-0.1.1
+summary: ananke-1.0.0
 test_files: 
+- spec/nice_formatter.rb
+- spec/call_chain.rb
 - spec/dumping.rb
 - spec/cov_adapter.rb
-- spec/lib/ananke_spec.rb
-- spec/lib/validation_spec.rb
-- spec/lib/out_spec.rb
 - spec/lib/json_spec.rb
-- spec/lib/link_to_spec.rb
+- spec/lib/ananke_spec.rb
 - spec/lib/route_for_spec.rb
+- spec/lib/out_spec.rb
+- spec/lib/validation_spec.rb
 - spec/lib/linked_spec.rb
+- spec/lib/link_to_spec.rb
 - spec/spec_helper.rb
-- spec/call_chain.rb
-- spec/nice_formatter.rb