shaf 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63fafb2ab34a4535e8d5ff38476ffcd43051bdcbeb397b9e9b06bc2c5fa855af
-  data.tar.gz: 8ce6362451525448857762bbfb016c80d698615dbf436549b3a600cf2521e72a
+  metadata.gz: b19e78676b4dc759b28198902633a7a66bde814d88b0ca7d442052fa62326ccd
+  data.tar.gz: 66c8a419a5590ad713f74a0d704439bf282cded99a5f5e0d30eabd26d8ab4d7d
 SHA512:
-  metadata.gz: 1f9fdf99ec948ac02e171efdb6be8d0f71c6e8231e8f9e27546f97f62c38b1d3365716d6e14a51f01676a0432e4b09be06db70a3ba8df571118dc2d8bba2266f
-  data.tar.gz: 737e3f828105a47ff124a02d0ccff2f8c9f2b60ec1202fab9ac695a860d3444a31147a90d6b3faa8120e1effe15f849941d883bc7f4d0e23d46e1ef8fa0302c2
+  metadata.gz: 183f94b5e51e365d431033c6b2b4d55dfec717c1b3808a5957751667e11a92d1e97b29ebcd5184b8140c2202d71de006e1cb2108c1438e746a0893275527264a
+  data.tar.gz: e9c812b5db8032ee330faeaba47e8d535f87f5321506f1f4e2a393b79d8118cf5d832f3ac43d84c2244834b294a7f448c542c4df9ab125f2b43a5901a9ba7569

data/lib/shaf/extensions/resource_uris.rb

@@ -74,6 +74,8 @@ module Shaf
     end
 
     def self.base_uri
+      return Settings.base_uri if Settings.base_uri
+
       protocol = Settings.protocol || 'http'
       host = Settings.hostname || 'localhost'
       port = Settings.port ? ":#{Settings.port}" : ""

data/lib/shaf/settings.rb

@@ -56,6 +56,10 @@ module Shaf
           @settings[key] = arg
         end
       end
+
+      def to_h
+        @settings.dup
+      end
     end
   end
 end

data/lib/shaf/utils.rb

@@ -56,15 +56,33 @@ module Shaf
       end
 
       def deep_symbolize_keys(value)
-        case value
+        deep_transform_keys(value) { |key| key.to_sym }
+      end
+
+      def deep_transform_keys(hash, &block)
+        case hash
         when Hash
-          value.each_with_object({}) do |(k, v), h|
-            h[k.to_sym] = deep_symbolize_keys(v)
+          hash.each_with_object({}) do |(k, v), h|
+            key = block.call(k)
+            h[key] = deep_transform_keys(v, &block)
           end
         when Array
-          value.map { |v| deep_symbolize_keys(v) }
+          hash.map { |v| deep_transform_keys(v, &block) }
         else
-          value
+          hash
+        end
+      end
+
+      def deep_transform_values(hash, &block)
+        case hash
+        when Hash
+          hash.each_with_object({}) do |(k, v), h|
+            h[k] = deep_transform_values(v, &block)
+          end
+        when Array
+          hash.map { |v| deep_transform_values(v, &block) }
+        else
+          block.call(hash)
         end
       end
 
@@ -72,14 +90,16 @@ module Shaf
         return {} unless File.exist? file
 
         yaml = File.read(file)
-        yaml = erb(yaml, binding: erb_binding) if erb || erb_binding
+        load_args = [yaml, {aliases: true, symbolize_names: true}]
         if RUBY_VERSION < '2.6.0'
-          Utils.deep_symbolize_keys(YAML.safe_load(yaml, [], [], true))
-        else
-          YAML.safe_load(yaml, aliases: true, symbolize_names: true)
+          load_args.pop
+          load_args += [[], [], true]
         end
+        YAML.safe_load(*load_args)
       end
 
+      private
+
       def erb(content, binding: nil)
         bindings = binding ? [binding] : []
         return ERB.new(content, 0, '%-<>').result(*bindings) if RUBY_VERSION < '2.6.0'

data/lib/shaf/version.rb

@@ -1,3 +1,3 @@
 module Shaf
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/templates/config.ru

@@ -1,4 +1,4 @@
-$:.unshift __dir__
+$:.unshift File.expand_path(__dir__)
 require 'config/bootstrap'
 
 Shaf::App.run!

data/templates/config/settings.yml

@@ -20,8 +20,8 @@ default: &default
 
 production:
   <<: *default
-  port: 443
-  protocol: https
+  port: <%= ENV.fetch('PORT', 443) %>
+  base_uri: https://my.public.shaf.api.com
 
 development:
   <<: *default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shaf
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -276,6 +276,7 @@ files:
 - upgrades/1.0.4.tar.gz
 - upgrades/1.1.0.tar.gz
 - upgrades/1.2.0.tar.gz
+- upgrades/1.2.1.tar.gz
 homepage: 
 licenses:
 - MIT