markaby 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d412822a03a87f0132e150f81b241078b5a991609dc49226789918f8ae95214
-  data.tar.gz: 349ae2eefe3eccc8e421d5e86fa9b5bce675e2a1a05f8dfc96cfc946a50fcb16
+  metadata.gz: a6bf58bcd04bd76cee97bdf153192eae567d6607aeb7461b0cd006bd618e0b0d
+  data.tar.gz: adfa965e6b1b10ab06f64e09077e4cecd4cd42b0eb11dfb16c976941bab55635
 SHA512:
-  metadata.gz: 944f0be9c29415e0cedb660c93a058a7e7e66d8a350212ab97ab57c9017243351ed577cb0ba381db3cfe37d8a56778d1f1345625b125671d059e77c4d33b9f43
-  data.tar.gz: ff5ee832b8a99c99c86280ba22d658c36205941e245b5375ec1c3d35d94e98387f81e6dc5e29f6467bfc7ad7072f83ab1a959d3d2d1fb8e43b656e1dda091725
+  metadata.gz: c919ddcba6bfb3ce0be0f24e5d63f23f418b552261fde81a9e9ab286c2dcabb3025fbbfe7e0cb3b0075931f67fa0360acbdce0d22320ed6d4567799a9017956a
+  data.tar.gz: a5cef34204f13670992f9ccbe82b3ab42e9743d59328f5a6292b5a04c643d30ce910cce09ac1c1e08635d8a7aab4e21344a28ac97f2e8c677c0d159b922864c6

data/CHANGELOG.rdoc

@@ -1,5 +1,15 @@
 = HEAD
 
+= 0.9.4
+
+* Earlopain - Fix compatibility with latest builder release #49
+ - https://github.com/markaby/markaby/pull/49
+* Aesthetikx Add Missing HTML5 Tags #48 - https://github.com/markaby/markaby/pull/48
+* MrPowers - Small Refactorings - https://github.com/markaby/markaby/pull/50, https://github.com/markaby/markaby/pull/34
+
+= 0.9.3
+= 0.9.2
+
 = 0.9.1
 
 * update release tasks [tech task]

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.1.3)
     diff-lcs (1.5.0)
     json (2.6.3)
@@ -15,7 +15,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.0)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -58,6 +59,7 @@ GEM
       rubocop-performance (~> 1.16.0)
     standardrb (1.0.1)
       standard
+    strscan (3.1.0)
     test-unit (3.5.8)
       power_assert
     unicode-display_width (2.4.2)

data/lib/markaby/builder.rb

@@ -97,20 +97,9 @@ module Markaby
       @_helper = helper
     end
 
-    def metaclass(&block)
-      metaclass = class << self; self; end
-      metaclass.class_eval(&block)
-    end
-
-    private :metaclass
-
     def locals=(locals)
       locals.each do |key, value|
-        metaclass do
-          define_method key do
-            value
-          end
-        end
+        define_singleton_method(key) { value }
       end
     end
 
@@ -245,7 +234,7 @@ module Markaby
   # is never used, though, and the stream stays intact.
   #
   # For a more practical explanation, check out the README.
-  class Fragment < ::Builder::BlankSlate
+  class Fragment < BasicObject
     def initialize(*args)
       @stream, @start, @length = args
       @transformed_stream = false
@@ -255,6 +244,12 @@ module Markaby
       undef_method method if method_defined?(method)
     end
 
+    def to_s
+      transform_stream unless transformed_stream?
+      @str.to_s
+    end
+    alias_method :to_str, :to_s
+
     private
 
     def method_missing(...)
@@ -271,7 +266,7 @@ module Markaby
 
       # We can't do @stream.slice!(@start, @length),
       # as it would invalidate the @starts and @lengths of other Fragment instances.
-      @str = @stream[@start, @length].to_s
+      @str = @stream[@start, @length].join.to_s
       @stream[@start, @length] = [nil] * @length
     end
 

data/lib/markaby/html5.rb

@@ -44,8 +44,10 @@ module Markaby
       bdi: Attrs,
       canvas: Attrs,
       command: Attrs,
+      data: Attrs,
       datalist: Attrs,
       details: Attrs,
+      dialog: Attrs,
       embed: Attrs,
       figure: Attrs,
       figcaption: Attrs,
@@ -53,17 +55,23 @@ module Markaby
       header: Attrs,
       hgroup: Attrs,
       keygen: Attrs,
+      main: Attrs,
       mark: Attrs,
       menu: Attrs,
+      menuitem: Attrs,
       meter: Attrs,
       nav: Attrs,
       output: Attrs,
+      picture: Attrs,
       progress: Attrs,
       rp: Attrs,
       rt: Attrs,
       ruby: Attrs,
       section: Attrs,
       source: Attrs,
+      summary: Attrs,
+      svg: Attrs,
+      template: Attrs,
       time: Attrs,
       track: Attrs,
       video: Attrs,
@@ -77,6 +85,8 @@ module Markaby
       base: [:target],
       button: [:autofocus, :form, :formaction, :formenctype, :formmethod,
         :formnovalidate, :formtarget],
+      data: [:value],
+      dialog: [:open],
       fieldset: [:form, :disabled, :name],
       form: [:novalidate],
       label: [:form],
@@ -90,6 +100,8 @@ module Markaby
       link: [:sizes],
       meta: [:charset],
       menu: [:type, :label],
+      menuitem: [:checked, :command, :default, :disabled, :icon, :label,
+        :radiogroup, :type],
       object: [:form, :typemustmatch],
       ol: [:reversed],
       output: [:form],

data/lib/markaby/version.rb

@@ -1,7 +1,7 @@
 module Markaby
   MAJOR = 0
   MINOR = 9
-  TINY = 3
+  TINY = 4
 
   VERSION = "#{MAJOR}.#{MINOR}.#{TINY}"
 end

data/spec/markaby/markaby_spec.rb

@@ -47,6 +47,16 @@ describe Markaby do
     builder.three.should == "four"
   end
 
+  it "should create locals as singleton methods" do
+    builder = Markaby::Builder.new
+    builder.locals = { :one => "two", :three => "four" }
+    builder.singleton_methods.should == [:one, :three]
+  end
+
+  it "should work with builder bang methods" do
+    mab { instruct! }.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+  end
+
   it "should be able to produce the correct html from a fragment" do
     str = ""
     str += "<div>"
@@ -122,6 +132,45 @@ describe Markaby do
     builder.three.should == "four"
   end
 
+  it "should be able to concat with to_s" do
+    str = ""
+    str += "<div class=\"title\">"
+    str += "Rock Bottom <span>by Robert Wyatt</span>"
+    str += "</div>"
+
+    generated = mab {
+      div.title { "Rock Bottom " + span("by Robert Wyatt").to_s }
+    }
+
+    generated.should == str
+  end
+
+  it "should be able to contact without to_s, but with +" do
+    str = ""
+    str += "<div class=\"title\">"
+    str += "Rock Bottom <span>by Robert Wyatt</span>"
+    str += "</div>"
+
+    generated = mab {
+      div.title { "Rock Bottom " + span("by Robert Wyatt") }
+    }
+
+    generated.should == str
+  end
+
+  it "should be able to contact by interpolation" do
+    str = ""
+    str += "<div class=\"title\">"
+    str += "Rock Bottom <span>by Robert Wyatt</span>"
+    str += "</div>"
+
+    generated = mab {
+      div.title { "Rock Bottom #{span("by Robert Wyatt")}" }
+    }
+
+    generated.should == str
+  end
+
   it "should be able to produce the correct html from a fragment" do
     str = ""
     str += "<div>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markaby
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Scott Taylor
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A pure ruby based, html markup language