liveblog 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d020cc9ba1d0b714720a4895462b8fa568c38b76
-  data.tar.gz: e9efdb606b0b99a21570674120eac50eaedb69f6
+  metadata.gz: 17a23b8215e37db1ab75a36b3fd42555339128e0
+  data.tar.gz: e404b6d3886c2f0e2e746f01ce239f0ad0981436
 SHA512:
-  metadata.gz: 7fb55b6886029261c07bdfa6e3b622be1b265c8efd70fb55a66050062615eccb7218fe4dd42f583057ba74208b96dad7283bf690d8b258b3c4a9b11d2a8d1fc0
-  data.tar.gz: 93992fdfcae3b062c1f957c78600aabfc2b12d5fbeca52d20c04936e954230be594a3f8e7f8bf2a57195ae0706216d38ccd10b2b354814ed418023aa1ea0823f
+  metadata.gz: fc3a70ca3de1c7e834c5a42d0f2bf66a18817e3a57bad7ea8ca7482596e78d91af735efacbe566eece5a0a98aed76faad4fd21d3c2e84f0136bee8f73c0cd2cd
+  data.tar.gz: d7f0f7004c33f48ed0de4ed05abb35c71fe2f45ab307a025724682b799b2c72bd982aa1890b49661d0c9b344a21cf26fc80b6fd480feba858506a74d90bb1a3a

data/lib/liveblog.rb

@@ -5,6 +5,7 @@
 require 'time'
 require 'dynarex'
 require 'fileutils'
+require 'martile'
 
 class LiveBlog
 
@@ -16,9 +17,7 @@ class LiveBlog
     @t = Time.now
     dxfile = File.join(path(), 'index.xml')
 
-    puts 'fxfile: ' + dxfile.inspect
     File.exists?(dxfile) ? @dx = Dynarex.new(dxfile) : new_file()      
-    puts '@dx : ' + @dx.inspect
       
   end
 
@@ -41,15 +40,18 @@ EOF
     
   end
   
-  def add_entry(hashtag, entry)
+  def add_entry(hashtag, raw_entry)
     
+    entry = String.new(raw_entry)
     a =  @dx.all
     rec = a.find {|section| section.x.lstrip.lines.first =~ /#\s*#{hashtag}/}
     
     if rec then
-      rec.x += "\n" + entry
+      
+      hashtag = entry.slice!(/#\w+$/)      
+      rec.x += "\n" + entry.rstrip
       save()      
-      hashtag = entry[/#\w+$/]
+
       [true, "%s %s/%s/index.html%s" % [entry, @urlbase, path(), hashtag]]
     else
       [false, 'rec not found']
@@ -69,6 +71,7 @@ EOF
     
     @dx.save File.join(path(), 'index.xml')
     File.write File.join(path(), 'index.txt'), @dx.to_s
+    save_html()
   end
   
   private
@@ -78,10 +81,28 @@ EOF
     File.join [@t.year.to_s, Date::MONTHNAMES[@t.month].downcase[0..2], \
                                                                 @t.day.to_s]
   end
+  
+  def save_html()
+    
+    newfilepath = File.join(path(), 'formatted.xml')
+    FileUtils.cp File.join(path(), 'index.xml'), newfilepath
+    
+    doc = Rexle.new File.read(newfilepath)
+    
+    doc.root.xpath('records/section/x') do |x|
+       html = RDiscount.new(Martile.new(x.text).to_html).to_html
+       e = x.parent
+       x.delete
+       e.add Rexle.new("<x>%s</x>" % html).root
+    end
+
+    File.write newfilepath, doc.xml(pretty: true)
+    
+  end
 
   def ordinalize(n)
     n.to_s + ( (10...20).include?(n) ? 'th' : 
               %w{ th st nd rd th th th th th th }[n % 10] )
   end  
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -42,7 +42,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,27 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.4
+- !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.1
+  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.1
 description: 
 email: james@r0bertson.co.uk
 executables: []