easy_settings 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b709efa47d7dddceee7ab9a1b1e37dd8cbe3f4ec
-  data.tar.gz: b261837ca1c99072433d6cc17fbdf934c112444e
+  metadata.gz: 5e7a4cd755414c8b9ac73537415a9354c216cfbe
+  data.tar.gz: bb8c676c3225d497595cc0524566c268e97fb444
 SHA512:
-  metadata.gz: 626795da3c3d70ceec31ae5348b54c9401ec780cb8b73b7b6ec2c4c47de517e7ec92695694654ba79168bf8af34baaa04719866ec4459f1fb4e38bbcdd0c07f6
-  data.tar.gz: 5b84a6e1630eadbbddd70b6b7ee1169896e4eb17e4a56d3fa9619167188de956fe61953bab142191c322d716ea032740c6dfb9a26b40b1953ce1a42eba1abd50
+  metadata.gz: 4e84cede6e0deb01912732e031d493cba0fb2f33cbfc45d77ee9a36496e20e969fe5d6172780d760599b04e9b47bc77606310b2488fa724a9ede9b904121646f
+  data.tar.gz: 5c84841fb7e8c092a80ebaac569fbc7c3079e9d960b03a77773941b8baeefee7e6dcdccc47c4e4920a013250d11101270ff57b59f8af2273504227467d03982d

data/easy_settings.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "easy_settings"
+require "easy_settings_version"
 
 Gem::Specification.new do |spec|
   spec.name          = "easy_settings"
-  spec.version       = EasySettings::VERSION
+  spec.version       = EasySettingsVersion::VERSION
   spec.authors       = ["nownabe"]
   spec.email         = ["nownabe@gmail.com"]
   spec.summary       = %q{EasySettings is a simple settings with YAML file.}

data/lib/easy_settings.rb

@@ -2,20 +2,20 @@ require "hashie"
 require "yaml"
 require "erb"
 
+require "easy_settings_version"
+
 class EasySettings < Hashie::Mash
-  VERSION = "0.0.1"
+  include EasySettingsVersion
+
+  class SourceFileNotExist < StandardError; end
+
+  DEFAULT_FILES = %w(settings.yml config/settings.yml)
 
   class << self
     attr_accessor :source_hash, :source_file, :namespace
 
-    def method_missing(method_name, *args, &blk)
-      p method_name
-      p args
-      instance.send(method_name, *args, &blk)
-    end
-
     def instance
-      @instance ||= new(source_hash || source_file, nil, namespace)
+      @instance ||= new(namespace ? _source[namespace] : _source)
     end
 
     def load!
@@ -27,33 +27,43 @@ class EasySettings < Hashie::Mash
       @instance = nil
       load!
     end
-  end
 
-  def initialize(source = nil, default = nil, namespace = nil, &blk)
-    source = load_source_file(source) if source.nil? or source.is_a?(String)
-    source = source[namespace] if namespace
-    super(source, default)
-  end
+    private
 
-  def assign_property(name, value)
-    super
-    self[name]
-  end
+    def _source
+      return source_hash.to_hash if source_hash
+      return _source_from_file if source_file
+      _source_from_default_file
+    end
 
-  def find_file(file)
-    return file if file and FileTest.exist?(file)
-    ["settings.yml", "config/settings.yml"].each do |f|
-      path = File.expand_path(f, Dir.pwd)
-      return path if FileTest.exist?(path)
+    def _load_file(file)
+      content = File.read(file)
+      content.empty? ? nil : YAML.load(ERB.new(content).result).to_hash
+    end
+
+    def _source_from_file
+      unless FileTest.exist?(source_file)
+        raise(SourceFileNotExist, "Your source file '#{file}' does not exist.")
+      end
+      _load_file(source_file)
+    end
+
+    def _source_from_default_file
+      DEFAULT_FILES.each do |f|
+        path = File.expand_path(f, Dir.pwd)
+        return _load_file(path) if FileTest.exist?(path)
+      end
+      nil
+    end
+
+    def method_missing(method_name, *args, &blk)
+      instance.send(method_name, *args, &blk)
     end
-    nil
   end
 
-  def load_source_file(source)
-    file = find_file(source)
-    return nil unless file # = find_file(source)
-    content = File.read(file)
-    content.empty? ? {} : YAML.load(ERB.new(content).result).to_hash
+  def assign_property(name, value)
+    super
+    self[name]
   end
 
   def method_missing(method_name, *args, &blk)

data/lib/easy_settings_version.rb

@@ -0,0 +1,3 @@
+module EasySettingsVersion
+  VERSION = "0.0.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_settings
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - nownabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -94,6 +94,7 @@ files:
 - Rakefile
 - easy_settings.gemspec
 - lib/easy_settings.rb
+- lib/easy_settings_version.rb
 homepage: https://github.com/nownabe/easy_settings
 licenses:
 - MIT