www_app 1.3.0 → 2.0.0

data/specs/lib/config.ru

@@ -3,46 +3,75 @@
 require 'cuba'
 require 'da99_rack_protect'
 require 'multi_json'
+require 'www_app'
 
-Cuba.use Da99_Rack_Protect.config { |c|
-  c.config :host, [:localhost, 'www_app.com']
-}
+PATH = File.expand_path(File.dirname(__FILE__) + '../../..')
 
-Cuba.use Rack::ShowExceptions
+Rack::Mime::MIME_TYPES.merge!({".map" => "application/json"})
 
-Cuba.use(Class.new {
-  def initialize app
-    @app = app
-  end
+Cuba.use Da99_Rack_Protect do |c|
+  c.config :host, :localhost if ENV['IS_DEV']
+end
+
+Cuba.use Rack::ShowExceptions
 
-  def call env
-    results = @app.call(env)
-    if results.first == 404
-      if env['PATH_INFO'] == '/'
-        return [
-          200,
-          {"Content-Type" => "text/html"},
-          [File.read("./specs/client-side/index.html").gsub("{token}", env['rack.session']['csrf'])]
-        ]
-      end
-
-      [
-        Rack::Directory.new(File.expand_path('./specs/lib')),
-        Rack::Directory.new(File.expand_path('./specs/client-side')),
-        Rack::Directory.new(File.expand_path('./lib/public'))
-      ].detect { |r|
-        status, headers, body = r.call(env)
-        return [status, headers, body] if status !=  404
-        false
+# Cuba.use(Class.new {
+  # def initialize app
+    # @app = app
+  # end
+
+  # def call env
+    # results = @app.call(env)
+    # if results.first == 404
+      # if env['PATH_INFO'] == '/old'
+        # return [
+          # 200,
+          # {"Content-Type" => "text/html"},
+          # [File.read("./specs/client-side/index.html").gsub("{token}", env['rack.session']['csrf'])]
+        # ]
+      # end
+
+      # [
+        # Rack::Directory.new(File.expand_path('./specs/lib')),
+        # Rack::Directory.new(File.expand_path('./specs/client-side')),
+        # Rack::Directory.new(File.expand_path('./lib/public'))
+      # ].detect { |r|
+        # status, headers, body = r.call(env)
+        # return [status, headers, body] if status !=  404
+        # false
+      # }
+    # end
+
+    # results
+  # end
+# })
+
+
+PAGES = {
+  :root => WWW_App.new {
+      title { 'hello' }
+      div {
+        _.^(:happy) {
+          border '1px dashed red'
+        }
+        on(:click) {
+          add_class :happy
+        }
+        "Almost done."
       }
-    end
+    }
+}
 
-    results
-  end
-})
+Cuba.use Rack::Static, :urls=>["/www_app-#{File.read(PATH + '/VERSION').strip}"], :root=>'Public'
 
 Cuba.define do
 
+  on get do
+    on root do
+      res.write PAGES[:root].to_html
+    end
+  end
+
   on post do
     data = (req.env["rack.request.form_hash"]).dup
     data.delete('authenticity_token')

data/specs/lib/helpers.rb

@@ -21,6 +21,10 @@ def norm ugly
     join("\n")
 end
 
+def norm_wo_lines str
+  str.split("\n").map(&:strip).join ""
+end
+
 def strip_each_line str
   str.split("\n").map(&:strip).join "\n"
 end
@@ -40,6 +44,10 @@ def script html
   get_content 'script', html
 end
 
+def script_srcs str
+  str.scan(%r@<script src="([^"]+)"></script>@).flatten
+end
+
 def body html
   get_content 'body', html
 end
@@ -81,13 +89,25 @@ end
 module Bacon
   class Context
 
+    #
+    # NOTE: I know this is a lazy hack,
+    # but I was short on time.
+    #
+    alias_method :rr_wo_target_args, :run_requirement
+    def run_requirement *args
+      @target_args = nil
+      rr_wo_target_args(*args) {
+        yield if block_given?
+      }
+    end
+
     def target *args
       @target_args = args
     end
 
     def actual vals = {}, &blok
       if !@target_args
-        return WWW_App.new(&blok).render(vals)
+        return WWW_App.new(&blok).to_html(vals)
       end
 
       include_tag = if @target_args.first == :outer
@@ -98,7 +118,7 @@ module Bacon
       norm_target   = norm @target_args.last
 
       tag           = @target_args.first
-      html          = WWW_App.new(&blok).render(vals)
+      html          = WWW_App.new(&blok).to_html(vals)
       section       = case
                       when include_tag
                         html[/(<#{tag}[^\>]*>.+<\/#{tag}>)/m] && $1
@@ -118,6 +138,8 @@ module Bacon
       end
 
       norm_actual.should == norm_target
+
+      @target_args = nil
     end
 
   end # === class Context ===

data/specs/server-side/0000-new.rb

@@ -7,7 +7,7 @@ describe "it runs" do
       div {
         "test"
       }
-    }.render.should == "<div>test</div>"
+    }.to_html.should == "<div>test</div>"
   end
 
 end # === describe IS_DEV ===

data/specs/server-side/0001-underscore-double.rb

@@ -0,0 +1,38 @@
+
+describe :underscore__double do
+
+  it "lets you combine different elements in a css selector" do
+    target :style, %^
+      div.bad div {
+        color: #mebad;
+      }
+    ^
+
+    actual {
+      style {
+        div.^(:bad).__.div {
+          color '#mebad'
+        }
+      }
+    }
+  end # === it lets you combine different elements in a css selector
+
+  it "can be used with :_ in :style: div.__._ { ... }" do
+    target :style, %^
+      div.outside #main.inner {
+        color: #deep;
+      }
+    ^
+
+    actual do
+      div.id(:main) {
+        style {
+          div.^(:outside).__._.^(:inner) {
+            color '#deep'
+          }
+        }
+      }
+    end
+  end # === it can be used with :_ in :style: div.__._ { ... }
+
+end # === describe :underscore__double

data/specs/server-side/0001-underscore.rb

@@ -0,0 +1,73 @@
+
+describe :_ do
+
+  it "let's you add :id to the body" do
+    actual = WWW_App.new {
+      _.id(:the_body)
+    }.to_html
+
+    actual[/<body[^\<]+/].should == %!<body id="the_body">!
+  end # === it lets you add :id to the body
+
+  it "let's you add a :class to body" do
+    actual = WWW_App.new {
+      _.^(:sad)
+    }.to_html
+
+    actual[/<body[^\<]+/].should == %!<body class="sad">!
+  end # === it lets you add a :class to body
+
+  it "let's you create a style inside a tag, outside of :style" do
+    target :style, <<-EOF
+      #main.happy:link {
+        color: #happy;
+      }
+
+      #main.sad {
+        border: 1px dashed red;
+      }
+    EOF
+
+    actual do
+      div.id(:main) {
+        _.^(:happy)._link { color '#happy' }
+        _.^(:sad)   { border '1px dashed red' }
+      }
+    end
+  end # === it let's you create a style inside a tag, outside of :style
+
+  it "refers to the :body when used inside a parent-less :style" do
+    target :style, %!
+      body {
+        color: #abc;
+      }
+    !
+
+    actual do
+      style {
+        _ {
+          color '#abc'
+        }
+      }
+    end
+  end # === it refers to the :body when used inside a parent-less :style
+
+  it "can be used with double-underscore: _.__div" do
+    target :style, %^
+      #main.sad div.happy {
+        color: #confused;
+      }
+    ^
+
+    actual do
+      div.id(:main).^(:sad) {
+        style {
+          _.__.div.^(:happy) {
+            color '#confused'
+          }
+        }
+      }
+    end
+  end # === it can be used with double-underscore: _.__div
+
+end # === describe :_

data/specs/server-side/0010-attrs.rb

@@ -1,15 +1,14 @@
 
 describe "all attrs" do
 
-  it "raises a RuntimeError if tag has an unknown attribute" do
+  it "raises a RuntimeError if tag has an invalid attribute" do
     should.raise(RuntimeError) {
       actual {
-        a.href('/href') {
-          tag![:attrs][:hi] = 'hiya'
+        a.href('/href').src('file') {
           "here"
         }
       }
-    }.message.should.match /Unknown attr: :hi/
+    }.message.should.match /:src not allowed to be set here/
   end
 
   it "escapes attributes" do

data/specs/server-side/0011-id.rb

@@ -1,12 +1,12 @@
 
 
 
-describe :* do
+describe :id do
 
   it "raises Invalid if id has invalid chars" do
     should.raise(Escape_Escape_Escape::Invalid) {
       actual do
-        div.*('a<&a') { 'hello' }
+        div.id('a<&a') { 'hello' }
       end
     }.message.should.match /a<&a/
   end
@@ -14,8 +14,8 @@ describe :* do
   it "raises HTML_ID_Duplicate if id is used more than once" do
     should.raise(WWW_App::HTML_ID_Duplicate) {
       actual do
-        div.*(:my_id) { '1' }
-        div.*(:my_id) { '2' }
+        div.id(:my_id) { '1' }
+        div.id(:my_id) { '2' }
       end
     }.message.should.match /my_id/
   end
@@ -29,7 +29,7 @@ describe :* do
     target '<a id="warning" href="&#47;there">There</a>'
 
     actual do
-      a.*(:warning).href('/there') { "There" }
+      a.id(:warning).href('/there') { "There" }
     end
   end
 

data/specs/server-side/0020-tag.rb

@@ -4,7 +4,7 @@ describe :tag do
   it "raises Invalid if tag starts w/ a number" do
     should.raise(Escape_Escape_Escape::Invalid) {
       actual do
-        div.*('0a') { 'hello' }
+        div.id('0a') { 'hello' }
       end
     }.message.should.match /0a/
   end
@@ -12,7 +12,7 @@ describe :tag do
   it "raises Invalid if tag is unknown: e.g. :footers" do
     should.raise(StandardError) {
       actual do
-        tag(:footers) { 'bye' }
+        footers { 'bye' }
       end
     }.message.should.match /footers/
   end

data/specs/server-side/0020-tag_content.rb

@@ -1,5 +1,5 @@
 
-describe "HTML contents" do
+describe 'tag content' do
 
   it "uses last String value as content" do
     target %^<p>Hello</p>^

data/specs/server-side/0021-body.rb

@@ -1,7 +1,7 @@
 
 describe "body with inner style" do
 
-  it "uses 'body' instead of id" do
+  it "adds styles to page as: body { ... }" do
     target :style, %^
       body {
         border-width: 3px;

data/specs/server-side/0021-script.rb

@@ -4,41 +4,87 @@ describe :script do
   it "raises Invalid_Relative_HREF if :src is not relative" do
     should.raise(Escape_Escape_Escape::Invalid_Relative_HREF) {
       actual do
-        script.src('http://www.example.org/file.js')./
+        script('http://www.example.org/file.js')
       end
     }.message.should.match /example\.org/
   end
 
+  it "puts custom script files w/ :src at the after vendor files and www_app.js" do
+    actual = WWW_App.new {
+      p { 'paragraph' }
+      script 'my_script.js'
+    }.to_html
+
+    script_srcs(actual).last.should == 'my_script.js'
+  end # === it puts custom script files w/ :src at the after vendor files and www_app.js
+
   it "allows a relative :src" do
-    target %^<script src="&#47;file.js"></script>^
-    actual {
-      script.src('/file.js')./
-    }
+    actual = WWW_App.new {
+      script('/file.js')
+    }.to_html
+
+    script_srcs(actual).last.should == %^&#47;file.js^
   end
 
   it "escapes slashes in attr :src" do
-    target %^<script src="&#47;dir&#47;file.js"></script>^
-    actual {
-      script.src('/dir/file.js')./
-    }
-  end
+    actual = WWW_App.new {
+      script('/dir/file.js')
+    }.to_html
 
-  it "does not allow vars in :script :src attribute" do
-    target :body, <<-EOF
-      <script src="help"></script>
-    EOF
+    script_srcs(actual).last.should == %^&#47;dir&#47;file.js^
+  end
 
-    actual do
-      script.src(:help)
-    end
+  it "allowed to have a :class attribute" do
+    WWW_App.new {
+      script.^(:append) do
+        div {}
+      end
+    }.to_html.should.match /<script type="text\/mustache" class="append"/
   end
 
-  it "ignores text for :script block" do
-    target %^<script src="&#47;hello.js"></script>^
+  it "renders :type when given a block" do
+    target %^<script type="text/text">hello</script>^
     actual {
-      script.src('/hello.js') { 'hello' }
+      script('text/text') { 'hello' }
     }
   end
 
+  it "includes client-side script files" do
+    actual = WWW_App.new {
+      div { }
+      script 'my.js'
+    }.to_html
+
+    targets = (
+      Dir.glob('lib/public/**/*.js').map { |f|
+        href = "/www_app-#{File.read('VERSION').strip}/#{f}".sub('/lib/public', '')
+        Escape_Escape_Escape.relative_href href
+      } + ['my.js']
+    )
+
+    script_srcs(actual).sort.should == targets.sort
+  end # === it includes client-side script files
+
+  it "is rendered inside a full document" do
+    actual = WWW_App.new {
+      div { }
+      script 'my.js'
+    }.to_html
+
+    actual['<body>'].should == '<body>'
+  end
+
+  it "allows rendering of child elements" do
+    target :body, <<-EOF
+      <script type="text/mustache">
+        <div>!{ html.hello }!</div>
+      </script>
+    EOF
+    actual do
+      script 'text/mustache' do
+        div { :hello }
+      end
+    end
+  end # === it allows rendering of child elements
 
 end # === describe :JS ===

data/specs/server-side/{0021-page_title.rb → 0021-title.rb}

@@ -2,9 +2,11 @@
 describe "page_title" do
 
   it "creates only one :title tag" do
-    WWW_App.new {
-      page_title { 'yo' }
-    }.render.scan(/<title>[^>]+<\/title>/).
+    html = WWW_App.new {
+      title { 'yo' }
+    }.to_html
+
+    html.scan(/<title>[^>]+<\/title>/).
     should == ['<title>yo</title>']
   end # === it creates on :title tag
 

data/specs/server-side/0030-mustache.rb

@@ -56,45 +56,52 @@ describe :mustache do
   end
 
   it "escapes html in nested values" do
-    target <<-EOF
-      <div id="my_box"><span>&amp; hello 1</span>
-        <span>&amp;&amp; hello 2</span></div>
-    EOF
-
-    actual(:hello=>{:msg=>'& hello 1', :goodbye=>nil}) {
-      div.*(:my_box) {
+    actual = WWW_App.new() {
+      div.id(:my_box) {
         render_if(:hello) {
           span { :msg } 
-          render_unless(:goodbye) { span { '&& hello 2' } }
+          render_unless(:goodbye) {
+            span { '&& hello 2' }
+          }
         }
       }
-    }
+    }.to_html(:hello=>{:msg=>'& hello 1', :goodbye=>nil})
+
+    target = <<-EOF
+      <div id="my_box"><span>&amp; hello 1</span>
+        <span>&amp;&amp; hello 2</span></div>
+    EOF
+
+    norm_wo_lines(actual).should == norm_wo_lines(target)
   end
 
   it "escapes :href in nested values" do
-    target %^<div><div><a href="&#47;hello">hello</a></div></div>^
-    actual(o: {url: '/hello', msg: 'hello'}) {
+    actual = WWW_App.new {
       div {
         render_if(:o) {
           div { a.href(:url) { :msg } }
         }
       }
-    }
+    }.to_html(o: {url: '/hello', msg: 'hello'})
+    target = %^<div><div><a href="&#47;hello">hello</a></div></div>^
+    norm_wo_lines(actual).should == norm_wo_lines(target)
   end
 
   it "does not allow vars to be used in form :action" do
-    target %^<form action="url"><input type="hidden" name="auth_token" value="hello" /></form>^
+    should.raise(Escape_Escape_Escape::Invalid_Type) {
+      actual :url=>'not allowed', :auth_token => 'hello' do
+        form.action(:url) {}
+      end
+    }.message.should.match /:url/
 
-    actual :auth_token => 'hello' do
-      form.action(:url) {}
-    end
   end
 
   it "does not allow vars to be used in :link :href" do
-    target %^<link href="hello" />^
-    actual {
-      link.href(:hello)./
-    }
+    should.raise(Escape_Escape_Escape::Invalid_Type) {
+      actual(:hello=>'not_allowed') {
+        link.href(:hello)./
+      }
+    }.message.should.match /:hello/
   end
 
   it "raises ContextMiss if encounters unescaped value" do