mns_timeline 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82251504958ae2871d01ac352a133918917a26af
-  data.tar.gz: 7ba144ada135968256657a6fd19be70c8856b8ea
+  metadata.gz: 5f3990871c1224f957a2e1df07db7346d28d9cb6
+  data.tar.gz: d21fda35abe1f931bb4e00665187ef881c6acb18
 SHA512:
-  metadata.gz: 51554a5528f4b53556d5945460a7b47da8c88e578b533b66b4a60480a2f07964e102854f8ac0eee10803a49c85774ee78d3c01384bf3376567f4f517c7f0bd61
-  data.tar.gz: 71fdbb5a46c81ad18940c1175294b8f82eb734398ed50a847c44b0caf006831020902b3c0d82dbc28be8f4d109b4f7059caf4ea2a2bfe7c80f81c4f990a181de
+  metadata.gz: 0410076073b440ccb4cda74083128028d1691d4e53b6581c90201eb15bdf1cef02f834e48b6ddb0be8bf8be2e5fefd39737d1919b9e0b7c011474eeab126c1c4
+  data.tar.gz: d83cd5a5dd0573b813c4f5dba39e4e1a231fe52da3c5fdf4dbd7b396d375160441b6b2f4bb2ca83e905b7f2b02e30aa0444dc498114e48bc07c6bddcd046c700

data/lib/mns_timeline.rb

@@ -4,14 +4,15 @@
 
 
 require 'sps-sub'
-require "sqlite3"
 require 'fileutils'
 require 'daily_notices'
+require 'recordx_sqlite'
 
 
 class MNSTimeline < SPSSub
 
-  def initialize(timeline: 'notices', host: 'sps', port: 59000, dir: '.', options: {})
+  def initialize(timeline: 'notices', host: 'sps', port: 59000, 
+                 dir: '.', options: {})
     
     # note: a valid url_base must be provided
     
@@ -24,8 +25,25 @@ class MNSTimeline < SPSSub
     }.merge(options)
 
     super(host: host, port: port)
-    @filepath = dir
-    @timeline = timeline
+    
+    timeline_dir = File.join(dir, timeline)
+
+    @notices = DailyNotices.new timeline_dir, 
+        @options.merge(identifier: timeline, title: timeline.capitalize)
+    
+    dbfilename = File.join(timeline_dir, 'timeline.db')
+    
+    table = {
+      notices: {
+        id: 0, 
+        date: Date.today,
+        topic: '',
+        title: '', 
+        description: '',
+        link: ''
+      }
+    }
+    @rxnotices = RecordxSqlite.new(dbfilename, table: table)
 
   end
 
@@ -37,52 +55,38 @@ class MNSTimeline < SPSSub
 
   def ontopic(timeline_topic, msg)
 
-    puts "%s: %s %s"  % [timeline_topic, Time.now.to_s, msg.inspect]
+    puts "%s %s: %s"  % [Time.now.to_s, timeline_topic, msg.inspect]
           
     topic, id = msg.split('/').values_at 0, -1            
+
     url_base = @options[:url_base]
-    fileid = Time.at(id.to_i).strftime("%Y/%b/%d/").downcase + id + '/index.xml'
+    fileid = Time.at(id.to_i)
+      .strftime("%Y/%b/%-d/").downcase + id + '/index.xml'
     
     url = "%s%s/%s" % [url_base, topic, fileid]
+
     kvx = Kvx.new url
 
-    add_notice(kvx.body.clone.merge(topic: topic), id)    
+    add_notice(kvx.body.clone.merge(topic: topic), id, topic)
 
   end
 
-  def add_notice(h, id)
+  def add_notice(h, id, topic)
 
-    timeline_dir = File.join(@filepath, @timeline)
-
-    notices = DailyNotices.new timeline_dir, 
-        @options.merge(identifier: @timeline, title: @timeline.capitalize)
-
-    return_status = notices.add(item: h, id: id)
+    return_status = @notices.add(item: h, id: id)
     
     return if return_status == :duplicate
-
-    dbfilename = File.join(timeline_dir, h[:topic] + '.db')
-            
-    if File.exists? dbfilename then
-
-      db = SQLite3::Database.new dbfilename   
-      
-    else
-
-      db = SQLite3::Database.new dbfilename   
-      
-db.execute <<-SQL
-  create table notices (
-    ID INT PRIMARY KEY     NOT NULL,
-    MESSAGE TEXT
-  );
-SQL
+    
+    record = {
+      id: id,
+      date: Time.at(id.to_i).to_s,
+      topic: topic,
+      title: h[:title],
+      description: h[:description],
+      link: h[:link]      
+    }
             
-    end   
-
-    db.execute("INSERT INTO notices (id, message) 
-            VALUES (?, ?)", [id, msg=h[:description]])    
-    sleep 1.5
+    @rxnotices.create record
     
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mns_timeline
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   YBz+URMHtVq6O+d7EkE/k4kCrvXbft0ECyMz6y5LS2066ci943uRhmBABvzPeO1K
   tBQ+W56kQhJC1g==
   -----END CERTIFICATE-----
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sps-sub
@@ -42,7 +42,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,47 +52,47 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: daily_notices
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: recordx_sqlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 0.2.7
 description: 
 email: james@jamesrobertson.eu
 executables: []