bcdatabase 1.2.0 → 1.2.1

data/CHANGELOG.markdown

@@ -1,15 +1,18 @@
 Bcdatabase history
 ==================
 
-1.2.0
+1.2.1
 -----
+- Generalize `datamapper_adapter` and `jruby_adapter` transforms to
+  work with any similarly prefixed keys. (#15)
 
+1.2.0
+-----
 - Add automatic transform for `jruby_adapter` when running under
   JRuby. (#14)
 
 1.1.0
 -----
-
 - Introduce "transforms" -- a way to attach behavior to modify entries
   on load. See {Bcdatabase.load} for details.
 - Add `:datamapper` built-in transform to support sharing one set of

data/lib/bcdatabase.rb

@@ -111,6 +111,20 @@ module Bcdatabase
   ##
   # The set of groups and entries returned by one call to {Bcdatabase.load}.
   class DatabaseConfigurations
+    ##
+    # @return [#call] a transform that copies a prefixed key's value
+    #   to the name without the prefix. E.g., the built-in
+    #   `:datamapper` transform is `prefix_remove_copy_transform('datamapper_')`.
+    def self.prefix_remove_copy_transform(prefix)
+      lambda { |entry, name, group|
+        entry.merge(
+          entry.keys.select { |k| k =~ /^#{prefix}/ }.inject({}) { |additions, k|
+            additions[k.sub(/^#{prefix}/, '')] = entry[k]; additions
+          }
+        )
+      }
+    end
+
     BUILT_IN_TRANSFORMS = {
       :key_defaults => lambda { |entry, name, group|
         { 'username' => name, 'database' => name }.merge(entry)
@@ -118,12 +132,8 @@ module Bcdatabase
       :decrypt => lambda { |entry, name, group|
         entry.merge({ 'password' => Bcdatabase.decrypt(entry['epassword']) }) if entry['epassword']
       },
-      :datamapper => lambda { |entry, name, group|
-        entry.merge('adapter' => entry['datamapper_adapter']) if entry['datamapper_adapter']
-      },
-      :jruby => lambda { |entry, name, group|
-        entry.merge('adapter' => entry['jruby_adapter']) if entry['jruby_adapter']
-      }
+      :datamapper => prefix_remove_copy_transform('datamapper_'),
+      :jruby => prefix_remove_copy_transform('jruby_')
     }
 
     def self.automatic_transforms

data/lib/bcdatabase/version.rb

@@ -1,3 +1,3 @@
 module Bcdatabase
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bcdatabase
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Rhett Sutphin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -05:00
+date: 2011-09-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency