liveblog 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9163bbe970094e38ddb40af515abdd8a9daf6a60
-  data.tar.gz: b996abf14fd4b18ad55b206a384f261af7ce97c5
+  metadata.gz: 25857725f9516a9bae9edad4ca0e413093d74380
+  data.tar.gz: eea926eb619a669b4950ff544e399ffe9b5c3616
 SHA512:
-  metadata.gz: 8097f7d97ffa18d1426cf1884b0011b3ea3762514e561c70cb56ca231ef0cd1fb2ab7a976b930b2e73aaa0bb3109fd935b1cade86ae06ad6c7516be739fbcc6e
-  data.tar.gz: 57eded9c5203d106dacb07a699861bea67ef16b7af0700d66d50a99bd4651772e22ac49d3d776059c33fe9177bad05f5682a1bf12ed07bd706af704764bd3900
+  metadata.gz: 31b88c3f70e5ad247427029d4225bce071ac9b8f3eb634c0f6e04927a63561bd3a02ff14d3093193d345ef77ae3be24a6aa5a8f5fb07750db741ce2b68c9d503
+  data.tar.gz: 56e1c0c05dab8110e0b02f88512d1cc3ada28c8e7606ace587efdc6d3fb1ac6359f123ad405e2d879895c7ca39c557ca84427b0c7c6ae490c311b0f2767df78b

checksums.yaml.gz.sig

@@ -1 +1 @@
-����]���ǖ�e��f��:}biJy	�`��Z��]�T�����c��ʸ"��M��(}���>�^/��鯬��Li
���,,5y��DH�"ٽ�\��Ά���g�ͤ;}��+���.;:C#��*
+=1�?]oS�ٌ�x�{|�b�!؂4�^��K~#y����>�)TyPRq���QF����f������4��C��wv���Ҭ1�9�u3

data/lib/liveblog.rb

@@ -3,9 +3,8 @@
 # file: liveblog.rb
 
 require 'time'
-require 'dynarex'
 require 'fileutils'
-require 'martile'
+require 'dxsectionx'
 require 'simple-config'
 require 'rexle-diff'
 
@@ -347,35 +346,10 @@ EOF
     summary.add tags
     
     domain = @urlbase[/https?:\/\/([^\/]+)/,1].split('.')[-2..-1].join('.')
+    dxsx = DxSectionX.new(doc,  domain: domain, xsl_url: @xsl_url)
+    xmldoc = dxsx.to_doc
 
-    doc.root.xpath('records/section/x') do |x|
-
-      s = "=%s\n%s\n=" % [x.text.lines.first[/#\w+$/], x.text.unescape]
-
-      html = Martile.new(s, ignore_domainlabel: domain).to_html
-
-      e = x.parent
-      x.delete
-      doc2 = Rexle.new(html)
-      
-      h1 = doc2.root.element('h1')
-      details = Rexle::Element.new('details')
-      details.attributes[:open] = 'open'
-      summary = Rexle::Element.new('summary')
-      summary.add h1
-
-      details.add summary
-      doc2.root.xpath('.').each {|x| details.add x }     
-      doc2.root.add details
-      e.add doc2.root
-    end
-    
-    doc.instructions << [
-      'xml-stylesheet',
-      "title='XSL_formatting' type='text/xsl' href='#{@xsl_url}'"
-    ]
-    
-    File.write formatted2_filepath, doc.xml(pretty: true)
+    File.write formatted2_filepath, xmldoc.xml(pretty: true)
         
     # save the related CSS file locally if the file doesn't already exist
     if not File.exists? 'liveblog.css' then
@@ -388,7 +362,7 @@ EOF
     
     unless File.exists? raw_formatted_filepath then
 
-      doc2 = doc.root.deep_clone
+      doc2 = xmldoc.root.deep_clone
 
       doc2.root.traverse do |node|
         node.attributes[:created] = Time.now.to_s

data/lib/liveblog.xsl

@@ -30,7 +30,7 @@ xml version="1.0" encoding="utf-8"?>
   
   <div id='summary'>
   <ul>
-  <xsl:for-each select="records/section/section">
+  <xsl:for-each select="records/section">
     <!--<xsl:sort select='../@id' order='descending'/>-->
      <li><a href='#{@id}'><xsl:value-of select='details/summary/h1'/></a></li>
   </xsl:for-each>  
@@ -68,7 +68,7 @@ xml version="1.0" encoding="utf-8"?>
   <div style='clear:both'/>
   <xsl:for-each select="records/section">
      <!--<xsl:sort select='@id' order='descending'/>-->
-     <xsl:copy-of select='section'/>
+     <xsl:copy-of select='.'/>
 
   </xsl:for-each>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - James Robertson
@@ -31,48 +31,28 @@ cert_chain:
   WoOSxvsTN7qoA8F0W4mkDpf+HhHxBOLTPykcHMIlx2gILLnNraaZ1rJlZAqWABGj
   v8lGgeeqqjd5QA==
   -----END CERTIFICATE-----
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dynarex
+  name: dxsectionx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.23
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.23
-- !ruby/object:Gem::Dependency
-  name: martile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.20
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.20
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: simple-config
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Uses the Dynarex gem to create a daily live blog. Convenient for grouping