bibliotech 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8ab1fe00c875d062b981cd72231994461afabe4
-  data.tar.gz: 79859147aae212198e852bf30f67781bbae12ef4
+  metadata.gz: b70db645dc570547b493dda820ee2de92ea533f5
+  data.tar.gz: 0173bfc09213a275f488c02157b15a31eefec375
 SHA512:
-  metadata.gz: d3f106ed97cf3b468010ada6c7d8876724dd2f6f6f8a3b31f15d6c29491701b78c273c10eab65ad164a9def9ba2eac203ee99ea5c1c65dd105f397ed3fb788db
-  data.tar.gz: eea6a2754eb6f02cd7c393388afe37c2c6d69a3cfed71881e1702f82dec1566d5081043318e5d37d2893d0ba5514336209e15b4cb7879b011750f002d4238bcd
+  metadata.gz: 9f20dfa5184e4e2e7c2858ce1f39eb74e3b4555f9b8d49b79be864a4fdbebb3a7e551874a1e00985584c9fdab8c9afee88a173bc7ee08d917c9830f8b8abb830
+  data.tar.gz: 1174441ee8b6f34103df557508bfe4b066a336553f8c3f9705fdd5ee1c57ec81a6e7f3ad9cf86a5e67fee667d1d35ac5719d9111715d0d4d05094cd2f0ce0282

data/lib/bibliotech/builders/database.rb

@@ -4,7 +4,7 @@ module BiblioTech
   module Builders
     class Database < Base
       def self.find_class(config)
-        adapter_registry.fetch(config.adapter) do
+        adapter_registry.fetch(config.adapter.to_s) do
           raise "config.adapter is #{config.adapter.inspect} - supported adapters are #{supported_adapters.join(", ")}"
         end
       end

data/lib/bibliotech/builders/file.rb

@@ -4,16 +4,11 @@ module BiblioTech
   module Builders
     class File < Base
       def self.find_class(config)
-        file = config.backup_file
-
         explicit = find_explicit(config)
         return explicit unless explicit.nil?
 
-        _, klass = adapter_registry.find{ |pattern, klass|
-          next if pattern.is_a? Symbol
-          file =~ pattern
-        }
-        klass || identity_adapter
+        file = config.backup_file
+        adapter_registry.fetch(file){ identity_adapter }
       rescue Config::MissingConfig
         return NullAdapter
       end

data/lib/bibliotech/builders.rb

@@ -2,9 +2,49 @@ module BiblioTech
   module Builders
     class Base
       include Caliph::CommandLineDSL
+
+      class AdapterRegistry
+        def initialize
+          @hash = {}
+          @has_regexp = false
+        end
+
+        def put(name, value)
+          if name.is_a?(Regexp)
+            @has_regexp = true
+          else
+            name = name.to_s
+          end
+          @hash[name] = value
+        end
+
+        def fetch(name)
+          @hash.fetch(name.to_s) do
+            klass = nil
+            if @has_regexp
+              _, klass = @hash.find{ |pattern, klass|
+                next unless pattern.is_a? Regexp
+                name =~ pattern
+              }
+            end
+
+            if klass.nil?
+              if block_given?
+                yield
+              else
+                raise KeyError, "No adapter registered for #{name} - try #{@hash.keys.join(", ")}"
+              end
+            else
+              klass
+            end
+          end
+        end
+      end
+
       class << self
+
         def register(adapter_name)
-          adapter_registry[adapter_name] = self
+          adapter_registry.put(adapter_name, self)
         end
 
         def adapter_registry
@@ -12,7 +52,7 @@ module BiblioTech
         end
 
         def registry
-          @registry ||={}
+          @registry ||= AdapterRegistry.new
         end
 
         def supported_adapters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bibliotech
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Evan Dorn
@@ -128,7 +128,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- bibliotech-0.2.7 Documentation
+- bibliotech-0.2.8 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement