radiant-fabulator-extension 0.0.2 → 0.0.3

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "jgsmith@tamu.edu"
     gem.homepage = "http://github.com/jgsmith/radiant-fabulator"
     gem.authors = ["James Smith"]
-    gem.add_dependency('fabulator', '>= 0.0.3')
+    gem.add_dependency('fabulator', '>= 0.0.4')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/app/models/fabulator_page.rb

@@ -190,7 +190,7 @@ class FabulatorPage < Page
     end
     root = c
 
-    xml = %{<view><form>} + xml + %{</form></view>}
+    xml = "<view><form id='#{form_base}'>" + xml + %{</form></view>}
     doc = text_parser.parse(c, xml)
 
     # add default values
@@ -199,93 +199,6 @@ class FabulatorPage < Page
     doc.to_html
   end
 
-  # borrowed heavily from http://cpansearch.perl.org/src/JSMITH/Gestinanna-0.02/lib/Gestinanna/ContentProvider/XSM.pm
-  def add_default_values(doc, ctx)
-    REXML::XPath.each(doc.root, %{
-      //text
-      | //textline
-      | //textbox
-      | //editbox
-      | //file
-      | //password
-      | //selection
-      | //grid
-    }) do |el|
-      own_id = el.attribute('id')
-      next if own_id.nil? || own_id.to_s == ''
-
-      default = 0
-      is_grid = false
-      if el.local_name == 'grid'
-        default = REXML::XPath.match(el, './default | ./row/default | ./column/default')
-        is_grid = true
-      else
-        default = REXML::XPath.match(el, './default')
-      end
-
-      #missing = el.attribute('missing')
-
-      ancestors = REXML::XPath.match(el, %{
-        ancestor::option[@id != '']
-        | ancestor::group[@id != '']
-        | ancestor::form[@id != '']
-        | ancestor::container[@id != '']
-      })
-      ids = ancestors.collect{|a| a.attribute('id')}.select{|a| !a.nil? }
-      ids << own_id
-      id = ids.collect{|i| i.to_s}.join('.')
-      ids = id.split('.')
-      if !ctx.nil? && (default.is_a?(Array) && default.empty? || !default)
-        # create a new node 'default'
-        l = ctx.traverse_path(ids)
-        if !l.nil? && !l.empty?
-          if is_grid
-            count = (el.attribute('count').to_s rescue '')
-            how_many = 'multiple'
-            direction = 'both'
-            if count =~ %r{^(multiple|single)(-by-(row|column))?$}
-              how_many = $1
-              direction = $3 || 'both'
-            end
-            if direction == 'both'
-              l.collect{|ll| ll.value }.each do |v|
-                default = el.add_element('default')
-                default.add_text(v)
-              end
-            elsif direction == 'row' || direction == 'column'
-              REXML::XPath.each(el, "./#{direction}").each do |div|
-                id = (div.attribute('id').to_s rescue '')
-                next if id == ''
-                l.collect{|c| c.traverse_path(id)}.flatten.collect{|c| c.value }. each do |v|
-                  default = div.add_element('default')
-                  default.add_text(v)
-                end
-              end
-            end
-          else
-            l.collect{|ll| ll.value }.each do |v|
-              default = el.add_element('default')
-              default.add_text(v)
-            end
-          end
-        end
-      end
-      # now handle missing info for el
-
-      if !missing_args.nil? && missing_args.include?(id)
-        el.add_attribute('missing', '1')
-      end
-    end
-
-  end
-
-  desc %{
-    Defines XML namespace prefix to URI mappings.
-  }
-  tag 'xmlns' do |tag|
-    tag.expand
-  end
-
   desc %{
     Iterates through a set of data nodes.
 
@@ -303,6 +216,8 @@ class FabulatorPage < Page
     sort_by = tag.attr['sort']
     sort_dir = tag.attr['order'] || 'asc'
 
+    as = tag.attr['as']
+
     if !sort_by.nil? && sort_by != ''
       parser = Fabulator::Expr::Parser.new
       sort_by_f = parser.parse(sort_by, c)
@@ -316,6 +231,9 @@ class FabulatorPage < Page
     items.each do |i|
       next if i.empty?
       tag.locals.fabulator_context = c.with_root(i)
+      if !as.blank?
+        tag.locals.fabulator_context.set_var(as, i)
+      end
       res = res + tag.expand
     end
     res
@@ -357,7 +275,7 @@ class FabulatorPage < Page
     c = get_fabulator_context(tag)
     items = c.nil? ? [] : c.eval_expression(selection)
     if items.is_a?(Array)
-      if items.empty?
+      if items.empty? || !items[0].value
         return ''
       else
         @chosen[0] = true

data/fabulator_extension.rb

@@ -1,6 +1,7 @@
 $: << File.expand_path(File.dirname(__FILE__))+'/lib'
 
 require 'fabulator'
+require 'fabulator/template'
 require 'fabulator/radiant'
 
 require_dependency "#{File.expand_path(File.dirname(__FILE__))}/app/models/fabulator_page"
@@ -27,7 +28,9 @@ class FabulatorExtension < Radiant::Extension
     end
 
     PagePart.class_eval do
-      before_save :compile_xml
+      validates_each :content do |record, attr, value|
+        record.compile_xml
+      end
 
       def compile_xml
         if self.page.class_name == 'FabulatorPage' &&
@@ -41,14 +44,22 @@ class FabulatorExtension < Radiant::Extension
             isa = nil
             sm = nil
             if isa.nil?
-              sm = Fabulator::Core::StateMachine.new.compile_xml(self.content)
+              begin
+                sm = Fabulator::Core::StateMachine.new.compile_xml(self.content)
+              rescue => e
+                self.errors.add(:content, "Compiling the XML application resulted in the following error: #{e}")
+              end
             else
               supersm_page = self.page.find_by_url(isa)
               if supersm_page.nil? || supersm_page.is_a?(FileNotFoundPage) || !supersm_page.is_a?(FabulatorPage) || supersm_page.state_machine.nil?
                 raise "File Not Found: unable to find #{isa}"
               end
               sm = supersm_page.state_machine.clone
-              sm.compile_xml(self.content)
+              begin
+                sm.compile_xml(self.content)
+              rescue => e
+                self.errors.add(:content, "Compiling the XML application resulted in the following error: #{e}")
+              end
             end
             self.page.compiled_xml = YAML::dump(sm)
           end

data/lib/fabulator/radiant/actions.rb

@@ -21,7 +21,7 @@ module Fabulator
 
         register_type 'page', {
           :ops => {
-            :children => Proc.new { |p| p.value.children.collect { |c| Lib.page_to_node(c, p) } },
+            :children => Proc.new { |p| Page.find(p.value.to_i).children.collect { |c| Lib.page_to_node(c, p) } },
           },
         }
 
@@ -57,7 +57,6 @@ module Fabulator
           if !u.nil?
             n = ctx.root.anon_node(u.id) #, [ RADIANT_NS, 'user' ])
             n.set_attribute('admin', u.admin?)
-Rails.logger.info("Returning: #{YAML::dump(n)}")
             return [ n ]
           else
             return [ ]
@@ -66,13 +65,14 @@ Rails.logger.info("Returning: #{YAML::dump(n)}")
 
         def self.page_to_node(p, ctx)
           return nil if p.nil?
-          p_node = ctx.root.anon_node(p, [ RADIANT_NS, 'page' ])
+          p_node = ctx.root.anon_node(p.id, [ RADIANT_NS, 'page' ])
           p_node.name = p.slug
           p.parts.each do |pp|
-            pp_node = ctx.root.anon_node(pp.content, [ RADIANT_NS, 'page-part' ])
-            pp_node.name = pp.name
+            #pp_node = ctx.root.anon_node(pp.content, [ RADIANT_NS, 'page-part' ])
+            #pp_node.name = pp.name
             #pp_node.set_attribute('filter', pp.filter)
-            p_node.set_attribute(pp.name, pp_node)
+            #p_node.set_attribute(pp.name, pp_node)
+            p_node.set_attribute(pp.name, pp.content)
           end
           p_node.set_attribute('title', p.title)
           p_node.set_attribute('breadcrumb', p.breadcrumb)

data/lib/fabulator/radiant/actions/require_auth.rb

@@ -0,0 +1,9 @@
+module Fabulator
+  module Radiant
+  module Actions
+  class RequireAuth
+
+  end
+  end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-fabulator-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +00:00
+date: 2010-08-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
         - 0
         - 0
-        - 3
-        version: 0.0.3
+        - 4
+        version: 0.0.4
   type: :runtime
   version_requirements: *id001
 description: Creates a Fabulator page type allowing applications to be built using the fabulator engine.
@@ -54,6 +54,7 @@ files:
 - fabulator_extension.rb
 - lib/fabulator/radiant.rb
 - lib/fabulator/radiant/actions.rb
+- lib/fabulator/radiant/actions/require_auth.rb
 - lib/radiant-fabulator-extension.rb
 has_rdoc: true
 homepage: http://github.com/jgsmith/radiant-fabulator