pluto-news 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ea3e56d2fafd5f9632ec43d764a67dbd79c3f31
-  data.tar.gz: f3d699d67b12b51f997c96b62656698cc0372d7b
+  metadata.gz: 7908922c343e9a80b979528c5561f2b946b77a74
+  data.tar.gz: 1c6753f57ad5d2f47ac9b1f9d2dc774619a5fe0d
 SHA512:
-  metadata.gz: 1efd5f84d0b143b52b5009b7309ab83a594d5f43bf035fec5ab3a530c2f86c6853f6a19cc84048be060fb1ee7ac4653309ad9268ed188b64eceb0b8a552584f7
-  data.tar.gz: 9c673852ef696eb8eaee63a366797d28c6e2b0e976a9d2dcd723c45cc996d97a13d3cb10ba7f34c12d39189a28484f83e5ee6a44881c81d6ab6b98316e78c697
+  metadata.gz: 2278051b4c6b0729a83d2697012b61fe214f8cfecbcaffc24ca365ad6e8dba4db3a4c8cae9b22feadf23cd4b9a80115893b2d0e2f10f72b42628f39d5c927e1e
+  data.tar.gz: 232c79b23e21ce139bfc107495e65f2bcb960c1f926c98f8d40197ddf1885f5d8add3bea79d9afcb4939817a8de7383bb13d08e7dc9f771d1f981a0f00ffa9e3

data/lib/pluto/news.rb

@@ -54,13 +54,18 @@ require 'pluto/news/version'
 
 module News
 
+  def self.site=(value)  @site   = value;  end
+  def self.site()        @site ||= 'news'; end   ## note: defaults to news
+
+
+
   def self.subscribe( *feeds )
     site_hash = {        ## note: keys are strings (NOT symbols) for now
-      'title' => 'News, News, News'
+      'title' => 'Untitled'
     }
 
     feeds.each_with_index do |feed|
-      ## note: 
+      ## note:
       ##   use a "fingerprint" hash digest as key
       ##     do NOT include scheme (e.g. https or http)
       ##     do NOT include port
@@ -74,14 +79,14 @@ module News
       ## note: cut-off www. if leading e.g. www.ruby-lang.org => ruby-lang.org
       host = uri.host.downcase.sub( /^www\./, '' )
       #   use a differt separator e.g _ or ~ and NOT $ - why? why not?
-      key = "#{host}$#{Digest::MD5.hexdigest( uri.request_uri )}" 
+      key = "#{host}$#{Digest::MD5.hexdigest( uri.request_uri )}"
 
       site_hash[ key ] = { 'feed'  => feed }
     end
 
     connection   ## make sure we have a database connection (and setup) up-and-running
-    site_key  = 'news'   ## note: use always news (and single-site setup) for now
-    Pluto::Model::Site.deep_create_or_update_from_hash!( site_key, site_hash )
+    ## note: always use "multi-site" setup; defaults to 'news' site key
+    Pluto::Model::Site.deep_create_or_update_from_hash!( site, site_hash )
   end
 
   def self.update
@@ -94,20 +99,32 @@ module News
 
   def self.feeds
     connection
+    ## note: always use "multi-site" setup; defaults to 'news' site key
     ## note: add "default" scope - orders (sorts) by latest / time
-    Pluto::Model::Feed.order(
+    rec = Pluto::Model::Site.where(key: site).first
+    if rec.nil?
+      Pluto::Model::Feed.none     ## use null (relation) pattern to avoid crash on nil - why? why not?
+    else
+      rec.feeds.order(
         Arel.sql( "coalesce(feeds.updated,feeds.published,'1970-01-01') desc" )
       )
+    end
   end
   def self.channels()  feeds; end   ## convenience alias for feeds
 
 
   def self.items
     connection    ## make sure we have a database connection (and setup) up-and-running
+    ## note: always use "multi-site" setup; defaults to 'news' site key
     ## note: add "default" scope - orders (sorts) by latest / time
-    Pluto::Model::Item.order(
+    rec = Pluto::Model::Site.where(key: site).first
+    if rec.nil? 
+      Pluto::Model::Item.none    ## use null (relation) pattern to avoid crash on nil - why? why not?
+    else
+      rec.items.order(
         Arel.sql( "coalesce(items.updated,items.published,'1970-01-01') desc" )
       )
+    end
   end
   def self.latest()    items; end   ## note: "default" scope orders (sorts) by latest / time
 
@@ -174,7 +191,7 @@ module News
   def self.q3( year=Date.today.year ) quarter3( year ); end
   def self.q4( year=Date.today.year ) quarter4( year ); end
 
-  
+
   def self.year( year=Date.today.year )
     q = year
     items.
@@ -183,9 +200,9 @@ module News
       )
   end
 
-  
-  
-  
+
+
+
   def self.this_week()    week;    end   ## convenience alias - keep - why? why not?
   def self.this_month()   month;   end
   def self.this_quarter() quarter; end

data/lib/pluto/news/version.rb

@@ -2,8 +2,8 @@
 module PlutoNews
 
     MAJOR = 1
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 0
     VERSION = [MAJOR,MINOR,PATCH].join('.')
   
     def self.version
@@ -20,4 +20,3 @@ module PlutoNews
     end
   
 end # module PlutoNews
-  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-news
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models