config_plus 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec4ceff4f380e588b0e43d98ff99ca52877041c
-  data.tar.gz: bed1b98ab63af2868bdb19fdf7942e6d85d828f2
+  metadata.gz: 189eb84bec6ebcfa3fbb181d5d548c47fb7e4c3e
+  data.tar.gz: 8b71d5dc1ac70f6eadc0fe5d49d78e724d63ad6c
 SHA512:
-  metadata.gz: b780e303acb8ce8a639bba7cd7f44120d59ec132230e081c0274032c784e709e75c3a5284aa230946fa8a7718880ecdcd1f5eda8378564ee6515961c38bea243
-  data.tar.gz: ef9f084b4b87ddb467278902b6b509f2ce7cf93b3459a2b9d57ec59fbc7a4442f3b787a2fc1cf6bb2d9317ac752025d52ac5161a604ffd21ed4dafe200de2301
+  metadata.gz: 4c5807c8460291543b7c536d0394034b05cc3bdef580fddccf312f56ee7af0fd69f78a3481f661e131263b9b5eae7c3141c0c55006f10c682b19a2a807d897cc
+  data.tar.gz: 7ccf3c2d162116d904e5d56162461cfc1f311239af62158869efbeb25d6df09a72b3035bd2797eebb0d005657829a56e9eadaca6a7c506d3580b1cdb5b6bd754

data/README.ja.md

@@ -54,6 +54,25 @@ ConfigPlus.generate(from: '/path/to/configuration/directory')
 ConfigPlus.generate(from: ['/path/to/directory1', '/path/to/file1.yml'])
 ```
 
+ERB タグを含む YAML の読み込み
+--------------------------------------------------
+`loader_logic` に `erb_yaml` を指定すると、ERB タグを解釈して読み込むことができます。
+
+たとえばこのような YAML ファイルがあった場合、
+
+```yaml
+abc:
+  foo: <%= (1..10).inject(&:+) %>
+```
+
+次のようになります。
+
+```ruby
+ConfigPlus.generate(from: 'path/to/configuration/file.erb.yml', loader_logic: :erb_yaml)
+ConfigPlus.abc.foo
+#=> 55
+```
+
 自動マッピング
 --------------------------------------------------
 YAML の構造と同じパスを持つクラスがある場合、
@@ -148,6 +167,7 @@ end
 | `namespace`     | 使用するネームスペース                                               |                   |
 | `root_dir`      | `source` で指定するパスの親ディレクトリのパス                        |                   |
 | `source`        | 設定ファイル、またはそれが格納されているディレクトリのパス           |                   |
+| `loader_logic`  | 設定ファイルの読み込みロジックの設定                                 | `default`         |
 
 ライセンス
 --------------------------------------------------

data/README.md

@@ -48,6 +48,25 @@ ConfigPlus.generate(from: ['/path/to/directory1', '/path/to/file1.yml'])
 ```
 
 
+YAML with ERB tags
+------------------------------------------------------------
+`ConfigPlus` can evaluate ERB tags when you add `loader_logic` setting.
+For example, when there is a such YAML file:
+
+```yaml
+abc:
+  foo: <%= (1..10).inject(&:+) %>
+```
+
+You can get it with the following way:
+
+```ruby
+ConfigPlus.generate(from: '/path/to/configuration/file.yml', loader_logic: :erb_yaml)
+ConfigPlus.abc.foo
+#=> 55
+```
+
+
 Auto Mapping
 ------------------------------------------------------------
 When data structure of loaded YAML and class structure of your
@@ -139,6 +158,9 @@ Properties you can set are following:
     relative path as `source`
 * `source`
   * a file path or a directory path or an array of them
+* `loader_logic`
+  * logic to load YAML files. When you specify `erb_yaml`
+    ERB tags can be evaluated
 
 
 License

data/lib/config_plus/base.rb

@@ -27,11 +27,14 @@ module ConfigPlus
     #
     #  ConfigPlus.generate(from: '/path/to/yaml/file.yml')
     #
-    def generate(from: nil, **properties)
-      config.source = from if from
-      properties.each do |k, v|
-        attr = "#{k}="
-        config.public_send(attr, v) if config.respond_to? attr
+    def generate(options={})
+      config.source = options.delete(:from) or options.delete('from')
+      options.each do |k, v|
+        if config.has_property?(k)
+          config.property_set(k, v)
+        else
+          raise "Unknown configuration property `#{k}'"
+        end
       end
       load
     end
@@ -50,7 +53,7 @@ module ConfigPlus
     #
     def load
       hash = config.loader.load
-      @root = self::Node.new(hash)
+      @root = config.node_model.new(hash)
     end
 
     def inherited_config_of(klass)
@@ -72,12 +75,13 @@ module ConfigPlus
       own = self::Helper.config_for(base, self.root)
       inheritance = inherited_config_of(base)
 
+      node_model = config.node_model
       [base, base.singleton_class].each do |obj|
         obj.instance_eval do
           config = inheritance ?
             ::ConfigPlus::Merger.merge(inheritance, own || {}) : own
-          config = ::ConfigPlus::Node.new(config)
-          define_method method_name, -> { config }
+          config = node_model.new(config)
+          define_method method_name, lambda { config }
         end
       end
     end

data/lib/config_plus/config.rb

@@ -1,19 +1,31 @@
 module ConfigPlus
   class Config
-    attr_accessor :config_method,
+    class << self
+      attr_reader :properties
+
+      def prop_accessor(*names)
+        @properties ||= []
+        @properties.concat(names)
+        attr_accessor *names
+      end
+
+      private :prop_accessor
+    end
+
+    prop_accessor :config_method,
                   :extension,
                   :namespace,
+                  :node_model,
                   :root_dir,
-                  :source
-    attr_reader :version
-    attr_writer :loader_logic
+                  :source,
+                  :loader_logic
 
     def initialize
-      @version = VERSION
       @config_method = :config
       @extension = nil
       @loader_logic = :default
       @namespace = nil
+      @node_model = Node
       @root_dir = nil
       @source = nil
     end
@@ -31,5 +43,17 @@ module ConfigPlus
         ::ConfigPlus::const_defined?(name)
       ::ConfigPlus::const_get(name)
     end
+
+    def version
+      VERSION
+    end
+
+    def has_property?(name)
+      self.class.properties.include?(name.to_sym)
+    end
+
+    def property_set(name, value)
+      instance_variable_set("@#{name}", value)
+    end
   end
 end

data/lib/config_plus/default_loader_logic.rb

@@ -1,20 +1,26 @@
 require 'yaml'
 
 module ConfigPlus
+  # This loader reads configuration from the specified
+  # a YAML file with its ++load_from++ method.
+  # When a directory is specified this recurses a file
+  # tree and reads all YAML files.
+  #
   class DefaultLoaderLogic
-    def initialize(config)
-      @config = config
-    end
-
-    def extension
-      @config.extension || [:yml, :yaml]
+    def initialize(extension)
+      @extension = extension || [:yml, :yaml]
     end
 
     def load_from(path)
+      raise Errno::ENOENT, "No such file or directory: `#{path}'" unless File.exist?(path)
       return load_file(path) if File.file?(path)
       load_dir(path)
     end
 
+    private
+
+    attr_reader :extension
+
     def load_file(filepath)
       content = open(filepath).read
       YAML.load(content).to_hash

data/lib/config_plus/erb_yaml_loader_logic.rb

@@ -0,0 +1,11 @@
+require 'erb'
+
+module ConfigPlus
+  class ErbYamlLoaderLogic < DefaultLoaderLogic
+    def load_file(filepath)
+      content = open(filepath).read
+      content = ERB.new(content).result
+      YAML.load(content).to_hash
+    end
+  end
+end

data/lib/config_plus/helper.rb

@@ -6,7 +6,7 @@ module ConfigPlus
         return configs.first if configs.size <= 1
 
         if configs.all? {|c| c.is_a? Hash }
-          configs.inject(::ConfigPlus::Node.new) {|h, conf|
+          configs.inject(config.class.new) {|h, conf|
             ::ConfigPlus::Merger.merge(h, conf)
           }
         else
@@ -17,8 +17,7 @@ module ConfigPlus
       def underscore(name)
         return name.underscore if name.respond_to?(:underscore)
 
-        name.gsub(/::/, '.')
-          .gsub(/((\A|\b)([A-Z]+))|([A-Z]+)/) do
+        name.gsub(/::/, '.').gsub(/((\A|\b)([A-Z]+))|([A-Z]+)/) do
           next $3.downcase if $3
           "_#{$4.downcase}"
         end
@@ -26,8 +25,8 @@ module ConfigPlus
 
       def classify(name)
         return name.classify if name.respond_to?(:classify)
-        name.to_s.gsub(/\/+/, '::')
-          .gsub(/_?([a-z]+)/) { $1.capitalize }
+        name.to_s.gsub(/\/+/, '::').
+          gsub(/_?([a-z]+)/) { $1.capitalize }
       end
 
       private

data/lib/config_plus/loader.rb

@@ -18,7 +18,7 @@ module ConfigPlus
     protected
 
     def loader_logic
-      @loader_logic ||= @config.loader_logic.new(@config)
+      @loader_logic ||= @config.loader_logic.new(@config.extension)
     end
 
     def source_paths

data/lib/config_plus/node.rb

@@ -44,7 +44,7 @@ module ConfigPlus
       return if respond_to?(method_name) or
         private_methods.include?(method_name.to_sym)
       singleton_class.class_eval do
-        define_method method_name, -> { self[method_name] }
+        define_method method_name, lambda { self[method_name] }
       end
     end
   end

data/lib/config_plus/version.rb

@@ -1,3 +1,3 @@
 module ConfigPlus
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/config_plus.rb

@@ -1,8 +1,12 @@
 require 'config_plus/base'
-require 'config_plus/config'
-require 'config_plus/default_loader_logic'
-require 'config_plus/helper'
-require 'config_plus/loader'
-require 'config_plus/merger'
-require 'config_plus/node'
 require 'config_plus/version'
+
+module ConfigPlus
+  autoload :Config, 'config_plus/config'
+  autoload :DefaultLoaderLogic, 'config_plus/default_loader_logic'
+  autoload :ErbYamlLoaderLogic, 'config_plus/erb_yaml_loader_logic'
+  autoload :Helper, 'config_plus/helper'
+  autoload :Loader, 'config_plus/loader'
+  autoload :Merger, 'config_plus/merger'
+  autoload :Node, 'config_plus/node'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - m4oda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-03 00:00:00.000000000 Z
+date: 2017-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,6 +37,7 @@ files:
 - lib/config_plus/base.rb
 - lib/config_plus/config.rb
 - lib/config_plus/default_loader_logic.rb
+- lib/config_plus/erb_yaml_loader_logic.rb
 - lib/config_plus/helper.rb
 - lib/config_plus/loader.rb
 - lib/config_plus/merger.rb
@@ -54,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -62,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An easy-to-use, powerful configuration module using YAML files