key_tree 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a507ce5dd70323ccb58dacefa9bb7bcbdb9479b977f086c09cfe3409326341
-  data.tar.gz: 205f90e3467562c846a0139cba358879f4942fc8fa6f91e726af5325f9093baf
+  metadata.gz: 173c5891978625d7465eda060527e347d2b027398ee4cd91c295515acd7f0e51
+  data.tar.gz: 4cad395ecbe13ad5e515e59c0a8fc9b19328590280623d95d1537358bd7ba821
 SHA512:
-  metadata.gz: f9df024317615e4ac92d1b552fc1c8adc51acb3dc9f1af9e1636cbdd2edb1e6db986cbcfb6ff1b00ff974ad91c4c0383be5e1ff1d909a0027745047521d315da
-  data.tar.gz: d34833616cc2eecb57630715e3a98c3a850c28257b670a22c9b99c5a5481f69c237244198a8e0967b434cdd58adb6da0096aa7449e242d1d069cbb68ec039c0f
+  metadata.gz: 8adf5ecf6a524a71d9dfb1989f5a9410a6b50ab63eed51c45abb07a434748343ef4e83e26fbec860876ee32f366ed2d78440eeb5f20257e8b873e37f4a34b502
+  data.tar.gz: b45dbebd32d4b54dbe9c38760e362cb41773d400d6859f7913eb052bd86c58a514539bfc58f204e10b119446d757bee089b80fd8cfdb3d0d596b7482fd74a95c

data/lib/key_tree/loader.rb

@@ -0,0 +1,21 @@
+module KeyTree
+  # Module to manage key tree loaders
+  module Loader
+    BUILTIN_LOADERS = {
+      json: 'JSON',
+      yaml: 'YAML', yml: 'YAML'
+    }.freeze
+
+    def self.[](loader_type)
+      @loaders ||= BUILTIN_LOADERS.each_with_object({}) do |pair, result|
+        type, name = pair
+        result[type] = const_get(name) if const_defined?(name)
+      end
+      @loaders[loader_type]
+    end
+
+    def self.[]=(type, loader_class)
+      @loaders[type] = loader_class
+    end
+  end
+end

data/lib/key_tree.rb

@@ -1,6 +1,7 @@
 require 'key_tree/version'
 require 'key_tree/tree'
 require 'key_tree/forest'
+require 'key_tree/loader'
 
 # Manage a tree of keys
 #
@@ -40,10 +41,9 @@ module KeyTree
     end
 
     type, serialization = typed_serialization.flatten
-
-    loader = get_loader(type)
+    loader = Loader[type]
     self[loader.load(serialization)].with_meta_data do |meta_data|
-      meta_data << { load: { type: type.to_sym,
+      meta_data << { load: { type: type,
                              loader: loader } }
     end
   end
@@ -52,6 +52,8 @@ module KeyTree
   #
   def self.open(file_name)
     type = File.extname(file_name)[/[^.]+/]
+    type = type.to_sym unless type.nil?
+
     keytree = File.open(file_name, mode: 'rb:utf-8') do |file|
       load_from_file(file, type)
     end
@@ -77,16 +79,6 @@ module KeyTree
 
   private_class_method
 
-  # Get a class for loading external serialization for +type+
-  # +require+s the class provider if necessary.
-  #
-  def self.get_loader(type)
-    Class.const_get(type.upcase)
-  rescue NameError
-    require type.to_s
-    retry
-  end
-
   def self.load_from_file(file, type)
     load(type => file.read).with_meta_data do |meta_data|
       file_path = file.path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: key_tree
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Calle Englund
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump
@@ -101,6 +101,7 @@ files:
 - key_tree.gemspec
 - lib/key_tree.rb
 - lib/key_tree/forest.rb
+- lib/key_tree/loader.rb
 - lib/key_tree/meta_data.rb
 - lib/key_tree/path.rb
 - lib/key_tree/tree.rb