RubyGems - dryml - Versions diffs - 1.3.3 → 1.4.0.pre2 - Mend

dryml 1.3.3 → 1.4.0.pre2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

data/Gemfile +6 -0
data/README +2 -0
data/Rakefile +2 -1
data/VERSION +1 -1
data/cucumber.yml +9 -0
data/dryml.gemspec +4 -2
data/features/cookbook/01_simple_page_templates.feature +44 -0
data/features/cookbook/02_defining_simple_tags.feature +375 -0
data/features/cookbook/03_implicit_context.feature +229 -0
data/features/cookbook/04_tag_attributes.feature +120 -0
data/features/cookbook/05_repeated_and_optional_content.feature +241 -0
data/features/cookbook/06_pseudo_parameters.feature +191 -0
data/features/cookbook/07_nested_parameters.feature +147 -0
data/features/cookbook/08_customizing_tags.feature +307 -0
data/features/cookbook/09_aliasing_tags.feature +50 -0
data/features/cookbook/10_polymorphic_tags.feature +168 -0
data/features/cookbook/11_wrapping_content.feature +57 -0
data/features/cookbook/12_local_and_scoped_variables.feature +102 -0
data/features/doctest_examples.feature +187 -0
data/features/merge_params.feature +36 -0
data/features/replace_parameters.feature +21 -0
data/features/static_tags.feature +91 -0
data/features/step_definitions/contexts.rb +25 -0
data/features/step_definitions/dom_comparison.rb +10 -0
data/features/step_definitions/rendering.rb +21 -0
data/features/support/env.rb +32 -0
data/features/support/models/author.rb +18 -0
data/features/support/models/blog_post.rb +37 -0
data/features/support/models/discussion.rb +15 -0
data/features/support/models/post.rb +12 -0
data/features/support/strip_formatter.rb +14 -0
data/lib/dryml/dryml_builder.rb +4 -14
data/lib/dryml/dryml_doc.rb +6 -1
data/lib/dryml/helper.rb +17 -1
data/lib/dryml/part_context.rb +12 -15
data/lib/dryml/railtie/template_handler.rb +1 -3
data/lib/dryml/railtie.rb +1 -0
data/lib/dryml/taglib.rb +24 -30
data/lib/dryml/template.rb +32 -86
data/lib/dryml/template_environment.rb +40 -17
data/lib/dryml.rb +22 -11
data/taglibs/core.dryml +18 -12
data/taglibs/dryml.dryml +3 -0
metadata +97 -56

data/Gemfile ADDED Viewed

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+gem 'hobo_support', :path => '../hobo_support'
+gemspec

data/README CHANGED Viewed

@@ -1,3 +1,5 @@
+Fundamental tags that can be considered part of the DRYML core language.
 # DRYML
 DRYML is the Don't Repeat Yourself Markup Language.  It uses an

data/Rakefile CHANGED Viewed

@@ -1,5 +1,5 @@
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
@@ -17,6 +17,7 @@ end
 # --- RDOC --- #
+require 'rubygems'
 require 'yard'
 YARD::Rake::YardocTask.new do |t|
   t.files = ['lib/**/*.rb', 'README', 'LICENSE.txt', 'CHANGES.txt']

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 1.3.3
1	+ 1.4.0.pre2

data/cucumber.yml ADDED Viewed

@@ -0,0 +1,9 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--require features --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/dryml.gemspec CHANGED Viewed

@@ -11,9 +11,11 @@ Gem::Specification.new do |s|
   s.summary = "The Don't Repeat Yourself Markup Language"
   s.description = "The Don't Repeat Yourself Markup Language"
-  s.add_runtime_dependency('actionpack', ["~> 3.0.0"])
+  s.add_runtime_dependency('actionpack', ["~> 3.1.0"])
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
-  s.add_development_dependency('rubydoctest', [">= 0"])
+  s.add_development_dependency('rubydoctest', [">= 1.1.3"])
+  s.add_development_dependency('cucumber', '~> 1.1.0')
+  s.add_development_dependency('aruba', '~> 0.4.6')
   s.files = `git ls-files -x #{name}/* -z`.split("\0")

data/features/cookbook/01_simple_page_templates.feature ADDED Viewed

@@ -0,0 +1,44 @@
+Feature: Simple page templates and ERB
+  Scenario: Interpolating in HTML attributes
+    Given a file named "example.dryml" with:
+      """
+      <% my_url = '/foo/bar' %>
+      <a href="#{my_url}">Link Text</a>
+      """
+    When I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <a href="/foo/bar">Link Text</a>
+      """
+  Scenario: Merging a hash of attributes
+    Given a file named "example.dryml" with:
+      """
+      <% hash = { :action => '/foo/bar', :method => 'get' } %>
+      <form merge-attrs="&hash">
+        <input type="text" name="wut" />
+      </form>
+      """
+    When I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <form action="/foo/bar" method="get">
+        <input type="text" name="wut" />
+      </form>
+      """
+  Scenario: Dynamically calling tags
+    Given a file named "example.dryml" with:
+      """
+      <% my_tag_name = "div" %>
+      <%= raw "<#{my_tag_name}>" %>FOO<%= raw "</#{my_tag_name}>" %>
+      <call-tag tag="&my_tag_name">BAR</call-tag>
+      """
+    When I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <div>FOO</div>
+      <div>BAR</div>
+      """

data/features/cookbook/02_defining_simple_tags.feature ADDED Viewed

@@ -0,0 +1,375 @@
+Feature: Defining simple tags
+  Scenario: A simple tag
+    Given a file named "example_taglib.dryml" with:
+      """
+      <def tag="page">
+        <html>
+          <head>
+            <title>My Blog</title>
+          </head>
+          <body>
+            <h1>My Famous Blog!</h1>
+            <h2><%= @post_title %></h2>
+            <div class="post-body">
+              <%= @post_body %>
+            </div>
+          </body>
+        </html>
+      </def>
+      """
+    And a file named "example.dryml" with:
+      """
+      <% @post_title = 'FOO' %>
+      <% @post_body = 'Blah blah blah' %>
+      <page />
+      """
+    When I include the taglib "example_taglib"
+    And I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <html>
+        <head>
+          <title>My Blog</title>
+        </head>
+        <body>
+          <h1>My Famous Blog!</h1>
+          <h2>FOO</h2>
+          <div class="post-body">
+            Blah blah blah
+          </div>
+        </body>
+      </html>
+      """
+  Scenario: a simple tag with a param
+    Given a file named "example_taglib.dryml" with:
+      """
+      <def tag="page">
+        <html>
+          <head>
+            <title>My Blog</title>
+          </head>
+          <body param/>
+        </html>
+      </def>
+      """
+    And a file named "example.dryml" with:
+      """
+      <% @post_title = 'FOO' %>
+      <% @post_body = 'Blah blah blah' %>
+      <page>
+        <body:>
+          <h1>My Famous Blog!</h1>
+          <h2><%= @post_title %></h2>
+          <div class="post-body">
+            <%= @post_body %>
+          </div>
+        </body:>
+      </page>
+      """
+    When I include the taglib "example_taglib"
+    And I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <html>
+        <head>
+          <title>My Blog</title>
+        </head>
+        <body>
+          <h1>My Famous Blog!</h1>
+          <h2>FOO</h2>
+          <div class="post-body">
+            Blah blah blah
+          </div>
+        </body>
+      </html>
+      """
+  Scenario: a simple tag with a renamed param
+    Given a file named "example_taglib.dryml" with:
+      """
+      <def tag="page">
+        <html>
+          <head>
+            <title>My Blog</title>
+          </head>
+          <body param="content"/>
+        </html>
+      </def>
+      """
+    And a file named "example.dryml" with:
+      """
+      <% @post_title = 'FOO' %>
+      <% @post_body = 'Blah blah blah' %>
+      <page>
+        <content:>
+          <h1>My Famous Blog!</h1>
+          <h2><%= @post_title %></h2>
+          <div class="post-body">
+            <%= @post_body %>
+          </div>
+        </content:>
+      </page>
+      """
+    When I include the taglib "example_taglib"
+    And I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <html>
+        <head>
+          <title>My Blog</title>
+        </head>
+        <body class="content">
+          <h1>My Famous Blog!</h1>
+          <h2>FOO</h2>
+          <div class="post-body">
+            Blah blah blah
+          </div>
+        </body>
+      </html>
+      """
+  Scenario: a simple tag with two parameters
+    Given a file named "example_taglib.dryml" with:
+      """
+      <def tag="page">
+        <html>
+          <head>
+            <title>My Blog</title>
+          </head>
+          <body>
+            <div param="content" />
+            <div param="aside" />
+          </body>
+        </html>
+      </def>
+      """
+    And a file named "example.dryml" with:
+      """
+      <% @post_title = 'FOO' %>
+      <% @post_body = 'Blah blah blah' %>
+      <page>
+        <content:>
+          <h1>My Famous Blog!</h1>
+          <h2><%= @post_title %></h2>
+          <div class="post-body">
+            <%= @post_body %>
+          </div>
+        </content:>
+        <aside:>
+          Here is some aside content!
+        </aside:>
+      </page>
+      """
+    When I include the taglib "example_taglib"
+    And I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <html>
+        <head>
+          <title>My Blog</title>
+        </head>
+        <body>
+          <div class="content">
+            <h1>My Famous Blog!</h1>
+            <h2>FOO</h2>
+            <div class="post-body">
+              Blah blah blah
+            </div>
+          </div>
+          <div class="aside">
+            Here is some aside content!
+          </div>
+        </body>
+      </html>
+      """
+  Scenario: a simple tag with default parameter content
+    Given a file named "example_taglib.dryml" with:
+      """
+      <def tag="page">
+        <html>
+          <head>
+            <title param>My Blog</title>
+          </head>
+          <body param/>
+        </html>
+      </def>
+      """
+    And a file named "example.dryml" with:
+      """
+      <% @post_title = 'FOO' %>
+      <% @post_body = 'Blah blah blah' %>
+      <page>
+        <title:>My VERY EXCITING Blog</title:>
+        <body:>
+          <h1>My Famous Blog!</h1>
+          <h2><%= @post_title %></h2>
+          <div class="post-body">
+            <%= @post_body %>
+          </div>
+        </body:>
+      </page>
+      """
+    When I include the taglib "example_taglib"
+    And I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <html>
+        <head>
+          <title>My VERY EXCITING Blog</title>
+        </head>
+        <body>
+          <h1>My Famous Blog!</h1>
+          <h2>FOO</h2>
+          <div class="post-body">
+            Blah blah blah
+          </div>
+        </body>
+      </html>
+      """
+  Scenario: a simple tag with nested parameters
+    Given a file named "example_taglib.dryml" with:
+      """
+      <def tag="page">
+        <html>
+          <head>
+            <title>My Blog</title>
+          </head>
+          <body param>
+            <div param="content" />
+            <div param="aside" />
+          </body>
+        </html>
+      </def>
+      """
+    And a file named "example.dryml" with:
+      """
+      <% @post_title = 'FOO' %>
+      <% @post_body = 'Blah blah blah' %>
+      <page>
+        <content:>
+          <h1>My Famous Blog!</h1>
+          <h2><%= @post_title %></h2>
+          <div class="post-body">
+            <%= @post_body %>
+          </div>
+        </content:>
+        <aside:>
+          Here is some aside content!
+        </aside:>
+      </page>
+      """
+    When I include the taglib "example_taglib"
+    And I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <html>
+        <head>
+          <title>My Blog</title>
+        </head>
+        <body>
+          <div class="content">
+            <h1>My Famous Blog!</h1>
+            <h2>FOO</h2>
+            <div class="post-body">
+              Blah blah blah
+            </div>
+          </div>
+          <div class="aside">
+            Here is some aside content!
+          </div>
+        </body>
+      </html>
+      """
+  Scenario: a simple tag with nested parameters, using the outside param
+    Given a file named "example_taglib.dryml" with:
+      """
+      <def tag="page">
+        <html>
+          <head>
+            <title>My Blog</title>
+          </head>
+          <body param>
+            <div param="content" />
+            <div param="aside" />
+          </body>
+        </html>
+      </def>
+      """
+    And a file named "example.dryml" with:
+      """
+      <% @post_title = 'FOO' %>
+      <% @post_body = 'Blah blah blah' %>
+      <page>
+        <body:>
+          This is body content!
+        </body:>
+      </page>
+      """
+    When I include the taglib "example_taglib"
+    And I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <html>
+        <head>
+          <title>My Blog</title>
+        </head>
+        <body>
+          This is body content!
+        </body>
+      </html>
+      """
+  Scenario: a simple tag with a default parameter
+    Given a file named "example_taglib.dryml" with:
+      """
+      <def tag="page">
+        <html>
+          <head>
+            <title>My Blog</title>
+          </head>
+          <body param="default" />
+        </html>
+      </def>
+      """
+    And a file named "example.dryml" with:
+      """
+      <% @post_title = 'FOO' %>
+      <% @post_body = 'Blah blah blah' %>
+      <page>
+        <h1>My Famous Blog!</h1>
+        <h2><%= @post_title %></h2>
+        <div class="post-body">
+          <%= @post_body %>
+        </div>
+      </page>
+      """
+    When I include the taglib "example_taglib"
+    And I render "example.dryml"
+    Then the output DOM should be:
+      """
+      <html>
+        <head>
+          <title>My Blog</title>
+        </head>
+        <body>
+          <h1>My Famous Blog!</h1>
+          <h2>FOO</h2>
+          <div class="post-body">
+            Blah blah blah
+          </div>
+        </body>
+      </html>
+      """