configue 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86aff7ac75739e3642c097da1e578ba446fb9cdf
-  data.tar.gz: 13da63cb35000679ab923d6de5f608ca61f97623
+  metadata.gz: 2c8e92bfb0e0054f24a36d936fe8d6ff0aded7f0
+  data.tar.gz: f1dd22096a2c57bd9c4e6d2989a0462bf2cbdcc9
 SHA512:
-  metadata.gz: 73a694a548c2e4a3d0f0e6d5ddb45af82759281289ad18ddb5b22e11415d634cf0df90890841872ac217bf4fc8adc6787587420042645ee2e0a3bfd37455b594
-  data.tar.gz: 91a904450a5a18a26eacef5910289a2aebdf2e30e4198b6d521cd37049f2a0e573ef1105cf538d84b68718ffece338e6be652d878cfc20f69c54ac218b492f7d
+  metadata.gz: 9124dc2d54f63952dd029a593eac75a79852af3beb2bbc8481eee04f20433dab65e359a25351cc0c087a969a00f7e07cb0d5f31657feb5a28342362606760a52
+  data.tar.gz: 692fbbbded7516817eae301166073c028b6cd706aebe488e3ba7c86d7009c08b5e18cbf4cdcdfb1b13dd12db734750c3ee3ac484fd7b807f0d40be3b99ced95c

data/README.md

@@ -20,28 +20,30 @@ end
 ### Write your settings in YAML file
 ```yaml
 # config/accounts/admin_users.yml
-accounts:
-  admin_users:
-    - grumpy
-    - sneezy
+config:
+  accounts:
+    admin_users:
+      - grumpy
+      - sneezy
 ```
 
 You can make multiple settings files.
 
 ```yaml
 # config/accounts/test_users.yml
-accounts:
-  test_users:
-    - sleepy
-    - dopey
+config:
+  accounts:
+    test_users:
+      - sleepy
+      - dopey
 ```
 
 ### Access your settings
 ```
->> MyConf.accounts.admin_users
+>> MyConf.config.accounts.admin_users
 => ["grumpy", "sneezy"]
 
->> MyConf.accounts.test_users
+>> MyConf.config.accounts.test_users
 => ["sleepy", "dopey"]
 ```
 

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.3"
-  s.license       = "MIT"
+  s.version       = "0.1.4"
+  s.license       = "MIT" 
 
   s.add_development_dependency 'rspec'
 end

data/lib/configue/array_node.rb

@@ -0,0 +1,107 @@
+# coding: utf-8
+
+module Configue
+  module ArrayNode
+    [ :first,
+      :second,
+      :third,
+      :fourth,
+      :fifth,
+      :sixth,
+      :seventh,
+      :eighth,
+      :ninth,
+      :tenth,
+    ].each_with_index do |m, n|
+      define_method(m, -> { self[n] })
+    end
+
+    [ :&,
+      :*,
+      :+,
+      :-,
+      :|,
+      :<=>,
+      :==,
+      :[],
+      :all?,
+      :any?,
+      :assoc,
+      :at,
+      :chunk,
+      :collect,
+      :combination,
+      :compact,
+      :count,
+      :cycle,
+      :detect,
+      :drop,
+      :drop_while,
+      :each,
+      :each_index,
+      :each_slice,
+      :each_with_index,
+      :each_with_object,
+      :empty?,
+      :entries,
+      :eql?,
+      :fetch,
+      :find,
+      :find_all,
+      :find_index,
+      :flat_map,
+      :flattern,
+      :frozen?,
+      :grep,
+      :group_by,
+      :hash,
+      :include?,
+      :index,
+      :inject,
+      :join,
+      :length,
+      :map,
+      :max,
+      :max_by,
+      :member?,
+      :min,
+      :min_by,
+      :minmax,
+      :minmax_by,
+      :none?,
+      :one?,
+      :pack,
+      :partition,
+      :product,
+      :reassoc,
+      :reduce,
+      :reject,
+      :repeated_combination,
+      :repeated_permutation,
+      :reverse,
+      :reverse_each,
+      :rindex,
+      :rotate,
+      :sample,
+      :select,
+      :shuffle,
+      :size,
+      :slice,
+      :slice_before,
+      :sort,
+      :sort_by,
+      :take,
+      :take_while,
+      :to_a,
+      :to_ary,
+      :transpose,
+      :uniq,
+      :values_at,
+      :zip,
+    ].each do |m|
+      define_method(m, ->(*args, &block) {
+                      @hash.__send__(m, *args, &block)
+                    })
+    end
+  end
+end

data/lib/configue/container.rb

@@ -69,7 +69,7 @@ module Configue
         # makes @instance in this line.
         @setting.load!
 
-        if @instance.key?(name)
+        if @instance.respond_to?(:key?) and @instance.key?(name)
           @instance[name]
         else
           @instance.__send__(name, *args, &block)

data/lib/configue/container_adapter.rb

@@ -15,13 +15,15 @@ module Configue
     end
 
     def instance=(arg)
-      raise TypeError unless arg.respond_to?(:[]) or arg.respond_to?(:keys)
+      raise TypeError unless arg.respond_to?(:[])
 
       @class.instance_variable_set(:@instance, arg)
-      sig = class << @class; self; end
-      arg.keys.each do |k|
-        next unless k.to_s =~ /\A\w[\w0-9]*\z/
-        sig.__send__(:define_method, k, -> { arg[k] })
+      if arg.respond_to?(:keys)
+        sig = class << @class; self; end
+        arg.keys.each do |k|
+          next unless k.to_s =~ /\A\w[\w0-9]*\z/
+          sig.__send__(:define_method, k, -> { arg[k] })
+        end
       end
       arg
     end

data/lib/configue/hash_node.rb

@@ -0,0 +1,68 @@
+# coding: utf-8
+
+module Configue
+  module HashNode
+    def [](key)
+      k = key.to_s
+      v = @hash[k]
+      @hash[k] = self.class.new(v) if node?(v)
+      @hash[k]
+    end
+
+    def fetch(key)
+      k = key.to_s
+      v = @hash[key]
+      @hash[k] = self.class.new(v) if node?(v)
+      @hash.fetch(k)
+    end
+
+    def key?(key)
+      k = key.to_s
+      @hash.key?(k)
+    end
+    alias_method :has_key?, :key?
+    alias_method :include?, :key?
+    alias_method :member?,  :key?
+
+    def assoc(key)
+      k = key.to_s
+      @hash.assoc(k)
+    end
+
+    def to_hash
+      @hash.dup
+    end
+
+    def values_at(*keys)
+      ks = keys.map {|k| k.to_s }
+      @hash.values_at(*ks)
+    end
+
+    [ :all?,
+      :any?,
+      :collect,
+      :count,
+      :cycle,
+      :keys,
+      :to_s,
+      :each,
+      :each_pair,
+      :each_key,
+      :empty?,
+      :value?,
+      :size,
+      :length,
+      :merge,
+      :rassoc,
+      :reject,
+      :select,
+      :sort,
+      :to_a,
+      :values,
+    ].each do |m|
+      define_method(m, ->(*args, &block) {
+                      @hash.__send__(m, *args, &block)
+                    })
+    end
+  end
+end

data/lib/configue/merger.rb

@@ -2,19 +2,20 @@
 
 module Configue
   module Merger
+    MERGER = ->(key, h1, h2) {
+      if h1.is_a?(Hash) and h2.is_a?(Hash)
+        h1.merge(h2, &MERGER)
+      else
+        h2
+      end
+    }
+    private_constant :MERGER
+
     def merge(hash1, hash2)
       return hash2 unless hash1
       return hash1 unless hash2
 
-      merger = ->(key, h1, h2) {
-        if h1.is_a?(Hash) and h2.is_a?(Hash)
-          h1.merge(h2, &merger)
-        else
-          h2
-        end
-      }
-
-      hash1.merge(hash2, &merger)
+      hash1.merge(hash2, &MERGER)
     end
 
     module_function :merge

data/lib/configue/node.rb

@@ -1,74 +1,45 @@
 # coding: utf-8
+require 'configue/hash_node'
+require 'configue/array_node'
 
 module Configue
   class Node
     def initialize(hash)
       raise TypeError unless hash.respond_to?(:[])
 
-      sig = class << self; self; end
-      @hash = hash.each.inject({}) do |h, (k, v)|
-        sig.__send__(:define_method, k, ->{ self[k] })
-        h[k.to_s] = v; h
+      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)
       end
       self
     end
 
-    def [](key)
-      k = key.to_s
-      v = @hash[k]
-      @hash[k] = self.class.new(v) if v.is_a?(Hash)
-      @hash[k]
-    end
-
-    def fetch(key)
-      k = key.to_s
-      v = @hash[key]
-      @hash[k] = self.class.new(v) if v.is_a?(Hash)
-      @hash.fetch(k)
-    end
-
-    def key?(key)
-      k = key.to_s
-      @hash.key?(k)
-    end
-    alias_method :has_key?, :key?
-    alias_method :include?, :key?
-    alias_method :member?,  :key?
-
-    def assoc(key)
-      k = key.to_s
-      @hash.assoc(k)
-    end
-
-    def to_hash
-      @hash.dup
+    private
+    def node?(object, counter=0)
+      return true if object.is_a? Hash
+      return false if counter >= 3
+      return object.any? {|n| node?(n, counter + 1) } if object.is_a? Array
+      return false
     end
 
-    def values_at(*keys)
-      ks = keys.map {|k| k.to_s }
-      @hash.values_at(*ks)
+    def setup_as_hash_node(hash)
+      sig = class << self; self; end
+      @hash = 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
+      sig.__send__(:include, HashNode)
+      @node_type = :hash
     end
 
-    [ :keys,
-      :to_s,
-      :each,
-      :each_pair,
-      :each_key,
-      :empty?,
-      :value?,
-      :size,
-      :length,
-      :merge,
-      :rassoc,
-      :reject,
-      :select,
-      :sort,
-      :to_a,
-      :values,
-    ].each do |m|
-      define_method(m, ->(*args, &block) {
-                      @hash.__send__(m, *args, &block)
-                    })
+    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
+      sig.__send__(:include, ArrayNode)
+      @node_type = :array
     end
   end
 end

data/spec/basic_spec.rb

@@ -62,4 +62,48 @@ describe "Configue::Container" do
         {"accounts" => ["admin_users"]}
     end
   end
+
+  context "when loading a yaml file with an array of records" do
+    require File.expand_path("../samples/array_records_conf", __FILE__)
+
+    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")
+          end
+        end
+
+        context 'when parameter is "email"' do
+          it "returns true" do
+            expect(ArrayRecordsConf.first).to have_key("email")
+          end
+        end
+
+        context "when parameter is :name" do
+          it "returns true" do
+            expect(ArrayRecordsConf.first).to have_key(:name)
+          end
+        end
+
+        context "when parameter is :email" do
+          it "returns true" do
+            expect(ArrayRecordsConf.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")
+          end
+        end
+
+        context "when parameter is :foo" do
+          it "returns false" do
+            expect(ArrayRecordsConf.first).not_to have_key(:foo)
+          end
+        end
+      end
+    end
+  end
 end

data/spec/samples/array_records_conf.rb

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

data/spec/samples/array_records_conf.yml

@@ -0,0 +1,12 @@
+- name: John Doe
+  email: john.doe@xxx.xx
+  friends:
+    - name: Jane Doe
+      email: jane.doe@xxx.xx
+    - name: Jonnie Roe
+      email: j.roe@xxx.xx
+- name: Janie Roe
+  email: janie.roe@xxx.xx
+  friends:
+    - name: John Smith
+      email: john.smith@xxx.xx

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configue
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - hosim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,9 +37,11 @@ files:
 - Rakefile
 - configue.gemspec
 - lib/configue.rb
+- lib/configue/array_node.rb
 - lib/configue/container.rb
 - lib/configue/container_adapter.rb
 - lib/configue/criteria.rb
+- lib/configue/hash_node.rb
 - lib/configue/importer.rb
 - lib/configue/merger.rb
 - lib/configue/node.rb
@@ -50,6 +52,8 @@ files:
 - spec/config_spec.rb
 - spec/configue/merger_spec.rb
 - spec/namespace_spec.rb
+- spec/samples/array_records_conf.rb
+- spec/samples/array_records_conf.yml
 - spec/samples/base_namespace_conf.rb
 - spec/samples/config/admin.yml
 - spec/samples/config/test.yml
@@ -95,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A simple configuration solution
@@ -104,6 +108,8 @@ test_files:
 - spec/config_spec.rb
 - spec/configue/merger_spec.rb
 - spec/namespace_spec.rb
+- spec/samples/array_records_conf.rb
+- spec/samples/array_records_conf.yml
 - spec/samples/base_namespace_conf.rb
 - spec/samples/config/admin.yml
 - spec/samples/config/test.yml