zafu 0.7.1 → 0.7.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.7.2 2010-09-14
+
+* Minor enhancement
+  * Better processing of nested arrays in node_context.
+
 == 0.7.1 2010-09-14
 
 * Major enhancement

data/lib/zafu/info.rb

@@ -1,4 +1,4 @@
 module Zafu
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end
 

data/lib/zafu/node_context.rb

@@ -31,10 +31,14 @@ module Zafu
       name
     end
 
+    def single_class
+      @single_class ||= Array(klass).flatten.first
+    end
+
     # Return true if the NodeContext represents an element of the given type. We use 'will_be' because
     # it is equivalent to 'is_a', but for future objects (during rendering).
     def will_be?(type)
-      klass.kind_of?(Array) ? klass.first.ancestors.include?(type) : klass.ancestors.include?(type)
+      single_class.ancestors.include?(type)
     end
 
     # Return a new node context that corresponds to the current object when rendered alone (in an ajax response or
@@ -43,16 +47,15 @@ module Zafu
     # You can also use an 'after_class' parameter to move up in the current object's class hierarchy to get
     # ivar name (see #master_class).
     def as_main(after_class = nil)
-      klass = after_class ? master_class(after_class) : Array(self.klass).first
-      NodeContext.new("@#{klass.to_s.underscore}", Array(self.klass).first)
+      klass = after_class ? master_class(after_class) : single_class
+      NodeContext.new("@#{klass.to_s.underscore}", single_class)
     end
 
     # Find the class just afer 'after_class' in the class hierarchy.
     # For example if we have Dog < Mamal < Animal < Creature,
     # master_class(Creature) would return Animal
     def master_class(after_class)
-      klass = self.klass
-      klass = klass.first if klass.kind_of?(Array)
+      klass = single_class
       begin
         up = klass.superclass
         return klass if up == after_class
@@ -95,16 +98,16 @@ module Zafu
     end
 
     def get(klass)
-      if list_context?
-        if self.klass.first <= klass
-          NodeContext.new("#{self.name}.first", self.klass.first)
-        elsif @up
-          @up.get(klass)
-        else
-          nil
+      if single_class <= klass
+        return self unless list_context?
+
+        res_class = self.klass
+        method = self.name
+        while res_class.kind_of?(Array)
+          method = "#{method}.first"
+          res_class = res_class.first
         end
-      elsif self.klass <= klass
-        return self
+        move_to(method, res_class)
       elsif @up
         @up.get(klass)
       else
@@ -130,7 +133,7 @@ module Zafu
     # FIXME: just use klass.to_s (so that we can do clever things with 'to_s')
     def class_name
       if list_context?
-        klass = @klass.first
+        klass = single_class
         "[#{(klass.name.blank? ? klass.superclass : klass).name}]"
       else
         (@klass.name.blank? ? @klass.superclass : @klass).name

data/test/node_context_test.rb

@@ -229,6 +229,35 @@ class NodeContextTest < Test::Unit::TestCase
     end
   end
 
+  context 'In a deeply nested list context' do
+    setup do
+      @grandma = NodeContext.new('@page', SubPage)
+      @mother = @grandma.move_to('@comment', Comment)
+    end
+
+    subject do
+      @mother.move_to('list', [[[Page]]])
+    end
+
+    should 'find the context and resolve with first' do
+      assert context = subject.get(Page)
+      assert_equal 'list.first.first.first', context.name
+      assert_equal Page, context.klass
+    end
+
+    should 'return parent on up with class' do
+      assert_equal @grandma, subject.up(Page)
+    end
+
+    should 'return true on will_be with the same class' do
+      assert subject.will_be?(Page)
+    end
+
+    should 'return class on master_class' do
+      assert_equal Page, subject.master_class(ActiveRecord::Base)
+    end
+  end
+
   context 'Generating a dom id' do
     context 'in a blank context' do
       subject do

data/zafu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zafu}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-09-22}
   s.description = %q{Provides a powerful templating language based on xhtml for rails}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +02:00
+date: 2010-09-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency