feedfilter 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81bab08453558167699203ea2a2ee6159a0fbaae
-  data.tar.gz: 83d6db5270e1ee8d8444b8334b96d364faba4bfe
+  metadata.gz: 428b8a9ca829c9fc22891127c72a4e14b84ff358
+  data.tar.gz: 519ac2778b2f578b5cf74281071b84e495978c6d
 SHA512:
-  metadata.gz: 59cd7df83d51380bfc8aa9bb524b086d05c24137f83dd1be29b89db9be885c1366b0fea95a4e132e0b251a169c37ba662a42fc89fbaff6bcc20524c0c402634b
-  data.tar.gz: 11ce28d9351a39e2e9a5ad736f7594194ebf7a07fc8417b240418871d3b96ef3487655f684e23fcdc69df08b6e88d28459026bf31f052c3f7c4f8b2260ac3d51
+  metadata.gz: 9cb9b0318659a95e50bd0b4f4f3d4c55d1436f69f9931aa0241ce32505f02d1a5f3c8bc51622cab0423951c5ac769f027b3b5db4d502e21f8be06933f889c605
+  data.tar.gz: 9c2397bd3660b5c4359da8a5aefbf6ac626a97c3ce81c28dbc513ef023030993607805eaadc66eaa447b277cfe590be0341724a2e01957263c46c8ba2b1a2f1f

data/Manifest.txt

@@ -6,9 +6,7 @@ config/feedburner.txt
 config/feedflare.txt
 lib/feedfilter.rb
 lib/feedfilter/ads.rb
-lib/feedfilter/block_reader.rb
 lib/feedfilter/version.rb
 test/helper.rb
 test/test_ads.rb
 test/test_ads_all.rb
-test/test_block_reader.rb

data/README.md

@@ -11,7 +11,7 @@
 ## Usage
 
 
-### `strip_ads`  in `AdsFilter` module
+### `strip_ads`  (in `AdsFilter` module)
 
 ~~~
 require 'feedfilter'

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.spec 'feedfilter' do
   self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['textutils'],
+    ['textutils', '>=1.0.0'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/feedfilter.rb

@@ -13,8 +13,6 @@ require 'textutils'
 require 'feedfilter/version'  # let it always go first
 require 'feedfilter/ads'
 
-require 'feedfilter/block_reader'   ## todo/fix: move to textutils!!!!
-
 
 # say hello
 puts FeedFilter.banner     if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)

data/lib/feedfilter/version.rb

@@ -2,8 +2,8 @@
 
 module FeedFilter
 
-  MAJOR = 0
-  MINOR = 3
+  MAJOR = 1
+  MINOR = 0
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
@@ -17,7 +17,7 @@ module FeedFilter
 
   def self.root
     "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
-  end  
+  end
 
 end # module FeedFilter
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feedfilter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textutils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,12 +72,10 @@ files:
 - config/feedflare.txt
 - lib/feedfilter.rb
 - lib/feedfilter/ads.rb
-- lib/feedfilter/block_reader.rb
 - lib/feedfilter/version.rb
 - test/helper.rb
 - test/test_ads.rb
 - test/test_ads_all.rb
-- test/test_block_reader.rb
 homepage: https://github.com/feedreader/feed.filter
 licenses:
 - Public Domain
@@ -107,4 +105,3 @@ summary: feedfilter - feed filter and rules for easy (re)use
 test_files:
 - test/test_ads_all.rb
 - test/test_ads.rb
-- test/test_block_reader.rb

data/lib/feedfilter/block_reader.rb

@@ -1,67 +0,0 @@
-# encoding: utf-8
-
-####
-## todo: move to textutils for re(use) ?????
-
-class BlockReader
-
-  include LogUtils::Logging
-
-  def self.from_file( path )
-    ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
-    ## - see textutils/utils.rb
-   text = File.read_utf8( path )
-   self.from_string( text )
-  end
-
-  def self.from_string( text )
-    self.new( text )
-  end
-
-  def initialize( text )
-    @text = text
-  end
-
-  def read
-    ## note returns an array of (line) strings e.g.
-    ## [
-    ##  "line1\nline2",         ## -- block1
-    ##  "line1\nline2\nline3"   ## -- block2
-    ## ]
-
-    blocks = []
-    buf = ""
-
-    @text.each_line do |line|
-       # comments allow:
-       # 1) ##### (shell/ruby style)
-       if line =~ /^\s*#/ 
-          # skip komments and do NOT copy to result (keep comments secret!)
-         logger.debug 'skipping comment line'
-         next
-       end
-
-#       if line =~ /^\s*$/
-#         # kommentar oder leerzeile überspringen
-#         logger.debug 'skipping blank line'
-#         next
-#       end
-
-       # pass 2) remove leading and trailing whitespace
-       line = line.strip
-
-       if line =~ /^-{3,}$/   ## three or more lines
-         logger.debug 'block separator'
-         blocks << buf.strip   ## note: strip leading and trailing whitespace
-         buf = ""
-       else
-         buf << "#{line}\n"
-       end
-    end # each lines
-
-    blocks << buf.strip ## note: strip leading and trailing whitespace
-    blocks
-  end # method read
-
-end # class BlockReader
-

data/test/test_block_reader.rb

@@ -1,25 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_block_reader.rb
-#  or better
-#     rake test
-
-require 'helper'
-
-
-class TestBlockReader < MiniTest::Test
-
-  def test_feedburner
-     blocks = BlockReader.from_file( "#{FeedFilter.root}/config/feedburner.txt" ).read
-
-     ## note: regex - use %q - do NOT escape \. or \1 etc.
-     pattern = %q{<img[^>]*?src=("|')(:?http:)?//feeds\.feedburner\.com/~r/[^>]+?\1.*?>}
-
-     test1   = %q{<img src="//feeds.feedburner.com/~r/Rubyflow/~4/1wUDnBztAJY" height="1" width="1" alt=""/>}
-
-     assert_equal 2, blocks.size
-     assert_equal pattern, blocks[0].gsub( /[\n ]/, '' )  ## note: need to remove newlines and spaces
-     assert_equal test1,   blocks[1]
-  end
-
-end # class TestBlockReader