ananke 0.1.0 → 0.1.1

data/Gemfile

@@ -4,12 +4,12 @@ gem "colored", "~>1.2"
 gem "json", "~>1.5.1"
 gem "sinatra", "~>1.1.2"
 
-group :development, :test do
+#group :development, :test do
   gem "rack-test", "~>0.5.6"
   gem "rake", "~>0.8.7"
   gem "rspec", "~>2.5.0"
   gem 'simplecov', '~>0.4.0'
-end
+#end
 
 
 

data/README.rdoc

@@ -19,7 +19,7 @@ Ananke is a DSL that extends the functionality of Sinatra for easy creation of R
     end
   end
   #-------------------REST Resources--------------------
-  rest :user do
+  route :user do
     id :id
   end
 
@@ -34,7 +34,7 @@ One User
   http://localhost:4567/user/1
 
 == REST Resources
-`rest` defines a complete Resource, and constructs Sinatra Routes
+`route` defines a complete Resource, and constructs Sinatra Routes
 based on what's available in it's respective Repository. Routes are:
 
   get     '/name/?'   -> Repository::Capitalize(name).all
@@ -51,7 +51,7 @@ The Default Repository can be changed:
 == HyperMedia
 === Linked
 
-  rest :user do
+  route :user do
     id :id
     linked :computer
    end
@@ -99,11 +99,11 @@ The link to <b>Self</b> uses this method. The output will be something like this
 
 === Link To and Route For
 
-  rest :user do
+  route :user do
     id :id
     link_to :car
   end
-  rest :car do
+  route :car do
     id :id
     route_for :user
   end
@@ -148,7 +148,7 @@ Output:
 This way of linking solves a lot of problems, and can also be used for searching support.
 <b>route_for</b> supports an optional 2nd parameter to specify the type of request it must register for:
 
-  rest :car do
+  route :car do
     id :id
     route_for :user, :post
   end

data/lib/ananke/helpers.rb

@@ -40,4 +40,46 @@ module Ananke
     puts message unless message.nil?
     message
   end
+
+  def symbolize_keys(hash)
+    new_hash = {}
+    hash.each{|k,v| new_hash[k.to_sym] = Hash === v ? symbolize_keys(v) : v}
+    new_hash
+  end
+
+  def collect_params(params)
+    new_params = {}
+    params.each do |k,v|
+      json = symbolize_keys(JSON.parse(k)) if v.nil?
+      if !json.nil? && !json.empty?
+        new_params.merge!(json)
+      else
+        new_params[k.to_sym] = v
+      end
+    end
+    new_params
+  end
+
+  def define_repository_call(mod, method_name)
+    inputs = mod.method(method_name).parameters
+    repository_name = mod.name.split('::').last
+    call_def = "def self.call_#{repository_name}_#{method_name}(params)"
+    case inputs.length
+      when 0
+        call_def << "#{mod}.send(:#{method_name})"
+      when 1
+        call_def << "#{mod}.send(:#{method_name}, params[:key])"
+      else
+        input_array = []
+        inputs.each{|i| input_array << "params[:#{i[1]}]"}
+        call_def << "#{mod}.send(:#{method_name}, #{input_array.join(',')})"
+    end
+    call_def << "end"
+    Ananke.send(:eval, call_def)
+  end
+
+  def repository_call(mod, method_name, params)
+    repository_name = mod.name.split('::').last
+    Ananke.send("call_#{repository_name}_#{method_name}", params)
+  end
 end

data/lib/ananke/routing.rb

@@ -1,3 +1,7 @@
+require './lib/ananke/validation'
+require './lib/ananke/linking'
+require './lib/ananke/helpers'
+
 module Ananke
   public
   class << self
@@ -14,6 +18,7 @@ module Ananke
   
   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)
       Sinatra::Base.send verb, "#{route}", do
         instance_eval(&block)
@@ -74,11 +79,13 @@ module Ananke
 
     #===========================POST===============================
     build_route mod, :add, :post, "/#{path}/?" do
-      status, message = validate(fields, params)
+      new_params = collect_params(params)
+      status, message = validate(fields, new_params)
       error status, message unless status.nil?
-      obj = mod.add(params)
+      
+      obj = repository_call(mod, :add, new_params)
 
-      links = build_links(link_list, link_to_list, path, params[key], mod)
+      links = build_links(link_list, link_to_list, path, new_params[key], mod)
       json = get_json(path, obj, links)
 
       status 201
@@ -87,10 +94,12 @@ module Ananke
 
     #===========================PUT================================
     build_route mod, :edit, :put, "/#{path}/:#{key}" do
-      param_missing!(key) if params[key].nil?
-      status, message = validate(fields, params)
+      new_params = collect_params(params)
+      param_missing!(key) if new_params[key].nil?
+      status, message = validate(fields, new_params)
       error status, message unless status.nil?
-      obj = mod.edit(params[key], params)
+
+      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)
@@ -120,24 +129,11 @@ module Ananke
       full_path = "/#{path}/#{r[:name]}"
       full_path << "/:key" if inputs.length == 1
 
-      call_def = "def self.call_#{path}_#{r[:name]}(params)"
-      case inputs.length
-        when 0
-          call_def << "#{mod}.send(:#{r[:name]})"
-        when 1
-          call_def << "#{mod}.send(:#{r[:name]}, params[:key])"
-        else
-          input_array = []
-          inputs.each{|i| input_array << "params[:#{i[1]}]"}
-          call_def << "#{mod}.send(:#{r[:name]}, #{input_array.join(',')})"
-      end
-      call_def << "end"
-      puts call_def
-      Ananke.send(:eval, call_def)
-
       build_route mod, r[:name], r[:verb], full_path do
-        param_missing!(:key) if inputs.length == 1 && params[:key].nil?
-        obj = Ananke.send("call_#{path}_#{r[:name]}", params)
+        new_params = collect_params(params)
+        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)

data/lib/ananke/validation.rb

@@ -10,7 +10,7 @@ module Ananke
   def validate(fields, params)
     errors = []
     fields.each do |field|
-      value = params[field[:key].to_s]
+      value = params[field[:key]]
       errors << "Missing Required Parameter: #{field[:key]}" if field[:type] == :required && value.nil?
       Ananke::Rules.value = value
       field[:rules].each do |r|

data/lib/ananke.rb

@@ -16,7 +16,7 @@ module Ananke
 
   public
   #===========================DSL================================
-  def rest(path, &block)
+  def route(path, &block)
     @id = {}
     @fields = []
     @link_list = []

data/lib/version.rb

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

data/spec/lib/ananke_spec.rb

@@ -21,7 +21,7 @@ describe 'Basic Ananke REST' do
   it """
   Should be able to describe a Valid REST Resource
   """ do
-    rest :user do
+    route :user do
       id :user_id
     end
   end
@@ -29,7 +29,7 @@ describe 'Basic Ananke REST' do
   it """
   Should skip creating Routes for Non-Existing Repositories
   """ do
-    rest :invalid do
+    route :invalid do
     end
   end
 
@@ -104,7 +104,7 @@ describe 'Basic Ananke REST' do
       - content-type: text/json
       - body:
   """ do
-    put "/user/3", body={:user_id => 3, :username => 'four'}
+    put "/user/3", body={:username => 'four'}
     check_status(200)
   end
 
@@ -128,7 +128,7 @@ describe 'Basic Ananke REST' do
       - content-type: text/json
       - body:         Missing Parameter: user_id
   """ do
-    put "/user", body={:user_id => 3, :username => 'four'}
+    put "/user", body={:username => 'four'}
     check_status(400)
     last_response.body.should == 'Missing Parameter: user_id'
   end
@@ -155,22 +155,24 @@ module Repository
       @data
     end
 
-    def self.one(id)
-      @data[@data.index{ |d| d[:user_id] == id.to_i}]
+    def self.one(user_id)
+      @data[@data.index{ |d| d[:user_id] == user_id.to_i}]
     end
     def self.all
       @data
     end
-    def self.add(data)
-      @data << data
-      data
+    def self.add(user_id, username)
+      obj = {:user_id => user_id.to_i, :username => username}
+      @data << obj
+      obj
     end
-    def self.edit(id, data)
-      @data.each { |d| d = data if d[:user_id] == id}
-      data
+    def self.edit(user_id, username)
+      obj = {:user_id => user_id.to_i, :username => username}
+      @data[@data.index{|i| i[:user_id] == user_id.to_i}] = obj
+      obj
     end
-    def self.delete(id)
-      @data.delete_if { |i| i[:user_id] == id}
+    def self.delete(user_id)
+      @data.delete_if { |i| i[:user_id] == user_id.to_i}
     end
   end
 end

data/spec/lib/json_spec.rb

@@ -0,0 +1,51 @@
+require './spec/spec_helper'
+
+describe 'Ananke - JSON Body' do
+  include Rack::Test::Methods
+  include Ananke
+
+  def app
+    Sinatra::Base
+  end
+
+  it "should be able to parse a JSON Body in a basic POST route" do
+    post "/json", body={:name => 'one', :surname => 'sur_one'}.to_json
+    check_status(201)
+  end
+
+  it "should be able to parse a JSON Body in a basic PUT route" do
+    put "/json/1", body={:name => 'one', :surname => 'sur_one'}.to_json
+    check_status(200)
+  end
+
+  it "should be able to parse a JSON Body in a Custom Route" do
+    get "/json/custom", body={:name => 'one', :surname => 'sur_one'}.to_json
+    check_status(200)
+  end
+
+  module Repository
+    module Json
+      @data = []
+      def self.add(name, surname)
+        id = @data.empty? && 1 || @data.last[:id] + 1
+        obj = {:id => id, :name => name, :surname => surname}
+        @data << obj
+        obj
+      end
+      def self.edit(id, name, surname)
+        obj = {:id => id, :name => name, :surname => surname}
+        @data[@data.index{|i| i[:id] == id.to_i}] = obj
+        obj
+      end
+      def self.custom(name, surname)
+        @data[@data.index{|i| i[:name] == name && i[:surname] == surname}]
+      end
+    end
+  end
+  route :json do
+    id :id
+    required :name
+    required :surname
+    route_for :custom
+  end
+end

data/spec/lib/link_to_spec.rb

@@ -19,7 +19,7 @@ describe 'Link-To Resource' do
         end
       end
     end
-    rest :link_to do
+    route :link_to do
       id :link_id
       link_to :to
     end

data/spec/lib/linked_spec.rb

@@ -20,7 +20,7 @@ describe 'Resource' do
         end
       end
     end
-    rest :self do
+    route :self do
       id :user_id
     end
 
@@ -56,11 +56,11 @@ describe 'Resource' do
       def self.one(id) end
     end
   end
-  rest :linked do
+  route :linked do
     id :user_id
     linked :line
   end
-  rest :line do
+  route :line do
     id :line_id
   end
 
@@ -95,7 +95,7 @@ describe 'Resource' do
         end
       end
     end
-    rest :linked_fail do
+    route :linked_fail do
       id :user_id
       linked :line
     end

data/spec/lib/route_for_spec.rb

@@ -19,7 +19,7 @@ describe 'Resource Route-For' do
         end
       end
     end
-    rest :route_for do
+    route :route_for do
       id :link_id
       route_for :custom
     end
@@ -39,7 +39,7 @@ describe 'Resource Route-For' do
         end
       end
     end
-    rest :route_for do
+    route :route_for do
       id :link_id
       route_for :multi, :post
     end

data/spec/lib/validation_spec.rb

@@ -19,7 +19,7 @@ describe 'Resource' do
         def self.add(data)end
       end
     end
-    rest :basic do
+    route :basic do
       id :user_id
       required :username, :length => 4
     end
@@ -49,7 +49,7 @@ describe 'Resource' do
         def self.add(data)end
       end
     end
-    rest :explicit do
+    route :explicit do
       id :user_id
       required :email, :email
     end
@@ -73,7 +73,7 @@ describe 'Resource' do
         def self.add(data)end
       end
     end
-    rest :added do
+    route :added do
       id :user_id
       required :country, :country
     end

metadata

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