pluto 0.9.0 → 0.9.1

data/Manifest.txt

@@ -14,7 +14,7 @@ lib/pluto/formatter.rb
 lib/pluto/installer.rb
 lib/pluto/lister.rb
 lib/pluto/manifest_helpers.rb
-lib/pluto/models/action.rb
+lib/pluto/models/activity.rb
 lib/pluto/models/feed.rb
 lib/pluto/models/item.rb
 lib/pluto/models/site.rb

data/README.md

@@ -14,12 +14,12 @@ from published web feeds.
 Use the `pluto` command line tool and pass in one or more planet configuration files.
 Example:
 
-    pluto build ruby.yml        or
+    pluto build ruby.ini        or
     pluto b ruby
 
 This will
 
-1) fetch all feeds listed in `ruby.yml` and 
+1) fetch all feeds listed in `ruby.ini` and 
 
 2) store all entries in a local database, that is, `ruby.db` in your working folder and
 
@@ -201,13 +201,13 @@ viennarb:
   feed:  http://vienna-rb.at/atom.xml
 ```
 
-For more samples, see [`nytimes.yml`](https://github.com/feedreader/pluto.samples/blob/master/nytimes.yml),
-[`js.yml`](https://github.com/feedreader/pluto.samples/blob/master/js.yml),
-[`dart.yml`](https://github.com/feedreader/pluto.samples/blob/master/dart.yml),
-[`haskell.yml`](https://github.com/feedreader/pluto.samples/blob/master/haskell.yml),
-[`viennarb.yml`](https://github.com/feedreader/pluto.samples/blob/master/viennarb.yml),
-[`beer.yml`](https://github.com/feedreader/pluto.samples/blob/master/beer.yml),
-[`football.yml`](https://github.com/feedreader/pluto.samples/blob/master/football.yml).
+For more samples, see [`nytimes.ini`](https://github.com/feedreader/pluto.samples/blob/master/nytimes.ini),
+[`js.ini`](https://github.com/feedreader/pluto.samples/blob/master/js.ini),
+[`dart.ini`](https://github.com/feedreader/pluto.samples/blob/master/dart.ini),
+[`haskell.ini`](https://github.com/feedreader/pluto.samples/blob/master/haskell.ini),
+[`viennarb.ini`](https://github.com/feedreader/pluto.samples/blob/master/viennarb.ini),
+[`beer.ini`](https://github.com/feedreader/pluto.samples/blob/master/beer.ini),
+[`football.ini`](https://github.com/feedreader/pluto.samples/blob/master/football.ini).
 
 
 ## Template Packs

data/Rakefile

@@ -22,8 +22,9 @@ Hoe.spec 'pluto' do
     ['fetcher',   '>= 0.4.1'],    # use min. 0.4.1 - added cache/conditional GET support
     ['logutils',  '>= 0.6'],
     ['feedutils', '>= 0.4.0'],    #  use min. 0.4.0 - added rss 2.0 - content:encoded; 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
+    ['props',     '>= 1.0.3'],    #  use min. 1.0.2 - added ini support
     ['textutils', '>= 0.7'],      #  use min. 0.7; moved hy/date helpers to gem; future: add some filters (for include/exclude)
+    ['activityutils', '>= 0.1.0' ],
     ['gli',       '>= 2.5.6']
     ## ['activerecord', '~> 3.2'],  #  NB:  soft dependency, will include activesupport,etc.
   ]

data/lib/pluto/connecter.rb

@@ -24,7 +24,7 @@ class Connecter
 
   def connect!( config = nil )
 
-    if config.nil?   # use DATABASE_URL
+    if config.nil?   # use/try DATABASE_URL from environment
 
       logger.debug "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
 
@@ -40,7 +40,7 @@ class Connecter
           database: db.path[1..-1],
           encoding: 'utf8'
         }
-      else 
+      else   # assume sqlite3
         config = {
           adapter:  db.scheme,       # sqlite3
           database: db.path[1..-1]   # pluto.db (NB: cut off leading /, thus 1..-1)
@@ -51,16 +51,42 @@ class Connecter
     puts 'db settings:'
     pp config
 
+    ### for dbbrowser and other tools add to ActiveRecord
+    
+    if ActiveRecord::Base.configurations.nil?   # todo/check: can this ever happen? remove?
+       puts "ActiveRecord configurations nil - set to empty hash"
+       ActiveRecord::Base.configurations = {}  # make it an empty hash
+    end
+
+    if debug?
+      puts 'ar configurations (before):'
+      pp ActiveRecord::Base.configurations
+    end
+    
+    # note: for now always use pluto key for config storage
+    ActiveRecord::Base.configurations['pluto'] = config
+
+    if debug?
+      puts 'ar configurations (after):'
+      pp ActiveRecord::Base.configurations
+    end
+
+
     # for debugging - disable for production use
     if debug?
       ActiveRecord::Base.logger = Logger.new( STDOUT ) 
     end
 
+
     ActiveRecord::Base.establish_connection( config )
-    
+
     # first time? - auto-run db migratation, that is, create db tables
+    unless ActivityDb::Models::Activity.table_exists?
+      ActivityDb::CreateDb.new.up
+    end
+
     unless Models::Feed.table_exists?
-       CreateDb.new.up  
+      CreateDb.new.up  
     end
   end # method connect!
 

data/lib/pluto/models/{action.rb → activity.rb}

@@ -1,12 +1,8 @@
 module Pluto
   module Models
 
-
-class Action < ActiveRecord::Base
-  self.table_name = 'actions'
-
-end
-
+# add shortcut/alias
+Activity = ActivityDb::Models::Activity
 
   end # module Models
 end # module Pluto

data/lib/pluto/refresher.rb

@@ -21,8 +21,8 @@ class Refresher
       @worker.debug = true   # also pass along worker debug flag if set
     end
 
-    # -- log update action
-    Action.create!( title: 'update feeds' )
+    # -- log update activity
+    Activity.create!( text: 'update feeds' )
     
     feeds_fetched = Time.now
     
@@ -45,8 +45,8 @@ class Refresher
       @worker.debug = true   # also pass along worker debug flag if set
     end
 
-    # -- log update action
-    Action.create!( title: "update feeds >#{site_key}<" )
+    # -- log update activity
+    Activity.create!( text: "update feeds >#{site_key}<" )
 
     #####
     # -- update fetched  timestamps for all sites

data/lib/pluto/schema.rb

@@ -91,13 +91,6 @@ class CreateDb < ActiveRecord::Migration
       ## todo: add author/authors, category/categories
     end
 
-    create_table :actions do |t|
-      t.string   :title                # e.g. new site, new subscription, update feeds, etc.
-      t.string   :object            # todo: find better names for action attribs ??
-      t.string   :object_type
-      t.timestamps
-    end
-    
   end
     
   def down

data/lib/pluto/subscriber.rb

@@ -21,7 +21,9 @@ class Subscriber
     site_attribs = {
       title: config['title'] || config['name']   # support either title or name
     }
- 
+    
+    logger.debug "site_attribs: #{site_attribs.inspect}"
+
     site_rec = Site.find_by_key( site_key )
     if site_rec.nil?
       site_rec             = Site.new
@@ -29,12 +31,12 @@ class Subscriber
 
       ## use object_id: site.id and object_type: Site
       ## change - model/table/schema!!!
-      Action.create!( title: "new site >#{site_key}<", object: site_attribs[ :title ] )
+      Activity.create!( text: "new site >#{site_key}< - #{site_attribs[ :title ]}" )
     end
     site_rec.update_attributes!( site_attribs )
 
-    # -- log update action
-    Action.create!( title: "update subscriptions >#{site_key}<" )
+    # -- log update activity
+    Activity.create!( text: "update subscriptions >#{site_key}<" )
 
     # clean out subscriptions and add again
     logger.debug "before site.subscriptions.delete_all - count: #{site_rec.subscriptions.count}"
@@ -81,7 +83,7 @@ class Subscriber
         ## use object_id: feed.id and object_type: Feed
         ## change - model/table/schema!!!
         ## todo: add parent_action_id - why? why not?
-        Action.create!( title: "new feed >#{feed_key}<", object: feed_attribs[ :title ] )
+        Activity.create!( text: "new feed >#{feed_key}< - #{feed_attribs[ :title ]}" )
       end
 
       feed_rec.update_attributes!( feed_attribs )

data/lib/pluto/version.rb

@@ -1,4 +1,4 @@
 
 module Pluto
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/lib/pluto.rb

@@ -27,6 +27,7 @@ require 'pakman'    # template pack manager
 require 'feedutils'
 require 'textutils'
 
+require 'activityutils'
 
 # our own code
 
@@ -34,7 +35,7 @@ require 'pluto/version'   # let version always get first
 require 'pluto/schema'
 require 'pluto/activerecord'
 
-require 'pluto/models/action'
+require 'pluto/models/activity'
 require 'pluto/models/feed'
 require 'pluto/models/item'
 require 'pluto/models/site'
@@ -54,10 +55,12 @@ require 'pluto/formatter'
 
 require 'pluto/cli/opts'     ## fix: make sure fetcher/updater etc. do not depend on cli/opts
 
+
 module Pluto
 
   def self.banner
-    "pluto #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    ### todo: add RUBY_PATCHLEVEL or RUBY_PATCH_LEVEL  e.g. -p124
+    "pluto/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
   def self.generator   # convenience alias for banner (matches HTML generator meta tag)
@@ -133,5 +136,5 @@ end
 if __FILE__ == $0
   Pluto.main
 else
-  puts Pluto.banner    # say hello
+  puts Pluto.banner       # say hello
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &85034260 !ruby/object:Gem::Requirement
+  requirement: &81472690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *85034260
+  version_requirements: *81472690
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &85034020 !ruby/object:Gem::Requirement
+  requirement: &81472130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *85034020
+  version_requirements: *81472130
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &85033740 !ruby/object:Gem::Requirement
+  requirement: &81494060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *85033740
+  version_requirements: *81494060
 - !ruby/object:Gem::Dependency
   name: feedutils
-  requirement: &85033490 !ruby/object:Gem::Requirement
+  requirement: &81493690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,21 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *85033490
+  version_requirements: *81493690
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &85033170 !ruby/object:Gem::Requirement
+  requirement: &81493150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *85033170
+  version_requirements: *81493150
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &85032890 !ruby/object:Gem::Requirement
+  requirement: &81492890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,21 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *85032890
+  version_requirements: *81492890
+- !ruby/object:Gem::Dependency
+  name: activityutils
+  requirement: &81492660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *81492660
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &85032620 !ruby/object:Gem::Requirement
+  requirement: &81492380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *85032620
+  version_requirements: *81492380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &85032330 !ruby/object:Gem::Requirement
+  requirement: &81492080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *85032330
+  version_requirements: *81492080
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &85032040 !ruby/object:Gem::Requirement
+  requirement: &81491610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +120,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *85032040
+  version_requirements: *81491610
 description: pluto - Another Planet Generator (Lets You Build Web Pages from Published
   Web Feeds)
 email: feedreader@googlegroups.com
@@ -135,7 +146,7 @@ files:
 - lib/pluto/installer.rb
 - lib/pluto/lister.rb
 - lib/pluto/manifest_helpers.rb
-- lib/pluto/models/action.rb
+- lib/pluto/models/activity.rb
 - lib/pluto/models/feed.rb
 - lib/pluto/models/item.rb
 - lib/pluto/models/site.rb