pluto 0.8.8 → 0.8.9

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.spec 'pluto' do
 
   self.extra_deps = [
     ['pakman',    '>= 0.5'], 
-    ['fetcher',   '>= 0.3'],
+    ['fetcher',   '>= 0.4.1'],    # use min. 0.4.1 - added cache/conditional GET support
     ['logutils',  '>= 0.6'],
     ['feedutils', '>= 0.3.2'],    #  use min. 0.3.2 - added fix for rss.item.guid missing; no more auto-summary in atom
     ['props',     '>= 1.0.2'],    #  use min. 1.0.2 - added ini support

data/lib/pluto/cli/main.rb

@@ -236,7 +236,6 @@ command [:merge, :m] do |c|
 
   c.desc 'Database name'
   c.arg_name 'NAME'
-  c.default_value '<PLANET>.db e.g. ruby.db'
   c.flag [:n, :dbname]
 
 
@@ -283,7 +282,6 @@ command [:update, :up, :u] do |c|
 
   c.desc 'Database name'
   c.arg_name 'NAME'
-  c.default_value '<PLANET>.db e.g. ruby.db'
   c.flag [:n, :dbname]
 
 
@@ -340,7 +338,6 @@ command [:build, :b] do |c|
 
   c.desc 'Database name'
   c.arg_name 'NAME'
-  c.default_value '<PLANET>.db e.g. ruby.db'
   c.flag [:n, :dbname]
 
 

data/lib/pluto/cli/opts.rb

@@ -11,7 +11,16 @@ class Opts
     @verbose = true     if options[:verbose] == true
 
     @db_path   = options[:dbpath]  if options[:dbpath].present?
-    @db_name   = options[:dbname]  if options[:dbname].present?
+    
+    if options[:dbname].present?
+      ##########
+      # note: c.default_value '<PLANET>.db e.g. ruby.db'
+      #  gli2 will set default if present - thus, do NOT set a default value
+      #    otherwise it will get set
+
+      @db_name   = options[:dbname]
+      puts "setting opts.db_name to '#{options[:dbname]}'"
+    end
 
     @config_path = options[:config]    if options[:config].present?
     @output_path = options[:output]    if options[:output].present?

data/lib/pluto/fetcher.rb

@@ -84,7 +84,23 @@ class Fetcher
     ##    and http_last_modified headers
     ##    and brute force body_old == body_new   etc.
 
+    ### todo/fix: normalize/unifiy feed_url
+    ##  - same in fetcher - use shared utitlity method or similar
+
+    @worker.use_cache = true
+    @worker.cache[ feed_url ] = {
+      'etag'          => feed_rec.http_etag,
+      'last-modified' => feed_rec.http_last_modified
+    }
+
     response = @worker.get( feed_url )
+    @worker.use_cache = false   # fix/todo: restore old use_cache setting instead of false
+
+    if response.code == '304'  # not modified (conditional GET - e.g. using etag/last-modified)
+      puts "OK - fetching feed '#{feed_key}' - HTTP status #{response.code} #{response.message}"
+      return nil   # no updates available; nothing to do
+    end
+
 
     feed_fetched = Time.now
 
@@ -125,11 +141,11 @@ class Fetcher
     feed_attribs = {
       http_code:          response.code.to_i,
       http_etag:          response.header[ 'etag' ],
-      http_last_modified: response.header[ 'last-modified' ],
+      http_last_modified: response.header[ 'last-modified' ], ## note: last_modified header gets stored as plain text (not datetime)
       body:               feed_xml,
       fetched:            feed_fetched
     }
-    
+
     ## if debug?
       puts "http header - etag: #{response.header['etag']} - #{response.header['etag'].class.name}"
       puts "http header - last-modified: #{response.header['last-modified']} - #{response.header['last-modified'].class.name}"

data/lib/pluto/schema.rb

@@ -59,7 +59,8 @@ class CreateDb < ActiveRecord::Migration
 
       t.integer  :http_code   # last http status code e.g. 200,404,etc.
       t.string   :http_etag    # last http header etag
-      t.datetime :http_last_modified   # last http header last-modified
+      ## note: save last-modified header as text (not datetime) - pass through as is
+      t.string   :http_last_modified   # last http header last-modified - note: save header as plain text!!! pass along in next request as-is
 
       t.text    :body    # last http response body (complete feed!)
 

data/lib/pluto/version.rb

@@ -1,4 +1,4 @@
 
 module Pluto
-  VERSION = '0.8.8'
+  VERSION = '0.8.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &82398980 !ruby/object:Gem::Requirement
+  requirement: &77270490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *82398980
+  version_requirements: *77270490
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &82398670 !ruby/object:Gem::Requirement
+  requirement: &77270080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *82398670
+  version_requirements: *77270080
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &82398350 !ruby/object:Gem::Requirement
+  requirement: &77269570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *82398350
+  version_requirements: *77269570
 - !ruby/object:Gem::Dependency
   name: feedutils
-  requirement: &82398090 !ruby/object:Gem::Requirement
+  requirement: &77268950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *82398090
+  version_requirements: *77268950
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &82397860 !ruby/object:Gem::Requirement
+  requirement: &77268430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *82397860
+  version_requirements: *77268430
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &82397520 !ruby/object:Gem::Requirement
+  requirement: &77268060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *82397520
+  version_requirements: *77268060
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &82397240 !ruby/object:Gem::Requirement
+  requirement: &77267780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *82397240
+  version_requirements: *77267780
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &82396970 !ruby/object:Gem::Requirement
+  requirement: &77267490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *82396970
+  version_requirements: *77267490
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &82396660 !ruby/object:Gem::Requirement
+  requirement: &77267190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *82396660
+  version_requirements: *77267190
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: feedreader@googlegroups.com