pluto-models 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92f609c55f1c97dce198ee7f9a8513d1937efc92
-  data.tar.gz: b688795ca55c96259a5ef2494fb3fe24fd63fb65
+  metadata.gz: 51ec18ad86fd2cc4cafda7e80bc4d9e8d038d650
+  data.tar.gz: 27883c52dd7e3d08b2380c0085d162e48112e7ef
 SHA512:
-  metadata.gz: e603bb5436e331469dc36edea780f52e831ccce781e43f79bcaf7c83fdb57f1599271a889b6b670b18ddc0542d2e69901c2f7f5526c11ba1b062f525d1096b5f
-  data.tar.gz: 62499df65996003274e377b6a9c9c5c8e2f398c1dbac7601b9daf4d3201295f89c13d4b8ce9f0641d8123e292444801d2d6a56bce45e25c8d0e7db66200ae997
+  metadata.gz: ba8e07e5e685a6d605625e399e210f017af5274724a518f12f9ab71cfb28f08cf9daf5fbd1537aad47f10792a84b4e0825bbb91bf6244683835d9dc275d1002b
+  data.tar.gz: 02ce3fde608247434c54114044c5368269b5f941a463d0f5f383041da61a8c49b181a182c6ffaaa74e1b95e38a6d18b505a4124a6144c328a4bd916555632394

data/Manifest.txt

@@ -2,6 +2,7 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
+lib/pluto/config.rb
 lib/pluto/connecter.rb
 lib/pluto/models.rb
 lib/pluto/models/feed.rb
@@ -12,7 +13,6 @@ lib/pluto/models/subscription.rb
 lib/pluto/models/utils.rb
 lib/pluto/schema.rb
 lib/pluto/version.rb
-test/data/ruby.ini
 test/helper.rb
 test/test_delete_removed.rb
 test/test_filter.rb

data/lib/pluto/config.rb

@@ -0,0 +1,32 @@
+
+
+module Pluto
+  class Configuration
+  
+    def debug=(value)  @debug = value;   end
+    def debug?()       @debug || false;  end
+  
+    def logger   
+       ## always return root for now; let's you globally configure e.g.
+       ##     logger.level = :debug etc.    
+       LogUtils::Logger.root
+    end
+  end # class Configuration
+  
+
+  
+  ## lets you use
+  ##   Pluto.configure do |config|
+  ##      config.debug        = true
+  ##      config.logger.level = :debug
+  ##   end
+  
+  def self.configure
+    yield( config )
+  end
+  
+  def self.config
+    @config ||= Configuration.new
+  end
+  
+end   # module Pluto

data/lib/pluto/connecter.rb

@@ -9,14 +9,15 @@ module Pluto
 class Connecter
 
   include LogUtils::Logging
+  
+
 
   def initialize
     # do nothing for now
   end
 
+  def debug?()  Pluto.config.debug?;  end
 
-  def debug=(value) @debug = value; end
-  def debug?()      @debug || false; end
 
 
   def connect( config={} )

data/lib/pluto/models.rb

@@ -34,6 +34,7 @@ require 'logutils/activerecord'
 # our own code
 
 require 'pluto/version'   # note: let version always get first
+require 'pluto/config'
 require 'pluto/schema'
 
 require 'pluto/models/forward'
@@ -106,9 +107,21 @@ module Pluto
   end # setup_in_memory_dd
 
 
+  #########################################
+  ## let's put test configuration in its own namespace / module
+  class Test    ## todo/check: works with module too? use a module - why? why not?
+  
+    ####
+    #  todo/fix:  find a better way to configure shared test datasets - why? why not?
+    #    note: use one-up (..) directory for now as default - why? why not?
+    def self.data_dir()        @data_dir ||= '../test'; end
+    def self.data_dir=( path ) @data_dir = path; end
+  end # class Test
+
 end  # module Pluto
 
 
 
+
 # say hello
 puts Pluto.banner   if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)

data/lib/pluto/models/feed.rb

@@ -12,8 +12,8 @@ class Feed < ActiveRecord::Base
 ##     only class method present?
 ##   what's the best way to add logging to activerecord (use "builtin" machinery??)
 
-  def debug=(value)  @debug = value;   end
-  def debug?()       @debug || false;  end
+
+  def debug?()  Pluto.config.debug?;  end
 
 
 
@@ -33,9 +33,9 @@ class Feed < ActiveRecord::Base
     # note: order by first non-null datetime field
     #   coalesce - supported by sqlite (yes), postgres (yes)
 
-    # note: if not updated or published use hardcoded 1971-01-01 for now
-    ## order( "coalesce(updated,published,'1971-01-01') desc" )
-    order( Arel.sql( "coalesce(feeds.items_last_updated,'1971-01-01') desc" ) )
+    # note: if not updated or published use hardcoded 1970-01-01 for now
+    ## was: order( "coalesce(updated,published,'1970-01-01') desc" )
+    order( Arel.sql( "coalesce(feeds.items_last_updated,'1970-01-01') desc" ) )
   end
 
   ##################################
@@ -119,8 +119,6 @@ class Feed < ActiveRecord::Base
           logger.info "UPDATE | #{item.title}"
         end
 
-        item_rec.debug = debug? ? true : false  # pass along debug flag
-
         item_rec.feed_id = id        # feed_rec.id - add feed_id fk_ref
         item_rec.fetched = fetched   # feed_rec.fetched
 

data/lib/pluto/models/item.rb

@@ -10,8 +10,8 @@ class Item < ActiveRecord::Base
 ##     only class method present?
 ##   what's the best way to add logging to activerecord (use "builtin" machinery??)
 
-  def debug=(value)  @debug = value;   end
-  def debug?()       @debug || false;  end
+
+  def debug?()  Pluto.config.debug?;  end
 
 
   self.table_name = 'items'
@@ -36,8 +36,8 @@ class Item < ActiveRecord::Base
     # note: order by first non-null datetime field
     #   coalesce - supported by sqlite (yes), postgres (yes)
 
-    # note: if not updated,published use hardcoded 1971-01-01 for now
-    order( Arel.sql( "coalesce(items.updated,items.published,'1971-01-01') desc" ) )
+    # note: if not updated,published use hardcoded 1970-01-01 for now
+    order( Arel.sql( "coalesce(items.updated,items.published,'1970-01-01') desc" ) )
   end
 
   def updated?()    read_attribute(:updated).present?;  end

data/lib/pluto/models/utils.rb

@@ -10,7 +10,7 @@ class ItemCursor
   end
 
   def each
-    last_updated      = Time.local( 1971, 1, 1 )
+    last_updated      = Time.local( 1970, 1, 1 )
     last_feed_id      = -1     ## todo: use feed_key instead of id?? why? why not??
 
     @items.each do |item|

data/lib/pluto/version.rb

@@ -4,7 +4,7 @@ module Pluto
 
   MAJOR = 1
   MINOR = 5
-  PATCH = 3
+  PATCH = 4
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -1,18 +1,15 @@
-## $:.unshift(File.dirname(__FILE__))
-
-
 ## minitest setup
-
 require 'minitest/autorun'
 
 ## our own code
 require 'pluto/models'
 
 
-LogUtils::Logger.root.level = :debug
+Pluto.config.debug        = true
+Pluto.config.logger.level = :debug
 
 
-## some shortcuts
+## add some (ActiveRecord model class) shortcuts
 Log         = LogDb::Model::Log
 Prop        = ConfDb::Model::Prop
 

data/test/test_delete_removed.rb

@@ -1,10 +1,7 @@
-# encoding: utf-8
-
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_delete_removed.rb
-#  or better
-#     rake test
+
 
 require 'helper'
 

data/test/test_filter.rb

@@ -1,10 +1,7 @@
-# encoding: utf-8
-
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_filter.rb
-#  or better
-#     rake test
+
 
 require 'helper'
 

data/test/test_helpers.rb

@@ -1,10 +1,7 @@
-# encoding: utf-8
-
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_helpers.rb
-#  or better
-#     rake test
+
 
 require 'helper'
 

data/test/test_site.rb

@@ -1,10 +1,7 @@
-# encoding: utf-8
-
 ###
 #  to run use
 #     ruby -I ./lib -I ./test test/test_site.rb
-#  or better
-#     rake test
+
 
 require 'helper'
 
@@ -20,7 +17,7 @@ class TestSite < MiniTest::Test
 
 
   def test_site_create
-    site_text   = File.read( "#{Pluto.root}/test/data/ruby.ini")
+    site_text   = File.read( "#{Pluto::Test.data_dir}/ruby.ini")
     site_config = INI.load( site_text )
     ## pp site_config
 
@@ -45,7 +42,7 @@ class TestSite < MiniTest::Test
 
 
   def test_site_update
-    site_text   = File.read( "#{Pluto.root}/test/data/ruby.ini")
+    site_text   = File.read( "#{Pluto::Test.data_dir}/ruby.ini")
     site_config = INI.load( site_text )
     ## pp site_config
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-models
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -191,6 +191,7 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- lib/pluto/config.rb
 - lib/pluto/connecter.rb
 - lib/pluto/models.rb
 - lib/pluto/models/feed.rb
@@ -201,7 +202,6 @@ files:
 - lib/pluto/models/utils.rb
 - lib/pluto/schema.rb
 - lib/pluto/version.rb
-- test/data/ruby.ini
 - test/helper.rb
 - test/test_delete_removed.rb
 - test/test_filter.rb

data/test/data/ruby.ini

@@ -1,13 +0,0 @@
-title  = Planet Ruby
-source = https://github.com/feedreader/pluto/raw/master/pluto-models/test/data/ruby.ini
-
-[rubylang]
-  title = Ruby Lang News
-  link  = http://www.ruby-lang.org/en/news
-  feed  = http://www.ruby-lang.org/en/feeds/news.rss
-
-[rubyonrails]
-  title = Ruby on Rails News
-  link  = http://weblog.rubyonrails.org
-  feed  = http://weblog.rubyonrails.org/feed/atom.xml
-