edgarj 0.01.19 → 0.01.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7dcfccb2029b1dc2b66cef4128f66f46ebdec25
-  data.tar.gz: c9d75de9e737a204e8156e83c3d7d2c94c4d26fe
+  metadata.gz: 833876d738a4dc3b3cfee8d7efcfa9508c919dd3
+  data.tar.gz: 07c2604cc87942816f9192f48b06cea521164c21
 SHA512:
-  metadata.gz: 2dd21b30f123b201fc72283fd9ab3403ce8041b05afe70e296e0430a6db73e4d9ccd16d3fae60ec0f5fd2adc95fce9f5d02f05cf9e4e046e37c17f1fb4d1eafc
-  data.tar.gz: bdd1cd446d5d0677aef030079b7b868ef32e1460338b943ecabaec552ab33544da7ace552f87d66143225c3f067d4b4ff6d148677567b1fc5284597b3819505c
+  metadata.gz: 23fd1a75c050a3080a00fef62a777c2af74595e6d96bb694395e8cc773515045dba4a68362b3a5ad349339056657d95bd77fe16d3844d1de1469fe12b22a16f9
+  data.tar.gz: 411a8e75d0d93849a5447eb337ad623e40cc9e63f8f50fba16864895df36d7da13a57408e7e6c4ac883b0e97b4e67f5e88eeddaf50c1a256caa3404c978802cb

data/config/settings.yml

@@ -3,3 +3,4 @@ edgarj:
     time_zone_for_timestamp_comparison: '9'
   work_dir: <%= Rails.root + 'tmp/edgarj' %>
   csv_dir:  <%= Rails.root + 'tmp/edgarj/csv_download' %>
+  _overwrite_test: 'hello'

data/lib/core_ext/rails_config.rb

@@ -0,0 +1,10 @@
+module RailsConfig
+  class Options < OpenStruct
+    def prepend_source!(source)
+      source = (Sources::YAMLSource.new(source)) if source.is_a?(String)
+
+      @config_sources ||= []
+      @config_sources.prepend(source)
+    end
+  end
+end

data/lib/edgarj/engine.rb

@@ -1,5 +1,7 @@
 module Edgarj
   class Engine < ::Rails::Engine
+    require 'rails_config'
+    require 'core_ext/rails_config'
     require 'core_ext/active_record'
     require 'core_ext/resources'
     require 'edgarj/enum_cache'
@@ -12,8 +14,8 @@ module Edgarj
     # (rails_config default loads from only Rails.root/config/...)
     def self.load_config
       engine_config_dir = Pathname.new(File.expand_path('../../../config', __FILE__))
-      Settings.add_source!((engine_config_dir + 'settings.yml').to_s)
-      Settings.add_source!((engine_config_dir + "settings/#{Rails.env}.yml").to_s)
+      Settings.prepend_source!((engine_config_dir + 'settings.yml').to_s)
+      Settings.prepend_source!((engine_config_dir + "settings/#{Rails.env}.yml").to_s)
       Settings.reload!
     end
 

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = "0.01.19"
+  VERSION = "0.01.20"
 end

data/test/dummy/config/settings.yml

@@ -0,0 +1,5 @@
+edgarj:
+  _overwrite_test:  'HELLO WORLD'
+
+dummy_app:
+  hello:            'Hello, World'

data/test/dummy/test/unit/rails_config_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class AuthorTest < ActiveSupport::TestCase
+  test 'settings' do
+    # test rails-app settings
+    assert_equal 'Hello, World', Settings.dummy_app.hello
+
+    # test Edgarj's settings
+    assert_equal (Rails.root + 'tmp/edgarj/csv_download').to_s, Settings.edgarj.csv_dir.to_s
+
+    # test overritten Edgarj's settings by rails-app
+    assert_equal 'HELLO WORLD', Settings.edgarj._overwrite_test
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 0.01.19
+  version: 0.01.20
 platform: ruby
 authors:
 - Fuminori Ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -275,6 +275,7 @@ files:
 - db/migrate/20140206222308_create_edgar_model_permissions.rb
 - db/migrate/20141209053055_rename_edgar_to_edgarj.rb
 - lib/core_ext/active_record.rb
+- lib/core_ext/rails_config.rb
 - lib/core_ext/resources.rb
 - lib/edgarj.rb
 - lib/edgarj/engine.rb
@@ -339,6 +340,7 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/locales/ja.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/settings.yml
 - test/dummy/db/migrate/20131107120635_create_authors.rb
 - test/dummy/db/migrate/20131218011851_create_books.rb
 - test/dummy/db/migrate/20140201000000_add_user_group_id_to_authors.rb
@@ -354,6 +356,7 @@ files:
 - test/dummy/test/helpers/authors_helper_test.rb
 - test/dummy/test/unit/author_test.rb
 - test/dummy/test/unit/book_test.rb
+- test/dummy/test/unit/rails_config_test.rb
 - test/edgar_test.rb
 - test/fixtures/authors.yml
 - test/fixtures/books.yml
@@ -451,6 +454,7 @@ test_files:
 - test/dummy/config/initializers/strong_parameter.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/routes.rb
+- test/dummy/config/settings.yml
 - test/dummy/config/database.yml
 - test/dummy/config/boot.rb
 - test/dummy/public/favicon.ico
@@ -464,6 +468,7 @@ test_files:
 - test/dummy/db/migrate/20140201000000_add_user_group_id_to_authors.rb
 - test/dummy/db/migrate/20140807065420_create_users.rb
 - test/dummy/test/unit/author_test.rb
+- test/dummy/test/unit/rails_config_test.rb
 - test/dummy/test/unit/book_test.rb
 - test/dummy/test/functional/books_controller_test.rb
 - test/dummy/test/functional/authors_controller_test.rb