erbside 0.2.0 → 0.2.1

data/.ruby

@@ -12,11 +12,18 @@ conflicts: []
 
 requirements: 
 - name: facets
-- name: pom
-- name: ko
+- name: qed
   groups: 
   - test
   development: true
+- name: citron
+  groups: 
+  - test
+  development: true
+- name: detroit
+  groups: 
+  - build
+  development: true
 dependencies: []
 
 repositories: 
@@ -31,7 +38,6 @@ resources:
 load_path: 
 - lib
 extra: 
-  contact: trans <transfire@gmail.com>
   manifest: MANIFEST
 source: []
 
@@ -43,6 +49,6 @@ summary: ERB-based Inline Templating
 suite: rubyworks
 created: "2009-07-15"
 description: Erbside is a simple project-oriented erb-based inline template system. Inline templates make it easy to do basic code generation without the need for duplicate files.
-version: 0.2.0
+version: 0.2.1
 name: erbside
 date: "2011-08-22"

data/HISTORY.rdoc

@@ -1,11 +1,33 @@
 = HISTORY
 
+== 0.2.1 / 2011-08-23
+
+Failed to fix dependencies in previous release.
+
+Changes:
+
+* Remove POM from dependencies.
+
+
+== 0.2.0 / 2011-08-22
+
+The release drops use of POM altogether and adds support for multiple optional
+metadata resources in its place, including .ruby and .gemspecs, yaml files 
+(ending in .yaml/.yml) and "metadir" metadata directories.
+
+Changes:
+
+* Support multiple metadata resources (via -r/--resource).
+* Block templates keep the same layout as given.
+* Project metadata is dynamically loaded using .ruby file.
+
+
 == 0.1.0 / 2011-02-22
 
-This is the initial release of Erbside. Erbside is a derivative of
-and successor to an earlier program called Till.
+This is the initial release of Erbside. Erbside is a derivative of and
+successor to an earlier program called Till (a name I never quite liked).
 
-* 1 Major Enhancment
+Changes:
 
-    * Happy Birthday!
+* Happy Birthday!
 

data/MANIFEST

@@ -14,14 +14,15 @@ lib/erbside/inline.rb
 lib/erbside/metadata.rb
 lib/erbside/runner.rb
 lib/erbside.rb
+lib/erbside.yml
+qed/01_ruby.rdoc
+qed/02_bash.rdoc
+qed/03_cpp.rdoc
+qed/04_js.rdoc
+qed/05_css.rdoc
+qed/06_sgml.rdoc
+qed/09_cli.rdoc
 qed/applique/env.rb
-qed/bash.rdoc
-qed/cli.rdoc
-qed/cpp.rdoc
-qed/css.rdoc
-qed/javascript.rdoc
-qed/ruby.rdoc
-qed/sgml.rdoc
 test/fixture/inline.rb
 test/fixture/inline_complex.rb
 test/inline_test.rb

data/PROFILE

@@ -1,7 +1,6 @@
 --- 
 title  : Erbside
 summary: ERB-based Inline Templating
-contact: trans <transfire@gmail.com>
 suite  : rubyworks
 authors: Thomas Sawyer <transfire@gmail.com>
 created: 2009-07-15
@@ -13,8 +12,12 @@ description:
 
 requires:
   - facets
-  - pom
-  - ko (test)
+  - qed     (test)
+  - citron  (test)
+  - detroit (build)
+
+#suggestions:
+#  - dotruby
 
 resources:
   home: http://rubyworks.github.com/erbside

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/erbside.rb

@@ -1,9 +1,23 @@
 module Erbside
-
   require 'erbside/runner'
 
   #
-  VERSION="0.2.0" #:erb: VERSION="<%= version %>"
+  module MetadataMixin
+    def metadata
+      @_metadata ||= (
+        require 'yaml'
+        YAML.load_file(File.dirname(__FILE__) + '/erbside.yml')
+      )
+    end
+    def const_missing(name)
+      key = name.to_s.downcase
+      metadata.key?(key) ? metadata[key] : super(name)
+    end
+  end
+  extend MetadataMixin
+
+  # Yea, this is old school.
+  #VERSION="0.2.0" #:erb: VERSION="<%= version %>"
 
   #
   def self.cli(argv=ARGV)

data/lib/erbside.yml

@@ -0,0 +1,54 @@
+--- 
+authors: 
+- name: Thomas Sawyer
+  email: transfire@gmail.com
+copyrights: 
+- holder: Thomas Sawyer
+  year: "2010"
+  license: Apache 2.0
+replacements: []
+
+conflicts: []
+
+requirements: 
+- name: facets
+- name: qed
+  groups: 
+  - test
+  development: true
+- name: citron
+  groups: 
+  - test
+  development: true
+- name: detroit
+  groups: 
+  - build
+  development: true
+dependencies: []
+
+repositories: 
+- uri: git://github.com/proutils/till.git
+  scm: git
+  name: public
+resources: 
+  home: http://rubyworks.github.com/erbside
+  code: http://github.com/rubyworks/erbside
+  docs: http://rubydoc.info/gems/erbside/frames
+  mail: http://googlegroups.com/group/rubyworks-mailinglist
+load_path: 
+- lib
+extra: 
+  manifest: MANIFEST
+source: []
+
+alternatives: []
+
+revision: 0
+title: Erbside
+summary: ERB-based Inline Templating
+suite: rubyworks
+created: "2009-07-15"
+description: Erbside is a simple project-oriented erb-based inline template system. Inline templates make it easy to do basic code generation without the need for duplicate files.
+version: 0.2.1
+name: erbside
+date: "2011-08-22"

data/lib/erbside/inline.rb

@@ -2,6 +2,7 @@ module Erbside
 
   # Base class for all the inline parsers.
   #
+  # TODO: Split this into two classes, one for inline and one for blocks.
   class Inline
 
     # C L A S S - M E T H O D S
@@ -166,18 +167,19 @@ module Erbside
 
         indent = md[1]
         front  = md[2]
-        remark = [ md[3], md[4], md[5], md[6], md[7], md[8], md[9] ].join('')
+        #remark = [ md[3], md[4], md[5], md[6], md[7], md[8], md[9] ].join('')
+        remark = md[3..-1].join('')
         tmplt  = md[9].strip
-        count  = md[7]
+        count  = md[7].to_i
 
         render = render_template(tmplt)
 
         result << text[index...md.begin(0)]
-        result << format_side(indent, front, remark, tmplt, render, count)
+        result << format_side(indent, front, remark, tmplt, render, !count.zero?)
 
         #index = md.end(0)
         i = md.end(0) + 1
-        count.to_i.times{ i = text[i..-1].index(/(\n|\Z)/) + i + 1 }
+        count.times{ i = text[i..-1].index(/(\n|\Z)/) + i + 1 }
         index = i
       end
 
@@ -206,7 +208,18 @@ module Erbside
     def block_match
       b = Regexp.escape(remarker_block_begin)
       e = Regexp.escape(remarker_block_end)
-      %r{^(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*\n)((?m:.*?))(\n#{e})}
+      %r{^()(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*\n)((?m:.*?))(\n#{e})}
+    end
+
+    #
+    def block_parts(match_data)
+      { :indent   => match_data[1],
+        :pad      => match_data[3],
+        :count    => match_data[5],
+        :space    => match_data[7],
+        :template => match_data[8],
+        :tail     => match_data[9]
+      }
     end
 
     #
@@ -217,17 +230,19 @@ module Erbside
       text.scan(block_match) do |m|
         md = $~
 
-        #indent = ""
-        #front  = nil
-        remark = md[0]
-        pad    = md[2]
-        count  = md[4]
-        tmplt  = md[7]
+        #remark = md[0]
+
+        parts = block_parts(md)
+
+        indent = parts[:indent]
+        pad    = parts[:pad]
+        count  = parts[:count]
+        tmplt  = parts[:template]
 
         render = render_template(tmplt)
 
         result << text[index...md.begin(0)]
-        result << format_block(pad, tmplt, render)
+        result << format_block(parts, render)
 
         i = md.end(0) + 1
         count.to_i.times{ i = text[i..-1].index(/(\n|\Z)/) + i + 1 }
@@ -239,11 +254,19 @@ module Erbside
     end
 
     #
-    def format_block(pad, template, render)
+    def format_block(parts, render)
+      indent, pad, space, template, tail = parts.values_at(:indent, :pad, :space, :template, :tail)
+
       size = render.count("\n") + 1
+
       b = remarker_block_begin
       e = remarker_block_end
-      "#{b}#{pad}:#{TAG}+#{size}:\n#{template}\n#{e}\n#{render}\n"
+
+      #if template.count("\n") > 0
+        "#{indent}#{b}#{pad}:#{TAG}+#{size}:#{space}#{template}#{tail}\n#{render}\n"
+      #else
+      #  "#{indent}#{b}#{pad}:#{TAG}+#{size}: #{template} #{e}\n#{render}\n"
+      #end
     end
 
   end

data/lib/erbside/inline/cpp.rb

@@ -30,7 +30,7 @@ module Erbside
     def block_match
       b = Regexp.escape(remarker_block_begin)
       e = Regexp.escape(remarker_block_end)
-      %r{^(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*)((?m:.*?))(\s#{e})}
+      %r{^(\s*)(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*)((?m:.*?))(\s#{e})}
     end
 
   end

data/lib/erbside/inline/css.rb

@@ -32,7 +32,7 @@ module Erbside
     def block_match
       b = Regexp.escape(remarker_block_begin)
       e = Regexp.escape(remarker_block_end)
-      %r{^(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*)((?m:.*?))(\s#{e})}
+      %r{^(\s*)(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*)((?m:.*?))(\s#{e})}
     end
 
   end

data/lib/erbside/inline/js.rb

@@ -32,7 +32,7 @@ module Erbside
     def block_match
       b = Regexp.escape(remarker_block_begin)
       e = Regexp.escape(remarker_block_end)
-      %r{^(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*)((?m:.*?))(\s#{e})}
+      %r{^(\s*)(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*)((?m:.*?))(\s#{e})}
     end
 
   end

data/lib/erbside/inline/sgml.rb

@@ -33,6 +33,24 @@ module Erbside
       /^(\ *)(.*?)(\ *)(#{rem})(\ *)(:#{TAG})()?(:)(.*?\S.*?)(-->)$/
     end
 
+    #
+    def block_match
+      b = Regexp.escape(remarker_block_begin)
+      e = Regexp.escape(remarker_block_end)
+      %r{^(\s*)(#{b})(\s*)(:#{TAG})(\+\d*)?(\:)(\s*)((?m:.*?))(\s#{e})}
+    end
+
+    #
+    def block_parts(match_data)
+      { :indent   => match_data[1],
+        :pad      => match_data[3],
+        :count    => match_data[5],
+        :space    => match_data[7],
+        :template => match_data[8],
+        :tail     => match_data[9]
+      }
+    end
+
 =begin
     #
     def render_result

data/main.assembly

@@ -10,7 +10,8 @@ gem:
   active: true
 
 qed:
-  active : false
+  files  : qed/*.rdoc
+  active : true
 
 #erbside:
 #  service : Custom

data/qed/{sgml.rdoc → 06_sgml.rdoc}

@@ -22,7 +22,7 @@ Given a file named 'example.xml' containing:
 
   <root>
     <letters>
-    <!-- :erb+1: <%= %w{z y x}.sort.join("\n").indent(4) -->
+    <!-- :erb+1: <%= %w{z y x}.sort.join("\n").indent(4) %> -->
     blah blah blah
     </letters>
   </root>
@@ -31,10 +31,10 @@ The rendered result of 'example.xml' will be:
 
   <root>
     <letters>
-    <!-- :erb+3: <%= %w{z y x}.sort.join("\n").indent(4) -->
-    x
-    y
-    z
+    <!-- :erb+3: <%= %w{z y x}.sort.join("\n").indent(4) %> -->
+      x
+      y
+      z
     </letters>
   </root>
 

metadata

@@ -2,7 +2,7 @@
 name: erbside
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Thomas Sawyer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facets
@@ -24,7 +24,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: pom
+  name: qed
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -32,10 +32,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ko
+  name: citron
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -45,6 +45,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: detroit
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Erbside is a simple project-oriented erb-based inline template system. Inline templates make it easy to do basic code generation without the need for duplicate files.
 email: 
 - transfire@gmail.com
@@ -69,6 +80,7 @@ files:
 - VERSION
 - bin/erbside
 - lib/erbside.rb
+- lib/erbside.yml
 - lib/erbside/context.rb
 - lib/erbside/gemspec.rb
 - lib/erbside/inline.rb
@@ -81,14 +93,14 @@ files:
 - lib/erbside/metadata.rb
 - lib/erbside/runner.rb
 - main.assembly
+- qed/01_ruby.rdoc
+- qed/02_bash.rdoc
+- qed/03_cpp.rdoc
+- qed/04_js.rdoc
+- qed/05_css.rdoc
+- qed/06_sgml.rdoc
+- qed/09_cli.rdoc
 - qed/applique/env.rb
-- qed/bash.rdoc
-- qed/cli.rdoc
-- qed/cpp.rdoc
-- qed/css.rdoc
-- qed/javascript.rdoc
-- qed/ruby.rdoc
-- qed/sgml.rdoc
 - site/.htaccess
 - site/.rsync-filter
 - site/assets/css/highlight.css