dimples 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01da1633d41b4a6bd472c904222ece07329a3fc0
-  data.tar.gz: eceed845d1ebedbfbe74505d7c4d5726baa9bd50
+  metadata.gz: bd1dfcb170bc3880ea8ea1391d1020abab51209c
+  data.tar.gz: a7499bb4bc0d2582397a3f3c0013a566c02f397e
 SHA512:
-  metadata.gz: be020d727fe23d9ceafbc4a0e4605e4e3a3c80d5def9824f0ed08d54cc759e32b1363d96ff2dfa45839632690924af3e7787488996a7ebb61f80aa231036359b
-  data.tar.gz: de19eae31e9bf2d79b521d0397d8d191252053a51b2e686b7bc6d5737fd2dbb8918babdcd48ea1dc3bd6547688195f264e37f2656a8b9e844a3f3225d5b3df77
+  metadata.gz: b925776ae7af279586dc90b839dba7bf5859d1101c6fa3c7accc84b68ac2ee7b22f8bbfa9b42c000754e6335901277a6db0ec479300f2ad8ff4fa8f316daeeee
+  data.tar.gz: 4c387d0ccc57b4ea7b602702c6db73b634e6b2b37fbcd8a6e9c3fbc57b5a09d531c55774a608800fb97d6fd84bf1070aee91d57bd81a81839ded8919d6e3a536

data/bin/dimples

@@ -42,7 +42,10 @@ config_path = options[:config] || File.join(Dir.pwd, 'config.json')
 
 if File.exist?(config_path)
   begin
-    config = JSON.parse(File.read(config_path), symbolize_names: true)
+    file_contents = File.read(config_path)
+    Trollop.die "Config file is empty (#{config_path})" if file_contents.empty?
+
+    config = JSON.parse(file_contents, symbolize_names: true)
   rescue
     Trollop.die "Invalid or malformed config file (#{config_path})"
   end
@@ -50,7 +53,7 @@ else
   Trollop.die "Unable to find config file (#{config_path})"
 end
 
-config[:verbose_logging] = options[:verbose] || false
+config[:verbose_logging] = options[:verbose] if options[:verbose]
 
 if Dir.exist?(lib_path)
   Dir.glob(File.join(lib_path, '**', '*.rb')) do |path|
@@ -58,8 +61,10 @@ if Dir.exist?(lib_path)
   end
 end
 
-site_klass = if config[:class_overrides][:site]
-               Object.const_get(config[:class_overrides][:site])
+site_klass_name = config.dig(:class_overrides, :site)
+
+site_klass = if site_klass_name
+               Object.const_get(site_klass_name)
              else
                Dimples::Site
              end

data/lib/dimples/configuration.rb

@@ -4,7 +4,16 @@ module Dimples
   # A class that models a site's configuration.
   class Configuration
     def initialize(config = {})
-      @settings = Configuration.default_settings.merge(config)
+      @settings = Dimples::Configuration.default_settings
+
+      config.each_key do |key|
+        case @settings[key]
+        when Hash
+          @settings[key].merge!(config[key])
+        else
+          @settings[key] = config[key]
+        end
+      end
     end
 
     def [](key)

data/lib/dimples/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dimples
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt