belletrist 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a59242bc76875cc57af10fc601d9f873eaeb3b5423f84a7f7d52b28360434db
-  data.tar.gz: 4c4ddb3a7ba0e25b0b354ce4fc753a5523b9e5b02b8621b72f6a04e23e00103f
+  metadata.gz: 1548984783b84be9e93ebfb48bec3b847b941d4f5423d4b62b6b41e1949143d2
+  data.tar.gz: 9f8a5ed9ce20dde4164b54082c63f178292ab36722041b07f0731c19b3781172
 SHA512:
-  metadata.gz: 933f94556b186d146d75ec205be968ab2928bf8be727a1d162f2e1de8585cb027ee6b626ee12b499644e33015d7a11152ac7948c1ee50007a93f90e44d73bc62
-  data.tar.gz: d642df58fde3590cfdbfc6985cbfb320c34eafff083a5d40483668e7c402af684a5b5b24d876de48d711665ef18c3ae4a75c273313f980fa61e1b235f2d6965d
+  metadata.gz: eff3997808304d963d70831bfe2465ff10ab98ca9590836eeba16751fc9f323a2ffe1d95b14e1b095e39e24400f0d6ee882c26bdd1286763051b2e62b7921bfc
+  data.tar.gz: 5d687259b269539d2ae70da5d3075f7648ad35e477024d0f7154327f61fc42197af96c8b8abe79a8ab8603ed6c610260e30c7db94a6b5f23ec19b4016e7be805

data/CHANGELOG.md

@@ -1,7 +1,14 @@
-# Scribe Changelog
+# Belletrist Changelog
 This file contains general, high level explanations of the differences between versions. Please check the commmit
 history for further details.
 
+## 1.1.2
+* Fixed issue with how the `lang` argument was declared for HTML documents, causing it to not be added properly.
+
+## 1.1.1
+* Ensuring the sanitize the key of a JSON object entry. While normally these would be converted from Symbols,
+  it should still be sanitized all the same.
+
 ## 1.1.0
 * Added JSON DSL. Supports the same `with` mechanism as the HTML DSL, and generally functions similarly.
 * Rewrote `HTML::Element` to inherit directly from `Belletrist::BaseCollector`.

data/lib/belletrist/{abstract.rb → collectors.rb}

@@ -20,10 +20,6 @@ module Belletrist
       raise NotImplementedError
     end
 
-    def p(*args, &block)
-      method_missing(:p, *args, &block)
-    end
-
     def with(ele, &block)
       @elements.push ele
       ele.instance_eval(&block) if block

data/lib/belletrist/html.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './abstract'
+require_relative './collectors'
 
 module Belletrist::HTML
   class Element < Belletrist::BaseCollector
@@ -41,6 +41,10 @@ module Belletrist::HTML
       Element.new(name, args)
     end
 
+    def p(*args, &block)
+      method_missing(:p, *args, &block)
+    end
+
     private def import_attribute(hash)
       hash.each do |entry|
         k, v = entry
@@ -68,13 +72,12 @@ module Belletrist::HTML
   end
 
   class Document
-    def initialize(spec=V5, lang=nil)
+    def initialize(spec=V5, lang: nil)
       super()
-      body_args = []
-      body_args.push lang if lang
+      language = {'lang': lang} if lang
 
       @head = Element.new 'head'
-      @body = Element.new 'body', body_args
+      @body = Element.new 'body', [language]
       @spec = spec
     end
 

data/lib/belletrist/json.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative './abstract'
+require_relative './collectors'
 
 module Belletrist::JSON
-  def self.to_value(v)
+  def self.sanitize(v)
     if v.nil?
       'null'
     elsif v.is_a?(String)
@@ -72,7 +72,7 @@ module Belletrist::JSON
       value = '{'
       @elements.each_index do |i|
         item = @elements[i]
-        value += "\"#{item.key}\":#{JSON.to_value(item.value)}"
+        value += "#{JSON.sanitize(item.key)}:#{JSON.sanitize(item.value)}"
         value += ',' unless i + 1 == @elements.length
       end
       value + '}'
@@ -119,7 +119,7 @@ module Belletrist::JSON
       value = '['
       @elements.each_index do |i|
         item = @elements[i]
-        value += JSON.to_value(item)
+        value += JSON.sanitize(item)
         value += ',' unless i + 1 == @elements.length
       end
       value + ']'

data/lib/belletrist/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Belletrist
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belletrist
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Juniper
@@ -26,7 +26,7 @@ files:
 - README.md
 - belletrist.gemspec
 - lib/belletrist.rb
-- lib/belletrist/abstract.rb
+- lib/belletrist/collectors.rb
 - lib/belletrist/html.rb
 - lib/belletrist/json.rb
 - lib/belletrist/version.rb