ananke 1.0.4 → 1.0.5

data/lib/ananke/helpers.rb

@@ -5,11 +5,11 @@ module Ananke
 
   public
 
-  def get_mod(path)
-    mod = nil
-    rep = Module.const_get(Ananke.repository) if Module.const_defined?(Ananke.repository)
-    mod = rep.const_get("#{path.capitalize}".to_sym) if !rep.nil? && rep.const_defined?("#{path.capitalize}".to_sym)
-    mod
+  def get_repository_module(path)
+    repository = nil
+    repository = Module.const_get(Ananke.repository) if Module.const_defined?(Ananke.repository)
+    repository = repository.const_get("#{path.capitalize}".to_sym) if !repository.nil? && repository.const_defined?("#{path.capitalize}".to_sym)
+    repository
   end
 
   def get_id(obj, key)

data/lib/ananke/linking.rb

@@ -1,9 +1,9 @@
 module Ananke
-  def build_links(link_list, link_to_list, path, id, mod)
+  def build_links(link_list, link_to_list, path, id, repository)
     return if !Ananke.settings[:links]
 
     links = id ? build_link_self(path, id) : []
-    links += build_link_list(path, id, mod, link_list)
+    links += build_link_list(path, id, repository, link_list)
     links += build_link_to_list(path, id, link_to_list)
 
     links
@@ -12,28 +12,24 @@ module Ananke
   def build_link_self(path, id)
     uri = "/#{path.to_s}"
     uri << "/#{id}" if id
-    [{:rel => 'self', :uri => uri}]#"/#{path}/#{id}"}]
+    [{:rel => 'self', :uri => uri}]
   end
   #===========================LINKED=============================
-  def build_link_list(path, id, mod, link_list)
+  def build_link_list(path, id, repository, link_list)
     links = []
-    link_list.each do |l|
-      mod_method = "#{l[:rel]}_id_list"
-      if mod.respond_to?(mod_method)
-        id_list = mod.send(mod_method, id)
-        id_list.each{|i| links << {:rel => "#{l[:rel]}", :uri => "/#{l[:rel]}/#{i}"}}
+    link_list.each do |link|
+      repository_method = "#{link[:rel]}_id_list"
+      if repository.respond_to?(repository_method)
+        id_list = repository.send(repository_method, id)
+        links = id_list.collect{|i| {:rel => "#{link[:rel]}", :uri => "/#{link[:rel]}/#{i}"}}
       else
-        out :error, "#{path} - #{mod} does not respond to '#{mod_method.to_s}'"
+        out :error, "#{path} - #{repository} does not respond to '#{repository_method.to_s}'"
       end
     end
     links
   end
   #===========================LINK_TO============================
   def build_link_to_list(path, id, link_to_list)
-    links = []
-    link_to_list.each do |l|
-      links << {:rel => "#{l[:rel]}", :uri => "/#{l[:rel]}/#{path.to_s.split('/')[0]}/#{id}"}
-    end
-    links
+    link_to_list.collect { |link| {:rel => "#{link[:rel]}", :uri => "/#{link[:rel]}/#{path.to_s.split('/')[0]}/#{id}"} }
   end
 end

data/lib/ananke/routing.rb

@@ -17,15 +17,16 @@ module Ananke
     Ananke.routes[name.to_sym] << method.to_sym
   end
   
-  def build_route(mod, mod_method, verb, route, &block)
-    if mod.respond_to? mod_method
-      define_repository_call(mod, mod_method)
-      add_route(route.split('/')[1], mod_method)
+  def build_route(repository_module, repository_method, verb, route, &block)
+    if repository_module.respond_to? repository_method
+      define_repository_call(repository_module, repository_method)
+      add_route(route.split('/')[1], repository_method)
       Sinatra::Base.send verb, "#{route}", do
+        @params = collect_params(@params)
         instance_eval(&block)
       end
     else
-      out(:warning, "#{mod} does not respond to '#{mod_method.to_s}'")
+      out(:warning, "#{repository_module} does not respond to '#{repository_method.to_s}'")
     end
   end
 
@@ -40,10 +41,10 @@ module Ananke
 
   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) if i}
+      result_list = obj.collect{|item| make_response_item(path, mod, link_list, link_to_list, item, key) if item}.compact
 
-      dic = result_list.empty? ? {} : {"#{path}_list".to_sym => result_list}
+      #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
 
@@ -54,7 +55,7 @@ module Ananke
   end
 
   def build(path)
-    mod = get_mod(path)
+    mod = get_repository_module(path)
     if mod.nil?
       out(:error, "Repository for #{path} not found")
       return
@@ -68,10 +69,9 @@ module Ananke
 
     #===========================GET/ID=============================
     build_route mod, :one, :get, "/#{path}/:#{key}" do
-      new_params = collect_params(params)
-      param_missing!(key) if new_params[key].nil?
+      param_missing!(key) if params[key].nil?
 
-      obj, obj_status = repository_call(mod, :one, new_params)
+      obj, obj_status = repository_call(mod, :one, params)
       error obj_status, obj if obj_status >= 400
       not_found if obj && obj.class == Array && obj.empty?
 
@@ -81,7 +81,6 @@ module Ananke
 
     #===========================GET================================
     build_route mod, :all, :get, "/#{path}/?" do
-      
       obj, obj_status = repository_call(mod, :all)
       error obj_status, obj if obj_status >= 400
       not_found if obj && obj.class == Array && obj.empty?
@@ -92,11 +91,10 @@ module Ananke
 
     #===========================POST===============================
     build_route mod, :add, :post, "/#{path}/?" do
-      new_params = collect_params(params)
-      status, message = validate(fields, new_params)
+      status, message = validate(fields, params)
       error status, message unless status.nil?
 
-      obj, obj_status = repository_call(mod, :add, new_params)
+      obj, obj_status = repository_call(mod, :add, params)
       error obj_status, obj if obj_status >= 400
       not_found if obj && obj.class == Array && obj.empty?
 
@@ -106,12 +104,11 @@ module Ananke
 
     #===========================PUT================================
     build_route mod, :edit, :put, "/#{path}/:#{key}" do
-      new_params = collect_params(params)
-      param_missing!(key) if new_params[key].nil?
-      status, message = validate(fields, new_params)
+      param_missing!(key) if params[key].nil?
+      status, message = validate(fields, params)
       error status, message unless status.nil?
 
-      obj, obj_status = repository_call(mod, :edit, new_params)
+      obj, obj_status = repository_call(mod, :edit, params)
       error obj_status, obj if obj_status >= 400
       not_found if obj && obj.class == Array && obj.empty?
       
@@ -125,10 +122,9 @@ module Ananke
 
     #===========================DELETE=============================
     build_route mod, :delete, :delete, "/#{path}/:#{key}" do
-      new_params = collect_params(params)
-      param_missing!(key) if new_params[key].nil?
+      param_missing!(key) if params[key].nil?
       
-      obj, obj_status = repository_call(mod, :delete, new_params)
+      obj, obj_status = repository_call(mod, :delete, params)
       error obj_status, obj if obj_status >= 400
       not_found if obj && obj.class == Array && obj.empty?
 
@@ -146,10 +142,9 @@ module Ananke
       full_path << "/:key" if inputs.length == 1
 
       build_route mod, r[:name], r[:verb], full_path do
-        new_params = collect_params(params)
-        param_missing!(:key) if inputs.length == 1 && new_params[:key].nil?
+        param_missing!(:key) if inputs.length == 1 && params[:key].nil?
 
-        obj, obj_status = repository_call(mod, r[:name], new_params)
+        obj, obj_status = repository_call(mod, r[:name], params)
         error obj_status, obj if obj_status >= 400
         not_found if obj && obj.class == Array && obj.empty?
         

data/lib/ananke/serialize.rb

@@ -18,6 +18,8 @@ module Serialize
         #ret << (can_serialize?(i) ? i : Serialize.to_hash(i))
         ret << Serialize.to_h(i)
       end
+    elsif obj.instance_variables.empty?
+      ret = obj
     else
       obj.instance_variables.each do |e|
         value = obj.instance_variable_get e.to_sym
@@ -31,7 +33,7 @@ module Serialize
     Serialize.to_h(obj).to_json
   end
 
-  def self.to_json_pretty(obj)
+  def self.to_j_pretty(obj)
     JSON.pretty_generate(Serialize.to_h(obj), opts = {:indent => '    '})
   end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ananke
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 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 == '{"user_list":[{"user":{"user_id":1,"username":"one"}},{"user":{"user_id":2,"username":"two"}}]}'
+    last_response.body.should == '{"items":[{"user":{"user_id":1,"username":"one"}},{"user":{"user_id":2,"username":"two"}}]}'
   end
 
   it """

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 == '{"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"}]}'
+    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"}]}'
   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 == '{"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"}]}'
+    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"}]}'
   end
 
   it """

metadata

@@ -2,7 +2,7 @@
 name: ananke
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Andries Coetzee
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +02:00
+date: 2011-03-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing ananke-1.0.4
+    Thank you for installing ananke-1.0.5
   
     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.4
+summary: ananke-1.0.5
 test_files: 
 - spec/dumping.rb
 - spec/cov_adapter.rb