pluto-models 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b81d3634465206e2bac108bcff1629627a250fd0
-  data.tar.gz: c5b02063eb4ac615fd6e2be6fef55847a24be435
+  metadata.gz: a3f3aa900ee09c45deb0049eaba8d2d50c37a226
+  data.tar.gz: 608cac74375d1b22df6d0486729b251c84f6cc3c
 SHA512:
-  metadata.gz: c925c6718b7ee40814b4bda67fb99fb19347adc5cba20a030ea1dcddb1d48311050cc3c358e77e103459c9fc650aa38641ea3c6200b32eb03e2d7497e9944264
-  data.tar.gz: 61364d47455fca58c1cc02282d712f846df860162a1455327c774ce73e6cd73af9545f2f5c2fad5effa7b0519e6e192d13302f9e80af29c8b1f56a12665d911d
+  metadata.gz: 980818918cfd27d11e3ffd7593977be648e0bfed4d44b5e64ee2f60f67794d71ff3e61bbceffb5ec0c76bfae17f2c6416c21c5bf722b85dd815663718742dcdf
+  data.tar.gz: 3b613701225714e04afd3ebceefdd75e7fb8714d5391868e085add8ca21c08ffaa59967a7cba64f425eb1bc487d89d2e7b5f37756d838bd1983722da5496d181

data/Manifest.txt

@@ -1,4 +1,4 @@
-HISTORY.md
+CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile

data/Rakefile

@@ -15,12 +15,12 @@ Hoe.spec 'pluto-models' do
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
-  self.history_file = 'HISTORY.md'
+  self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
     ['props',         '>= 1.2.0'],
     ['logutils',      '>= 0.6.1'],
-    ['feedparser',    '>= 2.1.0'],
+    ['feedparser',    '>= 2.1.1'],
     ['feedfilter',    '>= 1.1.1'],
     ['textutils',     '>= 1.4.0'],
     ['activerecord'],
@@ -34,7 +34,7 @@ Hoe.spec 'pluto-models' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-    required_ruby_version: '>= 2.3'
+    required_ruby_version: '>= 2.2.2'
   }
 
 end

data/lib/pluto/connecter.rb

@@ -63,7 +63,10 @@ class Connecter
     end
 
     # note: for now always use pluto key for config storage
-    ActiveRecord::Base.configurations['pluto'] = config
+    configs = ActiveRecord::Base.configurations.to_h.reject { |db_config| db_config.env_name == 'pluto' }
+    configs['pluto'] = config
+
+    ActiveRecord::Base.configurations = configs
 
     if debug?
       logger.debug 'ar configurations (after):'

data/lib/pluto/models/feed.rb

@@ -35,7 +35,7 @@ class Feed < ActiveRecord::Base
 
     # note: if not updated or published use hardcoded 1971-01-01 for now
     ## order( "coalesce(updated,published,'1971-01-01') desc" )
-    order( "coalesce(feeds.items_last_updated,'1971-01-01') desc" )
+    order( Arel.sql( "coalesce(feeds.items_last_updated,'1971-01-01') desc" ) )
   end
 
   ##################################
@@ -208,7 +208,7 @@ class Feed < ActiveRecord::Base
         end
     end
 
-    update_attributes!( feed_attribs )
+    update!( feed_attribs )
   end
 
 end  # class Feed

data/lib/pluto/models/item.rb

@@ -37,7 +37,7 @@ class Item < ActiveRecord::Base
     #   coalesce - supported by sqlite (yes), postgres (yes)
 
     # note: if not updated,published use hardcoded 1971-01-01 for now
-    order( "coalesce(items.updated,items.published,'1971-01-01') desc" )
+    order( Arel.sql( "coalesce(items.updated,items.published,'1971-01-01') desc" ) )
   end
 
   def updated?()    read_attribute(:updated).present?;  end
@@ -85,7 +85,7 @@ class Item < ActiveRecord::Base
       end
     end
 
-    update_attributes!( item_attribs )
+    update!( item_attribs )
   end
 
 end  # class Item

data/lib/pluto/models/site.rb

@@ -72,7 +72,7 @@ class Site < ActiveRecord::Base
       Activity.create!( text: "new site >#{key}< - #{title}" )
     end
 
-    update_attributes!( site_attribs )
+    update!( site_attribs )
 
 
     # -- log update activity
@@ -186,7 +186,7 @@ class Site < ActiveRecord::Base
         Activity.create!( text: "new feed >#{feed_key}< - #{feed_attribs[:title]}" )
       end
 
-      feed_rec.update_attributes!( feed_attribs )
+      feed_rec.update!( feed_attribs )
 
       #  add subscription record
       #   note: subscriptions get cleaned out on update first (see above)

data/lib/pluto/version.rb

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

data/test/data/ruby.ini

@@ -1,5 +1,5 @@
 title  = Planet Ruby
-source = https://github.com/feedreader/pluto.models/raw/master/test/data/ruby.ini
+source = https://github.com/feedreader/pluto/raw/master/pluto-models/test/data/ruby.ini
 
 [rubylang]
   title = Ruby Lang News
@@ -11,8 +11,3 @@ source = https://github.com/feedreader/pluto.models/raw/master/test/data/ruby.in
   link  = http://weblog.rubyonrails.org
   feed  = http://weblog.rubyonrails.org/feed/atom.xml
 
-[viennarb]
-  title = Vienna.rb News
-  link  = http://vienna-rb.at
-  feed  = http://vienna-rb.at/atom.xml
-

data/test/test_site.rb

@@ -30,12 +30,12 @@ class TestSite < MiniTest::Test
     Site.deep_create_or_update_from_hash!( 'ruby', site_config )
 
     assert_equal 1, Site.count
-    assert_equal 3, Feed.count
+    assert_equal 2, Feed.count
 
     ruby = Site.find_by_key!( 'ruby' )
     assert_equal 'Planet Ruby', ruby.title
-    assert_equal 3, ruby.subscriptions.count
-    assert_equal 3, ruby.feeds.count
+    assert_equal 2, ruby.subscriptions.count
+    assert_equal 2, ruby.feeds.count
 
     rubylang = Feed.find_by_key!( 'rubylang' )
     assert_equal 'Ruby Lang News', rubylang.title
@@ -43,6 +43,7 @@ class TestSite < MiniTest::Test
     assert_equal 'http://www.ruby-lang.org/en/feeds/news.rss', rubylang.feed_url
   end
 
+
   def test_site_update
     site_text   = File.read( "#{Pluto.root}/test/data/ruby.ini")
     site_config = INI.load( site_text )
@@ -56,12 +57,12 @@ class TestSite < MiniTest::Test
     Site.deep_create_or_update_from_hash!( 'ruby', site_config )
 
     assert_equal 1, Site.count
-    assert_equal 3, Feed.count
+    assert_equal 2, Feed.count
 
     ruby = Site.find_by_key!( 'ruby' )
     assert_equal 'Planet Ruby', ruby.title
-    assert_equal 3, ruby.subscriptions.count
-    assert_equal 3, ruby.feeds.count
+    assert_equal 2, ruby.subscriptions.count
+    assert_equal 2, ruby.feeds.count
 
     rubylang = Feed.find_by_key!( 'rubylang' )
     assert_equal 'Ruby Lang News', rubylang.title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-models
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: feedfilter
   requirement: !ruby/object:Gem::Requirement
@@ -183,11 +183,11 @@ email: wwwmake@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="