RubyGems - html_rb - Versions diffs - 1.0.0 → 2.0.0 - Mend

html_rb 1.0.0 → 2.0.0

Files changed (5) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 907ff51c68c17cdcf035eacaa2ef82b3a2a3050b
-  data.tar.gz: d70f50da58bc048b61ebf02873028dc3794f0a64
+SHA256:
+  metadata.gz: ae6b4e2173e7362e79f1bf874e6a7090b70e015a4e2fd26c5fe423004b578c7c
+  data.tar.gz: 802669903c2e3b34fd87f7f32dc64b7dd66b4f3ced64f975afaad3791bdfd073
 SHA512:
-  metadata.gz: 22c13f0bbdc20394782c704e59a8d92dde4d0a7361f4d8eaa83109feb21d2ce905578b2ac7c9dd0308378881f512a6912f609c24f761fc756f6d691bb116a6bc
-  data.tar.gz: a3098a8f2623954a6e81a1aece656ee22dd598afa76e31c6b404ce4028e958a2fa82148bf042525b1d7ec2867b8799d3ea0d2ea45186e5836e6d1d22b654b3a6
+  metadata.gz: c4e2292acfa4c0a264e2835bc886a7cd03201ddfe33ed3d6b2cd3a65981af6d470ebd459aaba90390d39815de807ed92640d9f0d5d8b8ca382c45897168f8fca
+  data.tar.gz: df9a847a624f75eed9f7efa4d61a24b750b141e59f804552d9c50264d617e2d40895fd913199886751d474267ef59c497a2202747f942ef7b844c4eb4a5c56cf

data/lib/html_rb.rb CHANGED Viewed

@@ -1,83 +1,17 @@
-require 'html_rb/constants'
 module HtmlRB
-  VERSION = "1.0.0".freeze
+  VERSION = "2.0.0".freeze
   Error = Class.new(StandardError)
+end
-  class Tag
-    def initialize(name=nil,content=nil,**attrs,&block)
-      @strings = []
-      build name, content, **attrs, &block
-    end
-    def to_s
-      @strings.join
-    end
-    private
-    def build(name=nil,content=nil,**attrs,&block)
-      void = HtmlRB::VOID_ELEMENTS.include?(name)
-      raise HtmlRB::Error, "May not provide both content and block" if content && block_given?
-      raise HtmlRB::Error, "Void elements cannot enclose content" if void && (content || block_given?)
-      @strings << "<#{[name,attribute_string(attrs)].join(" ").strip}>" if name
-      unless void
-        @strings << content if content
-        instance_eval(&block) if block_given?
-        @strings << "</#{name}>" if name
-      end
-    end
-    # Define all the tag methods
-    (HtmlRB::STD_ELEMENTS + HtmlRB::VOID_ELEMENTS).each do |el|
-      define_method(el) do |content=nil,**attrs,&block|
-        build el, content, **attrs, &block
-      end
-    end
-    # Used for Text Nodes
-    def text(content)
-      build nil, content
-    end
-    # ATTRIBUTE HANDLING
-    def attribute_string(hash={})
-      hash.delete_if{|k,v| v.nil? || v == "" }
-          .map{|k,v| attribute_pair(k,v) }
-          .compact
-          .join(" ")
-    end
-    def attribute_pair(k,v)
-      if HtmlRB::BOOL_ATTRS.include?(k)
-        attribute_key(k) if v
-      else
-        %Q|#{attribute_key(k)}="#{v}"|
-      end
-    end
-    def attribute_key(k)
-      str = k.to_s
-      if str.start_with? "!"
-        str.slice!(0)
-      else
-        str.gsub!("_","-")
-      end
-      str
-    end
-  end
+require 'html_rb/constants'
+require 'html_rb/tag'
-  def html(content=nil,document:false,doctype:"html",**attrs,&block)
-    name = nil
-    dt = ""
+module HtmlRB
+  module_function def html(content=nil, document: false, **attrs, &block)
     if document
-      name = :html
-      dt = "<!DOCTYPE #{doctype}>" if doctype
+      "<!DOCTYPE html>" + Tag.new('html', content, **attrs, &block).to_s
+    else
+      Tag.new(nil, content, **attrs, &block).to_s
     end
-    dt + Tag.new(name, content, **attrs, &block).to_s
   end
-  alias_method :markup, :html
-  module_function :markup
 end

data/lib/html_rb/constants.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+require 'set'
 module HtmlRB
   STD_ELEMENTS=[
     :a,
@@ -107,7 +109,7 @@ module HtmlRB
     :source,
     :track,
     :wbr,
-    ].to_set.freeze
+  ].to_set.freeze
   BOOL_ATTRS=[
     :allowfullscreen,

data/lib/html_rb/tag.rb ADDED Viewed

@@ -0,0 +1,76 @@
+module HtmlRB
+  class Tag
+    def initialize(name=nil,content=nil,**attrs,&block)
+      @strings = []
+      tag name, content, **attrs, &block
+    end
+    def to_s
+      @strings.join
+    end
+    def self.register(tag_name, void: false)
+      method_name = tag_name.to_s.downcase.gsub('-','_') # Rubify the tag name.
+      define_method(method_name) do |content=nil,**attrs,&block|
+        tag tag_name, content, _void: void, **attrs, &block
+      end
+    end
+    def self.unregister(tag_name)
+      method_name = tag_name.to_s.downcase.gsub('-','_') # Rubify the tag name.
+      remove_method method_name
+    end
+    # Define all the tag methods
+    HtmlRB::STD_ELEMENTS.each {|tag_name| register tag_name }
+    HtmlRB::VOID_ELEMENTS.each {|tag_name| register tag_name, void: true }
+    private
+    def tag(name=nil, content=nil, _void: false, **attrs, &block)
+      void = _void
+      raise HtmlRB::Error, "May not provide both content and block" if content && block_given?
+      raise HtmlRB::Error, "Void elements cannot enclose content" if void && (content || block_given?)
+      @strings << "<#{[name,attribute_string(attrs)].join(" ").strip}>" if name
+      return if void
+      @strings << content if content
+      instance_eval(&block) if block_given?
+      @strings << "</#{name}>" if name
+    end
+    # Used for Text Nodes
+    def text(content)
+      tag nil, content
+    end
+    # Really, text is just appending a string, so we can append anything.
+    # But saying `text` before some block of HTML stored in a variable feels
+    # wrong, so we'll add an alias `render` which feels less strange.
+    alias render text
+    # ATTRIBUTE HANDLING
+    def attribute_string(hash={})
+      hash.delete_if{|k,v| v.nil? || v == "" }
+          .map{|k,v| attribute_pair(k,v) }
+          .compact
+          .join(" ")
+    end
+    def attribute_pair(k,v)
+      if HtmlRB::BOOL_ATTRS.include?(k)
+        attribute_key(k) if v
+      else
+        %Q|#{attribute_key(k)}="#{v}"|
+      end
+    end
+    def attribute_key(k)
+      return k if k.is_a?(String)
+      k.to_s.gsub("_","-")
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html_rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrew Burleson
-autorequire:
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2021-08-14 00:00:00.000000000 Z
 dependencies: []
 description: A beautifully simple DSL for writing HTML in ruby. Check out the readme
   at github.com/burlesona/html_rb for detailed examples, or see the tests.
@@ -19,11 +19,12 @@ extra_rdoc_files: []
 files:
 - lib/html_rb.rb
 - lib/html_rb/constants.rb
+- lib/html_rb/tag.rb
 homepage: http://github.com/burlesona/html
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -31,17 +32,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.5.1
-signing_key:
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: A beautifully simple DSL for writing HTML in ruby
 test_files: []
-has_rdoc: