masterview 0.2.2 → 0.2.3

data/lib/masterview/plugin_load_tracking.rb

@@ -1,10 +1,21 @@
 module MasterView
 
-  # mix this in so that these become class methods
-  # mix in like so
+  # Mixin for directive implementation classes which
+  # automatically registers a directive implementation class
+  # in the MasterView directives registry.
+  # 
+  # Subclasses of MasterView::DirectiveBase inherit this mechanism
+  # and will be registered automatically without additional
+  # action on the part of the class developer.
+  # 
+  # If you are implementing a directive without subclassing 
+  # MasterView::DirectiveBase, mix this module into your directive
+  # class by using the standard Ruby <code>include</code> statement.
+  # 
   # class FooPluginBase
   #     include PluginLoadTracking
   # end
+  # 
   module PluginLoadTracking
 
     module InstanceMethods
@@ -12,7 +23,6 @@ module MasterView
     end
 
     module ClassMethods
-      @@loaded_classes = []
 
       # called when a class inherits from this
       def inherited(plugin_class)
@@ -21,11 +31,10 @@ module MasterView
 
       # register a loaded class, called from inherited and can be called manually.
       def register_class(plugin_class)
-        @@loaded_classes << plugin_class
-      end
-
-      def loaded_classes
-        @@loaded_classes
+        #ISSUE: do we really need both PluginLoadTracking.register_class 
+        #and DirectiveBase.register_directive, in addition to MasterView.register_directive???
+        #[DJL 04-Jul-2006]
+        MasterView.register_directive(plugin_class)
       end
 
     end

data/lib/masterview.rb

@@ -91,13 +91,16 @@ end
 
 #internal requires
 require 'masterview/masterview_version'
+require 'masterview/masterview_info'
 require 'masterview/pathname_extensions'
 require 'masterview/filter_helpers'
 require 'masterview/mtime_tracking_hash'
 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_helpers'
 require 'masterview/directive_base'
 require 'masterview/parser'

data/test/fixtures/configs/fake_rails_app_with_config/config/masterview/environments/production.rb

@@ -7,5 +7,9 @@
 #
 
 # set production-mode config settings here
+
+# enable tidy in this app's production environment
+config.default_parser_options[:tidy] = true
+
 # Only use the MasterView admin pages for development
-config.enable_admin_pages = false
+#config.enable_admin_pages = false

data/test/unit/config_settings_test.rb

@@ -78,7 +78,7 @@ class TestConfiguration < Test::Unit::TestCase
     # rails application options
     assert config.parse_masterview_templates_at_startup, 'template parsing at startup should be on by default for a rails app'
     assert ! config.reparse_changed_masterview_templates, 'reparsing changed templates is only supported when actually running on rails'
-    assert ! config.enable_admin_pages 
+    assert ! config.enable_admin_pages, 'MV Admin pages by default are only enabled for development'
   end
 
   def test_config_settings_rails_app
@@ -107,7 +107,11 @@ class TestConfiguration < Test::Unit::TestCase
     # rails application options
     assert config.parse_masterview_templates_at_startup, 'template parsing at startup should be on by default for a rails app'
     assert ! config.reparse_changed_masterview_templates, 'reparsing changed templates is only supported when actually running on rails'
-    assert ! config.enable_admin_pages 
+    assert ! config.enable_admin_pages, 'MV Admin pages by default are only enabled for development'
+
+    # check a setting that we only enabled in production for this app's MV config
+    assert ! config.default_parser_options[:tidy], 'We turned on tidy for this app specifically in production' 
+
   end
 
   def test_config_settings_rails_app_development
@@ -137,7 +141,11 @@ class TestConfiguration < Test::Unit::TestCase
     # rails application options
     assert config.parse_masterview_templates_at_startup, 'template parsing at startup should be on by default for a rails app'
     #assert config.reparse_changed_masterview_templates, 'reparsing changed templates is enabled by default in development mode'
-    assert ! config.enable_admin_pages  
+    assert config.enable_admin_pages, 'MV Admin pages by default are enabled for development'
+
+    # check a setting that we only enabled in production for this app's MV config
+    assert ! config.default_parser_options[:tidy], 'We turned on tidy for this app specifically in production' 
+
   end
 
   def test_config_settings_rails_app_production
@@ -166,7 +174,11 @@ class TestConfiguration < Test::Unit::TestCase
     # rails application options
     assert config.parse_masterview_templates_at_startup, 'template parsing at startup should be on by default for a rails app'
     #assert config.reparse_changed_masterview_templates, 'reparsing changed templates is enabled by default in development mode'
-    assert ! config.enable_admin_pages, 'this app doesn\'t want the MasterView admin pages in the production site'
+    assert ! config.enable_admin_pages, 'MV Admin pages by default are enabled  only for development'
+
+    # check a setting that we only enabled in production for this app's MV config
+    assert config.default_parser_options[:tidy], 'We turned on tidy for this app specifically in production' 
+
   end
 
 end

data/test/unit/directive_base_test.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+
+class TestDirectiveBase < Test::Unit::TestCase
+  def setup
+    @base = MasterView::DirectiveBase.new('')
+  end
+
+  def test_quote
+    assert_equal '\'hello\'', @base.quote('hello')
+  end
+
+  def test_quote_if
+    assert_equal '\'helloWorld0123\'', @base.quote_if('helloWorld0123')
+    assert_equal 'hello world', @base.quote_if('hello world')
+    assert_equal 'hello,world', @base.quote_if('hello,world')
+    assert_equal 'hello(world)', @base.quote_if('hello(world)')
+    assert_equal ':hello', @base.quote_if(':hello')
+    assert_equal '\"hello world\"', @base.quote_if('\"hello world\"')
+    assert_equal '%q{helloworld}', @base.quote_if('%q{helloworld}')
+    assert_equal 'hello.world', @base.quote_if('hello.world')
+    assert_equal 'hel/lo.w_orld', @base.quote_if('hel/lo.w_orld')
+    assert_equal '\'\'', @base.quote_if('')
+  end
+
+end

data/test/unit/directive_helpers_parse_test.rb

@@ -0,0 +1,324 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+
+class TestDirectiveHelpersParse < Test::Unit::TestCase
+  include MasterView::DirectiveHelpers
+
+  def test_parse_a
+    str = <<-END
+      a,b,'c'
+    END
+    assert_equal ['a','b',"'c'"], parse(str.strip)
+  end
+
+  def test_parse_a2
+    str = <<-END
+      'a','b','c'
+    END
+    assert_equal ["'a'","'b'","'c'"], parse(str.strip)
+  end
+
+  def test_parse_a3
+    str = <<-END
+      "a","b","c"
+    END
+    assert_equal ['"a"','"b"','"c"'], parse(str.strip)
+  end
+
+  def test_parse_b
+    str = <<-END
+      a,%q{hello,world},c
+    END
+    assert_equal ['a','%q{hello,world}','c'], parse(str.strip)
+  end
+
+  def test_parse_c
+    str = <<-END
+      a,%q[hello,world],c
+    END
+    assert_equal ['a','%q[hello,world]','c'], parse(str.strip)
+  end
+
+  def test_parse_d
+    str = <<-END
+      a,%q|hello,world|,c
+    END
+    assert_equal ['a','%q|hello,world|','c'], parse(str.strip)
+  end
+
+  def test_parse_e
+    str = <<-END
+      a,%q(hello,world),c
+    END
+    assert_equal ['a','%q(hello,world)','c'], parse(str.strip)
+  end
+
+  def test_parse_e2
+    str = <<-END
+      a,%q<hello,world>,c
+    END
+    assert_equal ['a','%q<hello,world>','c'], parse(str.strip)
+  end
+
+  def test_parse_e3
+    str = <<-END
+      a,%q_hello,world_,c
+    END
+    assert_equal ['a','%q_hello,world_','c'], parse(str.strip)
+  end
+
+  def test_parse_e4
+    str = <<-END
+      a,%q hello,world ,c
+    END
+    assert_equal ['a','%q hello,world','c'], parse(str.strip)
+  end
+
+  def test_parse_e5
+    str = <<-END
+      a,%q*hello,world*,c
+    END
+    assert_equal ['a','%q*hello,world*','c'], parse(str.strip)
+  end
+
+  def test_parse_e6
+    str = <<-END
+      a,%q!hello,world!,c
+    END
+    assert_equal ['a','%q!hello,world!','c'], parse(str.strip)
+  end
+
+  def test_parse_e7
+    str = <<-END
+      a,%q0hello,world0,c
+    END
+    assert_equal ['a','%q0hello','world0','c'], parse(str.strip)
+  end
+
+  def test_parse_e8
+    str = <<-END
+      a,%qahello,worlda,c
+    END
+    assert_equal ['a','%qahello','worlda','c'], parse(str.strip)
+  end
+
+  def test_parse_e9
+    str = <<-END
+      a,%qBhello,worldB,c
+    END
+    assert_equal ['a','%qBhello','worldB','c'], parse(str.strip)
+  end
+
+  def test_parse_f
+    str = <<-END
+      a,%Q{hello,world},c
+    END
+    assert_equal ['a','%Q{hello,world}','c'], parse(str.strip)
+  end
+
+  def test_parse_g
+    str = <<-END
+      a,%Q[hello,world],c
+    END
+    assert_equal ['a','%Q[hello,world]','c'], parse(str.strip)
+  end
+
+  def test_parse_h
+    str = <<-END
+      a,%Q|hello,world|,c
+    END
+    assert_equal ['a','%Q|hello,world|','c'], parse(str.strip)
+  end
+
+  def test_parse_i
+    str = <<-END
+      a,%Q(hello,world),c
+    END
+    assert_equal ['a','%Q(hello,world)','c'], parse(str.strip)
+  end
+
+  def test_parse_i2
+    str = <<-END
+      a,%Q<hello,world>,c
+    END
+    assert_equal ['a','%Q<hello,world>','c'], parse(str.strip)
+  end
+
+  def test_parse_j
+    str = <<-END
+      a,[1,2, 3],c
+    END
+    assert_equal ['a','[1,2, 3]','c'], parse(str.strip)
+  end
+
+  def test_parse_j
+    str = <<-END
+      a,[1,2, 3],[4,5,6]
+    END
+    assert_equal ['a','[1,2, 3]','[4,5,6]'], parse(str.strip)
+  end
+
+  def test_parse_k
+    str = <<-END
+      a,{:a => :b, :c => :d}, {:e => 'f', :g => 1}
+    END
+    assert_equal ['a','{:a => :b, :c => :d}','{:e => \'f\', :g => 1}'], parse(str.strip)
+  end
+
+  def test_parse_l
+    str = <<-END
+      a,{:a => :b, :c => :d}, :e => 'f', :g => 1
+    END
+    assert_equal ['a','{:a => :b, :c => :d}',':e => \'f\', :g => 1'], parse(str.strip)
+  end
+
+  def test_parse_l
+    str = <<-END
+      a,{:a => :b, :c => :d}, :e => 'f', :g => 1
+    END
+    assert_equal ['a','{:a => :b, :c => :d}',':e => \'f\', :g => 1'], parse(str.strip)
+  end
+
+  def test_parse_m
+    str = <<-END
+      a,%r{hello,world},c
+    END
+    assert_equal ['a','%r{hello,world}','c'], parse(str.strip)
+  end
+
+  def test_parse_n
+    str = <<-END
+      a,%r[hello,world],c
+    END
+    assert_equal ['a','%r[hello,world]','c'], parse(str.strip)
+  end
+
+  def test_parse_o
+    str = <<-END
+      a,%r|hello,world|,c
+    END
+    assert_equal ['a','%r|hello,world|','c'], parse(str.strip)
+  end
+
+  def test_parse_p
+    str = <<-END
+      a,%r(hello,world),c
+    END
+    assert_equal ['a','%r(hello,world)','c'], parse(str.strip)
+  end
+
+  def test_parse_q
+    str = <<-END
+      a,%w{hello, world},c
+    END
+    assert_equal ['a','%w{hello, world}','c'], parse(str.strip)
+  end
+
+  def test_parse_r
+    str = <<-END
+      a,%w[hello, world],c
+    END
+    assert_equal ['a','%w[hello, world]','c'], parse(str.strip)
+  end
+
+  def test_parse_s
+    str = <<-END
+      a,%w|hello, world|,c
+    END
+    assert_equal ['a','%w|hello, world|','c'], parse(str.strip)
+  end
+
+  def test_parse_t
+    str = <<-END
+      a,%w(hello, world),c
+    END
+    assert_equal ['a','%w(hello, world)','c'], parse(str.strip)
+  end
+
+  def test_parse_u
+    str = <<-END
+      a,Product.find(:all).collect{|p| [p.name, p.id]},c
+    END
+    assert_equal ['a','Product.find(:all).collect{|p| [p.name, p.id]}','c'], parse(str.strip)
+  end
+
+  def test_parse_v
+    str = <<-END
+      a,{:a => :b, :c => [1,2]}, :e => [3,:g], 'h,i' => [j,k]
+    END
+    assert_equal ['a','{:a => :b, :c => [1,2]}',':e => [3,:g], \'h,i\' => [j,k]'], parse(str.strip)
+  end
+
+  def test_parse_w
+    str = <<-END
+    END
+    assert_equal [], parse(str.strip)
+  end
+
+  def test_parse_x
+    str = <<-END
+      a,%(hello, world),c
+    END
+    assert_equal ['a','%(hello, world)','c'], parse(str.strip)
+  end
+
+  def test_parse_x2
+    str = <<-END
+      a,%{hello, world},c
+    END
+    assert_equal ['a','%{hello, world}','c'], parse(str.strip)
+  end
+
+  def test_parse_x3
+    str = <<-END
+      a,%[hello, world],c
+    END
+    assert_equal ['a','%[hello, world]','c'], parse(str.strip)
+  end
+
+  def test_parse_x4
+    str = <<-END
+      a,%<hello, world>,c
+    END
+    assert_equal ['a','%<hello, world>','c'], parse(str.strip)
+  end
+
+  def test_parse_y
+    str = <<-END
+      a,%s(hello, world),c
+    END
+    assert_equal ['a','%s(hello, world)','c'], parse(str.strip)
+  end
+
+  def test_parse_z
+    str = <<-END
+      a,"hello, world",c
+    END
+    assert_equal ['a','"hello, world"','c'], parse(str.strip)
+  end
+
+  def test_parse_z0
+    str = <<-END
+      a,'hello, world',c
+    END
+    assert_equal ['a','\'hello, world\'','c'], parse(str.strip)
+  end
+
+  def test_parse_z1
+    str = <<-END
+      a,"hello, \\"world",c
+    END
+    assert_equal ['a',"\"hello, \\\"world\"",'c'], parse(str.strip)
+  end
+
+  def test_parse_z2
+    str = <<-END
+      a,'hello, \\'world',c
+    END
+    assert_equal ['a','\'hello, \\\'world\'','c'], parse(str.strip)
+  end
+
+end