glimmer-dsl-xml 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c774d77fe8923afccfdc96d47731da399f3743c5b42aeaa569288d41438e3ca
-  data.tar.gz: 31d231cbb7893502c0322df99e3c8c2b36d086ffa9357708626476119bb0a70c
+  metadata.gz: b685c6e5771e631dde5326ebcaf4687aa92c7d89e6cf39df8b74eb95e99b4348
+  data.tar.gz: 9392982b3c7c3e3709dcf89793c0f85793dff98f953906e545a9f176e9438e47
 SHA512:
-  metadata.gz: 4316b94b77344436530a5d6e6ffe3db75f2aaa8997fc9f6418c4317a327bc614fd7820bd179142f1833ba8a629e3b9f3673acd9a452de3b552b4c7a48d4b3b88
-  data.tar.gz: 81a8014a802c731077eae762263284691ed9e7f2d4d9b82ac0409333a4693778a67736919fca2a8620787e2b280badcaf43d67c8f8d5dfafa3b1141bca78b6f0
+  metadata.gz: c3e4b76284985f4db72cbcbbf621eece60e17c9a640eb61caec19d74f1d47b3f64ac8bf92de084fe15da7f58cba37dd9dea3c45cd4e93924178a1bb6163546c4
+  data.tar.gz: a42597d205467c6e63830ec4cc831747116571adb0d37fd5918ea597ad8f64222cc8a3fa126c1c67a62b959eb1eafbfffc63d0589495257a82952111c1cfd628

data/README.md

@@ -1,11 +1,11 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for XML 1.1.0 (& HTML)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for XML 1.2.0 (& HTML)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-xml.svg)](http://badge.fury.io/rb/glimmer-dsl-xml)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-xml.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-xml)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-xml/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-xml?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/65f487b8807f7126b803/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-xml/maintainability)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for XML provides Ruby syntax for building XML (eXtensible Markup Language) documents.
+[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for XML provides Ruby syntax for building XML (eXtensible Markup Language) and HTML documents.
 
 Within the context of desktop development, Glimmer DSL for XML is useful in providing XML data for the [SWT Browser widget](https://github.com/AndyObtiva/glimmer-dsl-swt/tree/master#browser-widget).
 
@@ -23,7 +23,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-gem install glimmer-dsl-xml -v 1.1.0
+gem install glimmer-dsl-xml -v 1.2.0
 ```
 
 Note: When using JRuby, `jgem` is JRuby's version of `gem` command. RVM allows running `gem` as an alias in JRuby. Otherwise, you may also run `jruby -S gem install ...`
@@ -38,7 +38,7 @@ That's it! Requiring the gem activates the Glimmer XML DSL automatically.
 
 Add the following to `Gemfile` (after `glimmer-dsl-swt` and/or `glimmer-dsl-opal` if included too):
 ```
-gem 'glimmer-dsl-xml', '~> 1.1.0'
+gem 'glimmer-dsl-xml', '~> 1.2.0'
 ```
 
 And, then run:
@@ -67,13 +67,19 @@ Here are all the Glimmer XML DSL top-level keywords:
 
 Element properties are typically passed as a key/value hash (e.g. `section(id: 'main', class: 'accordion')`) . However, for properties like "selected" or "checked", you must leave value `nil` or otherwise pass in front of the hash (e.g. `input(:checked, type: 'checkbox')` )
 
-Example (full HTML document):
+You may try the following examples in IRB after installing the [glimmer-dsl-xml](https://rubygems.org/gems/glimmer-dsl-xml) gem.
+
+Just make sure to require the library and include Glimmer first:
 
 ```ruby
 require 'glimmer-dsl-xml'
 
 include Glimmer
+```
+
+Example (full HTML document):
 
+```ruby
 @html = html {
   head {
     meta(name: "viewport", content: "width=device-width, initial-scale=2.0")
@@ -82,6 +88,7 @@ include Glimmer
     h1 { "Hello, World!" }
   }
 }
+
 puts @html
 ```
 
@@ -94,13 +101,10 @@ Output:
 Example (partial HTML fragment):
 
 ```ruby
-require 'glimmer-dsl-xml'
-
-include Glimmer
-
 @html = html {
   h1 { "Hello, World!" }
 }
+
 puts @html
 ```
 
@@ -113,35 +117,29 @@ Output:
 Example (basic XML):
 
 ```ruby
-require 'glimmer-dsl-xml'
-
-include Glimmer
-
 @xml = xml {
-  h1 { "Hello, World!" }
+  greeting { "Hello, World!" }
 }
+
 puts @xml
 ```
 
 Output:
 
 ```
-<h1>Hello, World!</h1>
+<greeting>Hello, World!</greeting>
 ```
 
 Example (XML namespaces using `name_space` keyword):
 
 ```ruby
-require 'glimmer-dsl-xml'
-
-include Glimmer
-
 @xml = name_space(:acme) {
   product(:id => "thesis", :class => "document") {
     component(:id => "main") {
     }
   }
 }
+
 puts @xml
 ```
 
@@ -154,14 +152,11 @@ Output:
 Example (XML namespaces using dot operator):
 
 ```ruby
-  require 'glimmer-dsl-xml'
-  
-  include Glimmer
-  
   @xml = xml {
     document.body(document.id => "main") {
     }
   }
+  
   puts @xml
 ```
 
@@ -174,10 +169,6 @@ Output:
 Example (custom tag):
 
 ```ruby
-require 'glimmer-dsl-xml'
-
-include Glimmer
-
 puts tag(:_name => "p") {"p is a reserved keyword in Ruby"}
 ```
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/glimmer/dsl/xml/name_space_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 - Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -46,7 +46,7 @@ module Glimmer
           Glimmer::XML::Node.new(parent, args[0].to_s, :_name_space_context => true)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           node = block.call(parent)
           unless node.is_a?(String)
             name_space_visitor = Glimmer::XML::NameSpaceVisitor.new(parent.name)

data/lib/glimmer/dsl/xml/node_parent_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 - Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -30,8 +30,8 @@ module Glimmer
         include ParentExpression
         include Glimmer
 
-        def add_content(parent, &block)
-          return_value = block.call(parent)      
+        def add_content(parent, keyword, *args, &block)
+          return_value = block.call(parent)
           if !return_value.is_a?(Glimmer::XML::Node) and !parent.children.include?(return_value)
             text = return_value.to_s
             first_match = text.match(/[#][^{]+[{][^}]+[}]/)

data/lib/glimmer/xml/node.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 - Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -66,7 +66,7 @@ module Glimmer
       def method_missing(symbol, *args, &block)
         @is_name_space = true
         parent.children.delete(self) if parent
-        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::XML::XmlExpression.new) {@tag = super}
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::XML::XmlExpression.new, name, attributes) {@tag = super}
         @tag
       end
       

metadata

@@ -1,33 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-xml
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
@@ -238,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for XML