www_app 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 314db5f05be4d54977a9370a2e673eb5c565bd68
-  data.tar.gz: aeca39fff563301a42e6478099b711166d88ca90
+  metadata.gz: fbfdf7458b157b502e9cf03a522b7d3d41883a6e
+  data.tar.gz: dff3da5abcc509526f77e5b511306c5f113e4a9a
 SHA512:
-  metadata.gz: d3be19391e62718cd337f6c2a1a428bd0608a89fc60eb970985e04d02432cb361d8713764f5d5dc0ca872e4a7b54de7d379b5cc85a123afee57c1644d7f0642e
-  data.tar.gz: 3900d7a3efe2b6bdc378b68b4fb6d9d4fe65e3ebcdf697a5a17a77e9d8be8aeb4aeda4497705630e0e6249495aed878c99799650cbd424698b023960644da0af
+  metadata.gz: 938a2941e13c3912b4a9b6603d47fc77f0ac0e4b7c8813f66f27ad07392db2e00e66187e23bb6c02c6e9644ad4ec6ea244651b053800ec68e8ae520e7a18c4bf
+  data.tar.gz: 1580b1995dca04033a640ceee1131b328d086b525e3bdd1f681f57d45b9e992c2be756a7b9a7de466b7b8a8681049b124229b76d5557d279b18fffaf52913145

data/README.md

@@ -19,26 +19,37 @@ To install:
 To Use:
 
 ```ruby
-div {
+WWW_App.new {
+
+  style {
+    a {
+      _link    { color '#fff' }
+      _visited { color '#f88' }
+      _hover   { color '#ccc' }
+    }
+  }
 
-  border           '1px solid #000'
-  background_color 'grey'
+  div {
 
-  on('scary') {
-    border           '2px dotted red'
-    background_color 'white'
-  }
+    border           '1px solid #000'
+    background_color 'grey'
 
-  p { 'Click the button to make me scared.' }
+    on('scary') {
+      border           '2px dotted red'
+      background_color 'white'
+    }
 
-  button {
-    parent 'div'
-    add_class 'scary'
+    p { 'Click the button to make me scared.' }
 
-    'Scary-ify'
-  }
+    button {
+      parent 'div'
+      add_class 'scary'
 
-}
+      'Scary-ify'
+    }
+
+  }
+}.to_html
 ```
 
 It generates the CSS, JS, and HTML.

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/www_app.rb

@@ -100,6 +100,7 @@ class WWW_App < BasicObject
 
   Unescaped         = ::Class.new(::StandardError)
   Not_Unique        = ::Class.new(::StandardError)
+  Wrong_Parent      = ::Class.new(::StandardError)
   HTML_ID_Duplicate = ::Class.new(Not_Unique)
 
   ALWAYS_END_TAGS = [:script]
@@ -159,6 +160,21 @@ class WWW_App < BasicObject
       :at_rules       => [ 'font-face', 'media' ],
       :protocols      => [ :relative ],
 
+      :pseudo => %w[
+         active checked default dir() disabled
+         empty enabled
+         first first-child first-of-type fullscreen focus
+         hover
+         indeterminate in-range invalid
+         lang() last-child last-of-type left link
+         not() nth-child() nth-last-child() nth-last-of-type() nth-of-type()
+         only-child only-of-type optional out-of-range
+         read-only read-write required right root
+         scope
+         target
+         valid visited
+      ].select { |name| name[/\A[a-z0-9\-]+\Z/] }.map { |name| name.gsub('-', '_').to_sym },
+
       # From: Sanitize::Config::RELAXED[:css][:properties]
       :properties     => %w[
         background                 bottom                     font_variant_numeric       position
@@ -220,10 +236,11 @@ class WWW_App < BasicObject
   end # === class self ==============================================
 
   def initialize *files
-    @js      = []
-    @style   = {}
-    @css_arr = []
+    @js              = []
+    @style           = {}
+    @css_arr         = []
     @css_id_override = nil
+    @render_it       = true
 
     @title       = nil
     @scripts     = []
@@ -231,6 +248,7 @@ class WWW_App < BasicObject
     @compiled    = nil
     @cache       = {}
     @is_doc      = false
+    @page_title  = nil
     @default_ids = {}
 
     @state = [:create]
@@ -364,6 +382,10 @@ class WWW_App < BasicObject
 
   private # =========================================================
 
+  # =================================================================
+  #                    Parent-related methods
+  # =================================================================
+
   #
   # NOTE: Properties are defined first,
   # so :elements methods can over-write them,
@@ -391,7 +413,10 @@ class WWW_App < BasicObject
     EOF
   }
 
-  # -----------------------------------------------
+  # =================================================================
+  #                 Future features...
+  # =================================================================
+
   def section
     fail
   end
@@ -407,7 +432,11 @@ class WWW_App < BasicObject
   def at_bottom_of
     fail
   end
-  # -----------------------------------------------
+
+
+  # =================================================================
+  #                 Miscellaneaous Helpers
+  # =================================================================
 
   def is_doc?
     @is_doc || !@style[:css].empty? || !@js.empty?
@@ -628,7 +657,8 @@ class WWW_App < BasicObject
       :childs       =>  [],
       :parent_index =>  @current_tag_index,
       :is_closed    =>  false,
-      :tag_index    =>  @tag_arr.size
+      :tag_index    =>  @tag_arr.size,
+      :render?      =>  @render_it
     }
 
     @tag_arr << e
@@ -693,6 +723,14 @@ class WWW_App < BasicObject
   #                    CSS-related methods
   # =================================================================
 
+  def style
+    orig = @render_it
+    @render_it = false
+    results = yield
+    @render_it = orig
+    results
+  end
+
   def css_property name, val = nil
     prop = {:name=>name, :value=>val, :parent=>parent? ? parent : nil}
 
@@ -705,13 +743,24 @@ class WWW_App < BasicObject
     @css_arr.pop
   end
 
+  Methods[:css][:pseudo].each { |name|
+    eval <<-EOF, nil, __FILE__, __LINE__ + 1
+      def _#{name}
+        orig = @css_id_override
+        @css_id_override = ':#{name}'.freeze
+        result = yield
+        @css_id_override = orig
+        result
+      end
+    EOF
+  }
 
   # =================================================================
 
   def page_title
     @is_doc = true
     in_tag(@head) {
-      tag(:title) { yield }
+      tag(:title) { @page_title = yield }
     }
     self
   end
@@ -748,6 +797,7 @@ class WWW_App < BasicObject
       h = vals
       h.map { |raw_k,styles|
         k = raw_k.to_s
+
         <<-EOF
           #{Sanitize.css_selector k} {
             #{to_clean_text :styles, styles}
@@ -866,6 +916,8 @@ class WWW_App < BasicObject
         to_clean_text(:html, @tag_arr[tag_index])
       }.join(NEW_LINE).strip
 
+      return unless  h[:render?]
+
       if html.empty? && h[:text]
         html = h[:text].is_a?(::Symbol) ?
           h[:text].to_mustache(:html) :

data/specs/sample.rb

@@ -1,4 +1,17 @@
 
+NAME:             user
+
+/define
+  name:           username
+  is:             one_line_text
+  length between: 3, 10
+  only chars:     a-z A-Z 0-9 _ - *
+  unique:         enforce
+
+/after_create
+
+-----------------------------
+
 background {
   url "/imgs/squares.png"
 }
@@ -41,4 +54,31 @@ div.^(:col).^(:creations) {
 
 } # div.col.creations
 
+----------------------------
+
+
+title "Hello, World!"
+
+form {
+  button "send"
+}
+
+
+col.c_1! {
+  box {
+    p.first!.hello { "Hiya" }
+  }
+}
+
+col.c_2! {
+  box {
+    p.second!.hello.again { 
+      border "1px solid #fff"
+      "Hiya, again."
+    }
+  }
+}
+
+
+
 

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

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

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

@@ -0,0 +1,63 @@
+
+describe "css pseudo" do
+
+  %w[link visited hover].each { |name|
+    it "adds :#{name} pseudo-class" do
+      target :style, <<-EOF
+        a:#{name} {
+          color: #fff;
+        }
+      EOF
+
+      actual do
+        style {
+          a {
+            send("_#{name}".to_sym) { color '#fff' }
+          }
+        }
+      end
+    end # === it
+  }
+
+  it "does not add anything to :body" do
+    target :body, <<-EOF
+      <p>empty</p>
+    EOF
+
+    actual do
+      style {
+        a { _link { color '#fff' } }
+      }
+      p {
+        'empty'
+      }
+    end
+  end # === it does not add anything 
+
+  it "adds tag to :body when used outside of :style" do
+    target :body, <<-EOF
+      <a id="main" href="&#47;test">test</a>
+    EOF
+    actual do
+      a.*(:main).href("/test") { 
+        _link { color '#fff' }
+        "test"
+      }
+    end
+  end # === it adds tag to :body when used outside of :style
+
+  it "uses :id in :style tag if specified" do
+    target :style, <<-EOF
+      #main:link {
+        color: #ffc;
+      }
+    EOF
+    actual do
+      a.*(:main).href("/test") { 
+        _link { color '#ffc' }
+        "test"
+      }
+    end
+  end # === it uses :id in :style tag if specified
+
+end # === describe "css pseudo"

data/specs/server-side/0041-font_family.rb

@@ -0,0 +1,15 @@
+
+describe :font_family do
+
+  it "allows commas: Tommy, Harry, Sally" do
+    target :style, %^
+      body {
+        font-family: Ubuntu, Segoe UI, Helvetica, sans-serif;
+      }
+    ^
+    actual {
+      font_family "Ubuntu, Segoe UI, Helvetica, sans-serif"
+    }
+  end # === it allows commas: Tommy, Harry, Sally
+
+end # === describe :font_family

data/www_app.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_runtime_dependency "yajl-ruby"            , ">= 1.2"
-  spec.add_runtime_dependency "escape_escape_escape" , ">= 0.2"
+  spec.add_runtime_dependency "escape_escape_escape" , ">= 1.4.2"
   spec.add_runtime_dependency "mustache"             , ">= 0.99"
 
   spec.add_development_dependency "multi_json"    , ">= 1.10.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: www_app
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -219,30 +219,30 @@ files:
 - lib/www_app/Clean.rb
 - lib/www_app/dsl.rb
 - lib/www_app/source.rb
-- specs/as_ruby/0000-new.rb
-- specs/as_ruby/0010-attrs.rb
-- specs/as_ruby/0011-class.rb
-- specs/as_ruby/0011-href.rb
-- specs/as_ruby/0011-id.rb
-- specs/as_ruby/0020-tag.rb
-- specs/as_ruby/0020-tag_content.rb
-- specs/as_ruby/0021-body.rb
-- specs/as_ruby/0021-form.rb
-- specs/as_ruby/0021-link.rb
-- specs/as_ruby/0021-script.rb
-- specs/as_ruby/0030-mustache.rb
-- specs/as_ruby/0040-css.rb
-- specs/as_ruby/0050-on.rb
 - specs/client-side/index.html
 - specs/client-side/index.js
 - specs/lib/config.ru
 - specs/lib/helpers.rb
 - specs/lib/qunit/qunit-1.15.0.css
 - specs/lib/qunit/qunit-1.15.0.js
-- specs/lib/sample.rb
-- specs/sampe.2.rb
-- specs/sample.3.rb
 - specs/sample.rb
+- specs/server-side/0000-new.rb
+- specs/server-side/0010-attrs.rb
+- specs/server-side/0011-class.rb
+- specs/server-side/0011-href.rb
+- specs/server-side/0011-id.rb
+- specs/server-side/0020-tag.rb
+- specs/server-side/0020-tag_content.rb
+- specs/server-side/0021-body.rb
+- specs/server-side/0021-form.rb
+- specs/server-side/0021-link.rb
+- specs/server-side/0021-page_title.rb
+- specs/server-side/0021-script.rb
+- specs/server-side/0030-mustache.rb
+- specs/server-side/0030-style.rb
+- specs/server-side/0040-css.rb
+- specs/server-side/0041-font_family.rb
+- specs/server-side/0050-on.rb
 - www_app.gemspec
 homepage: https://github.com/da99/www_app
 licenses:

data/specs/lib/sample.rb

@@ -1,23 +0,0 @@
-
-title "Hello, World!"
-
-form {
-  button "send"
-}
-
-
-col.c_1! {
-  box {
-    p.first!.hello { "Hiya" }
-  }
-}
-
-col.c_2! {
-  box {
-    p.second!.hello.again { 
-      border "1px solid #fff"
-      "Hiya, again."
-    }
-  }
-}
-

data/specs/sampe.2.rb

@@ -1,14 +0,0 @@
-
-NAME:             user
-
-/define
-  name:           username
-  is:             one_line_text
-  length between: 3, 10
-  only chars:     a-z A-Z 0-9 _ - *
-  unique:         enforce
-
-/after_create
-
-
-

data/specs/sample.3.rb

@@ -1,17 +0,0 @@
-
-I am ...
-I am bored.
-I am happy.
-I am Batman.
-I am busy.
-
-Contest:
-Page:
-Note:
-Random thought:
-New Command:
-  Make me laugh.
-
-It is friends only.
-
-