masterview 0.2.5 → 0.3.0

data/lib/masterview/directives/omit_tag.rb

@@ -4,29 +4,45 @@ module MasterView
     # omit tag if attr_value is empty or if at runtime the condition evaluates to true
     # mv:omit_tag="" will not render the tag,
     # mv:omit_tag="true" will not render the tag,
-    # mv:omit_tag="false" will render the tag
-    class Omit_tag < MasterView::DirectiveBase
-      def priority
-        DirectivePriorities::UltraLow
+    # mv:omit_tag="false" will render the tag unconditionally
+    # mv:omit_tag="expression" will conditionally render the tag subject to the expression
+    class OmitTag < MasterView::DirectiveBase
+
+      metadata :priority => 'UltraLow',
+        :category => 'general',
+        :description => 'Omits the element\'s tag from the generated output if the value is empty or evaluates to true'
+
+      event :before_stag do
+        # determine whether tag is omitted or included and if latter whether conditional
+        spec = attr_value.strip()
+        @omit_tag = spec.empty? || spec == 'true'
+        @tag_condition = (@omit_tag || spec == 'false' ) ? nil : spec
       end
 
-      def stag(dcs)
-        ret = []
-        unless attr_value.empty?
-          ret << erb('if '+attr_value)
-          ret << dcs.render
-          ret << erb('end')
+      event :stag do
+        if @omit_tag
+          render :nothing
+        elsif @tag_condition.nil?
+          render render_result
+        else # had something we need to evaluate so wrap tag in condition
+          render erb_eval( 'if', @tag_condition )
+          render render_result
+          render erb_eval( 'end' )
         end
       end
 
-      def etag(dcs)
-        ret = []
-        unless attr_value.empty?
-          ret << erb('if '+attr_value)
-          ret << dcs.render
-          ret << erb('end')
+      event :etag do
+        if @omit_tag
+          render :nothing
+        elsif @tag_condition.nil?
+          render render_result
+        else # had something we need to evaluate so wrap tag in condition
+          render erb_eval( 'if', @tag_condition )
+          render render_result
+          render erb_eval( 'end' )
         end
       end
+
     end
   end
 end

data/lib/masterview/directives/password_field.rb

@@ -1,31 +1,19 @@
 module MasterView
   module Directives
 
-    class Password_field < MasterView::DirectiveBase
-      def stag(dcs)
-        #eat
-      end
-
-      def etag(dcs)
-        args = parse_attr_value
-        obj = args[0]
-        method = args[1]
+    class PasswordField < MasterView::DirectiveBase
 
-        obj = quote_if(obj)
-        method = quote_if(method)
+      metadata :priority => :default,
+        :category => 'form',
+        :description => 'Replaces the element with a password input element using the Rails password_field helper',
+        :element_usage => 'input'
 
-        options = {}
-        options[:size] = attrs_lck['size'].to_i if attrs_lck['size']
-        options[:maxlength] = attrs_lck['maxlength'].to_i if attrs_lck['maxlength']
-        options.merge! common_html_options(attrs_lck)
-        remove_strings_from_attr_value!
-        merge_hash_attr_value!(0, options)
+      attr_arg :name, :quote => true
+      attr_arg :method, :quote => true
+      attr_arg :options, :append_element_attrs => [:common_html]
 
-        a = []
-        a << 'password_field '+ obj
-        a << method
-        a << attr_value unless attr_value.strip.empty?
-        erb_content(a.join(', '))
+      event :element do
+        render erb_content( 'password_field', :name, :method, :options )
       end
 
     end

data/lib/masterview/directives/radio_button.rb

@@ -3,31 +3,20 @@ module MasterView
 
     # create radio_button helper, quoting object and method if necessary
     # merging in any html options specified
-    class Radio_button < MasterView::DirectiveBase
-      def stag(dcs)
-        #eat
-      end
-
-      def etag(dcs)
-        args = parse_attr_value
-        obj = args[0]
-        method = args[1]
-        tag_value = args[2]
+    class RadioButton < MasterView::DirectiveBase
 
-        obj = quote_if(obj)
-        method = quote_if(method)
+      metadata :priority => :default,
+        :category => 'form',
+        :description => 'Replaces the element with a Rails radio_button helper.',
+        :element_usage => 'input'
 
-        options = {}
-        options.merge! common_html_options(attrs_lck)
-        remove_strings_from_attr_value!
-        merge_hash_attr_value!(0, options)
+      attr_arg :name, :quote => true
+      attr_arg :method, :quote => true
+      attr_arg :value
+      attr_arg :options, :append_element_attrs => [:common_html]
 
-        a = []
-        a << 'radio_button '+ obj
-        a << method
-        a << tag_value
-        a << attr_value unless attr_value.strip.empty?
-        erb_content(a.join(', '))
+      event :element do
+        render erb_content( 'radio_button', :name, :method, :value, :options )
       end
 
     end

data/lib/masterview/directives/replace.rb

@@ -2,17 +2,16 @@ module MasterView
   module Directives
 
     class Replace < MasterView::DirectiveBase
-      def priority
-        DirectivePriorities::MediumLow
-      end
 
-      def stag(directive_call_stack)
-      end
+      metadata :priority => 'MediumLow',
+        :category => 'general',
+        :description => 'Replaces the element and its content with the value of the expression'
 
-      def etag(directive_call_stack)
-        self.content=''
-        erb_content(attr_value) unless attr_value.blank?
+      # replace the entire element with <%= attr_value %>
+      event :element do
+        render erb_content( attr_value )
       end
+
     end
   end
 end

data/lib/masterview/directives/select.rb

@@ -4,33 +4,20 @@ module MasterView
     # creates a select helper. quotes object and method if necessary, merges
     # html options specfied on element into any html options in attr_value
     class Select < MasterView::DirectiveBase
-      def stag(dcs)
-        #eat
-      end
-
-      def etag(dcs)
-        args = parse_attr_value
-        obj = args[0]
-        method = args[1]
-        choices = args[2]
-
-        obj = quote_if(obj)
-        method = quote_if(method)
 
-        options = {}
-        options[:size] = attrs_lck['size'].to_i if attrs_lck['size']
-        options.merge! common_html_options(attrs_lck)
-        remove_strings_from_attr_value!
-        merge_hash_attr_value!(1, options)
+      metadata :priority => :default,
+        :category => 'form',
+        :description => 'Replaces the element with a Rails select helper.',
+        :element_usage => 'select'
 
-        a = []
-        a << 'select '+ obj
-        a << method
-        a << choices
-        a << attr_value unless attr_value.strip.empty?
+      attr_arg :obj, :quote => true
+      attr_arg :method, :quote => true
+      attr_arg :choices, :default => []
+      attr_arg :options, :default => {}
+      attr_arg :html_options, :append_element_attrs => [:common_html]
 
-        self.content = ''
-        erb_content(a.join(', '))
+      event :element do
+        render erb_content( 'select', :obj, :method, :choices, :options, :html_options )
       end
 
     end

data/lib/masterview/directives/stylesheet_link.rb

@@ -2,24 +2,32 @@ module MasterView
   module Directives
 
     #creates a link_to
-    class Stylesheet_link < MasterView::DirectiveBase
+    class StylesheetLink < MasterView::DirectiveBase
 
       # /public\/stylesheets\/(.*)/
-      STYLESHEET_SRC_EXTRACT_REGEX = MasterView::ConfigSettings.template_asset_base_ref_pattern[:stylesheets] 
+      STYLESHEET_SRC_EXTRACT_REGEX = MasterView::ConfigSettings.template_asset_base_ref_pattern[:stylesheets]
 
-      def stag(dcs)
-      end
+      metadata :priority => :default,
+        :category => 'asset',
+        :description => 'Replaces the element using the Rails stylesheet_link_tag helper',
+        :element_usage => 'link'
+
+      attr_arg :src, :varargs => true
 
-      def etag(dcs)
-        src = attrs_lck['src']
-        if attr_value.empty? && src
-          match = STYLESHEET_SRC_EXTRACT_REGEX.match(src)
-          ss_loc = (match) ? match[1] : src
-        else
-          ss_loc = attr_value
+      event :element do
+        if @src.nil? or @src.empty?
+          if src_attr = element_attrs[:src]
+            if match = STYLESHEET_SRC_EXTRACT_REGEX.match(src_attr)
+              @src = [match[1]]
+            else
+              @src = [src_attr]
+            end
+          end
         end
-        erb_content('stylesheet_link_tag ' + quote(ss_loc))
+        @src.collect! { |x| quote(x) }
+        render erb_content('stylesheet_link_tag', :src)
       end
+
     end
 
   end

data/lib/masterview/directives/submit.rb

@@ -2,13 +2,19 @@ module MasterView
   module Directives
 
     class Submit < MasterView::DirectiveBase
-      def stag(directive_call_stack); end
 
-      def etag(directive_call_stack)
-        remove_strings_from_attr_value!
-        prepend_to_attr_value! quote( attrs_lck['value'] ) #prepend quoted submit button name
-        erb_content('submit_tag ' + attr_value)
+      metadata :priority => :default,
+        :category => 'form',
+        :description => 'Replaces the element with a submit input element using the Rails submit_tag helper.',
+        :element_usage => 'input'
+
+      attr_arg :text do |x,args,inst| if (x and x.include?('=>')) : args.unshift(x); end; inst.quote(inst.element_attrs[:value]) end # if hash found push it back on, override with quoted element_attrs[:value]
+      attr_arg :options, :append_element_attrs => [:common_html]
+
+      event :element do
+        render erb_content( 'submit_tag', :text, :options )
       end
+
     end
   end
 end

data/lib/masterview/directives/text_area.rb

@@ -1,32 +1,19 @@
 module MasterView
   module Directives
 
-    class Text_area < MasterView::DirectiveBase
-      def stag(dcs)
-        #eat
-      end
-
-      def etag(dcs)
-        args = parse_attr_value
-        obj = args[0]
-        method = args[1]
+    class TextArea < MasterView::DirectiveBase
 
-        obj = quote_if(obj)
-        method = quote_if(method)
+      metadata :priority => :default,
+        :category => 'form',
+        :description => 'Replaces the element with a textarea input element using the Rails text_area helper.',
+        :element_usage => 'textarea'
 
-        options = {}
-        options[:rows] = attrs_lck['rows'].to_i if attrs_lck['rows']
-        options[:cols] = attrs_lck['cols'].to_i if attrs_lck['cols']
-        options.merge! common_html_options(attrs_lck)
-        remove_strings_from_attr_value!
-        merge_hash_attr_value!(0, options)
+      attr_arg :obj, :quote => true
+      attr_arg :method, :quote => true
+      attr_arg :options, :append_element_attrs => [:common_html]
 
-        a = []
-        a << 'text_area '+ obj
-        a << method
-        a << attr_value unless attr_value.strip.empty?
-        self.content=''
-        erb_content(a.join(', '))
+      event :element do
+        render erb_content( 'text_area', :obj, :method, :options )
       end
 
     end

data/lib/masterview/directives/text_field.rb

@@ -1,31 +1,19 @@
 module MasterView
   module Directives
 
-    class Text_field < MasterView::DirectiveBase
-      def stag(dcs)
-        #eat
-      end
-
-      def etag(dcs)
-        args = parse_attr_value
-        obj = args[0]
-        method = args[1]
+    class TextField < MasterView::DirectiveBase
 
-        obj = quote_if(obj)
-        method = quote_if(method)
+      metadata :priority => :default,
+        :category => 'form',
+        :description => 'Replaces the element with a text input element using the Rails text_field helper.',
+        :element_usage => 'textarea'
 
-        options = {}
-        options[:size] = attrs_lck['size'].to_i if attrs_lck['size']
-        options[:maxlength] = attrs_lck['maxlength'].to_i if attrs_lck['maxlength']
-        options.merge! common_html_options(attrs_lck)
-        remove_strings_from_attr_value!
-        merge_hash_attr_value!(0, options)
+      attr_arg :obj, :quote => true
+      attr_arg :method, :quote => true
+      attr_arg :options, :append_element_attrs => [:common_html]
 
-        a = []
-        a << 'text_field '+ obj
-        a << method
-        a << attr_value unless attr_value.strip.empty?
-        erb_content(a.join(', '))
+      event :element do
+        render erb_content( 'text_field', :obj, :method, :options )
       end
 
     end

data/lib/masterview/exceptions.rb

@@ -0,0 +1,21 @@
+module MasterView
+
+  # Raised when an invalid path is encountered.
+  #
+  # Used by both directive loading and template IO processing.
+  #
+  class InvalidPathError < RuntimeError
+
+    # the file system path
+    def path
+      @path || nil
+    end
+
+    def initialize( path, err_msg)
+      super(err_msg)
+      @path = path.to_s
+    end
+
+  end
+
+end