action_tree 0.1.1 → 0.2.0

data/lib/action_tree/errors.rb

@@ -0,0 +1,12 @@
+
+
+
+
+module ActionTree::Errors
+
+  class NotFound < NameError
+    def code; 404; end
+  end
+
+end
+

data/lib/action_tree/eval_scope.rb

@@ -1,22 +1,24 @@
 
-# The scope in which matched actions are run. Used to copy instance variables, define instance variables from captures, and extend helper method modules.
+# The execution scope for running matches. Built dynamically for each match by mixing in modules and setting variables.
+# @api private
 
 class ActionTree::EvalScope
-  def initialize(*ingredients)
-    ingredients.each do |ing|
-      case ing
-        when Hash
-          ing.each do |name, value|
-            instance_variable_set(:"@#{name}", value)
-          end
-        when Module
-          extend ing
-        else
-          ing.instance_variables.each do |name|
-            self.instance_variable_set(name,
-              ing.instance_variable_get(name)
-              )
-          end
+
+  # Build a new EvalScope from the given sources. The
+  # sources can be:
+  #
+  # * Hash: instance variable names and values (:name becomes @name)
+  # * Module: will be extended
+  # * Array: flattened and used just the same
+  #
+  def initialize(*sources)
+    Array(sources).flatten.each do |s|
+      case s
+      when Hash
+        s.each {|k,v| instance_variable_set(:"@#{k}", v) }
+      when Module then extend s
+      else
+        raise 'invalid scope source ' + s.inspect
       end
     end
   end

data/spec/00_foundations/capture_hash_spec.rb

@@ -0,0 +1,47 @@
+
+require 'action_tree'
+
+
+EXTRA_FAMILY_INFO = {
+  :brother => 'Smerdyakov',
+  :father => 'Fyodor'
+  }
+
+describe ActionTree::CaptureHash do
+
+  describe '#add' do
+    it 'once adds item as itself' do
+      subject.add :canoe_color, 'green'
+      subject[:canoe_color].should == 'green'
+    end
+
+    it 'more than once becomes an Array' do
+      subject.add :sister, 'Arleta'
+      subject.add :sister, 'Maud'
+      subject[:sister].should == ['Arleta', 'Maud']
+    end
+  end
+
+  describe '#merge' do
+
+    before do
+      subject.add :brother, 'Dmitry'
+      subject.add :brother, 'Ivan'
+      subject.add :brother, 'Alexey'
+    end
+
+    it 'merges with array, accumulating on equal keys' do
+      family = subject.merge(EXTRA_FAMILY_INFO)
+      family[:brother].should ==
+        %w{Dmitry Ivan Alexey Smerdyakov}
+      family[:father].should == 'Fyodor'
+    end
+
+    it 'is non-destructive' do
+      family = subject.dup
+      family.merge(EXTRA_FAMILY_INFO)
+      family.should == subject
+    end
+  end
+
+end

data/spec/00_foundations/eval_scope_spec.rb

@@ -0,0 +1,80 @@
+
+require 'action_tree'
+
+module Hooga
+  def peace
+    'is valuable'
+  end
+end
+
+module Booga
+  def get_name
+    'Melchior'
+  end
+end
+
+module Shooga
+  def get_name
+    'Baltazar'
+  end
+end
+
+LIFE_MEMO = {
+  :love => :free,
+  :world => :good
+}
+
+DEATH_MEMO = {
+  :world => :over,
+  :worries => :none
+}
+
+describe ActionTree::EvalScope do
+
+  describe 'when created' do
+
+    subject do
+      ActionTree::EvalScope.new(
+        Hooga, Booga, LIFE_MEMO
+        )
+    end
+
+    it 'sets instance variables given a hash' do
+      LIFE_MEMO.each do |k,v|
+        subject.instance_eval("@#{k.to_s}").should == v
+      end
+    end
+
+    it 'given a module, extends it' do
+      subject.get_name.should == 'Melchior'
+      subject.peace.should    == 'is valuable'
+    end
+
+  end
+
+  describe 'prioritizes' do
+
+    subject do
+      ActionTree::EvalScope.new(
+        [[Hooga], Booga, Shooga],
+        [LIFE_MEMO, DEATH_MEMO]
+        )
+    end
+    
+    it 'and recursively reads arrays' do
+      subject.peace.should == 'is valuable'
+    end
+
+    it 'latest variables over first' do
+      LIFE_MEMO.merge(DEATH_MEMO).each do |k,v|
+        subject.instance_eval("@#{k.to_s}").should == v
+      end
+    end
+
+    it 'latest extensions over first' do
+      subject.get_name.should == 'Baltazar'
+    end
+
+  end
+
+end

data/spec/{02_node_spec.rb → 01_node/02_node_spec.rb}

@@ -3,45 +3,40 @@ require 'action_tree'
 
 describe ActionTree::Basic::Node do
 
-  
   # PATH PARSING AND DESCENDING
   
-  it 'can be inspected' do
-    subject.inspect
-  end
-
   describe 'descend' do
     it 'returns self when descending to nil, "", "/" or []' do
       [nil, '', '/', []].each do |location|
-        subject.descend(location).should == subject
+        subject.locate(location).should == subject
       end
     end
 
     it 'returns a new node when descending one level' do
-      n = subject.descend('/the')
+      n = subject.locate('/the')
       n.should be_a(ActionTree::Basic::Node)
       n.should_not == subject
     end
 
     it 'returns a new node when descending two levels' do
-      n = subject.descend('/the/world')
+      n = subject.locate('/the/world')
       n.should be_a(ActionTree::Basic::Node)
       n.should_not == subject
-      n.should_not == subject.descend('/the')
+      n.should_not == subject.locate('/the')
     end
 
     it 'gives same node when descending two times, one level' do
-      subject.descend('/the').should == subject.descend('/the')
+      subject.locate('/the').should == subject.locate('/the')
     end
 
     it 'gives same node when descending two times, three levels' do
-      subject.descend('/the/world/is').should == subject.descend('/the/world/is')
+      subject.locate('/the/world/is').should == subject.locate('/the/world/is')
     end
 
     it 'gives birth recursively and selectively when descending' do
-       n = subject.descend('/the/world/is/good')
+       n = subject.locate('/the/world/is/good')
        n.token.should == 'good'
-       n.should == subject.descend('the').descend('world/is').descend('good')
+       n.should == subject.locate('the').locate('world/is').locate('good')
     end
   end
 

data/spec/{03_match_spec.rb → 02_query/query_spec.rb}

@@ -5,7 +5,7 @@ require 'action_tree'
 
 
 
-describe ActionTree::Basic::Match do
+describe ActionTree::Basic::Query do
 
   it 'can be inspected' do
     ActionTree.new.match.inspect
@@ -25,8 +25,9 @@ describe ActionTree::Basic::Match do
       end
     end
 
-    it 'no values when no match' do
-      subject.match('/one/two/three/bobsleigh').run.should be_nil
+    it 'raises NotFound when no match' do
+      expect { subject.match('/one/two/three/bobsleigh').run }.
+        to raise_error(ActionTree::NotFound)
     end
 
     it 'one value' do
@@ -54,7 +55,7 @@ describe ActionTree::Basic::Match do
         after { @boring = false }
         action { "no sound at #{@altitude} altitudes" }
         helpers { def infinite?; true; end }
-        not_found { 'nix nada zip' }
+        handle(NotFound) { 'nix nada zip' }
         route :world do
           before { @status = :threatened }
           helpers { def infinite?; false; end }

data/spec/{04_integration_spec.rb → 03_action_tree_basic/04_integration_spec.rb}

@@ -25,7 +25,9 @@ describe ActionTree do
         before('/a/b') { @v4 = @v3 + '5' }
         before('/a/b') { @v5 = @v4 }
         a('/a/b') { @v5 }
-        not_found('a/b') { @v5 + h4 }
+        route('a/b') do
+          handle(NotFound) { 'not_found' }
+        end
       end
     end
 
@@ -39,7 +41,7 @@ describe ActionTree do
 
     it 'works with not_found' do
       subject.match('a/b/y').run.should ==
-        '123456'
+        'not_found'
     end
   end
 
@@ -88,19 +90,19 @@ describe ActionTree do
     end
 
     it 'matches a first level request' do
-      subject.match('/houses').node.should == subject.descend('houses')
+      subject.match('/houses').node.should == subject.locate('houses')
     end
 
     it 'matches a second level request' do
-      subject.match('/houses/create').node.should == subject.descend('houses/create')
+      subject.match('/houses/create').node.should == subject.locate('houses/create')
     end
 
     it 'matches a second level capture' do
-      subject.match('/houses/4').node.should == subject.descend('houses/:id')
+      subject.match('/houses/4').node.should == subject.locate('houses/:id')
     end
 
     it 'matches beneath second level capture' do
-      subject.match('/houses/4/edit').node.should == subject.descend('houses/:id/edit')
+      subject.match('/houses/4/edit').node.should == subject.locate('houses/:id/edit')
     end
 
     it 'returns nil for nonexistant node beneath capture' do
@@ -121,7 +123,7 @@ describe ActionTree do
     end
 
     it 'matches regexp in root scope' do
-      subject.match('/346').node.should == subject.descend([/[0-9]+/])
+      subject.match('/346').node.should == subject.locate([/[0-9]+/])
     end
 
     it 'fills in path for regexp in root scope' do
@@ -129,7 +131,7 @@ describe ActionTree do
     end
 
     it 'matches regexp in capture scope' do
-      subject.match('/houses/5/4').node.should == subject.descend(['houses', :id, /[0-9]+/])
+      subject.match('/houses/5/4').node.should == subject.locate(['houses', :id, /[0-9]+/])
     end
 
     it 'fills in path for regexp in capture scope' do

data/spec/{p01_tilt_spec.rb → 04_components/template_spec.rb}

@@ -3,13 +3,14 @@ require 'action_tree'
 require 'haml'
 
 module Templated
-  extend ActionTree::Dialect
+  extend ActionTree::Basic
   class Node < ActionTree::Basic::Node; end
-  class Match < ActionTree::Basic::Match; end
-  apply(ActionTree::Plugins::Tilt)
+  class Query < ActionTree::Basic::Query; end
+  #use ActionTree::Components::Templating
 end
 
 
+=begin
 describe Templated::Node do
 
   pending 'still passes normal specs'
@@ -51,10 +52,5 @@ describe Templated::Node do
 
 end
 
-
-
-
-
-
-
+=end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - jbe
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
+date: 2011-03-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,46 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: ActionTree is a router. It provides a compact DSL for defining routes that map paths to actions. It was designed as a router for modern ruby mini-frameworks.
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard-rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: ActionTree is a DRY request router. It provides a compact DSL for defining actions and mapping requests to invoke them.
 email: post@jostein.be
 executables: []
 
@@ -45,26 +84,32 @@ files:
 - .rspec
 - .yardopts
 - LICENSE
-- MANUAL.md
 - README.md
 - Rakefile
 - TODO
 - VERSION
 - lib/action_tree.rb
-- lib/action_tree/basic/match.rb
+- lib/action_tree/basic.rb
+- lib/action_tree/basic/helpers.rb
 - lib/action_tree/basic/node.rb
+- lib/action_tree/basic/query.rb
+- lib/action_tree/basic/shared.rb
 - lib/action_tree/capture_hash.rb
-- lib/action_tree/dialect_helper.rb
+- lib/action_tree/components/rack.rb
+- lib/action_tree/components/rack/request.rb
+- lib/action_tree/components/rack/response.rb
+- lib/action_tree/components/tilt.rb
+- lib/action_tree/errors.rb
 - lib/action_tree/eval_scope.rb
-- lib/action_tree/plugins/tilt.rb
-- spec/01_support_lib_spec.rb
-- spec/02_node_spec.rb
-- spec/03_match_spec.rb
-- spec/04_integration_spec.rb
+- spec/00_foundations/capture_hash_spec.rb
+- spec/00_foundations/eval_scope_spec.rb
+- spec/01_node/02_node_spec.rb
+- spec/02_query/query_spec.rb
+- spec/03_action_tree_basic/04_integration_spec.rb
+- spec/04_components/template_spec.rb
 - spec/fixtures/test.haml
 - spec/fixtures/test_layout.haml
 - spec/log
-- spec/p01_tilt_spec.rb
 has_rdoc: true
 homepage: http://github.com/jbe/action_tree
 licenses: []
@@ -96,10 +141,11 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Versatile routing dry enough to kill cacti.
+summary: Versatile and DRY controllers and routing.
 test_files: 
-- spec/01_support_lib_spec.rb
-- spec/02_node_spec.rb
-- spec/03_match_spec.rb
-- spec/04_integration_spec.rb
-- spec/p01_tilt_spec.rb
+- spec/00_foundations/capture_hash_spec.rb
+- spec/00_foundations/eval_scope_spec.rb
+- spec/01_node/02_node_spec.rb
+- spec/02_query/query_spec.rb
+- spec/03_action_tree_basic/04_integration_spec.rb
+- spec/04_components/template_spec.rb