masterview 0.3.1 → 0.3.2

data/lib/masterview/masterview_version.rb

@@ -2,7 +2,7 @@ module MasterView
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/masterview/rails_ext/action_view_erb_direct.rb

@@ -1,16 +1,16 @@
 #
-# Installs hooks in ActionView::Base to intercept template_exist? calls 
+# Installs hooks in ActionView::Base 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. 
+# 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.
 #
-# If the template dispatching code is enriched in the future we may be able 
+# If the template dispatching code is enriched in the future we may be able
 # to rewrite this code to use the provided hooks.
-# 
+#
 
 module ActionView #:nodoc:
 
@@ -24,7 +24,7 @@ module ActionView #:nodoc:
       template_exists_pre_mv?(template_path, extension) || MasterView::IOMgr.erb.path(short_path).exist?
     end
 
-    # checks for the existence of the template in MasterView first before using the 
+    # checks for the existence of the template in MasterView first before using the
     # rails file system based read_template_file
     alias :read_template_file_pre_mv :read_template_file  #:nodoc:
     def read_template_file(template_path, extension)  #:nodoc:
@@ -36,32 +36,58 @@ module ActionView #:nodoc:
       end
     end
 
-    # Check whether compilation is necessary.
-    # 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.
-    alias :compile_template_pre_mv? :compile_template?   #:nodoc:
-    def compile_template?(template, file_name, local_assigns) #:nodoc:
-      short_path_mio = (file_name && !file_name.empty?) ? MasterView::IOMgr.erb.path(short_relative_path_mv(file_name)) : nil
-      if short_path_mio && short_path_mio.exist? # mio template
-        method_key    = file_name || template
-        render_symbol = @@method_names[method_key]
-
-        if @@compile_time[render_symbol] && supports_local_assigns?(render_symbol, local_assigns)
-          if file_name && !@@cache_template_loading 
-            need_to_compile = (@@compile_time[render_symbol] < short_path_mio.mtime) # use mio.mtime instead of File.mtime
-            MasterView::Log.debug{ 'compile_template? template_short_path = '+short_path_mio.pathname.to_s+' compile?='+need_to_compile.to_s }
-            need_to_compile
+    # I submitted a patch to rails to make this easier it was picked up in changeset 5587
+    # http://dev.rubyonrails.org/ticket/6651
+    # we can test for existence of this private instance method to determine if in this version of Rails
+    if ActionView::Base.private_instance_methods.include?('template_changed_since?')
+
+      private
+
+      # handles checking if template changed since last compile, isolated so that templates
+      # not stored on the file system can hook and extend appropriately
+      alias :template_changed_since_pre_mv? :template_changed_since?
+      def template_changed_since?(file_name, compile_time)
+        short_path_mio = (file_name && !file_name.empty?) ? MasterView::IOMgr.erb.path(short_relative_path_mv(file_name)) : nil
+        if short_path_mio && short_path_mio.exist? # mio template so use mv to check if changed
+          compile_time < short_path_mio.mtime
+        else # delegate to rails original file based version
+          template_changed_since_pre_mv?(file_name, compile_time)
+        end
+      end
+
+      public
+
+    else # older rails needs to use old method
+
+      # Check whether compilation is necessary.
+      # 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.
+      alias :compile_template_pre_mv? :compile_template?   #:nodoc:
+      def compile_template?(template, file_name, local_assigns) #:nodoc:
+        short_path_mio = (file_name && !file_name.empty?) ? MasterView::IOMgr.erb.path(short_relative_path_mv(file_name)) : nil
+        if short_path_mio && short_path_mio.exist? # mio template
+          method_key    = file_name || template
+          render_symbol = @@method_names[method_key]
+
+          if @@compile_time[render_symbol] && supports_local_assigns?(render_symbol, local_assigns)
+            if file_name && !@@cache_template_loading
+              need_to_compile = (@@compile_time[render_symbol] < short_path_mio.mtime) # use mio.mtime instead of File.mtime
+              MasterView::Log.debug{ 'compile_template? template_short_path = '+short_path_mio.pathname.to_s+' compile?='+need_to_compile.to_s }
+              need_to_compile
+            end
+          else
+            true
           end
-        else
-          true
+        else # use original file based mtime checking
+          compile_template_pre_mv?(template, file_name, local_assigns)
         end
-      else # use original file based mtime checking
-        compile_template_pre_mv?(template, file_name, local_assigns)
       end
+
     end
 
+
     private
 
     # returns the short path relative to view_base since MasterView uses relative paths exclusively
@@ -74,26 +100,57 @@ module ActionView #:nodoc:
   # 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
-  class TemplateError < ActionViewError #:nodoc:
-
-    def source_extract(indention = 0) #:nodoc:
-
-      #added/modified the following three lines to support reading from MasterView with fallback to file system
-      relative_path = (@file_name.starts_with?(@base_path)) ? @file_name[@base_path.length+1..-1] : @file_name
-      short_path_mio = (relative_path && !relative_path.empty?) ? MasterView::IOMgr.erb.path(relative_path) : nil
-      source_code = (short_path_mio && short_path_mio.exist?) ? StringIO.new(short_path_mio.read).readlines : IO.readlines(@file_name)
-      
-      start_on_line = [ line_number - SOURCE_CODE_RADIUS - 1, 0 ].max
-      end_on_line   = [ line_number + SOURCE_CODE_RADIUS - 1, source_code.length].min
-
-      line_counter = start_on_line
-      extract = source_code[start_on_line..end_on_line].collect do |line| 
-        line_counter += 1
-        "#{' ' * indention}#{line_counter}: " + line
+  # todo submit mod to Rails so we can hook easier, currently Rails assumes file based template
+  if  ActionView::TemplateError.private_instance_methods.include?('source_location') # Rails 1.2
+
+    class TemplateError < ActionViewError #:nodoc:
+      def source_extract(indentation = 0)
+        return unless num = line_number
+        num = num.to_i
+
+        #added/modified the following three lines to support reading from MasterView with fallback to file system
+        relative_path = (@file_path.starts_with?(@base_path)) ? @file_path[@base_path.length+1..-1] : @file_path
+        short_path_mio = (relative_path && !relative_path.empty?) ? MasterView::IOMgr.erb.path(relative_path) : nil
+        source_code = (short_path_mio && short_path_mio.exist?) ? StringIO.new(short_path_mio.read).readlines : IO.readlines(@file_path)
+        # source_code = IO.readlines(@file_path) # original rails 1.2 source
+
+        start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
+        end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
+
+        indent = ' ' * indentation
+        line_counter = start_on_line
+
+        source_code[start_on_line..end_on_line].sum do |line|
+          line_counter += 1
+          "#{indent}#{line_counter}: #{line}"
+        end
       end
+    end
+
+  else # Rails 1.1.6 - we can deprecate this when Rails 1.2 is out
+
+
+    class TemplateError < ActionViewError #:nodoc:
+      def source_extract(indention = 0) #:nodoc:
 
-      extract.join
+        #added/modified the following three lines to support reading from MasterView with fallback to file system
+        relative_path = (@file_name.starts_with?(@base_path)) ? @file_name[@base_path.length+1..-1] : @file_name
+        short_path_mio = (relative_path && !relative_path.empty?) ? MasterView::IOMgr.erb.path(relative_path) : nil
+        source_code = (short_path_mio && short_path_mio.exist?) ? StringIO.new(short_path_mio.read).readlines : IO.readlines(@file_name)
+
+        start_on_line = [ line_number - SOURCE_CODE_RADIUS - 1, 0 ].max
+        end_on_line   = [ line_number + SOURCE_CODE_RADIUS - 1, source_code.length].min
+
+        line_counter = start_on_line
+        extract = source_code[start_on_line..end_on_line].collect do |line|
+          line_counter += 1
+          "#{' ' * indention}#{line_counter}: " + line
+        end
+
+        extract.join
+      end
     end
+
   end
 
-end
+end

data/test/fixtures/deprecated_directive_base_directives/submit.rb

@@ -0,0 +1,17 @@
+require 'masterview/deprecated/directive_base'  # Backwards compat for old directive impls
+module MasterView
+  module DirectivesOld
+
+    # Old implementation of submit form helper directive
+    # Test backwards compat in new MasterView 0.3.0 system (registry, paths, directive rework)
+    class Submit < MasterView::DirectiveBaseOld
+      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)
+      end
+    end
+  end
+end

data/test/unit/attr_string_parser_test.rb

@@ -9,8 +9,8 @@ class TestAttrStringParser < Test::Unit::TestCase
   # test subject
   AttrStringParser = MasterView::AttrStringParser
 
-  def verify_arg_parsing( attr_value, expected_args )
-    parsed_args = AttrStringParser.new(attr_value).parse
+  def verify_arg_parsing( attr_value, expected_args, split_implicit_hash = false )
+    parsed_args = AttrStringParser.new(attr_value).parse(split_implicit_hash)
     #assert_equal expected_args.size, parsed_args.size, "Wrong num args in parsed_args=#{parsed_args.inspect}"
     assert_equal expected_args, parsed_args, "GOT: parsed_args=#{parsed_args.inspect}"
   end
@@ -29,25 +29,25 @@ class TestAttrStringParser < Test::Unit::TestCase
 
   def test_multi_word_value
     attr_value = 'one, and a two, and a three lets go'
-    expected_args = attr_value.split(',').collect {|x| x.strip}  
+    expected_args = attr_value.split(',').collect {|x| x.strip}
     verify_arg_parsing( attr_value, expected_args )
   end
 
   def test_omitted_arg
     attr_value = 'one, two, skip the one after this,, five'
-    expected_args = attr_value.split(',').collect {|x| x.strip} 
+    expected_args = attr_value.split(',').collect {|x| x.strip}
     assert_equal '', expected_args[3], 'Omitted arg is parsed as empty string (not nil)'
     verify_arg_parsing( attr_value, expected_args )
   end
 
-  # assoc of an unwrapped hash gets parsed as one entry (deliberate or accidental?!)
+  # assoc of an unwrapped hash gets parsed as one entry
   def test_single_assoc
     attr_value = ':foo => :bar'
     expected_args = [ attr_value ]
     verify_arg_parsing( attr_value, expected_args )
   end
 
-  # multiple assocs of an unwrapped hash get parsed as one entry (deliberate or accidental?!)
+  # multiple assocs of an unwrapped hash get parsed as one entry
   def test_multiple_assocs
     attr_value = ':foo => :bar, :option => "bing", :default => 5'
     #expected_args = [ ':foo => :bar', ':option => "bing"', ':default => 5' ]
@@ -55,6 +55,13 @@ class TestAttrStringParser < Test::Unit::TestCase
     verify_arg_parsing( attr_value, expected_args )
   end
 
+  # multiple assocs of an unwrapped hash get parsed as multiple args if split_implicit_hash = true
+  def test_multiple_assocs_split_implicit_hash_true
+    attr_value = ':foo => :bar, :option => "bing", :default => 5'
+    expected_args = [ ':foo => :bar', ':option => "bing"', ':default => 5' ]
+    verify_arg_parsing( attr_value, expected_args, true ) # split_implicit_hash = true
+  end
+
   # wrapped hash gets parsed as a single hash literal string
   def test_single_entry_hash
     attr_value = '{ :foo => :bar }'
@@ -102,4 +109,4 @@ class TestAttrStringParser < Test::Unit::TestCase
     verify_arg_parsing( attr_value, expected_args )
   end
 
-end
+end

data/test/unit/directive_insert_generated_comment_test.rb

@@ -26,7 +26,7 @@ class TestInsertGeneratedComment < Test::Unit::TestCase
   def test_insert_generated_comment
     attr_value = ''
     create_directive InsertGeneratedComment, attr_value
-    assert_equal "\n<%\n#    WARNING - This is a generated file created by MasterView. \n#    Do not edit - changes will be lost when this file is re-generated.\n# \n#    To make changes, edit the MasterView source file located at: \n#    \n-%>", render_element_event(:stag)
+    assert_equal "\n<%\n#    WARNING - This is a generated file created by MasterView.\n#    Do not edit - changes will be lost when this file is re-generated.\n#\n#    To make changes, edit the MasterView source file located at:\n#    \n-%>", render_element_event(:stag)
   end
 
 end

data/test/unit/directive_link_to_test.rb

@@ -64,4 +64,16 @@ class TestLinkTo < Test::Unit::TestCase
     assert_equal expected_content, render_element_event(:etag)
   end
 
+  def test_post_link_with_confirm
+    link_tag = create_template_element ELEMENT_TAG, :content => 'Destroy'
+    attr_value = "{ :action => 'destroy', :id => component }, :confirm => 'Are you sure?', :post => true"
+    create_directive LinkTo, attr_value
+    assert_equal '', render_element_event(:stag)
+    expected_content = "<%= link_to( 'Destroy', { :action => 'destroy', :id => component }, :confirm => 'Are you sure?', :post => true ) %>"
+    assert_equal expected_content, render_element_event(:etag)
+  end
+
+
+
+
 end

data/test/unit/template_test.rb

@@ -100,6 +100,105 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
 
+  def test_attr_eval
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":class => #\{helloworld\}">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"<%= helloworld %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+
+  def test_attr_eval_helper_with_multi_params
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":id => #\{myhelper(arg, 1)\}">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"red\" id=\"<%= myhelper(arg, 1) %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+
+  def test_attr_multi_key_eval_multi_params
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":class => #\{helloworld 1, 2, 3\}, :id => #\{onemore 'five', 'six'\}">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"<%= helloworld 1, 2, 3 %>\" id=\"<%= onemore 'five', 'six' %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+
+  def test_attr_multi_key_eval_multi_params_parens
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":class => #\{helloworld(1, 2, 3)\}, :id => #\{onemore('five', 'six')\}">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"<%= helloworld(1, 2, 3) %>\" id=\"<%= onemore('five', 'six') %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_attr_eval_multi_params
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":class => #\{helloworld 1, 2, 3\}">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"<%= helloworld 1, 2, 3 %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_attr_eval_multi_params_explicit_hash
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr="{:class => #\{helloworld 1, 2, 3\}}">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"<%= helloworld 1, 2, 3 %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_attr_eval_multi_params_explicit_hash_ws_surrounding
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr="  {:class => #\{helloworld 1, 2, 3\}  }">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"<%= helloworld 1, 2, 3 %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_attr_eval_multi_params_parens
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":class => #\{helloworld(1, 2, 3)\}">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"<%= helloworld(1, 2, 3) %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
   def test_attr_erb
     template = <<-END
       <div mv:generate='foo/bar'>
@@ -234,6 +333,18 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
 
+  def test_link_to_with_post_and_confirm
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <a href="#" mv:link_to="{ :action => 'destroy', :id => component }, :confirm => 'Are you sure?', :post => true">Destroy</a>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= link_to( 'Destroy', { :action => 'destroy', :id => component }, :confirm => 'Are you sure?', :post => true ) %></div>"
+    }
+    assert_template_result expected, template
+  end
+
   def test_link_to_and_if
     template = <<-END
       <div mv:generate='foo/bar'>

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2006-11-20 00:00:00 -06:00
+  version: 0.3.2
+date: 2007-02-21 00:00:00 -06:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Jeff Barczewski
 files: 
@@ -104,6 +105,7 @@ files:
 - lib/masterview/extras/app
 - lib/masterview/extras/init_logger.rb
 - lib/masterview/extras/watcher.rb
+- lib/masterview/extras/admin_auth_mixin.rb
 - lib/masterview/extras/sample_templates.rb
 - lib/masterview/extras/init_mv_admin_pages.rb
 - lib/masterview/extras/app/controllers
@@ -137,7 +139,6 @@ files:
 - doc/stylesheets
 - doc/directives.html
 - doc/guide.html
-- doc/api
 - doc/screenshots
 - doc/installation.html
 - doc/configuration.html
@@ -166,6 +167,7 @@ files:
 - doc/stylesheets/mv-config.css
 - doc/stylesheets/masterview.css
 - examples/rails_app_config
+- examples/rails_app_admin_auth
 - examples/product.html.old
 - examples/product.html
 - examples/test.import
@@ -174,6 +176,7 @@ files:
 - examples/rails_app_config/masterview/settings.rb
 - examples/rails_app_config/masterview/environment/development.rb
 - examples/rails_app_config/masterview/environment/production.rb
+- examples/rails_app_admin_auth/admin_auth_mixin.rb
 - test/unit
 - test/xtras
 - test/fixtures
@@ -242,6 +245,7 @@ files:
 - test/fixtures/configs
 - test/fixtures/templates
 - test/fixtures/directives
+- test/fixtures/deprecated_directive_base_directives
 - test/fixtures/configs/fake_rails_app
 - test/fixtures/configs/fake_rails_app_with_config
 - test/fixtures/configs/fake_rails_app_with_config/config
@@ -254,12 +258,12 @@ files:
 - test/fixtures/templates/test.import
 - test/fixtures/directives/test_directive_events.rb
 - test/fixtures/directives/id_check.rb
+- test/fixtures/deprecated_directive_base_directives/submit.rb
 - test/tmp/template
 - test/tmp/erb
-- test/tmp/templates_src
 - test/tmp/views
+- test/tmp/templates_src
 - test/tmp/template/foo.txt
-- test/tmp/templates_src/product.html
 - test/tmp/views/product
 - test/tmp/views/layouts
 - test/tmp/views/product/_form.rhtml
@@ -271,6 +275,7 @@ files:
 - test/tmp/views/product/show.rhtml
 - test/tmp/views/product/destroy.rhtml
 - test/tmp/views/layouts/product.rhtml
+- test/tmp/templates_src/product.html
 - CHANGELOG
 - TODO
 - RELEASE_NOTES