dry-web 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cf74e9914404859f3cf1f5b28876932a39d0117
-  data.tar.gz: 9dd040e94f0c465f88c9801ca374286b07b47a6e
+  metadata.gz: ebcf4adb58017f9e639efb394e9beffed9569647
+  data.tar.gz: 04635ad8ebd204c99a9b07cd058c5153d72ac688
 SHA512:
-  metadata.gz: 903895a3b8da46407d8a852c6b2aebbeb1b4497cece24c8887d88b5ccfa88dfb4b2f80a8acd0f31813d22fe743ab64afa7ee220aeb96133a382ac8ea88a8891e
-  data.tar.gz: 4c724b2eade0233c437fc6abdeef5d3d862f0404fbad4615ddbc1d56414154771752d77de1ea9db1e777a647a591236fbd8dfad490bc62274473aca0b4571355
+  metadata.gz: b66229021044639a2abe4d42d4f4728deed718cd774324f1b551a8ebd6ef1c533f5bd4a7720753ada38c135ade1a47aaf9fcb4814cd8a6a621d2fa8d764b31bb
+  data.tar.gz: 2095506487f2aafa110dc75eba1dd202fd8a6ab9fadefafc5885e628dba7fb4aab8d80a3339d3080f22530d18b958d773005a5d1401d54b05f6a40857eda7149

data/.travis.yml

@@ -1,24 +1,21 @@
 language: ruby
-sudo: false
+dist: trusty
+sudo: required
 cache: bundler
 bundler_args: --without tools
 script:
   - bundle exec rake spec
+after_script:
+  - bundle exec codeclimate-test-reporter
 rvm:
   - 2.1
   - 2.2
   - 2.3.0
-  - rbx-2
+  - rbx-3
   - jruby-9000
-  - ruby-head
-  - jruby-head
 env:
   global:
     - JRUBY_OPTS='--dev -J-Xmx1024M'
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.0 - 2017-02-02
+
+### Added
+
+* Support for [dry-monitor](https://github.com/dry-rb/dry-monitor) with notifications and rack logging (solnic)
+
 # 0.5.0 - 2016-08-15
 
 Update to work with dry-system

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 group :test do
   gem 'byebug', platform: :mri
   gem 'codeclimate-test-reporter'
+  gem 'rack'
 end
 
 group :tools do

data/README.md

@@ -11,32 +11,18 @@
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-web/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-web.svg?branch=master&style=flat)][inchpages]
 
-## Tools
+## Examples
 
-dry-web is composed from the following libraries:
-
-* [dry-component](https://github.com/dry-rb/dry-component)
+See [icelab/berg](https://github.com/icelab/berg) for a working dry-web app, using [dry-web-roda](https://github.com/dry-rb/dry-web-roda).
 
 ## LICENSE
 
-See `LICENSE.txt` file.
+See `LICENSE` file.
 
 ## Development
 
-To run the specs make sure the dummy app uses proper db configuration `spec/dummy/config/application.yml`.
-Also you need to run the migrations, do following:
-
-```
-  $ cd spec/dummy
-  $ bundle install
-  $ rake db:migrate
-```
-
-After that you can run the specs from dry-web root:
-
-```
-  $ bundle exec rspec
-```
+After checking out the repo, run `bundle install` to install dependencies. Then, run
+`bundle exec rake spec` to run the tests.
 
 ## Contributing
 

data/dry-web.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Dry::Web::VERSION
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica@gmail.com"]
-  spec.summary       = "Lightweight web application stack on top of dry-component"
+  spec.summary       = "Lightweight web application stack on top of dry-system"
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/dry-rb/dry-web"
   spec.license       = "MIT"
@@ -21,6 +21,7 @@ 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_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 11.0"

data/lib/dry/web/container.rb

@@ -1,9 +1,56 @@
 require 'dry/system/container'
+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
+      setting :logger
+      setting :listeners, false
+
+      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
+
+        def configure_notifications
+          return self if key?(:notifications)
+          register(:notifications, Monitor::Notifications.new(config.name))
+          self
+        end
+
+        def configure_rack_monitor
+          return self if key?(:rack_monitor)
+          register(:rack_monitor, Monitor::Rack::Middleware.new(self[:notifications]))
+          self
+        end
+
+        def attach_listeners
+          return unless config.listeners
+          rack_logger = Monitor::Rack::Logger.new(self[:logger])
+          rack_logger.attach(self[:rack_monitor])
+          self
+        end
+      end
     end
   end
 end

data/lib/dry/web/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Web
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 ENV["RACK_ENV"] = "test"
 
 if RUBY_ENGINE == "ruby"
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-
   require "simplecov"
   SimpleCov.start do
     add_filter "/spec/"

data/spec/unit/container_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe "Dry::Web::Container" do
-  subject(:container) { Dry::Web::Container }
+  subject(:container) { Class.new(Dry::Web::Container) }
 
   describe "settings" do
     # Do some acrobatics to make the container reload a setting from scratch
@@ -9,10 +9,76 @@ RSpec.describe "Dry::Web::Container" do
         Dry::Web::Container.remove_instance_variable(:@_config)
       end
 
-      Dry::Web::Container.instance_variable_get(:@_settings)[key] = nil
+      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|
+          config.env = :development
+        end
+
+        expect(container[:logger].level).to be(Logger::DEBUG)
+      end
+
+      it 'sets up default logger for non-development env' do
+        container.configure do |config|
+          config.env = :production
+        end
+
+        expect(container[:logger].level).to be(Logger::ERROR)
+      end
+
+      it 'allows presetting a loggert' do
+        container.configure do |config|
+          config.logger = 'my logger'
+        end
+
+        expect(container[:logger]).to eql('my logger')
+      end
+    end
+
+    describe '.config.notifications' do
+      it 'sets up notifications by default' do
+        container.configure do |config|
+          config.env = :development
+        end
+
+        expect(container[:notifications].id).to be(container.config.name)
+      end
+    end
+
+    describe '.config.rack_monitor' do
+      it 'sets up rack monitor by default' do
+        container.configure do |config|
+          config.env = :development
+        end
+
+        expect(container[:rack_monitor].notifications).to be(container[:notifications])
+      end
+    end
+
+    describe '.config.rack_logger' do
+      it 'sets up rack logger by default' do
+        logger = spy(:logger)
+
+        container.configure do |config|
+          config.env = :development
+          config.logger = logger
+          config.listeners = true
+        end
+
+        payload = { a_rack: :env_hash }
+
+        container[:rack_monitor].instrument(:start, env: payload)
+
+        expect(logger).to have_received(:info)
+      end
+    end
+
     describe ".config.env" do
       context "existing RACK_ENV environment variable" do
         before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-web
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-system
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: dry-monitor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
-description: Lightweight web application stack on top of dry-component
+description: Lightweight web application stack on top of dry-system
 email:
 - piotr.solnica@gmail.com
 executables: []
@@ -91,10 +105,8 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
-- LICENSE.txt
 - README.md
 - Rakefile
 - dry-web.gemspec
@@ -104,7 +116,9 @@ files:
 - lib/dry/web/settings.rb
 - lib/dry/web/umbrella.rb
 - lib/dry/web/version.rb
+- log/.gitkeep
 - spec/fixtures/test/config/settings.yml
+- spec/fixtures/test/log/.gitkeep
 - spec/spec_helper.rb
 - spec/unit/container_spec.rb
 - spec/unit/settings_spec.rb
@@ -129,12 +143,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
-summary: Lightweight web application stack on top of dry-component
+summary: Lightweight web application stack on top of dry-system
 test_files:
 - spec/fixtures/test/config/settings.yml
+- spec/fixtures/test/log/.gitkeep
 - spec/spec_helper.rb
 - spec/unit/container_spec.rb
 - spec/unit/settings_spec.rb

data/CODE_OF_CONDUCT.md

@@ -1,13 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2015 Piotr Solnica
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.