thingfish-metastore-pg 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2994038b45a47267fabd1856d1a421c8f0bc79d8
-  data.tar.gz: 0763d5864e5f4dca9bdae8f6976b83d76e2aecf5
+  metadata.gz: 4cdd72c7d05eaa055da73c33c61c3a3855afea33
+  data.tar.gz: 24db84cda188e699a5085b0fc15563d2150eb4c6
 SHA512:
-  metadata.gz: c358ea5b1ba648219b3d6ce521f8d8f6dee053e161dd385c379c7532f0ba33b2f581f040e8e7be0fb77aff8d9f963797a56e0542f3026c41cf99439aa35cead8
-  data.tar.gz: e4a310fadb48052b82b7ce24f02e3650a3bb73e463de81895d4435d15b02b2f552fc2fd17b94fab3a7461d95bf6740cb259ec2610dc6d6f9e6e813302b2d9ca2
+  metadata.gz: f89915de236b45a95618a7063f4f274b1577236ee95b893afb58bc1a8aebef86baf6b7dcf3f0e92d368ceec1d5b8a6b3fa9150f3a98e3397eb823bcdb18640f2
+  data.tar.gz: 1139f3da4841b1586d99a9f4f4bb1ab748fec95cf207951f0497d017f48e67d8b09d7505329e9e81cc519a8f7efda5696c4022488a31c2b08c85a7804535a270

data/History.md

@@ -1,3 +1,8 @@
+## v0.2.0 [2016-11-14] Michael Granger <ged@FaerieMUD.org>
+
+Update to Configurability 3 syntax.
+
+
 ## v0.1.1 [2016-11-14] Michael Granger <ged@FaerieMUD.org>
 
 Bugfix release for build system change.

data/README.md

@@ -41,9 +41,8 @@ Here's an example configuration file that enables this plugin.
 	---
 	thingfish:
 	  metastore: pg
-
-	pg_metastore:
-	  uri: postgres://thingfish:password@db.example.com/database
+		pg_metastore:
+		  uri: postgres://thingfish:password@db.example.com/database
 
 
 When Thingfish starts, it will install the necessary database schema
@@ -52,7 +51,7 @@ automatically.
 
 ## License
 
-Copyright (c) 2014-2016, Michael Granger and Mahlon E. Smith.
+Copyright (c) 2014-2017, Michael Granger and Mahlon E. Smith.
 
 All rights reserved.
 

data/Rakefile

@@ -31,10 +31,10 @@ hoespec = Hoe.spec 'thingfish-metastore-pg' do |spec|
 	spec.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	spec.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 
-	spec.dependency 'thingfish', '~> 0.5'
-	spec.dependency 'loggability', '~> 0.11'
-	spec.dependency 'configurability', '~> 2.2'
-	spec.dependency 'sequel', '~> 4.35'
+	spec.dependency 'thingfish', '~> 0.6'
+	spec.dependency 'loggability', '~> 0.12'
+	spec.dependency 'configurability', '~> 3.1'
+	spec.dependency 'sequel', '~> 4.41'
 	spec.dependency 'pg', '~> 0.19'
 
 	spec.dependency 'hoe-deveiate', '~> 0.8',  :development
@@ -80,7 +80,7 @@ end
 
 task :gemspec => GEMSPEC
 file GEMSPEC => [ __FILE__, 'ChangeLog' ] do |task|
-	spec = $hoespec.spec
+	spec = hoespec.spec.dup
 	spec.files.delete( '.gemtest' )
 	spec.signing_key = nil
 	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"

data/lib/thingfish/metastore/pg.rb

@@ -24,13 +24,12 @@ class Thingfish::Metastore::PG < Thingfish::Metastore
 
 
 	# Package version
-	VERSION = '0.1.1'
+	VERSION = '0.2.0'
 
 	# Version control revision
-	REVISION = %q$Revision: ad5b3fefdce7 $
+	REVISION = %q$Revision: 257c0fa94884 $
 
 	# The data directory that contains migration files.
-	#
 	DATADIR = if ENV['THINGFISH_METASTORE_PG_DATADIR']
 			Pathname.new( ENV['THINGFISH_METASTORE_PG_DATADIR'] )
 		elsif Gem.datadir( 'thingfish-metastore-pg' )
@@ -40,31 +39,28 @@ class Thingfish::Metastore::PG < Thingfish::Metastore
 				'data' + 'thingfish-metastore-pg'
 		end
 
-	# The default config values
-	DEFAULT_CONFIG = {
-		uri: 'postgres:/thingfish',
-		slow_query_seconds: 0.01,
-	}
-
 
 	# Loggability API -- use a separate logger
 	log_as :thingfish_metastore_pg
 
-	# Configurability API -- load the `pg_metastore`
-	config_key :pg_metastore
+	# Configurability API -- add settings and defaults for the pg metastore
+	configurability( 'thingfish.pg_metastore' ) do
+
+		##
+		# The URI of the database to use for the metastore
+		setting :uri, default: 'postgres:/thingfish'
+
+		##
+		# The number of seconds to consider a "slow" query
+		setting :slow_query_seconds, default: 0.01
+
+	end
 
-	##
-	# The URI of the database to use for the metastore
-	singleton_attr_accessor :uri
 
 	##
 	# The Sequel::Database that's used to access the metastore tables
 	singleton_attr_accessor :db
 
-	##
-	# The number of seconds to consider a "slow" query
-	singleton_attr_accessor :slow_query_seconds
-
 
 	### Set up the metastore database and migrate to the latest version.
 	def self::setup_database
@@ -102,12 +98,8 @@ class Thingfish::Metastore::PG < Thingfish::Metastore
 	### Configurability API -- set up the metastore with the `pg_metastore` section of
 	### the config file.
 	def self::configure( config=nil )
-		config = self.defaults.merge( config || {} )
-
-		self.uri                = config[:uri]
-		self.slow_query_seconds = config[:slow_query_seconds]
-
-		self.setup_database
+		super
+		self.setup_database if self.uri
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thingfish-metastore-pg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
   p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thingfish
@@ -44,56 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: configurability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.35'
+        version: '4.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.35'
+        version: '4.41'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: This is a metadata storage plugin for the Thingfish digital asset manager