yaml-ostruct 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c3e433860d99b053d5a297e14aae64e2c7d974
-  data.tar.gz: 45e4fa08cfaa323085f18fe37e10d4542438fea5
+  metadata.gz: eb627152d7f4fda0ae36fd7eab92d2362f88c267
+  data.tar.gz: aaa013d458dbfd79bf342fb48f0933f4ca97fd79
 SHA512:
-  metadata.gz: 28590ac5beb1476c87f6ed7f4a7207199ead19610b53af5593599e267031aa1ff2f9934631a2c3cb94deddc8b7fb12cba46a6ac8f369922ae5dc0bcfe6836198
-  data.tar.gz: 9d6c3ed7004d72e1f96968bdc3a59f3fcebe90ef8551f134645d5dc6655d21b238270015c96676d0fb244b5959983f791c8837d4ada9a87503389a715ce27f3f
+  metadata.gz: 7c72cd1b55b26d84b2d798bb4e8ba90933a3b20d71b3a7938c0ce2fca3913f4c201469a4614b7cd2396393a72287222f3d9de62144ee3eb2919ec74ce24f7954
+  data.tar.gz: 5e53a92f489b31860e5f3cbe5e884f777a70d8cc0314f144df1ca3f14036534ef036b1fc905990ea04b9e69f81b6d4eb90f18a2da2ef0a76ae33cf584667e5b9

data/lib/{yaml/version.rb → version.rb}

@@ -1,4 +1,4 @@
 # yaml-ostruct gem version
 module YamlOstruct
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/yaml/yaml_ostruct_impl.rb

@@ -51,15 +51,7 @@ module YamlOstruct
       Find.find(dir) do |yaml_file|
         next unless yaml_file =~ /.*\.yml$/ or yaml_file =~ /.*\.yaml$/
 
-        new_config = begin
-          YAML.load_file(yaml_file)
-        rescue StandardError => e
-          if @skip_error
-            nil
-          else
-            raise e
-          end
-        end
+        new_config = load_yaml(yaml_file)
 
         attr_name = File.basename(yaml_file, File.extname(yaml_file)).to_sym
         if config.respond_to?(attr_name)
@@ -76,6 +68,7 @@ module YamlOstruct
 
     def load_recursively_with_path(dir, config)
       files = Dir.entries(dir)
+
       files.each do |file_name|
         next if file_name.start_with?('.')
         if File.directory?("#{dir}/#{file_name}")
@@ -86,18 +79,19 @@ module YamlOstruct
         extension = File.extname(file_name)
         next unless extension == '.yml' or extension == '.yaml'
 
-        new_config = begin
-          YAML.load_file("#{dir}/#{file_name}")
-        rescue StandardError => e
-          if @skip_error
-            nil
-          else
-            raise e
-          end
-        end
+        new_config = load_yaml("#{dir}/#{file_name}")
+
         config.send("#{File.basename(file_name, extension)}=", new_config.to_hashugar)
       end
+
       config
     end
+
+    def load_yaml(file_name)
+      YAML.load_file(file_name)
+    rescue StandardError => e
+      raise e unless @skip_error
+      nil
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml-ostruct
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Daniel Han
@@ -14,28 +14,28 @@ dependencies:
   name: hashugar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Read yaml files recursively from a given directory and return an OpenStruct
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/yaml/ostruct.rb
-- lib/yaml/version.rb
 - lib/yaml/yaml_ostruct_impl.rb
+- lib/yaml/ostruct.rb
+- lib/version.rb
 homepage: https://github.com/hex0cter/yaml-ostruct
 licenses:
 - MIT
@@ -58,17 +58,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Read yaml files with path into an OpenStruct