pluto-models 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d114af161602287c52ed90e78691eb9e4b04b74
-  data.tar.gz: 009c9f806a64391c97cee02f2d0e3f5e8a48b094
+  metadata.gz: a9b3813114643297e875af83b6de083bb21105e9
+  data.tar.gz: 91c8b11ba6a9355c094a4925c58746fac6767e9a
 SHA512:
-  metadata.gz: d07c395a1a7e88beab19c3f6b5b058fd99ae4c0a48ded6021b2265186ba3560b92ec514e056ed8c9ff32c0ce0f1ca0bcb2808c8967e5e8e98fa86dceaddf236e
-  data.tar.gz: 401d00c0da7059d0eefd9adec5f13a18e74446796e5cf92364c61c2547c886312c26b8b65eaa5510d46d423cdc27556c43778e090843f806cd7dd1a9384b4b95
+  metadata.gz: 1a4c186d390099072cf075e5ebce91f54b85b366888bc34418d392cdc7bb73aa9cb2cbbb5b5b6cf6b9efdfee17f628f19c41514e1973a22997e7cf008ebbc1c5
+  data.tar.gz: 37f8499fcd0e15309de9e590726d8db86c01ade4b805719c02be4199f48172dcb19a25ecc3140262d647490c2b655a6c0480b5ec101695822951d55b2642f7ed

data/Manifest.txt

@@ -2,29 +2,16 @@ HISTORY.md
 Manifest.txt
 README.md
 Rakefile
-config/pluto.index.yml
 lib/pluto/activerecord.rb
 lib/pluto/connecter.rb
-lib/pluto/fetcher.rb
-lib/pluto/formatter.rb
-lib/pluto/installer.rb
-lib/pluto/lister.rb
-lib/pluto/manifest_helpers.rb
 lib/pluto/models.rb
-lib/pluto/models/activity.rb
 lib/pluto/models/feed.rb
+lib/pluto/models/forward.rb
 lib/pluto/models/item.rb
 lib/pluto/models/site.rb
 lib/pluto/models/subscription.rb
 lib/pluto/models/utils.rb
-lib/pluto/refresher.rb
 lib/pluto/schema.rb
-lib/pluto/subscriber.rb
-lib/pluto/tasks/env.rake
-lib/pluto/tasks/setup.rake
-lib/pluto/tasks/stats.rake
-lib/pluto/tasks/update.rake
-lib/pluto/updater.rb
 lib/pluto/version.rb
 test/helper.rb
 test/test_helpers.rb

data/README.md

@@ -1,4 +1,4 @@
-# pluto-models gem - planet models and generator machinery for easy (re)use
+# pluto-models gem - planet schema 'n' models for easy (re)use
 
 * home  :: [github.com/feedreader/pluto-models](https://github.com/feedreader/pluto-models)
 * bugs  :: [github.com/feedreader/pluto-models/issues](https://github.com/feedreader/pluto-models/issues)
@@ -10,64 +10,12 @@
 
 ## Usage
 
-### Planet Configuration Sample 
-
-`ruby.ini`:
-
-```
-title = Planet Ruby
-
-[rubyflow]
-  title  = Ruby Flow
-  link   = http://rubyflow.com
-  feed   = http://feeds.feedburner.com/Rubyflow?format=xml
-
-[rubyonrails]
-  title = Ruby on Rails Blog
-  link  = http://weblog.rubyonrails.org
-  feed  = http://weblog.rubyonrails.org/feed/atom.xml
-
-[viennarb]
-  title = vienna.rb Blog
-  link  = http://vienna-rb.at
-  feed  = http://vienna-rb.at/atom.xml
-```
-
-or `ruby.yml`:
-
-```
-title: Planet Ruby
-
-
-rubyflow:
-  title: Ruby Flow
-  link:  http://rubyflow.com
-  feed:  http://feeds.feedburner.com/Rubyflow?format=xml
-
-rubyonrails:
-  title: Ruby on Rails Blog
-  link:  http://weblog.rubyonrails.org
-  feed:  http://weblog.rubyonrails.org/feed/atom.xml
-
-viennarb:
-  title: vienna.rb Blog
-  link:  http://vienna-rb.at
-  feed:  http://vienna-rb.at/atom.xml
-```
-
-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).
 
 
 ## Real World Usage
 
-[`pluto`](https://github.com/feedreader/pluto) - planet generator command line tool using the pluto-models gem
-[`pluto.live`](https://github.com/feedreader/pluto.live) - sample planet site; sinatra web app/starter template in ruby using the pluto-models gem
+- [`pluto`](https://github.com/feedreader/pluto) - planet generator command line tool using the pluto-models gem
+- [`pluto.live`](https://github.com/feedreader/pluto.live) - sample planet site; sinatra web app/starter template in ruby using the pluto-models gem
 
 
 

data/lib/pluto/connecter.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pluto
 
 
@@ -21,10 +23,9 @@ class Connecter
     @debug || false
   end
 
+  def connect( config={} )
 
-  def connect!( config = nil )
-
-    if config.nil?   # use/try DATABASE_URL from environment
+    if config.empty?   # use/try DATABASE_URL from environment
 
       logger.debug "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
 
@@ -77,18 +78,8 @@ class Connecter
       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  
-    end
-  end # method connect!
+  end # method connect
 
 
 end # class Connecter

data/lib/pluto/models.rb

@@ -7,24 +7,24 @@ require 'json'
 require 'uri'
 require 'pp'
 require 'fileutils'
-require 'logger'
 require 'date'
 require 'digest/md5'
 
+require 'logger'             # Note: use for ActiveRecord::Base.logger = Logger.new( STDOUT ) for now
+
 
 # 3rd party ruby gems/libs
 
-require 'active_record'   ## todo: add sqlite3? etc.
+require 'active_record'
 
 require 'logutils'
 require 'props'     # manage settings/env
 require 'fetcher'   # fetch (download) files
-require 'pakman'    # template pack manager
 require 'feedutils'
 require 'textutils'
 
+## add more activerecords addons/utils
 require 'activityutils'
-
 require 'props/activerecord'
 require 'logutils/activerecord'
 
@@ -35,53 +35,76 @@ require 'pluto/version'   # note: let version always get first
 require 'pluto/schema'
 require 'pluto/activerecord'
 
-require 'pluto/models/activity'
+require 'pluto/models/forward'
 require 'pluto/models/feed'
 require 'pluto/models/item'
 require 'pluto/models/site'
 require 'pluto/models/subscription'
 require 'pluto/models/utils'
 
-require 'pluto/manifest_helpers'
 require 'pluto/connecter'
 
-require 'pluto/installer'
-require 'pluto/fetcher'
-require 'pluto/refresher'
-require 'pluto/subscriber'
-require 'pluto/updater'
-require 'pluto/lister'
-require 'pluto/formatter'
-
 
 module Pluto
 
-  def self.connect!( config=nil )  # convenience shortcut
-    Connecter.new.connect!( config )
+  def self.create
+    CreateDb.new.up
+    ConfDb::Model::Prop.create!( key: 'db.schema.planet.version', value: VERSION )
   end
 
-
-  # todo: add alias update_site( config ) ??
-  def self.update_subscriptions( config )
-    Subscriber.new.update_subscriptions( config )
+  def self.create_all
+    LogDb.create # add logs table
+    ConfDb.create # add props table
+    ActivityDb::CreateDb.new.up    # todo/check - use ActivityDb.create if exists???
+    Pluto.create
   end
 
-  def self.update_feeds
-    Refresher.new.update_feeds
-  end
 
-  def self.update_sites
-    Refresher.new.update_sites
+  def self.auto_migrate!
+    # first time? - auto-run db migratation, that is, create db tables
+    unless LogDb::Model::Log.table_exists?
+      LogDb.create # add logs table
+    end
+
+    unless ConfDb::Model::Prop.table_exists?
+      ConfDb.create # add props table
+    end
+
+    ## fix: change to Model from Models
+    unless ActivityDb::Models::Activity.table_exists?
+      ActivityDb::CreateDb.new.up    # todo/check - use ActivityDb.create if exists???
+    end
+
+    unless Model::Feed.table_exists?
+      Pluto.create
+    end    
+  end # method auto_migrate!
+
+
+
+  def self.connect( config={} )  # convenience shortcut without (w/o) automigrate
+    Connecter.new.connect( config )
   end
 
-  def self.load_tasks
-    # load all builtin Rake tasks (from tasks/*rake)
-    load 'pluto/tasks/env.rake'
-    load 'pluto/tasks/setup.rake'
-    load 'pluto/tasks/stats.rake'
-    load 'pluto/tasks/update.rake'
+  def self.connect!( config={} )  # convenience shortcut w/ automigrate
+    Pluto.connect( config )
+    Pluto.auto_migrate!
   end
 
+
+  def self.setup_in_memory_db
+    # Database Setup & Config
+    ActiveRecord::Base.logger = Logger.new( STDOUT )
+    ## ActiveRecord::Base.colorize_logging = false - no longer exists - check new api/config setting?
+
+    Pluto.connect( adapter: 'sqlite3',
+                   database: ':memory:' )
+
+    ## build schema
+    Pluto.create_all
+  end # setup_in_memory_dd
+
+
 end  # module Pluto
 
 

data/lib/pluto/models/feed.rb

@@ -1,5 +1,8 @@
+# encoding: utf-8
+
+
 module Pluto
-  module Models
+  module Model
 
 class Feed < ActiveRecord::Base
   self.table_name = 'feeds'
@@ -123,5 +126,5 @@ class Feed < ActiveRecord::Base
 end  # class Feed
 
 
-  end # module Models
+  end # module Model
 end # module Pluto

data/lib/pluto/models/forward.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+module Pluto
+  module Model
+
+#######
+# ActivityDB
+
+# add shortcut/alias
+## fix: use Model instead of Models
+Activity = ActivityDb::Models::Activity
+
+  end # module Model
+
+  # note: convenience alias for Model
+  # lets you use include Pluto::Models
+  Models = Model
+
+end # module Pluto
+

data/lib/pluto/models/item.rb

@@ -1,5 +1,7 @@
+# encoding: utf-8
+
 module Pluto
-  module Models
+  module Model
 
 class Item < ActiveRecord::Base
   self.table_name = 'items'
@@ -69,5 +71,5 @@ class Item < ActiveRecord::Base
 end  # class Item
 
 
-  end # module Models
+  end # module Model
 end # module Pluto

data/lib/pluto/models/site.rb

@@ -1,5 +1,7 @@
+# encoding: utf-8
+
 module Pluto
-  module Models
+  module Model
 
 class Site < ActiveRecord::Base
   self.table_name = 'sites'
@@ -15,5 +17,5 @@ class Site < ActiveRecord::Base
 
 end
 
-  end # module Models
+  end # module Model
 end # module Pluto

data/lib/pluto/models/subscription.rb

@@ -1,5 +1,7 @@
+# encoding: utf-8
+
 module Pluto
-  module Models
+  module Model
 
 
 class Subscription < ActiveRecord::Base
@@ -10,5 +12,5 @@ class Subscription < ActiveRecord::Base
 end
 
 
-  end # module Models
+  end # module Model
 end # module Pluto

data/lib/pluto/models/utils.rb

@@ -1,5 +1,7 @@
+# encoding: utf-8
+
 module Pluto
-  module Models
+  module Model
 
 class ItemCursor
 
@@ -43,5 +45,5 @@ class ItemCursor
 end # class ItemCursor
 
 
-  end # module Models
+  end # module Model
 end # module Pluto

data/lib/pluto/schema.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 module Pluto
 

data/lib/pluto/version.rb

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

data/test/helper.rb

@@ -11,3 +11,16 @@ require 'pluto/models'
 
 LogUtils::Logger.root.level = :debug
 
+
+## some shortcuts
+Log         = LogDb::Model::Log
+Prop        = ConfDb::Model::Prop
+
+Site         = Pluto::Model::Site
+Feed         = Pluto::Model::Feed
+Item         = Pluto::Model::Item
+Subscription = Pluto::Model::Subscription
+
+
+Pluto.setup_in_memory_db
+

data/test/test_helpers.rb

@@ -12,11 +12,26 @@ class TestHelper < MiniTest::Test
 
   ## add some tests; to be done
 
-  def test_banner    
+  def test_banner
     puts Pluto.banner
-    
-    assert true
+
+    assert true    ## if we get here it should workd
   end
 
+  def test_models
+    assert_equal 1, Prop.count
+    assert_equal 0, Log.count
+
+    assert_equal 0, Site.count
+    assert_equal 0, Feed.count
+    assert_equal 0, Item.count
+    assert_equal 0, Subscription.count
+  end
+
+  def test_auto_migrate
+    Pluto.auto_migrate!
+    
+    assert true   ## if we get here it should workd
+  end
 
 end # class TestHelper