undies 3.0.0.rc.3 → 3.0.0

data/lib/undies/io.rb

@@ -28,7 +28,6 @@ module Undies
       "#{' '*(@level+relative_level)*@indent}"
     end
 
-    # TODO: threaded/forked writing for performance improvement
     def <<(markup)
       @stream << markup
     end

data/lib/undies/raw.rb

@@ -0,0 +1,15 @@
+module Undies
+
+  class Raw < ::String
+
+    # A Raw string is one that is impervious to String#gsub
+    # and returns itself when `to_s` is called.  Used to circumvent
+    # the default html escaping of markup
+
+    def gsub(*args);  self; end
+    def gsub!(*args); nil;  end
+    def to_s;         self; end
+
+  end
+
+end

data/lib/undies/source.rb

@@ -1,7 +1,5 @@
 module Undies
 
-
-
   class Source
 
     attr_reader :source, :data, :layout
@@ -72,8 +70,6 @@ module Undies
 
   end
 
-
-
   class NamedSource
 
     attr_accessor :file, :opts, :proc
@@ -123,8 +119,6 @@ module Undies
     end
   end
 
-
-
   class SourceStack < ::Array
 
     # a source stack is used to manage which sources and any deeply nested
@@ -144,6 +138,4 @@ module Undies
 
   end
 
-
-
 end

data/lib/undies/version.rb

@@ -1,3 +1,3 @@
 module Undies
-  VERSION = "3.0.0.rc.3"
+  VERSION = "3.0.0"
 end

data/lib/undies.rb

@@ -1,4 +1,6 @@
-module Undies; end
-
+require 'undies/version'
 require 'undies/io'
 require 'undies/template'
+
+module Undies
+end

data/test/helper.rb

@@ -1,88 +1,8 @@
-# this file is automatically required in when you require 'assert' in your tests
+# this file is automatically required when you run `assert`
+# put any test helpers here
 
-# add root dir to the load path
+# add the root dir to the load path
 $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
-require 'undies'
-
-module Undies
-  module Element
-
-    module CSSProxyMacro
-
-      def proxy_css_methods
-        called_from = caller.first
-        Assert::Macro.new("have style attributes") do
-
-          should "respond to any method ending in '!' as an id proxy", called_from do
-            assert subject.respond_to?(:asdgasdg!)
-          end
-
-          should "proxy id attr with methods ending in '!'", called_from do
-            assert_equal({
-              :id => 'thing1'
-            }, subject.thing1!.instance_variable_get("@attrs"))
-          end
-
-          should "proxy id attr with last method call ending in '!'", called_from do
-            assert_equal({
-              :id => 'thing2'
-            }, subject.thing1!.thing2!.instance_variable_get("@attrs"))
-          end
-
-          should "set id attr to explicit if called last ", called_from do
-            assert_equal({
-              :id => 'thing3'
-            }, subject.thing1!.thing2!(:id => 'thing3').instance_variable_get("@attrs"))
-          end
-
-          should "set id attr to proxy if called last", called_from do
-            assert_equal({
-              :id => 'thing1'
-            }, subject.thing2!(:id => 'thing3').thing1!.instance_variable_get("@attrs"))
-          end
-
-          should "respond to any other method as a class proxy", called_from do
-            assert_respond_to :asdgasdg, subject
-          end
-
-          should "proxy single html class attr", called_from do
-            assert_equal({
-              :class => 'thing'
-            }, subject.thing.instance_variable_get("@attrs"))
-          end
-
-          should "proxy multi html class attrs", called_from do
-            assert_equal({
-              :class => 'list thing awesome'
-            }, subject.list.thing.awesome.instance_variable_get("@attrs"))
-          end
-
-          should "set class attr with explicit if called last ", called_from do
-            assert_equal({
-              :class => 'list'
-            }, subject.thing.awesome(:class => "list").instance_variable_get("@attrs"))
-          end
-
-          should "update class attr with proxy if called last", called_from do
-            assert_equal({
-              :class => 'list is good'
-            }, subject.thing.awesome(:class => "list is").good.instance_variable_get("@attrs"))
-          end
-
-          should "proxy mixed class and id selector attrs", called_from do
-            subject.thing1!.awesome({:class => "list is", :id => "thing2"}).good.thing3!
-
-            assert_equal({
-              :class => 'list is good',
-              :id => "thing3"
-            }, subject.instance_variable_get("@attrs"))
-          end
-
-        end
-      end
-
-    end
-
-  end
-end
+# require pry for debugging (`binding.pry`)
+require 'pry'

data/test/support/element.rb

@@ -0,0 +1,79 @@
+require 'undies/element'
+
+module Undies::Element
+  module TestHelpers
+
+    def proxy_css_methods
+      called_from = caller.first
+      Assert::Macro.new("have style attributes") do
+
+        should "respond to any method ending in '!' as an id proxy", called_from do
+          assert subject.respond_to?(:asdgasdg!)
+        end
+
+        should "proxy id attr with methods ending in '!'", called_from do
+          assert_equal({
+            :id => 'thing1'
+          }, subject.thing1!.instance_variable_get("@attrs"))
+        end
+
+        should "proxy id attr with last method call ending in '!'", called_from do
+          assert_equal({
+            :id => 'thing2'
+          }, subject.thing1!.thing2!.instance_variable_get("@attrs"))
+        end
+
+        should "set id attr to explicit if called last ", called_from do
+          assert_equal({
+            :id => 'thing3'
+          }, subject.thing1!.thing2!(:id => 'thing3').instance_variable_get("@attrs"))
+        end
+
+        should "set id attr to proxy if called last", called_from do
+          assert_equal({
+            :id => 'thing1'
+          }, subject.thing2!(:id => 'thing3').thing1!.instance_variable_get("@attrs"))
+        end
+
+        should "respond to any other method as a class proxy", called_from do
+          assert_respond_to :asdgasdg, subject
+        end
+
+        should "proxy single html class attr", called_from do
+          assert_equal({
+            :class => 'thing'
+          }, subject.thing.instance_variable_get("@attrs"))
+        end
+
+        should "proxy multi html class attrs", called_from do
+          assert_equal({
+            :class => 'list thing awesome'
+          }, subject.list.thing.awesome.instance_variable_get("@attrs"))
+        end
+
+        should "set class attr with explicit if called last ", called_from do
+          assert_equal({
+            :class => 'list'
+          }, subject.thing.awesome(:class => "list").instance_variable_get("@attrs"))
+        end
+
+        should "update class attr with proxy if called last", called_from do
+          assert_equal({
+            :class => 'list is good'
+          }, subject.thing.awesome(:class => "list is").good.instance_variable_get("@attrs"))
+        end
+
+        should "proxy mixed class and id selector attrs", called_from do
+          subject.thing1!.awesome({:class => "list is", :id => "thing2"}).good.thing3!
+
+          assert_equal({
+            :class => 'list is good',
+            :id => "thing3"
+          }, subject.instance_variable_get("@attrs"))
+        end
+
+      end
+    end
+
+  end
+end

data/test/{element_closed_test.rb → unit/element_closed_tests.rb}

@@ -1,7 +1,7 @@
 require "assert"
-require 'undies/io'
 require "undies/element"
 
+require 'test/support/element'
 
 module Undies::Element
 
@@ -25,16 +25,12 @@ module Undies::Element
 
   end
 
-
-
   class ClosedCSSProxyTests < ClosedBasicTests
-    extend CSSProxyMacro
+    extend TestHelpers
 
     should proxy_css_methods
   end
 
-
-
   class ClosedSerializeTests < ClosedBasicTests
 
     should "serialize with no attrs" do

data/test/{element_node_test.rb → unit/element_node_tests.rb}

@@ -1,12 +1,12 @@
 require "assert"
-require 'undies/io'
 require 'undies/element_node'
-require 'undies/element'
 
+require 'undies/io'
+require 'undies/element'
 
 class Undies::ElementNode
 
-  class BasicTests < Assert::Context
+  class UnitTests < Assert::Context
     desc 'an element node'
     before do
       # io test with :pp 1 so we can test newline insertion
@@ -41,9 +41,7 @@ class Undies::ElementNode
 
   end
 
-
-
-  class AddContentTests < BasicTests
+  class AddContentTests < UnitTests
     desc "adding content"
     before do
       @text1 = "some raw markup"
@@ -122,8 +120,6 @@ class Undies::ElementNode
 
   end
 
-
-
   class AddContentStartTagNotWrittenTests < AddContentTests
     desc "(the start tag has not been written)"
     before do
@@ -208,9 +204,7 @@ class Undies::ElementNode
 
   end
 
-
-
-  class SerializeTests < BasicTests
+  class SerializeTests < UnitTests
 
     should "serialize nested elements with pp and only honor the last build block" do
       io = Undies::IO.new(@out = "", :pp => 1, :level => 0)

data/test/{element_open_test.rb → unit/element_open_tests.rb}

@@ -1,6 +1,7 @@
 require "assert"
 require "undies/element"
 
+require 'test/support/element'
 
 module Undies::Element
 
@@ -32,16 +33,12 @@ module Undies::Element
 
   end
 
-
-
   class OpenCSSProxyTests < OpenBasicTests
-    extend CSSProxyMacro
+    extend TestHelpers
 
     should proxy_css_methods
   end
 
-
-
   class OpenSerializeTests < OpenBasicTests
 
     should "serialize with no attrs, content, or build" do

data/test/{element_test.rb → unit/element_tests.rb}

@@ -1,8 +1,6 @@
 require "assert"
-require 'undies/io'
 require "undies/element"
 
-
 module Undies::Element
 
   class ElementBasicTests < Assert::Context
@@ -75,6 +73,7 @@ module Undies::Element
       assert_included 'id="test_2"', attrs
       assert_included 'nested_something="is_awesome"', attrs
     end
+
   end
 
 end

data/test/{io_test.rb → unit/io_tests.rb}

@@ -3,7 +3,7 @@ require "undies/io"
 
 class Undies::IO
 
-  class BasicTests < Assert::Context
+  class UnitTests < Assert::Context
     desc 'render data'
     before do
       @io = Undies::IO.new(@out = "")
@@ -43,9 +43,7 @@ class Undies::IO
 
   end
 
-
-
-  class PrettyPrintTests < BasicTests
+  class PrettyPrintTests < UnitTests
     desc "when pretty printing"
     before do
       subject.options = {:pp => 2, :level => 1}
@@ -70,9 +68,7 @@ class Undies::IO
 
   end
 
-
-
-  class NodeStackTests < BasicTests
+  class NodeStackTests < UnitTests
 
     should "push to, pop from, and refer to the current thing on the stack" do
       subject.push("lala")
@@ -98,7 +94,6 @@ class Undies::IO
       assert_not_empty subject
     end
 
-
   end
 
 end

data/test/{named_source_test.rb → unit/named_source_tests.rb}

@@ -1,13 +1,12 @@
 require "assert"
-
 require "undies/source"
 
 class Undies::NamedSource
 
-  class BasicTests < Assert::Context
+  class UnitTests < Assert::Context
     desc 'a named source'
     before do
-      @content_file = File.expand_path('test/templates/content.html.rb')
+      @content_file = File.expand_path('test/support/templates/content.html.rb')
       @content_file_data = File.read(@content_file)
       @content_file_nsource = Undies::NamedSource.new(@content_file)
       @content_file_source = Undies::Source.new(@content_file)
@@ -24,7 +23,7 @@ class Undies::NamedSource
 
   end
 
-  class AccessorTests < BasicTests
+  class AccessorTests < UnitTests
     before do
       subject.file = @content_file
       subject.opts = {:layout => :another}
@@ -53,7 +52,7 @@ class Undies::NamedSource
 
   end
 
-  class UndiesTests < BasicTests
+  class UndiesTests < UnitTests
     before do
       Undies.named_sources.clear
     end

data/test/{raw_test.rb → unit/raw_tests.rb}

@@ -1,13 +1,14 @@
 require 'assert'
+require 'undies/raw'
+
 require 'undies/template'
-require 'undies/element'
 
-module Undies
+class Undies::Raw
 
-  class RawTests < Assert::Context
+  class UnitTests < Assert::Context
     desc 'the Raw class'
     before do
-      @rs = Raw.new "ab&<>'\"/yz"
+      @rs = Undies::Raw.new "ab&<>'\"/yz"
     end
     subject { @rs }
 
@@ -17,7 +18,7 @@ module Undies
 
     should "ignore any gsubbing" do
       assert_equal subject.to_s, subject.gsub('ab', '__').gsub('yz', '--')
-      assert_equal subject.to_s, Template.escape_html(subject)
+      assert_equal subject.to_s, Undies::Template.escape_html(subject)
     end
 
   end

data/test/{root_node_test.rb → unit/root_node_tests.rb}

@@ -1,12 +1,13 @@
 require "assert"
+require "undies/root_node"
+
 require 'undies/io'
-require 'undies/element_node'
 require 'undies/element'
-require "undies/root_node"
+require 'undies/element_node'
 
 class Undies::RootNode
 
-  class BasicTests < Assert::Context
+  class UnitTests < Assert::Context
     desc 'a root node'
     before do
       @io = Undies::IO.new(@out = "", :pp => 1)

data/test/{source_stack_test.rb → unit/source_stack_tests.rb}

@@ -1,13 +1,12 @@
 require "assert"
-
 require "undies/source"
 
 class Undies::SourceStack
 
-  class BasicTests < Assert::Context
+  class UnitTests < Assert::Context
     desc 'a source stack'
     before do
-      @content_file = File.expand_path('test/templates/content.html.rb')
+      @content_file = File.expand_path('test/support/templates/content.html.rb')
       @content_file_source = Undies::Source.new(@content_file)
 
       @hi_proc = Proc.new do

data/test/{source_test.rb → unit/source_tests.rb}

@@ -1,13 +1,12 @@
 require "assert"
-
 require "undies/source"
 
 class Undies::Source
 
-  class BasicTests < Assert::Context
+  class UnitTests < Assert::Context
     desc 'a source'
     before do
-      @content_file = File.expand_path('test/templates/content.html.rb')
+      @content_file = File.expand_path('test/support/templates/content.html.rb')
       @content_file_data = File.read(@content_file)
       @content_file_source = Undies::Source.new(@content_file)
 
@@ -35,7 +34,7 @@ class Undies::Source
 
   end
 
-  class SourceWriterTests < BasicTests
+  class SourceWriterTests < UnitTests
     before do
       @does_not_exist_path = '/path/does/not/exist'
     end
@@ -66,7 +65,7 @@ class Undies::Source
 
   end
 
-  class LayoutWriterTests < BasicTests
+  class LayoutWriterTests < UnitTests
 
     should "write nil layout values" do
       subject.layout = nil
@@ -114,7 +113,7 @@ class Undies::Source
 
   end
 
-  class ArgsParserTests < BasicTests
+  class ArgsParserTests < UnitTests
 
     should "parse block arg as proc source" do
       s = Undies::Source.new(&@hi_proc)

data/test/{template_builder_render_test.rb → unit/template_builder_render_tests.rb}

@@ -1,6 +1,9 @@
 require "assert"
 require "undies/template"
 
+require 'undies/io'
+require 'undies/source'
+
 class Undies::Template
 
   class BuilderRenderTests < Assert::Context

data/test/{template_source_render_test.rb → unit/template_source_render_tests.rb}

@@ -1,9 +1,10 @@
 require "assert"
 require "undies/template"
 
-class Undies::Template
-
+require 'undies/io'
+require 'undies/source'
 
+class Undies::Template
 
   class SourceRenderTests < Assert::Context
     desc 'a template rendered using a source object'
@@ -25,8 +26,6 @@ class Undies::Template
 
   end
 
-
-
   class LayoutTests < SourceRenderTests
     setup do
       @expected_output = "<html><head></head><body><div>Hi</div></body></html>"
@@ -39,12 +38,12 @@ class Undies::Template
           }
         }
       end
-      @layout_file = File.expand_path "test/templates/layout.html.rb"
+      @layout_file = File.expand_path "test/support/templates/layout.html.rb"
 
       @content_proc = Proc.new do
         _div "Hi"
       end
-      @content_file = File.expand_path "test/templates/content.html.rb"
+      @content_file = File.expand_path "test/support/templates/content.html.rb"
 
       @cp_lp_source = Undies::Source.new(:layout => @layout_proc, &@content_proc)
       @cp_lf_source = Undies::Source.new(:layout => @layout_file, &@content_proc)
@@ -74,8 +73,6 @@ class Undies::Template
 
   end
 
-
-
   class PartialTests < SourceRenderTests
     desc "using partials"
 
@@ -106,6 +103,4 @@ class Undies::Template
 
   end
 
-
-
 end