masterview 0.2.5 → 0.3.0

data/lib/masterview/parser_helpers.rb

@@ -0,0 +1,54 @@
+module MasterView
+  module ParserHelpers
+    #returns an array of args by parsing and evaling the str value passed in
+    #uses evaling, so can't have any variables only simple strings, numbers, booleans
+    def parse_eval_into_array(value)
+      return [] if value.nil? || value.empty?
+      val = value.strip
+      args = []
+      until val.empty?
+        if val =~ /^[:'"%\[{&*]/ #starts with quote or ruby lang char
+          v = nil
+          val = '{'+val+'}' if val =~ /^:/ #starts with colon, assume hash so wrap with brackets
+          eval 'v = '+ val #rest is all evaled
+          if v.is_a? Array
+            args += v
+          else 
+            args << v
+          end
+          break
+        else
+          unquoted_string = val.slice!( /^[^,]+/ ) #pull off everything up to a comma
+          unquoted_string.strip!
+          args.push unquoted_string
+          val.slice!( /^,/ ) #strip off comma if exists
+          val.strip!
+        end
+      end
+      args
+    end
+
+    #returns a hash, for values that are not already part of hash it adds them using default_key
+    #uses evaling so it cannot have any variables or non-simple types
+    def parse_eval_into_hash(value, default_key)
+      h = {}
+      a = parse_eval_into_array(value)
+      a.each do |v|
+        if v.is_a?(Hash)
+          h.merge!(v)
+        else #it adds any additional non-hash args using default key, if key,val exists, it changes to array and appends
+          prev = h[default_key]
+          if prev.nil? #nil just add it
+            h[default_key] = v
+          elsif prev.is_a?(Array) #was array, concat
+            h[default_key] = prev+v
+          else #anything else, make it into array
+            h[default_key] = [prev, v]
+          end
+        end
+      end
+      h
+    end
+
+  end
+end

data/lib/masterview/rails_ext/action_controller_erb_direct.rb

@@ -0,0 +1,29 @@
+#
+# Installs hooks in ActionController::Layout to add layouts defined in MasterView templates
+# to the list of layout template paths.
+#
+# Rails assumes everything is file-based and that there will be a file for each layout.
+# MasterView template compilation of .html directly into the .rhtml erb cache
+# introduces a separation betweeen the file name and the cache entry
+# that does not fit the Rails viewpoint.
+#
+
+module ActionController #:nodoc:
+  module Layout #:nodoc:
+    module ClassMethods #:nodoc:
+
+      # get list of layout template paths, original rails implementation assumes everything is file based
+      # so this method is enhanced to pull layouts out of MasterView and concatenate them to the list
+      # from rails
+      alias :layout_list_pre_mv :layout_list #:nodoc:
+      def layout_list #:nodoc:
+        mv_layouts = []
+        MasterView::IOMgr.erb.find do |mio|
+         mv_layouts << "#{template_root}/"+mio.pathname.to_s if mio.pathname.to_s.starts_with?('layouts/')
+        end
+        layout_list_pre_mv.concat( mv_layouts )
+      end
+
+    end
+  end
+end

data/lib/masterview/rails_ext/action_controller_reparse_checking.rb

@@ -0,0 +1,27 @@
+#
+# Installs hooks to insert MasterView changed-template reparsing
+# into the Rails request dispatching handler in ActionController::Base.
+# 
+# Ensures that MasterView output files are always current while running a
+# Rails application.  The <code>:rails_reparse_checking</code> option in the
+# MasterView configuration should generally be enabled/disabled in conjunction 
+# with Rails class load caching, which is normally off in a development environment 
+# configuration.  
+# 
+# Requires that MasterView templates be parsed at application startup to properly 
+# initialize the mechanism for detecting template changes after application startup.
+# 
+
+module ActionController #:nodoc:
+  class Base #:nodoc
+    # Install hook to enable MasterView to detect and automatically reparse
+    # changed templates during Rails request dispatching.
+    alias :process_pre_mv :process #:nodoc:
+    def process(request, response, method = :perform_action, *arguments) #:nodoc:
+      MasterView::TemplateWatcher.check_updated(MasterView::IOMgr.template, MasterView::TemplateFilenamePattern ) do |mio| 
+        MasterView::Parser.parse_mio( mio, MasterView::IOMgr.erb )
+      end
+      process_pre_mv(request, response, method, *arguments)
+    end
+  end
+end

data/lib/masterview/{extras/init_rails_erb_mv_direct.rb → rails_ext/action_view_erb_direct.rb}

@@ -1,40 +1,19 @@
-#!/usr/bin/env ruby
-
-#--
-# Copyright (c) 2006 Jeff Barczewski
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+# Installs hooks in ActionView::Base to intercept template_exist? calls 
+# and read_template_file so that Rails can find MasterView templates.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
+# MasterView cannot use the provided hooks because Rails always assumes 
+# everything is file based and that there will be a file for each thing to render. 
+# MasterView template compilation of .html directly into the .rhtml erb cache
+# introduces a separation betweeen the file name and the cache entry
+# that does not fit this viewpoint.
 #
-# Setup hook to intercept template_exist? calls and read_template_file
-# so that rails can find masterview templates. MasterView cannot use the 
-# provided hooks because rails always assumes everything is file based
-# and that there will be a file for each thing to render. If the 
-# template dispatching code is enriched in the future we may be able 
-# to rewrite this code to use the provided hooks
+# If the template dispatching code is enriched in the future we may be able 
+# to rewrite this code to use the provided hooks.
 # 
-#
-
-MasterView::Log.info { 'Adding hooks to enable Rails to read erb directly from MasterView' }
 
 module ActionView #:nodoc:
+
   class Base #:nodoc:
 
     # checks for template existence, uses standard rails file based check first and if not found
@@ -58,7 +37,7 @@ module ActionView #:nodoc:
     end
 
     # Check whether compilation is necessary.
-    # Since rails compile_templat? is file based there was no easy way to hook into
+    # Since rails compile_template? is file based there was no easy way to hook into
     # this, so much of this method had to be duplicated.
     # If file_name exists in MasterView then check mtime from it otherwise defer to 
     # original code.
@@ -92,7 +71,6 @@ module ActionView #:nodoc:
 
   end
 
-
   # The TemplateError exception is raised when the compilation of the template fails. This exception then gathers a
   # bunch of intimate details and uses it to report a very precise exception message.
   # Extend source_extract to be able to pull from MasterView if exists and fallback to file system
@@ -118,29 +96,4 @@ module ActionView #:nodoc:
     end
   end
 
-end
-
-
-
-
-module ActionController #:nodoc:
-  module Layout #:nodoc:
-    module ClassMethods
-
-      # get list of layout template paths, original rails implementation assumes everything is file based
-      # so this method is enhanced to pull layouts out of MasterView and concatenate them to the list
-      # from rails
-      alias :layout_list_pre_mv :layout_list
-      def layout_list
-        mv_layouts = []
-        MasterView::IOMgr.erb.find do |mio|
-         mv_layouts << "#{template_root}/"+mio.pathname.to_s if mio.pathname.to_s.starts_with?('layouts/')
-        end
-        layout_list_pre_mv.concat( mv_layouts )
-      end
-
-    end
-  end
-end
-
-MasterView::LoadedFeatures[:rails_erb_mv_direct] = true
+end

data/lib/masterview/template_spec.rb

@@ -117,8 +117,9 @@ module MasterView
         #Log.debug { li.inspect }
         con = builder.data(li.name, li.index)
         if li.import
-          con = con.gsub NamespacePrefix+'generate', NamespacePrefix+'import'
-          con.gsub! NamespacePrefix+'gen_partial', NamespacePrefix+'import_render'
+          mv_ns = DirectiveRegistry.current.mv_namespace_prefix
+          con = con.gsub mv_ns+'generate', mv_ns+'import'
+          con.gsub! mv_ns+'gen_partial', mv_ns+'import_render'
         end
         out << con
       end

data/lib/masterview.rb

@@ -23,18 +23,18 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 #
-# = MasterView - Rails-optimized (x)html friendly template engine 
-# 
-# MasterView is a ruby/rails optimized HTML/XHTML friendly template engine. 
-# It is designed to use the full power and productivity of rails including 
-# layouts, partials, and rails html helpers while still being editable/styleable 
+# = MasterView - Rails-optimized (x)html friendly template engine
+#
+# MasterView is a ruby/rails optimized HTML/XHTML friendly template engine.
+# It is designed to use the full power and productivity of rails including
+# layouts, partials, and rails html helpers while still being editable/styleable
 # in a WYSIWYG HTML editor.
-# 
+#
 # The MasterView template engine supports a number of configuration settings
 # which allow a client to easily customize its operation.
 # See MasterView::Configuration for a complete description of the
 # supported configuration options.
-# 
+#
 #--
 #TODO: add some documentation in MasterView::DirectiveBase for directive developers:
 # Reference the MV logger using <code>MasterView::Log</code>
@@ -59,12 +59,12 @@ end
 # is loaded below and then to perform final installation configuration.
 should_run_initializer = defined?(MasterView::ConfigSettings).nil?
 if should_run_initializer
-  require 'masterview/initializer'
+  require 'masterview/initializer'  # pulls in masterview/directive_load_path, directive_metadata
   MasterView::Initializer.run(:initialize_configuration)  # bail out at load_plugin to continue below
 end
 
 #external requires
-require 'rexml/parsers/sax2parser'
+require 'rexml/parsers/sax2parser_with_doctype_fix'
 require 'rexml/sax2listener'
 require 'cgi'
 require 'fileutils'
@@ -75,6 +75,7 @@ require 'stringio'
 require 'set'
 require 'pathname'
 require 'ostruct'
+require 'yaml'
 
 #external gem requires
 require 'facets/core/string/blank'
@@ -89,20 +90,28 @@ rescue LoadError
   # Tidy was not available to load
 end
 
+#internal requires - ruby and rails extensions
+require 'masterview/core_ext/pathname'
+require 'masterview/core_ext/string'
+
 #internal requires
 require 'masterview/masterview_version'
 require 'masterview/masterview_info'
-require 'masterview/pathname_extensions'
+require 'masterview/case_insensitive_hash'
 require 'masterview/filter_helpers'
 require 'masterview/mtime_tracking_hash'
+require 'masterview/exceptions'
 require 'masterview/io'
 require 'masterview/keyword_expander'
-require 'masterview/string_extensions'
-require 'masterview/directive_registry'
 require 'masterview/plugin_load_tracking'
 require 'masterview/attr_string_parser'
+#require 'masterview/directive_metadata'  # already loaded by initializer
+require 'masterview/directive_dsl'
 require 'masterview/directive_helpers'
 require 'masterview/directive_base'
+#require 'masterview/directive_load_path'  # already loaded by initializer
+require 'masterview/directive_registry'
+require 'masterview/parser_helpers'
 require 'masterview/parser'
 require 'masterview/analyzer'
 require 'masterview/template_spec'