liveblog 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d74a7db4baa06c88624936dc0378ef25b7e886e
-  data.tar.gz: 23bf500a909e1cab502c8323d71e31c94972c522
+  metadata.gz: 5afbb5af5239ae78124596c00158a5c81d6dcb43
+  data.tar.gz: 66f86ba416a0d0e669b98fba87bc56a8a871f591
 SHA512:
-  metadata.gz: 54c3706263e5ba672de086a9c66d9a4e208063cb54376cb2d90411825053dbc8591c517ad2461a608142b02e13ea15adb739b4e19f16bf0220d6d91a2279751b
-  data.tar.gz: 8a83bcb6e74282653bcae1719b52878e7d9177601d1502935d20aa4727ba96f83d6dc08efc522581a75272951467043397cfaf1e5c132bc893ae6c2fb7295874
+  metadata.gz: a687a57d24753358e984c68436fe812e3b17a04e054af90e6724756ca430b18d9078c49ca71cec0caf280d614917dcf12c3df2f392cd84d2a3c3aa1d218a0ba9
+  data.tar.gz: 0e26b0551567985dfa1dd1f5c05b042aa0f314a2cb4e9ffb18e019758bbf4ce3773e585a4a033f5fa245ccd4882d8ea14bbbfb70ea7aa539db0b1b6abbc99b2d

data/lib/liveblog.rb

@@ -20,12 +20,48 @@ class LiveBlog
     File.exists?(dxfile) ? @dx = Dynarex.new(dxfile) : new_file()      
       
   end
+  
+  def add_entry(raw_entry)
+
+    hashtag = raw_entry[/#\w+$/]
+    
+    success, msg = case raw_entry
+    when /^#\s*\w.*#\w+$/ then add_section raw_entry
+    when /#\w+$/ then add_section_entry raw_entry, hashtag      
+    else [false, 'no valid entry found']
+    end
+    
+    return [false, msg] unless success
+    
+    save()
+    [true, "%s %s/%s/index.html%s" % [raw_entry, @urlbase, path(), hashtag]]
+  end    
+
+  
+  private
 
+  
+  def add_section_entry(raw_entry, hashtag)
+    
+    rec = @dx.all.find {|section| section.x.lstrip.lines.first =~ /#{hashtag}/}
+    
+    return [false, 'rec not found'] unless rec
+          
+    rec.x += "\n\n" + raw_entry.rstrip
+    [true, 'entry added to section ' + hashtag]
+  end
+  
+  def add_section(raw_entry)
+
+    @dx.create({x: raw_entry})    
+    [true, 'section added']
+  end  
+  
   def new_file
 
 s =<<EOF    
 <?dynarex schema="sections[title]/section(x)"?>
-title: LiveBlog #{ordinalize(@t.day) + @t.strftime(" %B %Y")} 
+title: LiveBlog #{ordinalize(@t.day) + @t.strftime(" %B %Y")}
 --#
 
 EOF
@@ -40,47 +76,18 @@ EOF
     
   end
   
-  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
-      
-      hashtag = entry.slice!(/#\w+$/)      
-      rec.x += "\n" + entry.rstrip
-      save()      
-
-      [true, "%s %s/%s/index.html%s" % [entry, @urlbase, path(), hashtag]]
-    else
-      [false, 'rec not found']
-    end    
-  end
-  
-  def add_section(entry)
+  def path
 
-    hashtag = entry[/#\w+$/]
-    @dx.create({x: entry})
-    save()
-    
-    [true, "%s %s/%s/index.html%s" % [entry, @urlbase, path(), hashtag]]
+    File.join [@t.year.to_s, Date::MONTHNAMES[@t.month].downcase[0..2], \
+                                                                @t.day.to_s]
   end
-
+  
   def save()
     
     @dx.save File.join(path(), 'index.xml')
     File.write File.join(path(), 'index.txt'), @dx.to_s
     save_html()
-  end
-  
-  private
-  
-  def path
-
-    File.join [@t.year.to_s, Date::MONTHNAMES[@t.month].downcase[0..2], \
-                                                                @t.day.to_s]
-  end
+  end  
   
   def save_html()
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liveblog
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   WoOSxvsTN7qoA8F0W4mkDpf+HhHxBOLTPykcHMIlx2gILLnNraaZ1rJlZAqWABGj
   v8lGgeeqqjd5QA==
   -----END CERTIFICATE-----
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex