rails-etcs 0.1.0.beta2 → 0.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a32d6b5756f24bd469be9368fe4d3f616fad340da550d28e0b7be27815538e7b
-  data.tar.gz: 07b1f9ee4c086c04a2b06ecdcd6e12cef94416881cba1a6cb0702f8c85b70936
+  metadata.gz: e2b1136012e22d9ec9e8be3561c1fd2e6596df1c4a5db2189cf567fb420440fc
+  data.tar.gz: b82da6f787f7c42f9f374fcee9ff45651884dc7d96e8a6817a277bda59433622
 SHA512:
-  metadata.gz: f3f5fc7f5e9e761618b316adaa6a3bdeac33213880d2e12f7a80b3d4cf293bf77e4340c03924f7a00ef5573d8e64070aac22e669d54b5f49ceaf6a590e51d444
-  data.tar.gz: 5a4a54e5430cb7a0ce50b05ae942e6dbab8918a25686aee2aad6e38548312e11be6fb5d29a8050c0c19c45f33ef8677206d6cf9a82a7d15f06883a38ec67ac2d
+  metadata.gz: aedbf7efe88f3314d7d12721b451ebe4df6affbe000e425a88924d1b1f806b6a7c553dd8ba5e1fb0bbe0691de45dea48a1781b58a1b9d6e86487e264de196584
+  data.tar.gz: 524a96fd53f1f7269881313bd4ab4a0bb135b256bf3d63d86bace93035c4cc4373a90622428aef25ce1282dbff2fa43a22732e9490021a579d0605ab09cffb05

data/Appraisals

@@ -13,7 +13,7 @@ appraise 'rails-5.1' do
 end
 
 appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.0.rc'
+  gem 'rails', '~> 5.2.0'
 end
 
 appraise 'rails-head' do

data/Gemfile

@@ -11,3 +11,6 @@ gem 'appraisal'
 gem 'rake'
 gem 'rake-release'
 gem 'rspec', '~> 3.0'
+
+gem 'pry'
+gem 'pry-byebug'

data/README.md

@@ -2,21 +2,18 @@
 
 A collection of patches and alternatives for Rails core classes.
 
-## Installation
-
-If you cannot install the gem alone you should better not use it.
-
 ## Usage
 
 ### Rails::Etcs::Application
 
-`Rails::Etcs::Application` can be used instead of `Rails::Application` when creating your own applications:
+`Rails::Etcs::Application` can be included when creating your application:
 
 ```ruby
 # my-app/config/application.rb
 
 module MyApp
-  class Application < ::Rails::Etcs::Application
+  class Application < ::Rails::Application
+    include ::Rails::Etcs::Application
     self.ident = 'my-app'
   end
 end
@@ -46,6 +43,24 @@ You can customize the application name via `self.ident = 'my-app'`. Configuratio
 The same lookup is applied for `database.yml`, `secrets.yml`, and additional
 initializers and environments files.
 
+#### `#config_for`
+
+`#config_for` has been patched with additional functionality.
+
+It returns the full parsed config instead of the environment key when `env: false` is passed:
+
+```ruby
+config_for('database', env: false) # => {'development' => ..., 'test' => ..., ...}
+```
+
+The additional `quiet` keyword argument can be used to suppress a file not found exception. Together with the new `yield` support you can easily handle optional configuration:
+
+```ruby
+config_for('may-exist-or-not', quiet: true) do |conf|
+   # ...
+end
+```
+
 ## License
 
 Rails::Etcs (c) 2018 Jan Graichen

data/gemfiles/rails_4.2.gemfile

@@ -4,7 +4,10 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"
+gem "rake-release"
 gem "rspec", "~> 3.0"
+gem "pry"
+gem "pry-byebug"
 gem "rails", "~> 4.2.0"
 
 gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -4,7 +4,10 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"
+gem "rake-release"
 gem "rspec", "~> 3.0"
+gem "pry"
+gem "pry-byebug"
 gem "rails", "~> 5.0.0"
 
 gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -4,7 +4,10 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"
+gem "rake-release"
 gem "rspec", "~> 3.0"
+gem "pry"
+gem "pry-byebug"
 gem "rails", "~> 5.1.0"
 
 gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -4,7 +4,10 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"
+gem "rake-release"
 gem "rspec", "~> 3.0"
-gem "rails", "~> 5.2.0.rc"
+gem "pry"
+gem "pry-byebug"
+gem "rails", "~> 5.2.0"
 
 gemspec path: "../"

data/gemfiles/rails_head.gemfile

@@ -4,7 +4,10 @@ source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"
+gem "rake-release"
 gem "rspec", "~> 3.0"
+gem "pry"
+gem "pry-byebug"
 gem "rails", git: "https://github.com/rails/rails"
 
 gemspec path: "../"

data/lib/rails/etcs/application/configuration.rb

@@ -2,7 +2,7 @@
 
 require 'xdg'
 
-class Rails::Etcs::Application
+module Rails::Etcs::Application
   class Configuration < ::Rails::Application::Configuration
     attr_reader :ident
 
@@ -47,6 +47,15 @@ class Rails::Etcs::Application
           with: paths['config'],
           glob: 'secrets.yml{,.enc}'
 
+        if Gem::Requirement.new('< 5.1') =~ Gem::Version.new(Rails.version)
+          # Rails < 5.1 does not check for existing secrets file but just
+          # uses the first path even if it does not exist.
+          #
+          # This workaround fixes that by pre-expanding the path with only
+          # existing files.
+          paths.add 'config/secrets', with: paths['config/secrets'].existent
+        end
+
         paths['config'].to_ary.reverse.each do |dir|
           paths['config/initializers'] << File.join(dir, 'initializers')
           paths['config/environments'] << File.join(dir, 'environments')

data/lib/rails/etcs/application.rb

@@ -1,9 +1,23 @@
 # frozen_string_literal: true
 
 module Rails::Etcs
-  class Application < ::Rails::Application
+  module Application
+    extend ActiveSupport::Concern
+
     require 'rails/etcs/application/configuration'
 
+    included do
+      attr_writer :ident
+
+      def ident
+        @ident ||= begin
+          self.class.name.underscore
+              .gsub(/[^A-z]+/, '-')
+              .gsub(/-application$/, '')
+        end
+      end
+    end
+
     def config
       @config ||= begin
         root = self.class.find_root self.class.called_from
@@ -14,7 +28,8 @@ module Rails::Etcs
 
     # rubocop:disable AbcSize
     # rubocop:disable MethodLength
-    def config_for(name, env: Rails.env)
+    # rubocop:disable CyclomaticComplexity
+    def config_for(name, env: Rails.env, quiet: false)
       files = paths['config']
               .expanded
               .map {|d| Pathname.new(d).join("#{name}.yml") }
@@ -22,13 +37,18 @@ module Rails::Etcs
       yaml = files.find(&:exist?)
 
       unless yaml
+        return if quiet
         raise "Could not load configuration. No such file - #{files.join(', ')}"
       end
 
       require 'erb'
 
       data = YAML.safe_load(ERB.new(yaml.read).result, [], [], true) || {}
-      data.fetch(env, {})
+      data = env ? data.fetch(env, {}) : data
+
+      yield data if block_given?
+
+      data
     rescue Psych::SyntaxError => e
       raise <<~ERR
         YAML syntax error occurred while parsing #{yaml}.
@@ -38,15 +58,5 @@ module Rails::Etcs
       ERR
     end
     # rubocop:enable all
-
-    class << self
-      attr_writer :ident
-
-      def ident
-        @ident ||= begin
-          name.underscore.gsub(/[^A-z]+/, '-').gsub(/-application$/, '')
-        end
-      end
-    end
   end
 end

data/lib/rails/etcs/version.rb

@@ -6,7 +6,7 @@ module Rails
       MAJOR = 0
       MINOR = 1
       PATCH = 0
-      STAGE = :beta2
+      STAGE = :beta3
 
       STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-etcs
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta2
+  version: 0.1.0.beta3
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdg
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Collection of patches and alternatives for Rails core classes