easy_settings 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827b69b45d86134959d77d73490c8531bc213b78
-  data.tar.gz: 5605569579894ee23ebdc06fa923c455f212d32c
+  metadata.gz: 366d74abf13192efbab8c9441bc9fa51d83ccbe1
+  data.tar.gz: d3c86143c642fc900ca00ac5ee8cce947eddeec2
 SHA512:
-  metadata.gz: 5a1fa628bbe199f431ee8434c17763fb083a385a3c2984921d686e6c4ed97a0f49a667e403197e8f1d10c3414735fa23b9732d46e9dc890778701cd550705725
-  data.tar.gz: 6f3bd2bb344cb2f6a9ad27b20673fda388b89a2fc05f89fcc1943cfc4005ca57ca18cf65c370fccfbf4be95634a33a88db5461329abfab68a2ae28926c6ff6d4
+  metadata.gz: f6f1dc3c8fbe9bddb391824e99409791ced68ea24ffea5078bddff11f823de66a7419c776c92ffb8beba6719524a96f46188d2fbc977304b9a7785899fa1337d
+  data.tar.gz: 9041525ccd526ffd115c5914676ca74930ff2d0a2ad94aea44289cef3af48255b7543240855156af1fd01b670c27356b0efc9074628c8a1806813879b279ceff

data/lib/easy_settings.rb

@@ -4,11 +4,16 @@ require "erb"
 
 class EasySettings < Hashie::Mash
   SourceFileNotExist = Class.new(StandardError)
-
-  DEFAULT_FILES = %w(settings.yml config/settings.yml)
-
   class << self
-    attr_accessor :source_hash, :source_file, :namespace
+    attr_accessor :source_hash, :source_file, :namespace, :default_files
+
+    def inherited(child_class)
+      child_class.class_eval do
+        define_singleton_method(:default_files) do
+          instance_variable_get(:@default_files) || superclass.default_files
+        end
+      end
+    end
 
     def instance
       @instance ||= new(namespace ? _source[namespace] : _source)
@@ -53,7 +58,7 @@ class EasySettings < Hashie::Mash
     end
 
     def _source_from_default_file
-      DEFAULT_FILES.each do |f|
+      default_files.each do |f|
         path = File.expand_path(f, _root_path)
         return _load_file(path) if FileTest.exist?(path)
       end
@@ -69,6 +74,8 @@ class EasySettings < Hashie::Mash
     end
   end
 
+  self.default_files = %w(settings.yml config/settings.yml)
+
   def assign_property(name, value)
     super
     self[name]

data/lib/easy_settings_version.rb

@@ -1,3 +1,3 @@
 module EasySettingsVersion
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/config/child1.yml

@@ -0,0 +1 @@
+app_name: Child Class 1

data/spec/config/child2.yml

@@ -0,0 +1 @@
+app_name: Child Class 2

data/spec/config/grand_child.yml

@@ -0,0 +1 @@
+app_name: Grand Child

data/spec/{settings_with_namespace.yml → config/namespace.yml}

@@ -9,6 +9,6 @@ defaults: &defaults
       role: manager
   erb: <%= "This was set by ERB" %>
 
-test: 
+test:
   <<: *defaults
   app_name: EasySettingsTest

data/spec/easy_settings_spec.rb

@@ -33,7 +33,7 @@ shared_examples_for "EasySettings" do |proc|
     settings.foo = :bar
     expect(settings.foo).to eq :bar
 
-    admin3 = {"password" => "PassWord3", "role" => "administrator"}
+    admin3 = { "password" => "PassWord3", "role" => "administrator" }
     settings.admins.admin3 = admin3
     expect(settings.admins.admin3.to_h).to eq admin3
   end
@@ -42,7 +42,7 @@ shared_examples_for "EasySettings" do |proc|
     settings[:foo] = :bar
     expect(settings.foo).to eq :bar
 
-    admin3 = {"password" => "PassWord3", "role" => "administrator"}
+    admin3 = { "password" => "PassWord3", "role" => "administrator" }
     settings[:admins][:admin3] = admin3
     expect(settings.admins.admin3.to_h).to eq admin3
   end
@@ -120,46 +120,26 @@ shared_examples_for "EasySettings" do |proc|
 
     it "can set nil when using nil option" do
       expect(settings.newkey(nil, nil: true)).to be_nil
-      expect(settings.has_key?(:newkey)).to be_truthy
+      expect(settings.key?(:newkey)).to be_truthy
       expect(settings.newkey).to be_nil
     end
 
     it "doesn't set nil when not using nil option" do
       expect(settings.newkey(nil)).to be_nil
-      expect(settings.has_key?(:newkey)).to be_falsey
+      expect(settings.key?(:newkey)).to be_falsey
     end
   end
 end
 
-describe EasySettings do
-  before do
-    FileUtils.mkdir File.expand_path("../../config", __FILE__)
-  end
-
-  after do
-    FileUtils.rm_rf File.expand_path("../../config", __FILE__)
-  end
+require "helpers/default_paths"
 
-  let(:settings) do
-    Class.new(EasySettings)
-  end
-
-  let(:test_settings_file) do
-    File.expand_path("../settings.yml", __FILE__)
-  end
-
-  let(:default_settings_path1) do
-    File.expand_path("../../settings.yml", __FILE__)
-  end
-
-  let(:default_settings_path2) do
-    File.expand_path("../../config/settings.yml", __FILE__)
-  end
+describe EasySettings do
+  include_context "default_paths"
 
   let(:custom_settings_path) do
     File.expand_path("../../config/application.yml", __FILE__)
   end
-  
+
   let(:app_name) do
     "EasySettingsTest"
   end
@@ -173,12 +153,12 @@ describe EasySettings do
       FileUtils.rm_f default_settings_path1
     end
 
-    it_behaves_like("EasySettings", Proc.new{Class.new(EasySettings)})
+    it_behaves_like("EasySettings", proc { Class.new(EasySettings) })
 
     describe ".reload!" do
       it "can reload source" do
         expect(settings.app_name).to eq app_name
-        settings.source_hash = {app_name: "RELOAD"}
+        settings.source_hash = { app_name: "RELOAD" }
         expect(settings.reload!).to be_truthy
         expect(settings.app_name).to eq "RELOAD"
       end
@@ -194,7 +174,7 @@ describe EasySettings do
       FileUtils.rm_f default_settings_path2
     end
 
-    it_behaves_like("EasySettings", Proc.new{Class.new(EasySettings)})
+    it_behaves_like("EasySettings", proc { Class.new(EasySettings) })
   end
 
   context "from custom path" do
@@ -208,7 +188,7 @@ describe EasySettings do
 
     it_behaves_like(
       "EasySettings",
-      Proc.new do
+      proc do
         Class.new(EasySettings) do
           self.source_file = File.expand_path("../../config/application.yml", __FILE__)
         end
@@ -219,8 +199,8 @@ describe EasySettings do
   context "from source hash" do
     it_behaves_like(
       "EasySettings",
-      Proc.new do
-        source_file = File.expand_path("../settings.yml", __FILE__)
+      proc do
+        source_file = File.expand_path("../config/settings.yml", __FILE__)
         Class.new(EasySettings) do
           self.source_file = source_file
           self.source_hash = YAML.load_file(source_file)
@@ -232,9 +212,9 @@ describe EasySettings do
   context "with namespace" do
     it_behaves_like(
       "EasySettings",
-      Proc.new do
+      proc do
         Class.new(EasySettings) do
-          self.source_file = File.expand_path("../settings_with_namespace.yml", __FILE__)
+          self.source_file = File.expand_path("../config/namespace.yml", __FILE__)
           self.namespace   = "test"
         end
       end
@@ -249,7 +229,7 @@ describe EasySettings do
 
   context "with empty source" do
     it "EasySettings become empty hash" do
-      settings.source_file = File.expand_path("../empty_settings.yml", __FILE__)
+      settings.source_file = File.join(spec_config_path, "empty.yml")
       expect(settings.to_h).to eq({})
     end
   end
@@ -257,7 +237,7 @@ describe EasySettings do
   context "specify wrong source path" do
     it "raise error" do
       settings.source_file = "notexist.yml"
-      expect{settings.to_h}.to raise_error(EasySettings::SourceFileNotExist)
+      expect { settings.to_h }.to raise_error(EasySettings::SourceFileNotExist)
     end
   end
 end

data/spec/helpers/default_paths.rb

@@ -0,0 +1,23 @@
+shared_context "default_paths" do
+  let!(:gem_root) { File.expand_path("../../../", __FILE__) }
+  let!(:config_path) { File.join(gem_root, "config") }
+  let!(:spec_root) { File.join(gem_root, "spec") }
+  let!(:spec_config_path) { File.join(spec_root, "config") }
+
+  before do
+    FileUtils.mkdir config_path
+  end
+
+  after do
+    FileUtils.rm_rf config_path
+  end
+
+  let(:test_settings_file) do
+    File.join(spec_config_path, "settings.yml")
+  end
+
+  let(:default_settings_path1) { File.join(gem_root, "settings.yml") }
+  let(:default_settings_path2) { File.join(config_path, "settings.yml") }
+
+  let(:settings) { Class.new(EasySettings) }
+end

data/spec/inheritance_spec.rb

@@ -0,0 +1,39 @@
+require "helpers/default_paths"
+
+describe "inheritance" do
+  include_context "default_paths"
+
+  subject(:child_class1) do
+    Class.new(settings) do
+      self.default_files = [File.expand_path("../config/child1.yml", __FILE__)]
+    end
+  end
+
+  let(:child_class2) do
+    Class.new(settings) do
+      self.default_files = [File.expand_path("../config/child2.yml", __FILE__)]
+    end
+  end
+  before { FileUtils.cp test_settings_file, default_settings_path1 }
+  after { FileUtils.rm default_settings_path1 }
+
+  it "has different value from parent's one" do
+    expect(child_class1.app_name).not_to eq EasySettings.app_name
+  end
+
+  it "has differnt value from other child class's one" do
+    expect(child_class1.app_name).not_to eq child_class2.app_name
+  end
+
+  describe "grandchild" do
+    subject(:grand_child) do
+      Class.new(child_class1) do
+        self.default_files = [File.expand_path("../config/grand_child.yml", __FILE__)]
+      end
+    end
+
+    it "has different valud from child's one" do
+      expect(grand_child.app_name).not_to eq child_class1.app_name
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ if ENV["CI"]
 end
 
 require "fileutils"
-require "easy_settings" 
+require "easy_settings"
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_settings
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - nownabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -126,6 +126,12 @@ files:
 - lib/easy_settings.rb
 - lib/easy_settings/rails.rb
 - lib/easy_settings_version.rb
+- spec/config/child1.yml
+- spec/config/child2.yml
+- spec/config/empty.yml
+- spec/config/grand_child.yml
+- spec/config/namespace.yml
+- spec/config/settings.yml
 - spec/easy_settings_spec.rb
 - spec/easy_settings_test/.env
 - spec/easy_settings_test/.gitignore
@@ -177,9 +183,8 @@ files:
 - spec/easy_settings_test/spec/rails_helper.rb
 - spec/easy_settings_test/spec/spec_helper.rb
 - spec/easy_settings_test/vendor/assets/stylesheets/.keep
-- spec/empty_settings.yml
-- spec/settings.yml
-- spec/settings_with_namespace.yml
+- spec/helpers/default_paths.rb
+- spec/inheritance_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/nownabe/easy_settings
 licenses:
@@ -206,6 +211,12 @@ signing_key:
 specification_version: 4
 summary: EasySettings is a simple settings with YAML file.
 test_files:
+- spec/config/child1.yml
+- spec/config/child2.yml
+- spec/config/empty.yml
+- spec/config/grand_child.yml
+- spec/config/namespace.yml
+- spec/config/settings.yml
 - spec/easy_settings_spec.rb
 - spec/easy_settings_test/.env
 - spec/easy_settings_test/.gitignore
@@ -257,8 +268,6 @@ test_files:
 - spec/easy_settings_test/spec/rails_helper.rb
 - spec/easy_settings_test/spec/spec_helper.rb
 - spec/easy_settings_test/vendor/assets/stylesheets/.keep
-- spec/empty_settings.yml
-- spec/settings.yml
-- spec/settings_with_namespace.yml
+- spec/helpers/default_paths.rb
+- spec/inheritance_spec.rb
 - spec/spec_helper.rb
-has_rdoc: