pluto-models 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6690b769ee8041814fe15af85acc647ced2c4f33
-  data.tar.gz: 797c2054af4bc2975495e9a7ba61ddf922d5f770
+  metadata.gz: 52da2d8bfe30ec7e531849507767e24a82d9e768
+  data.tar.gz: 3ad21aa0944f78a4aea8913bfe6a0fa2e200538a
 SHA512:
-  metadata.gz: 1dca815302f8ffffbb8902241bf4db7388a2b747839cf88ee7be68ce2dc392de935127e994b1428454229516cd0efcb169e08b17ac46e20fbaecd6e526263b23
-  data.tar.gz: af2731d41d1837c7ea81f7ac466c2714ed421e9a8ae0897e5e7dd989c9055f26daf594ffeb0b7469f0a396521c2b7912f5e6b92c61c401e98bf3cc976e5a7d56
+  metadata.gz: d4964db168547374f42d1a48c3a11c35dd8519115425cd33ae6b08752cacab00200da21333bf21aa5b5dea5fec6af8e45865694e58a78d514f7e86a3187f81b0
+  data.tar.gz: 95fac37ced095094ea37e766d4a129f4ff02f4a7e362d4186396091040133e835e169048dc589a493483e4d060da217621df8acd02f9740497e425d82c5e883c

data/Manifest.txt

@@ -13,4 +13,5 @@ lib/pluto/models/utils.rb
 lib/pluto/schema.rb
 lib/pluto/version.rb
 test/helper.rb
+test/test_filter.rb
 test/test_helpers.rb

data/README.md

@@ -10,6 +10,76 @@
 
 ## Usage
 
+### Models
+
+Site • Feed • Item • Subscription
+
+#### Site
+
+~~~
+class Site
+  has_many :subscriptions
+  has_many :feeds, :through => :subscriptions
+  has_many :items, :through => :feeds
+  ...
+end 
+~~~
+
+#### Feed
+
+~~~
+class Feed
+  has_many :items
+  has_many :subscriptions
+  has_many :sites, :through => :subscriptions
+  ...
+end
+~~~
+
+#### Item
+
+~~~
+class Item
+  belongs_to :feed
+  ...
+end
+~~~
+
+#### Subscription
+
+~~~
+class Subscription
+  belongs_to :site
+  belongs_to :feed
+  ...
+end
+~~~
+
+
+
+### Examples
+
+~~~
+DB_CONFIG = {
+  adapter: 'sqlite3',
+  database: './planet.db'
+}
+
+Pluto.connect( DB_CONFIG )
+
+Pluto::Model::Item.latest.limit(10).each_with_index do |item,i|
+  puts "[#{i+1}] #{item.title}"
+
+  if item.content
+    puts item.content
+  elsif item.summary
+    puts item.summary
+  else
+    ## warn: no content found
+  end
+end
+~~~
+
 
 
 ## Real World Usage

data/lib/pluto/models/feed.rb

@@ -74,12 +74,47 @@ class Feed < ActiveRecord::Base
   def debug=(value)  @debug = value;   end
   def debug?()       @debug || false;  end
 
+
+  def match_terms?( terms, text )   ### make helper method private - why? why not??
+    return false  if text.blank?     ## allow/guard against nil and empty string
+
+    terms.each do |term|
+      if /#{term}/i =~ text      ## Note: lets ignore case (use i regex option) 
+        return true
+      end
+    end
+
+    false  # no term match found
+  end
+
+
+
   def save_from_struct!( data )
 
     update_from_struct!( data )
     
     data.items.each do |item|
 
+      ######
+      ## check for filters (includes/excludes) if present
+      ##  for now just check for includes
+      ##
+      if includes.present?
+        ## split terms (allow comma,pipe) - do NOT use space; allows e.g. terms such as github pages
+        terms = includes.split( /\s*[,|]\s*/ )
+        ## remove leading and trailing white spaces - check - still required when using \s* ??
+        terms = terms.map { |term| term.strip }
+        match = match_terms?( terms, item.title  ) ||
+                match_terms?( terms, item.summary) ||
+                match_terms?( terms, item.content)
+        
+        if match == false
+          puts "** SKIPPING | #{item.title}"
+          puts "  no include terms match: #{terms.join('|')}"
+          next   ## skip to next item
+        end
+      end
+
       item_rec = Item.find_by_guid( item.guid )
       if item_rec.nil?
         item_rec  = Item.new

data/lib/pluto/version.rb

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

data/test/test_filter.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_filter.rb
+#  or better
+#     rake test
+
+require 'helper'
+
+class TestFilter < MiniTest::Test
+
+  def test_includes
+    
+    feed1 = Feed.create!(
+      key: 'test',
+      title: 'Test',
+      includes: 'test1,test2,github pages'
+    )
+
+    feed2 = Feed.create!(
+      key: 'test',
+      title: 'Test'
+    )
+
+    feed_data = FeedUtils::Feed.new
+    feed_data.title = 'Test'
+    feed_data.items = []
+    
+    item_data = FeedUtils::Item.new
+    item_data.title = 'Test #1'
+    item_data.summary = 'Test'
+    item_data.content = 'Test'
+
+    feed_data.items << item_data
+
+    item_data = FeedUtils::Item.new
+    item_data.title = 'Test #2'
+    item_data.summary = "Test\nTest\nTest1"
+    item_data.content = 'Test'
+
+    feed_data.items << item_data
+
+
+    item_data = FeedUtils::Item.new
+    item_data.title = 'Test #3'
+    item_data.summary = "Test\nTest\nTest"
+    item_data.content = 'Test\nTest\nGitHub Pages'
+
+    feed_data.items << item_data
+
+    feed1.save_from_struct!( feed_data )   ## check w/ includes
+    ## feed2.save_from_struct!( feed_data )   ## check w/o includes
+
+    assert true    ## if we get here it should workd
+  end
+
+end # class TestFilter

data/test/test_helpers.rb

@@ -2,7 +2,7 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_rss.rb
+#     ruby -I ./lib -I ./test test/test_helpers.rb
 #  or better
 #     rake test
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto-models
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -189,6 +189,7 @@ files:
 - lib/pluto/schema.rb
 - lib/pluto/version.rb
 - test/helper.rb
+- test/test_filter.rb
 - test/test_helpers.rb
 homepage: https://github.com/feedreader/pluto-models
 licenses:
@@ -217,4 +218,5 @@ signing_key:
 specification_version: 4
 summary: pluto-models - planet schema 'n' models for easy (re)use
 test_files:
+- test/test_filter.rb
 - test/test_helpers.rb