masterview 0.0.11 → 0.0.12

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.0.12 - April 24, 2006 - Fixed generator to use Controller name for files it generates, added attr directive, added more default styles to css, added styles to generator templates
+
 0.0.11 - April 22, 2006 - Changed the main load file to rescue LoadErrors from log4r and tidy
 
 0.0.6 - April 18, 2006 - Working on generator packaging

data/README

@@ -53,15 +53,15 @@ After this MasterView is ready for use. Skip down to the Usage section for more
 
 === Installation without using gems, install as plugin
 
-script/plugin install masterview
+script/plugin install svn://rubyforge.org/var/svn/masterview
 
-This will copy entire MasterView system into your vendor/plugin/masterview directory. You may tweak its init.rb to override any MasterView constants at runtime. See MasterView module masterview.rb for a list of available constants. You may also retrieve the plugin package (.tgz and .zip) from Rubyforge.org searching for the project masterview_complete.
+This will copy entire MasterView system into your vendor/plugin/masterview directory. You may tweak its init.rb to override any MasterView constants at runtime. See MasterView module masterview.rb for a list of available constants. Note that if you don't have svn (subversion) installed, you may also retrieve the plugin package (masterview_plugin.tgz or masterview_plugin.zip) from http://rubyforge.org/projects/masterview and simply extract into vendor/plugins/masterview 
 
 == Usage
 
 You may add MasterView attributes to existing (x)html or you may use the masterview generator to create a complete working application. The generator can create controllers, models, and the MasterView template file similar to how the built-in generator works. Simply change directory to your rails application and run the following
 
-script/generate masterview YourModelName
+script/generate masterview YourModelName [YourControllerName]
 
 Once it is done generating, the generated MasterView template file will be created in app/views/masterview/YourModelName.html. This file is html and can be edited with any standard html editor. The rails specific logic is contained in simple attributes which are ignored by html editors. The syntax for these attributes is heavily derived from the rails helper tags themselves so it should feel natural to the rails developer.
 
@@ -171,7 +171,24 @@ mv:gen_replace="whatToLeave"
 	<div>
 	  <form></form>
 	</div>
-	 
+
+mv:attr=":foo => 'bar', :cat => #{h product.name}"
+	At runtime this sets attribute values on the element this directive is defined on, for example...
+
+	<div mv:attr=":foo => 'bar', :hi => 'cat'">hello</div>
+
+	  becomes
+
+	<div foo="bar" hi="cat">hello</div>
+
+	You can put erb evaluated code in #{ } like in this example
+
+	<div mv:attr=":foo => #{h product.name}, :hi => 'cat'">hello</div>
+
+	  becomes
+
+	<div foo="<%= h product.name %>" hi="cat">hello</div>
+
 mv:block="rubyBlockCodeHere"
 	At runtime this expands to the equivalent rhtml (erb) block code around this element, for example...
 	

data/RELEASE_NOTES

@@ -43,9 +43,9 @@ Install in one of the two following ways depending on whether you can use gems o
 
 If you can use gems you may simply do the following
 
-gem install masterview
+gem install masterview_gem_pack
 
-Now your gem is installed and you can skip that step in the future. After creating your rails directory, change directory to it and run the following to create a very lightweight plugin instance for this application mainly consisting of an init.rb file which will get loaded at runtime. This init.rb refers to the gem for everything but allows you to override any constants or setup that has been provided. See MasterView module masterview.rb for a list of the available constants.
+Now your gem is installed and you can skip these steps in the future. After creating your rails directory, change directory to it and run the following to create a very lightweight plugin instance for this application mainly consisting of an init.rb file which will get loaded at runtime. This init.rb refers to the gem for everything but allows you to override any constants or setup that has been provided. See MasterView module masterview.rb for a list of the available constants.
 
 script/generate masterview_plugin
 
@@ -53,13 +53,13 @@ After this MasterView is ready for use. Skip down to the Usage section for more
 
 === Installation without using gems, install as plugin
 
-script/plugin install masterview
+script/plugin install svn://rubyforge.org/var/svn/masterview
 
-This will copy entire MasterView system into your vendor/plugin/masterview directory. You may tweak its init.rb to override any MasterView constants at runtime. See MasterView module masterview.rb for a list of available constants. You may also retrieve the plugin package (.tgz and .zip) from Rubyforge.org searching for the project masterview_complete.
+This will copy entire MasterView system into your vendor/plugin/masterview directory. You may tweak its init.rb to override any MasterView constants at runtime. See MasterView module masterview.rb for a list of available constants. Note that if you don't have svn (subversion) installed, you may also retrieve the plugin package (masterview_plugin.tgz or masterview_plugin.zip) from http://rubyforge.org/projects/masterview and simply extract into vendor/plugins/masterview 
 
 == Usage
 
 You may add MasterView attributes to existing (x)html or you may use the masterview generator to create a complete working application. The generator can create controllers, models, and the MasterView template file similar to how the built-in generator works. Simply change directory to your rails application and run the following
 
-script/generate masterview YourModelName
+script/generate masterview YourModelName [YourControllerName]
 

data/Rakefile

@@ -105,13 +105,14 @@ end
 #  Rake::SshDirPublisher.new("foobar.com", "dist/api/#{PKG_NAME}", "doc").upload
 #end
 
-
+desc 'Verify RUBYFORGE_USER and RUBYFORGE_PASSWORD'
 task :verify_rubyforge do
   raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
   raise "RUBYFORGE_PASSWORD environment variable not set!" unless ENV['RUBYFORGE_PASSWORD']
   MASTERVIEW = MetaProject::Project::XForge::RubyForge.new('masterview')
 end
 
+desc 'Verify GMAIL_USER GMAIL_PASSWORD'
 task :verify_gmail do
   raise "GMAIL_USER environment variable not set!" unless ENV['GMAIL_USER']
   raise "GMAIL_PASSWORD environment variable not set!" unless ENV['GMAIL_PASSWORD']

data/lib/masterview/directives/attr.rb

@@ -0,0 +1,27 @@
+module MasterView
+  module Directives
+    # takes the attr_value and parses it as a hash :foo => 'bar', :baz => 'cat'
+    # it sets/overrides the tag's attribute values for each value.
+    # To use erb output simply wrap the content in #{ foo } for example :foo => #{h product.name}
+    class Attr < MasterView::DirectiveBase
+      # substitution to make it easy to parse erb in attr
+      SubstForErb = '#'+InlineErbStart+'= \1 '+InlineErbEnd+'#'
+
+      def priority
+        DirectivePriorities::MediumLow
+      end
+      
+      def stag(dcs)
+        
+        attr_value.gsub!( /#\{([^}]*)\}/, SubstForErb ) #taking #{h product.name} and changing to #{{{= h product.name}}}# for easy parsing
+        arr = attr_value.scan( /:(\w+)\s*=>\s*(['"#])([^,\2]*)\2,?/  )
+        arr.each do |scn|
+          n = scn[0]
+          v = scn[2]
+          dcs.context[:tag].attributes[n] = v
+        end
+        dcs.render
+      end
+    end
+  end
+end

data/lib/masterview/masterview_version.rb

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

data/test/attr_test.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../lib/masterview' )
+require File.join( currentPath, '../lib/masterview/directives/attr')
+
+class TestAttr < Test::Unit::TestCase
+  include MasterView::Directives
+
+  def setup
+    @directives = MasterView::DirectiveSet.new
+    @tag = MasterView::Tag.new(@directives, 'foo', {'bar' => 'cat'}, :normal, nil)
+  end
+
+  def test_hello
+    @directives.directives = []
+    attr_value = "{:hello => 'world'}"
+    @directives << Attr.new(attr_value)
+    dcs = @directives.determine_dcs(:stag)
+    dcs.context = @tag.create_context
+    assert_equal '', dcs.render.join
+    assert_equal 'cat', dcs.context[:tag].attributes['bar']
+    assert_equal 'world', dcs.context[:tag].attributes['hello']
+  end
+
+  def test_hello_hi
+    @directives.directives = []
+    attr_value = ":hello => 'world', :hi => 'there'"
+    @directives << Attr.new(attr_value)
+    dcs = @directives.determine_dcs(:stag)
+    dcs.context = @tag.create_context
+    assert_equal '', dcs.render.join
+    assert_equal 'cat', dcs.context[:tag].attributes['bar']
+    assert_equal 'world', dcs.context[:tag].attributes['hello']
+    assert_equal 'there', dcs.context[:tag].attributes['hi']
+  end
+
+  def test_hello_erb
+    @directives.directives = []
+    attr_value = %q":hello => 'world', :hi => 'there', :wow => #{h product.name}"
+    @directives << Attr.new(attr_value)
+    dcs = @directives.determine_dcs(:stag)
+    dcs.context = @tag.create_context
+    assert_equal '', dcs.render.join
+    assert_equal 'cat', dcs.context[:tag].attributes['bar']
+    assert_equal 'world', dcs.context[:tag].attributes['hello']
+    assert_equal 'there', dcs.context[:tag].attributes['hi']
+    assert_equal '{{{= h product.name }}}', dcs.context[:tag].attributes['wow']
+  end
+
+end

data/test/template_test.rb

@@ -1,11 +1,48 @@
+#!/usr/bin/env ruby
+
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
 require File.join( currentPath, '../lib/masterview' )
 require File.join( currentPath, 'test_helper' )
-include MasterView::Directives
 
 class TestTemplate < Test::Unit::TestCase
 
+  def test_attr
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"blue\" id=\"testid\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_attr_erb
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":class => 'blue', :id => '{{{= @product.id }}}'">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"blue\" id=\"<%= @product.id %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
+  def test_attr_erb2
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span class="red" mv:attr=":class => 'blue', :id => \#\{@product.id\}">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><span class=\"blue\" id=\"<%= @product.id %>\">foo bar</span></div>"
+    }
+    assert_template_result expected, template
+  end
+
   def test_multi
     template = <<-END
       <div mv:generate='foo/bar'>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
-date: 2006-04-22 00:00:00 -05:00
+  version: 0.0.12
+date: 2006-04-24 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths: 
 - lib
@@ -28,79 +28,81 @@ cert_chain:
 authors: 
 - Jeff Barczewski
 files: 
+- lib/facets
 - lib/masterview
 - lib/masterview.rb
-- lib/facets
+- lib/facets/ProjectInfo
+- lib/facets/AUTHORS
+- lib/facets/CHANGELOG
+- lib/facets/COPYING
+- lib/facets/README
+- lib/facets/core/string
+- lib/facets/core/string/starts_with.rb
+- lib/facets/core/string/indent.rb
+- lib/facets/core/string/blank.rb
 - lib/masterview/directives
 - lib/masterview/extras
-- lib/masterview/directive_base.rb
-- lib/masterview/masterview_version.rb
-- lib/masterview/parser.rb
 - lib/masterview/plugin_load_tracking.rb
+- lib/masterview/directive_helpers.rb
 - lib/masterview/runtime_helpers.rb
 - lib/masterview/string_extensions.rb
-- lib/masterview/directive_helpers.rb
-- lib/masterview/directives/block.rb
-- lib/masterview/directives/content.rb
-- lib/masterview/directives/else.rb
-- lib/masterview/directives/elsif.rb
-- lib/masterview/directives/form.rb
+- lib/masterview/directive_base.rb
+- lib/masterview/masterview_version.rb
+- lib/masterview/parser.rb
 - lib/masterview/directives/global_inline_erb.rb
-- lib/masterview/directives/hidden_field.rb
-- lib/masterview/directives/if.rb
-- lib/masterview/directives/javascript_include.rb
-- lib/masterview/directives/link_to.rb
 - lib/masterview/directives/link_to_if.rb
-- lib/masterview/directives/link_to_remote.rb
-- lib/masterview/directives/password_field.rb
 - lib/masterview/directives/preview.rb
-- lib/masterview/directives/replace.rb
-- lib/masterview/directives/stylesheet_link.rb
 - lib/masterview/directives/testfilter.rb
-- lib/masterview/directives/text_area.rb
+- lib/masterview/directives/password_field.rb
 - lib/masterview/directives/text_field.rb
+- lib/masterview/directives/else.rb
+- lib/masterview/directives/block.rb
+- lib/masterview/directives/if.rb
+- lib/masterview/directives/hidden_field.rb
+- lib/masterview/directives/link_to.rb
+- lib/masterview/directives/elsif.rb
+- lib/masterview/directives/form.rb
 - lib/masterview/directives/submit.rb
 - lib/masterview/directives/insert_generated_comment.rb
+- lib/masterview/directives/stylesheet_link.rb
+- lib/masterview/directives/javascript_include.rb
+- lib/masterview/directives/link_to_remote.rb
+- lib/masterview/directives/content.rb
+- lib/masterview/directives/replace.rb
+- lib/masterview/directives/text_area.rb
+- lib/masterview/directives/attr.rb
 - lib/masterview/extras/rails_init.rb
 - lib/masterview/extras/watcher.rb
-- lib/facets/README
-- lib/facets/ProjectInfo
-- lib/facets/COPYING
-- lib/facets/CHANGELOG
-- lib/facets/AUTHORS
-- lib/facets/core/string
-- lib/facets/core/string/starts_with.rb
-- lib/facets/core/string/indent.rb
-- lib/facets/core/string/blank.rb
-- test/block_test.rb
-- test/content_test.rb
+- test/run_parser_test.rb
+- test/test_helper.rb
+- test/template_file_watcher_test.rb
+- test/global_inline_erb_test.rb
+- test/password_field_test.rb
+- test/text_field_test.rb
 - test/else_test.rb
-- test/elsif_test.rb
+- test/block_test.rb
 - test/example_test.rb
-- test/filter_helpers_test.rb
-- test/form_test.rb
-- test/global_inline_erb_test.rb
-- test/hidden_field_test.rb
+- test/parser_test.rb
 - test/if_test.rb
-- test/javascript_include_test.rb
-- test/link_to_if_test.rb
+- test/hidden_field_test.rb
 - test/link_to_test.rb
-- test/parser_test.rb
-- test/password_field_test.rb
-- test/replace_test.rb
-- test/run_parser_test.rb
-- test/stylesheet_link_test.rb
+- test/elsif_test.rb
+- test/form_test.rb
 - test/submit_test.rb
-- test/template_file_watcher_test.rb
-- test/template_test.rb
-- test/test_helper.rb
+- test/javascript_include_test.rb
+- test/stylesheet_link_test.rb
+- test/filter_helpers_test.rb
 - test/text_area_test.rb
-- test/text_field_test.rb
+- test/content_test.rb
+- test/replace_test.rb
+- test/template_test.rb
+- test/link_to_if_test.rb
+- test/attr_test.rb
 - CHANGELOG
-- MIT-LICENSE
 - Rakefile
-- README
 - RELEASE_NOTES
+- MIT-LICENSE
+- README
 - init.rb
 test_files: []