CRUDtree 0.1 → 0.1.1

data/README.rdoc

@@ -21,9 +21,10 @@ EndNode:: A route endpoint.
 
 === as Tinkerer
 
-  CRUDtree::Interface.for(:usher_rack, rango: true).add_helper(CRUDtree::Interface::Helper)
-  
+  require 'crudtree/interface/usher/rack'
+
   Usher::Interface.for(:rack) do
+    extend CRUDtree::Interface::Usher::Rack
     node(klass: Posts) do
       sub(type: :member, call: :show, rest: :get)
       sub(type: :collection, call: :index, rest: :get)
@@ -32,9 +33,12 @@ EndNode:: A route endpoint.
 
 === As Dev
 
-  CRUDtree::Interface.for(:usher_rack, rango: true)
+  require 'crudtree/interface/usher/rack'
+  require 'crudtree/helper'
   
   Usher::Interface.for(:rack) do
+    extend CRUDtree::Interface::Usher::Rack
+    extend CRUDtree::Interface::Helper
     resource(klass: Posts) do # the resource helper will include a bunch of default routes
       member(call: :show, rest: :get)
       collection(call: :index, rest: :get)

data/lib/crudtree/generator.rb

@@ -8,14 +8,15 @@ module CRUDtree
 
     def generate(resource, *names)
       if resource.is_a? Symbol
-        names << resource
+        names.unshift(resource)
         node = @master
         url = ""
       else
         node, identifiers = find_node(resource)
+        last_identifier = identifiers.last
         url = generate_url_from_node(node, identifiers)
       end
-      url << generate_from_sub(node, names) unless names.empty?
+      generate_from_sub(node, names, url, last_identifier) unless names.empty?
       url
     end
 
@@ -71,12 +72,12 @@ module CRUDtree
       identifiers.reverse
     end
 
-    def generate_from_sub(node, names)
+    def generate_from_sub(node, names, url, last_identifier=nil)
       name = names.shift
       sub = node.subs.find{|sub| sub.name == name} or raise(ArgumentError, "No subnode found on #{node} with name of #{name}.")
-      url = "/#{sub.path}"
-      url << generate_from_sub(sub, names) unless names.empty?
-      url
+      url.chomp!("/#{last_identifier}") if last_identifier && sub.collection?
+      url << "/#{sub.path}"
+      generate_from_sub(sub, names, url) unless names.empty?
     end
   end
 

data/lib/crudtree/helper.rb

@@ -11,7 +11,7 @@ module CRUDtree
           member(call: :update, rest: :put, path: "")
           member(call: :delete, rest: :get)
           member(call: :destroy, rest: :delete, path: "")
-          eval(&resource_block) if resource_block
+          instance_eval(&resource_block) if resource_block
         end
       end
     end

data/lib/crudtree/tree/endnode.rb

@@ -36,5 +36,9 @@ module CRUDtree
 
     attr_reader :type, :path, :rest, :call, :name, :parent
 
+    def collection?
+      type == :collection
+    end
+
   end
 end

data/lib/crudtree/tree/node.rb

@@ -111,6 +111,14 @@ module CRUDtree
       @paths.first
     end
 
+    def subs
+      endnodes
+    end
+
+    def collection?
+      false
+    end
+
     private
     def find_parent(node)
       if node.parent.respond_to? :parent

data/test/suite/lib/generator.rb

@@ -172,7 +172,9 @@ BareTest.suite do
         end
 
         assert "generates the correct url from :names" do
-          equal @path, Generator.allocate.send(:generate_from_sub, @node, @names)
+          url = ""
+          Generator.allocate.send(:generate_from_sub, @node, @names, url)
+          equal(@path, url)
         end
 
       end
@@ -182,8 +184,12 @@ BareTest.suite do
         setup do
           @master = Master.new
           @master.node(klass: Klass0, model: Mod0) do
+            collection(call: :new)
+            member(call: :delete)
             node(klass: Klass1, model: Mod1){:foo}
             node(klass: Klass2, model: Mod2) do
+              member(call: :edit)
+              collection(call: :post)
               node(klass: Klass2, model: Mod2){:foo}
             end
           end
@@ -205,8 +211,28 @@ BareTest.suite do
           @path = "/klass0/0"
         end
 
-        assert "#generate" do
-          equal(@path, @generator.generate(@resource))
+        setup :model, "collection on base node" do
+          @resource = [:klass0, :new]
+          @path = "/klass0/new"
+        end
+
+        setup :model, "member on base node" do
+          @resource = [:klass0, :delete]
+          @path = "/klass0/delete"
+        end
+
+        setup :model, "member on simple node" do
+          @resource = [Mod2.new, :edit]
+          @path = "/klass0/0/klass2/2/edit"
+        end
+
+        setup :model, "collection on simple node" do
+          @resource = [Mod2.new, :post]
+          @path = "/klass0/0/klass2/post"
+        end
+
+        assert "#generate with :model" do
+          equal(@path, @generator.generate(*@resource))
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: CRUDtree
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Simon Hafner aka Tass
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-01-25 00:00:00 +01:00
+date: 2010-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: []