configue 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c8e92bfb0e0054f24a36d936fe8d6ff0aded7f0
-  data.tar.gz: f1dd22096a2c57bd9c4e6d2989a0462bf2cbdcc9
+  metadata.gz: 7b5c480c38747c62db01402d5a22485adb0e5ce3
+  data.tar.gz: a5f756b18f7ec40aa762969b51c3f8e05784db38
 SHA512:
-  metadata.gz: 9124dc2d54f63952dd029a593eac75a79852af3beb2bbc8481eee04f20433dab65e359a25351cc0c087a969a00f7e07cb0d5f31657feb5a28342362606760a52
-  data.tar.gz: 692fbbbded7516817eae301166073c028b6cd706aebe488e3ba7c86d7009c08b5e18cbf4cdcdfb1b13dd12db734750c3ee3ac484fd7b807f0d40be3b99ced95c
+  metadata.gz: f9a48b2d04625e6f7f9af57bf0c0f26d71e550af73d88130ec2208203da21855e66307fffb7de032ec38792ae87ef6ca6f0b753f8e06c65f2aae1779a864af4f
+  data.tar.gz: 41c6f83925d0ff7a78e9df3dcd5e7772f411a4de9fa8302c7f41cab05e6026e68317c74b401beed6c5ec0860dfe4cef34a94a69261aa7a2e579341102817fbc5

data/README.md

@@ -20,30 +20,28 @@ end
 ### Write your settings in YAML file
 ```yaml
 # config/accounts/admin_users.yml
-config:
-  accounts:
-    admin_users:
-      - grumpy
-      - sneezy
+accounts:
+  admin_users:
+    - grumpy
+    - sneezy
 ```
 
 You can make multiple settings files.
 
 ```yaml
 # config/accounts/test_users.yml
-config:
-  accounts:
-    test_users:
-      - sleepy
-      - dopey
+accounts:
+  test_users:
+    - sleepy
+    - dopey
 ```
 
 ### Access your settings
 ```
->> MyConf.config.accounts.admin_users
+>> MyConf.accounts.admin_users
 => ["grumpy", "sneezy"]
 
->> MyConf.config.accounts.test_users
+>> MyConf.accounts.test_users
 => ["sleepy", "dopey"]
 ```
 
@@ -115,6 +113,16 @@ class MyConf < Configue::Container
   ...
 ```
 
+### support ERB tag
+You can use ERB tags in YAML files.
+
+```yaml
+foo:
+  baa:
+    baz:
+      - <%= ENV['foo'] %>
+```
+
 ### import_config
 You can import a configuration into an object as one of its attributes without
 defining a class for that.

data/configue.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
-  s.version       = "0.1.4"
-  s.license       = "MIT" 
+  s.version       = "0.1.5"
+  s.license       = "MIT"
 
   s.add_development_dependency 'rspec'
 end

data/lib/configue/array_node.rb

@@ -100,7 +100,7 @@ module Configue
       :zip,
     ].each do |m|
       define_method(m, ->(*args, &block) {
-                      @hash.__send__(m, *args, &block)
+                      @container.__send__(m, *args, &block)
                     })
     end
   end

data/lib/configue/criteria.rb

@@ -2,24 +2,24 @@
 
 module Configue
   class Criteria
-    def initialize(hash, *path)
-      @hash = hash
+    def initialize(container, *path)
+      @container = container
       @path = path
     end
 
     def [](key)
-      self.class.new(@hash, *@path, key.to_s)
+      self.class.new(@container, *@path, key.to_s)
     end
 
     def retrieve
-      @path.each.inject(@hash) do |h, key|
+      @path.each.inject(@container) do |h, key|
         return nil unless h.respond_to?(:has_key?) and h.has_key?(key)
         h[key]
       end
     end
 
     def exist?
-      @path.each.inject(@hash) do |h, key|
+      @path.each.inject(@container) do |h, key|
         return false unless h.respond_to?(:has_key?) and h.has_key?(key)
         h[key]
       end

data/lib/configue/hash_node.rb

@@ -4,21 +4,21 @@ module Configue
   module HashNode
     def [](key)
       k = key.to_s
-      v = @hash[k]
-      @hash[k] = self.class.new(v) if node?(v)
-      @hash[k]
+      v = @container[k]
+      @container[k] = self.class.new(v) if node?(v)
+      @container[k]
     end
 
     def fetch(key)
       k = key.to_s
-      v = @hash[key]
-      @hash[k] = self.class.new(v) if node?(v)
-      @hash.fetch(k)
+      v = @container[key]
+      @container[k] = self.class.new(v) if node?(v)
+      @container.fetch(k)
     end
 
     def key?(key)
       k = key.to_s
-      @hash.key?(k)
+      @container.key?(k)
     end
     alias_method :has_key?, :key?
     alias_method :include?, :key?
@@ -26,16 +26,16 @@ module Configue
 
     def assoc(key)
       k = key.to_s
-      @hash.assoc(k)
+      @container.assoc(k)
     end
 
     def to_hash
-      @hash.dup
+      @container.dup
     end
 
     def values_at(*keys)
       ks = keys.map {|k| k.to_s }
-      @hash.values_at(*ks)
+      @container.values_at(*ks)
     end
 
     [ :all?,
@@ -61,7 +61,7 @@ module Configue
       :values,
     ].each do |m|
       define_method(m, ->(*args, &block) {
-                      @hash.__send__(m, *args, &block)
+                      @container.__send__(m, *args, &block)
                     })
     end
   end

data/lib/configue/importer.rb

@@ -20,8 +20,7 @@ module Configue
     #
     def import_config(args)
       raise ArgumentError unless args.respond_to?(:[])
-      var = args.delete(:as)
-      raise if var.nil?
+      var = args.delete(:as) || 'config'
 
       dirs = args.delete(:from_dir)
       files = args.delete(:from_file)

data/lib/configue/merger.rb

@@ -11,11 +11,15 @@ module Configue
     }
     private_constant :MERGER
 
-    def merge(hash1, hash2)
-      return hash2 unless hash1
-      return hash1 unless hash2
+    def merge(container1, container2)
+      return container2 unless container1
+      return container1 unless container2
 
-      hash1.merge(hash2, &MERGER)
+      if container1.is_a?(Array) and container2.is_a?(Array)
+        container1.concat(container2)
+      else
+        container1.merge(container2, &MERGER)
+      end
     end
 
     module_function :merge

data/lib/configue/node.rb

@@ -4,14 +4,17 @@ require 'configue/array_node'
 
 module Configue
   class Node
-    def initialize(hash)
-      raise TypeError unless hash.respond_to?(:[])
+    def initialize(object)
+      raise TypeError unless object.respond_to?(:[])
 
-      node_type = hash.instance_variable_get(:@node_type) if hash.is_a? self.class
-      if hash.is_a? Hash or node_type == :hash
-        setup_as_hash_node(hash)
-      elsif hash.is_a? Array or node_type == :array
-        setup_as_array_node(hash)
+      if object.is_a? self.class
+        node_type = object.instance_variable_get(:@node_type)
+      end
+
+      if object.is_a? Hash or node_type == :hash
+        setup_as_hash_node(object)
+      elsif object.is_a? Array or node_type == :array
+        setup_as_array_node(object)
       end
       self
     end
@@ -26,7 +29,7 @@ module Configue
 
     def setup_as_hash_node(hash)
       sig = class << self; self; end
-      @hash = hash.each.inject({}) do |h, (k, v)|
+      @container = hash.each.inject({}) do |h, (k, v)|
         sig.__send__(:define_method, k, ->{ self[k] })
         h[k.to_s] = node?(v) ? self.class.new(v) : v; h
       end
@@ -36,8 +39,8 @@ module Configue
 
     def setup_as_array_node(array)
       sig = class << self; self; end
-      @hash = array
-      @hash = array.map {|x| self.class.new(x) } if array.is_a? Array
+      @container = array
+      @container = array.map {|x| self.class.new(x) } if array.is_a? Array
       sig.__send__(:include, ArrayNode)
       @node_type = :array
     end

data/lib/configue/source_loader.rb

@@ -15,7 +15,7 @@ module Configue
       @sources.each do |src|
         src.each {|k, v| __send__("load_#{k}", v) }
       end
-      @hash
+      @container
     end
 
     protected
@@ -30,15 +30,15 @@ module Configue
       if @namespace and source[@namespace]
         namespaced_hash(source)
       else
-        @hash = Merger.merge(@hash, source)
+        @container = Merger.merge(@container, source)
       end
     end
 
     def namespaced_hash(hash)
       if @basespace and hash.key?(@basespace)
-        @hash = Merger.merge(@hash, @basespace => hash[@basespace])
+        @container = Merger.merge(@container, @basespace => hash[@basespace])
       end
-      @hash = Merger.merge(@hash, @namespace => hash[@namespace])
+      @container = Merger.merge(@container, @namespace => hash[@namespace])
     end
   end
 end

data/lib/configue/yaml_loader.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require "yaml"
+require "erb"
 
 module Configue
   class YamlLoader
@@ -8,7 +9,9 @@ module Configue
     end
 
     def load(path)
-      YAML.load_file(path)
+      buf = open(path).read
+      return {} if buf.empty?
+      YAML.load(ERB.new(buf).result)
     end
   end
 end

data/spec/basic_spec.rb

@@ -64,43 +64,120 @@ describe "Configue::Container" do
   end
 
   context "when loading a yaml file with an array of records" do
-    require File.expand_path("../samples/array_records_conf", __FILE__)
+    let(:config) do
+      source_file = File.expand_path("../samples/array_records.yml", __FILE__)
+      Class.new(Configue::Container) {
+        config.source_file source_file
+      }
+    end
 
     describe "first record" do
       describe ".has_key?" do
         context 'when parameter is "name"' do
           it "returns true" do
-            expect(ArrayRecordsConf.first).to have_key("name")
+            expect(config.first).to have_key("name")
           end
         end
 
         context 'when parameter is "email"' do
           it "returns true" do
-            expect(ArrayRecordsConf.first).to have_key("email")
+            expect(config.first).to have_key("email")
           end
         end
 
         context "when parameter is :name" do
           it "returns true" do
-            expect(ArrayRecordsConf.first).to have_key(:name)
+            expect(config.first).to have_key(:name)
           end
         end
 
         context "when parameter is :email" do
           it "returns true" do
-            expect(ArrayRecordsConf.first).to have_key(:email)
+            expect(config.first).to have_key(:email)
           end
         end
 
         context 'when parameter is "foo"' do
           it "returns false" do
-            expect(ArrayRecordsConf.first).not_to have_key("foo")
+            expect(config.first).not_to have_key("foo")
           end
         end
 
         context "when parameter is :foo" do
           it "returns false" do
-            expect(ArrayRecordsConf.first).not_to have_key(:foo)
+            expect(config.first).not_to have_key(:foo)
+          end
+        end
+      end
+    end
+  end
+
+  context "when loading the sample multiple yaml files with an array of records" do
+    let(:config) do
+      source_dir = File.expand_path("../samples/multiple_array_records", __FILE__)
+      Class.new(Configue::Container) {
+        config.source_dir source_dir
+      }
+    end
+
+    describe ".size" do
+      it "returns 2" do
+        expect(config.size).to eq 2
+      end
+    end
+
+    describe ".first" do
+      it "can respond to a `keys' message" do
+        expect(config.first).to respond_to(:keys)
+      end
+
+      describe ".keys" do
+        it "returns 'name' and 'fields'" do
+          expect(config.first.keys).to match_array(["name", "fields"])
+        end
+      end
+
+      describe ".name" do
+        it "returns String value" do
+          expect(config.first.name).to be_instance_of(String)
+        end
+      end
+
+      describe ".fields" do
+        describe ".first" do
+          describe ".keys" do
+            it "returns `name', `type', `default', `null' and `option'" do
+              target = config.first.fields.first.keys
+              expect(target).to match_array(%w[name type default null option])
+            end
+          end
+        end
+      end
+    end
+
+    describe ".select" do
+      context "when select records of which `name' is `friends'" do
+        let(:friends_record) do
+          config.select {|item| item.name == 'friends' }
+        end
+
+        it "returns an array that has only one record" do
+          expect(friends_record.size).to eq 1
+        end
+
+        describe ".first" do
+          it "returns a hash node that has `name' and `fields' key" do
+            expect(friends_record.first.keys).to match_array(%w[name fields])
+          end
+
+          describe ".fields" do
+            let(:friends_fields) do
+              friends_record.first.fields
+            end
+
+            it "return an array that has 4 records" do
+              expect(friends_fields.size).to eq 4
+            end
           end
         end
       end

data/spec/erb_spec.rb

@@ -0,0 +1,20 @@
+# coding: utf-8
+require File.expand_path("../spec_helper", __FILE__)
+
+describe "Configue::Container" do
+  context "when ERB tags are in the setting file" do
+    require File.expand_path("../samples/single_erb_yaml_conf", __FILE__)
+
+    context "1st level" do
+      it "has keys `foo', `baa', `baz'" do
+        expect(SingleErbYamlConf.keys).to eq ["foo", "baa", "baz"]
+      end
+    end
+
+    context "2nd level" do
+      it "has an array `pee', `kaa', `boo' as `foo'" do
+        expect(SingleErbYamlConf.foo).to eq ["pee", "kaa", "boo"]
+      end
+    end
+  end
+end

data/spec/samples/multiple_array_records/friends.yml

@@ -0,0 +1,26 @@
+- name: friends
+  fields:
+    - name: id
+      type: Bignum
+      default: null
+      "null": false
+      option:
+        - primary key
+        - auto increment
+    - name: subject_friend_id
+      type: Bignum
+      default: null
+      "null": false
+      option:
+        - foreign key: users
+    - name: object_friend_id
+      type: Bignum
+      default: null
+      "null": false
+      option:
+        - foreign key: users
+    - name: status
+      type: integer
+      default: 0
+      "null": false
+      option:

data/spec/samples/multiple_array_records/users.yml

@@ -0,0 +1,30 @@
+- name: users
+  fields:
+    - name: id
+      type: Bignum
+      default: null
+      "null": false
+      option:
+        - primary key
+        - auto increment
+    - name: name
+      type: string
+      default: null
+      "null": false
+      option:
+    - name: email
+      type: string
+      default: null
+      "null": false
+      option:
+        - unique
+    - name: password
+      type: string
+      default: null
+      "null": false
+      option:
+    - name: salt
+      type: string
+      default: null
+      "null": false
+      option:

data/spec/samples/single_erb_yaml/conf.yml

@@ -0,0 +1,11 @@
+foo:
+ - <%= 'pee-kaa-boo'.split('-')[0] %>
+ - <%= 'pee-kaa-boo'.split('-')[1] %>
+ - <%= 'pee-kaa-boo'.split('-')[2] %>
+baa:
+ - spam
+ - ham
+baz:
+ - toto
+ - titi
+ - tata

data/spec/samples/single_erb_yaml_conf.rb

@@ -0,0 +1,5 @@
+# coding: utf-8
+
+class SingleErbYamlConf < Configue::Container
+  config.source_dir "#{File.dirname(__FILE__)}/single_erb_yaml"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configue
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - hosim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -51,13 +51,15 @@ files:
 - spec/basic_spec.rb
 - spec/config_spec.rb
 - spec/configue/merger_spec.rb
+- spec/erb_spec.rb
 - spec/namespace_spec.rb
-- spec/samples/array_records_conf.rb
-- spec/samples/array_records_conf.yml
+- spec/samples/array_records.yml
 - spec/samples/base_namespace_conf.rb
 - spec/samples/config/admin.yml
 - spec/samples/config/test.yml
 - spec/samples/config_conf.rb
+- spec/samples/multiple_array_records/friends.yml
+- spec/samples/multiple_array_records/users.yml
 - spec/samples/multiple_yaml/foo/baa.yml
 - spec/samples/multiple_yaml/foo/bar/ding.yml
 - spec/samples/multiple_yaml/foo/bar/tick.yml
@@ -69,6 +71,8 @@ files:
 - spec/samples/namespace_conf.rb
 - spec/samples/signs/config.yml
 - spec/samples/signs_conf.rb
+- spec/samples/single_erb_yaml/conf.yml
+- spec/samples/single_erb_yaml_conf.rb
 - spec/samples/single_source_conf.rb
 - spec/samples/single_yaml/conf.yml
 - spec/samples/single_yaml_conf.rb
@@ -107,13 +111,15 @@ test_files:
 - spec/basic_spec.rb
 - spec/config_spec.rb
 - spec/configue/merger_spec.rb
+- spec/erb_spec.rb
 - spec/namespace_spec.rb
-- spec/samples/array_records_conf.rb
-- spec/samples/array_records_conf.yml
+- spec/samples/array_records.yml
 - spec/samples/base_namespace_conf.rb
 - spec/samples/config/admin.yml
 - spec/samples/config/test.yml
 - spec/samples/config_conf.rb
+- spec/samples/multiple_array_records/friends.yml
+- spec/samples/multiple_array_records/users.yml
 - spec/samples/multiple_yaml/foo/baa.yml
 - spec/samples/multiple_yaml/foo/bar/ding.yml
 - spec/samples/multiple_yaml/foo/bar/tick.yml
@@ -125,6 +131,8 @@ test_files:
 - spec/samples/namespace_conf.rb
 - spec/samples/signs/config.yml
 - spec/samples/signs_conf.rb
+- spec/samples/single_erb_yaml/conf.yml
+- spec/samples/single_erb_yaml_conf.rb
 - spec/samples/single_source_conf.rb
 - spec/samples/single_yaml/conf.yml
 - spec/samples/single_yaml_conf.rb

data/spec/samples/array_records_conf.rb

@@ -1,6 +0,0 @@
-# coding: utf-8
-require "configue"
-
-class ArrayRecordsConf < Configue::Container
-  config.source_file "#{File.dirname(__FILE__)}/array_records_conf.yml"
-end