dry-web 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02df09586b21408b90c3471bea69419b3cff6cdd
-  data.tar.gz: b5d24c33ce4f44cde81347a477d33100cb822fce
+  metadata.gz: 6bd38cff5b681971b1dc6b4291944d7d22c2b1fe
+  data.tar.gz: 3552ee32bd6052c1f4a1f50058ebdaf0977bead5
 SHA512:
-  metadata.gz: 8f7a7e946e9de3ad3ee0ae80d879e5136b5c054bfee920a4ccdc59e99fa5a993e102c64db37e7342b2df56a141822832a76295a47f0ccb1a38faeb87aa587675
-  data.tar.gz: 7423c16ad141d8a4457bcd4b7a741acdbd7ff8f16b13f2f471a3d29d729c4d4f41d88d2689c682b282ad18a52048ae4cc5c210cbade8311cd0e1eff135ee9a19
+  metadata.gz: 2a390ec0d28183d82e79cbdc288c0ef63b977b84f6e1d0ef5417c0e0ef1b18a7e3ddf04ed54ae9d37510532fbd5fd56aa4ada3792df8ed80a80be4b3200602d8
+  data.tar.gz: 9698aa2a296a5767ec936caf8c31994fc04a1e7daa4b43b77617a8359ac94d1affdd6f9bc31ad0d50d6e722daa2cb8a19bfea0d18eebfd3e5231027de3b0e777

data/.travis.yml

@@ -1,21 +1,19 @@
 language: ruby
-dist: trusty
-sudo: required
 cache: bundler
-bundler_args: --without tools
+bundler_args: --without benchmarks tools
 script:
   - bundle exec rake spec
+before_install: gem update --system
 after_script:
   - bundle exec codeclimate-test-reporter
 rvm:
-  - 2.4.0
-  - 2.3
-  - 2.2
-  - rbx-3
-  - jruby-9.1.6.0
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - jruby-9.1.9.0
 env:
   global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
+    - COVERAGE='true'
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.8.0 - 2018-01-02
+
+### Changed
+
+* Updated to `dry-system ~> 0.9` (solnic)
+
+[Compare v0.7.1...v0.8.0](https://github.com/dry-rb/dry-web/compare/v0.7.1...v0.8.0)
+
 # 0.7.1 - 2017-07-25
 
 ### Changed

data/Gemfile

@@ -2,6 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'dry-system', git: 'https://github.com/dry-rb/dry-system.git', branch: 'master'
+gem 'dry-monitor', git: 'https://github.com/dry-rb/dry-monitor.git', branch: 'master'
+gem 'dry-events', git: 'https://github.com/dry-rb/dry-events.git', branch: 'master'
+
 group :test do
   gem 'byebug', platform: :mri
   gem 'codeclimate-test-reporter'

data/dry-web.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1.0'
 
-  spec.add_runtime_dependency "dry-system", "~> 0.5"
-  spec.add_runtime_dependency "dry-monitor"
+  spec.add_runtime_dependency "dry-system", "~> 0.9"
+  spec.add_runtime_dependency "dry-monitor", "~> 0.1"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 11.0"

data/lib/dry/web/container.rb

@@ -4,41 +4,23 @@ require 'dry/monitor'
 module Dry
   module Web
     class Container < Dry::System::Container
-      setting :env, ENV.fetch('RACK_ENV', 'development').to_sym
-      setting :log_dir, 'log'.freeze
-      setting :log_levels, development: Logger::DEBUG, test: Logger::DEBUG
-      setting :logger
-      setting :listeners, false
+      use :env, inferrer: -> { ENV.fetch('RACK_ENV', 'development').to_sym }
+      use :logging
+      use :notifications
 
-      class << self
-        def configure(&block)
-          super.
-            configure_logger.
-            configure_notifications.
-            configure_rack_monitor.
-            attach_listeners
-        end
-
-        def configure_logger
-          if key?(:logger)
-            self
-          elsif config.logger
-            register(:logger, config.logger)
-          else
-            config.logger = Monitor::Logger.new(config.root.join(config.log_dir).realpath.join("#{config.env}.log"))
-            config.logger.level = config.log_levels.fetch(config.env, Logger::ERROR)
-            register(:logger, config.logger)
-            self
-          end
-        end
+      setting :logger_class, Monitor::Logger
+      setting :listeners, false
 
-        def configure_notifications
-          return self if key?(:notifications)
-          register(:notifications, Monitor::Notifications.new(config.name))
-          self
+      def self.inherited(klass)
+        klass.after(:configure) do
+          register_rack_monitor
+          attach_listeners
         end
+        super
+      end
 
-        def configure_rack_monitor
+      class << self
+        def register_rack_monitor
           return self if key?(:rack_monitor)
           register(:rack_monitor, Monitor::Rack::Middleware.new(self[:notifications]))
           self

data/lib/dry/web/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Web
-    VERSION = '0.7.1'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/spec/unit/container_spec.rb

@@ -2,19 +2,6 @@ RSpec.describe "Dry::Web::Container" do
   subject(:container) { Class.new(Dry::Web::Container) }
 
   describe "settings" do
-    # Do some acrobatics to make the container reload a setting from scratch
-    # and apply a new default
-    def reload_setting_for(key)
-      if Dry::Web::Container.instance_variables.include?(:@_config)
-        Dry::Web::Container.remove_instance_variable(:@_config)
-      end
-
-      Dry::Web::Container.instance_variable_get(:@_settings).delete_if do |setting|
-        setting.name == key
-      end
-      load "dry/web/container.rb"
-    end
-
     describe ".config.logger" do
       it 'sets up default logger for development env' do
         container.configure do |config|
@@ -81,36 +68,8 @@ RSpec.describe "Dry::Web::Container" do
 
     describe ".config.env" do
       context "existing RACK_ENV environment variable" do
-        before do
-          @rack_env = ENV["RACK_ENV"]
-          ENV["RACK_ENV"] = "production"
-
-          reload_setting_for :env
-        end
-
-        after do
-          ENV["RACK_ENV"] = @rack_env
-        end
-
         it "returns the RACK_ENV" do
-          expect(Dry::Web::Container.config.env).to eq :production
-        end
-      end
-
-      context "no RACK_ENV set" do
-        before do
-          @rack_env = ENV["RACK_ENV"]
-          ENV.delete("RACK_ENV")
-
-          reload_setting_for :env
-        end
-
-        after do
-          ENV["RACK_ENV"] = @rack_env
-        end
-
-        it "defaults to development" do
-          expect(Dry::Web::Container.config.env).to eq :development
+          expect(Class.new(Dry::Web::Container).config.env).to eq :test
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-web
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-system
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: dry-monitor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,9 +114,6 @@ files:
 - lib/dry-web.rb
 - lib/dry/web/console.rb
 - lib/dry/web/container.rb
-- lib/dry/web/settings.rb
-- lib/dry/web/settings/file_loader.rb
-- lib/dry/web/settings/file_parser.rb
 - lib/dry/web/version.rb
 - log/.gitkeep
 - spec/fixtures/multiple_env_files/.env
@@ -125,9 +122,6 @@ files:
 - spec/fixtures/test/log/.gitkeep
 - spec/spec_helper.rb
 - spec/unit/container_spec.rb
-- spec/unit/settings/file_loader_spec.rb
-- spec/unit/settings/file_parser_spec.rb
-- spec/unit/settings_spec.rb
 homepage: https://github.com/dry-rb/dry-web
 licenses:
 - MIT
@@ -148,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Lightweight web application stack on top of dry-system
@@ -159,6 +153,3 @@ test_files:
 - spec/fixtures/test/log/.gitkeep
 - spec/spec_helper.rb
 - spec/unit/container_spec.rb
-- spec/unit/settings/file_loader_spec.rb
-- spec/unit/settings/file_parser_spec.rb
-- spec/unit/settings_spec.rb

data/lib/dry/web/settings.rb

@@ -1,57 +0,0 @@
-require "dry/web/settings/file_loader"
-
-module Dry
-  module Web
-    class Settings
-      SettingValueError = Class.new(StandardError)
-
-      def self.schema
-        @schema ||= {}
-      end
-
-      def self.setting(name, type = nil)
-        settings(name => type)
-      end
-
-      def self.settings(new_schema)
-        check_schema_duplication(new_schema)
-        @schema = schema.merge(new_schema)
-
-        self
-      end
-
-      def self.check_schema_duplication(new_schema)
-        shared_keys = new_schema.keys & schema.keys
-
-        raise ArgumentError, "Setting :#{shared_keys.first} has already been defined" if shared_keys.any?
-      end
-      private_class_method :check_schema_duplication
-
-      def self.load_files(root, env)
-        FileLoader.new.(root, env)
-      end
-      private_class_method :load_files
-
-      def self.load(root, env)
-        env_data = load_files(root, env)
-        schema = self.schema
-
-        Class.new do
-          extend Dry::Configurable
-
-          schema.each do |key, type|
-            value = ENV.fetch(key.to_s.upcase) { env_data[key.to_s.upcase] }
-
-            begin
-              value = type[value] if type
-            rescue => e
-              raise SettingValueError, "error typecasting +#{key}+: #{e}"
-            end
-
-            setting key, value
-          end
-        end.config
-      end
-    end
-  end
-end

data/lib/dry/web/settings/file_loader.rb

@@ -1,28 +0,0 @@
-require "dry/web/settings/file_parser"
-
-module Dry
-  module Web
-    class Settings
-      class FileLoader
-        def call(root, env)
-          files(root, env).reduce({}) do |hash, file|
-            hash.merge(parser.(file))
-          end
-        end
-
-        private
-
-        def parser
-          @parser ||= FileParser.new
-        end
-
-        def files(root, env)
-          [
-            root.join(".env"),
-            root.join(".env.#{env}")
-          ].compact
-        end
-      end
-    end
-  end
-end

data/lib/dry/web/settings/file_parser.rb

@@ -1,49 +0,0 @@
-module Dry
-  module Web
-    class Settings
-      class FileParser
-        # Regex extracted from dotenv gem
-        # https://github.com/bkeepers/dotenv/blob/master/lib/dotenv/parser.rb#L14
-        LINE = %r(
-          \A
-          \s*
-          (?:export\s+)?    # optional export
-          ([\w\.]+)         # key
-          (?:\s*=\s*|:\s+?) # separator
-          (                 # optional value begin
-            '(?:\'|[^'])*'  #   single quoted value
-            |               #   or
-            "(?:\"|[^"])*"  #   double quoted value
-            |               #   or
-            [^#\n]+         #   unquoted value
-          )?                # value end
-          \s*
-          (?:\#.*)?         # optional comment
-          \z
-        )x
-
-        def call(file)
-          File.readlines(file).each_with_object({}) do |line, hash|
-            parse_line(line, hash)
-          end
-        rescue Errno::ENOENT
-          {}
-        end
-
-        private
-
-        def parse_line(line, hash)
-          if (match = line.match(LINE))
-            key, value = match.captures
-            hash[key] = parse_value(value || "")
-          end
-          hash
-        end
-
-        def parse_value(value)
-          value.strip.sub(/\A(['"])(.*)\1\z/, '\2')
-        end
-      end
-    end
-  end
-end

data/spec/unit/settings/file_loader_spec.rb

@@ -1,16 +0,0 @@
-require "dry/web/settings/file_loader"
-
-RSpec.describe Dry::Web::Settings::FileLoader do
-  let(:klass) { Dry::Web::Settings::FileLoader }
-  let(:root) { SPEC_ROOT.join("fixtures/multiple_env_files") }
-  let(:env) { :test }
-  subject(:data) { klass.new.(root, env)  }
-
-  describe "#call" do
-    it "will create hash with both variables from files" do
-      expect(subject["ONLY_ON_ENV"]).to eq ("will be loaded from env")
-      expect(subject["ONLY_IN_TEST"]).to eq ("will be loaded from env.test")
-      expect(subject["IN_BOTH_ENVIRONMENT"]).to eq (".env.test")
-    end
-  end
-end

data/spec/unit/settings/file_parser_spec.rb

@@ -1,29 +0,0 @@
-require "dry/web/settings/file_parser"
-
-RSpec.describe Dry::Web::Settings::FileParser do
-  let(:klass) { Dry::Web::Settings::FileParser }
-  let(:parser) { klass.new  }
-
-  describe "#call" do
-    context "with existing file" do
-      let(:file) { SPEC_ROOT.join("fixtures/test/.env.test") }
-      subject(:settings) { parser.(file) }
-
-      it "will retrun a hash with all variables and its value" do
-        expect(subject["API_KEY"]).to eq ("yaml123")
-        expect(subject["PRECOMPILE_ASSETS"]).to eq ("1")
-        expect(subject["UNDECLARED"]).to eq ("not declared in settings")
-        expect(subject["TESTING"]).to eq ("variables with = in it")
-      end
-    end
-
-    context "without existing file" do
-      let(:file) { SPEC_ROOT.join("fixtures/test/.env") }
-      subject(:settings) { parser.(file) }
-
-      it "will retrun a empty hash" do
-        expect(subject).to eq ({})
-      end
-    end
-  end
-end

data/spec/unit/settings_spec.rb

@@ -1,105 +0,0 @@
-require "dry/web/settings"
-
-RSpec.describe Dry::Web::Settings do
-  describe ".setting" do
-    it "raises an error if a duplicate setting is specified" do
-      expect {
-        Class.new(Dry::Web::Settings) do
-          setting :foo
-          setting :foo
-        end
-      }.to raise_error(ArgumentError)
-    end
-  end
-
-  describe ".load" do
-    subject(:settings) {
-      Class.new(Dry::Web::Settings) do
-        setting :api_key
-        setting :precompile_assets
-        setting :env_only_setting
-      end.load(SPEC_ROOT.join("fixtures/test"), :test)
-    }
-
-    it "loads settings from ENV first (as upper-cased variables)" do
-      ENV["ENV_ONLY_SETTING"] = "hello"
-      expect(settings.env_only_setting).to eq "hello"
-    end
-
-    it "loads settings from a env file (as upper-cased keys) if unavailable from ENV" do
-      expect(settings.api_key).to eq "yaml123"
-    end
-
-    it "ignores undeclared settings in the env file" do
-      expect(settings).not_to respond_to(:undeclared)
-    end
-
-    context "without file" do
-      subject(:settings) {
-        Class.new(Dry::Web::Settings) do
-          setting :api_key
-          setting :precompile_assets
-        end.load(SPEC_ROOT.join("fixtures/test"), :development)
-      }
-
-      it "will retrun an config hash " do
-        expect(settings.to_h).to eq ({api_key: nil, precompile_assets: nil})
-      end
-    end
-
-    context "specific env file will merge on top of `.env`" do
-      subject(:settings) {
-        Class.new(Dry::Web::Settings) do
-          setting :in_both_environment
-        end.load(SPEC_ROOT.join("fixtures/multiple_env_files"), :test)
-      }
-
-      it "will retrun the value set from the test env " do
-        expect(settings.in_both_environment).to eq ".env.test"
-      end
-    end
-
-    context "settings with types" do
-      before do
-        Test::CoercingBool = Class.new do
-          def self.[](val)
-            %w[1 true].include?(val.to_s)
-          end
-        end
-
-        Test::ConstraintNotMatched = Class.new(ArgumentError)
-
-        Test::LongString = Class.new do
-          def self.[](val)
-            raise Test::ConstraintNotMatched, "string must be 12 characters or longer" if val.length < 12
-          end
-        end
-      end
-
-      context "coercing types" do
-        subject(:settings) {
-          Class.new(Dry::Web::Settings) do
-            setting :precompile_assets, Test::CoercingBool
-          end.load(SPEC_ROOT.join("fixtures/test"), :test)
-        }
-
-        it "supports coercion input data" do
-          expect(settings.precompile_assets).to eq true
-        end
-      end
-
-      context "constraining types" do
-        subject(:settings) {
-          Class.new(Dry::Web::Settings) do
-            setting :api_key, Test::LongString
-          end.load(SPEC_ROOT.join("fixtures/test"), :test)
-        }
-
-        it "raises helpful exceptions if input data does not match constraints" do
-          expect { settings }.to raise_error(Dry::Web::Settings::SettingValueError)
-          expect { settings }.to raise_error(/error typecasting \+api_key\+/)
-        end
-      end
-    end
-  end
-end