hanami 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5241578094119f951c2963df359b8f839520c629
-  data.tar.gz: 228ea32e116908b675b40a0b8ed892f42f824514
+  metadata.gz: dac74bd1407b2a277b071bfd1c678d561b5d1385
+  data.tar.gz: df791585b6be2709032db1ac7d492ab5d165da3e
 SHA512:
-  metadata.gz: 07b120d484379b5a1f111413fc9848e02e1e7b38925521313794002bb0e32c9f96531505e95f37564a63e5a396bc2968fee7934e3371d2f4b481239273e5880a
-  data.tar.gz: de770871c2358c88742b3be294359ea030ca0e499b6e661a95eb71cbf497c742671e8f8cdb9b22907ebcdd279a414fd96a82e5bd509aa595fe27a5c11ef99f62
+  metadata.gz: '00007885789a92bc354914bdaf4a35330b33bdf066d01bccc438f35e5ddc606fe7464284893a49cbab28225a0d590d84265acc5ccb3ef88044c3d82082140968'
+  data.tar.gz: 0b9bfe9ec4eb0924f44a43dc053cadaf86fdf6b30dc9f393e4806710845ed2e254424719b3e4d657f6e20808f5cd2f228b1d4535b312e4eb40f0c6332f01e390

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Hanami
 The web, with simplicity.
 
+## v0.9.2 - 2016-12-19
+## Added
+- [The Crab] Mark unit tests/specs as pending for generated actions and views
+
+### Fixed
+- [Luca Guidi] Rake task `:environment` no longer depends on the removed `:preload` task
+- [Luca Guidi] Ensure force SSL to use the default port, or the configured one
+- [Luca Guidi] Boot the project when other it's started without `hanami server` (eg. `puma` or `rackup`)
+
 ## v0.9.1 - 2016-11-18
 ### Fixed
 - [Luca Guidi] Ensure JSON body parser to not eval untrusted input

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+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, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/FEATURES.md

@@ -3,7 +3,11 @@
 
 ## Features
 
-## v0.9.0 - (unreleased)
+## v0.9.2 - 2016-12-19
+
+## v0.9.1 - 2016-11-18
+
+## v0.9.0 - 2016-11-15
 
 - Experimental repositories associations (only "has many")
 - Database automapping for SQL databases

data/README.md

@@ -1,23 +1,50 @@
-# Hanami
+[![Gem Version](https://badge.fury.io/rb/hanami.svg)](http://badge.fury.io/rb/hanami)
+[![Build Status](https://secure.travis-ci.org/hanami/hanami.svg?branch=master)](http://travis-ci.org/hanami/hanami?branch=master)
+[![Coverage](https://coveralls.io/repos/hanami/hanami/badge.svg?branch=master)](https://coveralls.io/r/hanami/hanami)
+[![Code Climate](https://codeclimate.com/github/hanami/hanami.svg)](https://codeclimate.com/github/hanami/hanami)
+[![Dependencies](https://gemnasium.com/hanami/hanami.svg)](https://gemnasium.com/hanami/hanami)
+[![Inline docs](http://inch-ci.org/github/hanami/hanami.svg)](http://inch-ci.org/github/hanami/hanami)
+
+# Hanami :cherry_blossom:
 
 The web, with simplicity.
 
 ## Frameworks
 
-Hanami combines small yet powerful frameworks:
+Hanami is a **full-stack** Ruby web framework.
+It's made up of smaller, single-purpose libraries.
 
-* [**Hanami::Utils**](https://github.com/hanami/utils) - Ruby core extensions and class utilities
-* [**Hanami::Router**](https://github.com/hanami/router) - Rack compatible HTTP router for Ruby
+This repository is for the full-stack framework,
+which provides the glue that ties all the parts together:
+
+* [**Hanami::Model**](https://github.com/hanami/model) - Persistence with entities, repositories and data mapper
+* [**Hanami::View**](https://github.com/hanami/view) - Presentation with a separation between views and templates
+* [**Hanami::Controller**](https://github.com/hanami/controller) - Full featured, fast and testable actions for Rack
 * [**Hanami::Validations**](https://github.com/hanami/validations) - Validations mixin for Ruby objects
+* [**Hanami::Router**](https://github.com/hanami/router) - Rack compatible HTTP router for Ruby
 * [**Hanami::Helpers**](https://github.com/hanami/helpers) - View helpers for Ruby applications
 * [**Hanami::Mailer**](https://github.com/hanami/mailer) - Mail for Ruby applications
-* [**Hanami::Model**](https://github.com/hanami/model) - Persistence with entities, repositories and data mapper
 * [**Hanami::Assets**](https://github.com/hanami/assets) - Assets management for Ruby
-* [**Hanami::View**](https://github.com/hanami/view) - Presentation with a separation between views and templates
-* [**Hanami::Controller**](https://github.com/hanami/controller) - Full featured, fast and testable actions for Rack
+* [**Hanami::Utils**](https://github.com/hanami/utils) - Ruby core extensions and class utilities
 
 These components are designed to be used independently or together in a Hanami application.
-If you aren't familiar with them, please take time to go through their READMEs.
+
+## Installation
+__Hanami__ supports Ruby (MRI) 2.3+
+
+```shell
+gem install hanami
+```
+
+## Usage
+
+```shell
+hanami new bookshelf
+cd bookshelf && bundle
+bundle exec hanami server # visit http://localhost:2300
+```
+
+Please follow along with the [Getting Started guide](http://hanamirb.org/guides/getting-started).
 
 ## Donations
 
@@ -27,15 +54,6 @@ You can give back to Open Source, by supporting Hanami development via a [donati
 
   * [James Carlson](https://github.com/jxxcarlson)
 
-## Status
-
-[![Gem Version](https://badge.fury.io/rb/hanami.svg)](http://badge.fury.io/rb/hanami)
-[![Build Status](https://secure.travis-ci.org/hanami/hanami.svg?branch=master)](http://travis-ci.org/hanami/hanami?branch=master)
-[![Coverage](https://coveralls.io/repos/hanami/hanami/badge.svg?branch=master)](https://coveralls.io/r/hanami/hanami)
-[![Code Climate](https://codeclimate.com/github/hanami/hanami.svg)](https://codeclimate.com/github/hanami/hanami)
-[![Dependencies](https://gemnasium.com/hanami/hanami.svg)](https://gemnasium.com/hanami/hanami)
-[![Inline docs](http://inch-ci.org/github/hanami/hanami.svg)](http://inch-ci.org/github/hanami/hanami)
-
 ## Contact
 
 * Home page: http://hanamirb.org
@@ -44,53 +62,17 @@ You can give back to Open Source, by supporting Hanami development via a [donati
 * Mailing List: http://hanamirb.org/mailing-list
 * API Doc: http://rdoc.info/gems/hanami
 * Bugs/Issues: https://github.com/hanami/hanami/issues
-* Support: http://stackoverflow.com/questions/tagged/hanami
-* Forum: https://discuss.hanamirb.org
-* Chat: http://chat.hanamirb.org
-
-## Rubies
-
-__Hanami__ supports Ruby (MRI) 2.3+
-
-## Installation
-
-```shell
-% gem install hanami
-```
-
-## Usage
-
-```shell
-% hanami new bookshelf
-% cd bookshelf && bundle
-% bundle exec hanami server # visit http://localhost:2300
-```
-
-Please follow along with the [Getting Started guide](http://hanamirb.org/guides/getting-started).
+* Stack Overflow: http://stackoverflow.com/questions/tagged/hanami
+* Forum: https://discourse.hanamirb.org
+* **Chat**: http://chat.hanamirb.org
 
 ## Community
 
-We strive for a Community made of **inclusive, helpful and smart people**.
+We strive for an inclusive and helpful community.
 We have a [Code of Conduct](http://hanamirb.org/community/#code-of-conduct) to handle controversial cases.
 In general, we expect **you** to be **nice** with other people.
 Our hope is for a great software and a great Community.
 
-### 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, ethnicity, 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.
-
-This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
-
-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, version 1.1.0, available from http://contributor-covenant.org/version/1/1/0/
-
 ## Contributing
 
 1. Fork it ( https://github.com/hanami/hanami/fork )
@@ -116,7 +98,7 @@ bundle
 
   * Ruby 2.3+ / JRuby 9.1.5.0+
   * Bundler
-  * Qt (MacOS)
+  * [PhantomJS](http://phantomjs.org/download.html)
   * Node.js (MacOS)
 
 ### Testing
@@ -127,16 +109,14 @@ all the gems locally in `vendor/cache`, including `hanami` code from `lib/`.
 **Before running a test, please make sure you have a fresh version of the code:**
 
 ```shell
-% ./script/setup
-% bundle exec rspec spec/path/to/file_spec.rb
+./script/setup
+bundle exec rspec spec/path/to/file_spec.rb
 ```
 
-### Build / CI
-
 To run all the tests, please use:
 
 ```shell
-% ./script/ci
+./script/ci
 ```
 
 ## Versioning
@@ -145,5 +125,8 @@ __Hanami__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Copyright © 2014-2016 Luca Guidi – Released under MIT License
+Released under MIT License.
+
 This project was formerly known as Lotus (`lotusrb`).
+
+Copyright © 2014-2016 Luca Guidi.

data/hanami.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://hanamirb.org'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -c -o --exclude-standard -z -- lib/* bin/* LICENSE.md README.md CHANGELOG.md FEATURES.md hanami.gemspec`.split("\x0")
+  spec.files         = `git ls-files -c -o --exclude-standard -z -- lib/* bin/* LICENSE.md README.md CODE_OF_CONDUCT.md CHANGELOG.md FEATURES.md hanami.gemspec`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']

data/lib/hanami.rb

@@ -77,7 +77,15 @@ module Hanami
     end
   end
 
-  # Boot Hanami project
+  # Boot your Hanami project
+  #
+  # NOTE: In case this is invoked many times, it guarantees that the boot
+  #   process happens only once.
+  #
+  # NOTE: There is no reason to cache the result with `@_booted`, because it
+  #   already caches it internally.
+  #
+  # NOTE: This MUST NOT be wrapped by a Mutex, because it would cause a deadlock.
   #
   # @since 0.9.0
   # @api private
@@ -92,11 +100,20 @@ module Hanami
   #   * `config.ru` (`run Hanami.app`)
   #   * Feature tests (`Capybara.app = Hanami.app`)
   #
+  #
+  #
+  # It lazily loads your Hanami project, in case it wasn't booted on before.
+  # This is the case when `hanami server` isn't invoked, but we use different
+  # ways to run the project (eg. `rackup`).
+  #
   # @return [Hanami::App] the app
   #
   # @since 0.9.0
   # @api private
+  #
+  # @see Hanami.boot
   def self.app
+    boot
     App.new(configuration, environment)
   end
 

data/lib/hanami/application_configuration.rb

@@ -21,6 +21,10 @@ module Hanami
     # @see Hanami::Configuration#ssl?
     SSL_SCHEME = 'https'.freeze
 
+    # @since x.x.x
+    # @api private
+    DEFAULT_SSL_PORT = 443
+
     # @since 0.1.0
     # @api private
     attr_reader :namespace
@@ -37,11 +41,11 @@ module Hanami
     #
     # @since 0.1.0
     # @api private
-    def initialize(namespace, configurations, path_prefix)
+    def initialize(namespace, configurations, path_prefix, env: Environment.new)
       @namespace      = namespace
       @configurations = configurations
       @path_prefix    = path_prefix
-      @env            = Environment.new
+      @env            = env
 
       evaluate_configurations!
     end
@@ -1012,7 +1016,10 @@ module Hanami
       if value
         @port = Integer(value)
       else
-        @port || @env.port
+        return @port if defined?(@port)
+        return @env.port unless @env.default_port?
+        return DEFAULT_SSL_PORT if force_ssl
+        @env.port
       end
     end
 

data/lib/hanami/environment.rb

@@ -329,6 +329,16 @@ module Hanami
       end.to_i
     end
 
+    # Check if the current port is the default one
+    #
+    # @since x.x.x
+    # @api private
+    #
+    # @see Hanami::ApplicationConfiguration#port
+    def default_port?
+      port == DEFAULT_PORT
+    end
+
     # Path to the Rack configuration file
     #
     # In order to decide the value, it looks up the following sources:

data/lib/hanami/generators/action/view_spec.minitest.tt

@@ -8,6 +8,9 @@ describe <%= config[:app] %>::Views::<%= config[:controller] %>::<%= config[:act
   let(:rendered)  { view.render }
 
   it 'exposes #foo' do
+    skip 'This is an auto-generated test. Edit it and add your own tests.'
+
+    # Example
     view.foo.must_equal exposures.fetch(:foo)
   end
 end

data/lib/hanami/generators/action/view_spec.rspec.tt

@@ -7,6 +7,9 @@ RSpec.describe <%= config[:app] %>::Views::<%= config[:controller] %>::<%= confi
   let(:rendered)  { view.render }
 
   it 'exposes #foo' do
+    pending 'This is an auto-generated test. Edit it and add your own tests.'
+
+    # Example
     expect(view.foo).to eq exposures.fetch(:foo)
   end
 end

data/lib/hanami/generators/app/application.rb.tt

@@ -273,7 +273,7 @@ module <%= config[:classified_app_name] %>
       handle_exceptions false
 
       # Logger
-      # See: http://hanamirb.org/guides/applications/logging
+      # See: http://hanamirb.org/guides/projects/logging
       #
       # Logger stream. It defaults to STDOUT.
       # logger.stream "log/development.log"
@@ -293,7 +293,7 @@ module <%= config[:classified_app_name] %>
       handle_exceptions false
 
       # Logger
-      # See: http://hanamirb.org/guides/applications/logging
+      # See: http://hanamirb.org/guides/projects/logging
       #
       # Logger level. It defaults to ERROR
       logger.level :error
@@ -308,7 +308,7 @@ module <%= config[:classified_app_name] %>
       # port   443
 
       # Logger
-      # See: http://hanamirb.org/guides/applications/logging
+      # See: http://hanamirb.org/guides/projects/logging
       #
       # Logger stream. It defaults to STDOUT.
       # logger.stream "log/production.log"
@@ -340,7 +340,7 @@ module <%= config[:classified_app_name] %>
 
         # Subresource Integrity
         #
-        # See: http://hanamirb.org/guides/assets/subresource-integrity
+        # See: http://hanamirb.org/guides/assets/content-delivery-network/#subresource-integrity
         subresource_integrity :sha256
       end
     end

data/lib/hanami/generators/application/app/config/application.rb.tt

@@ -272,7 +272,7 @@ module <%= config[:classified_app_name] %>
       handle_exceptions false
 
       # Logger
-      # See: http://hanamirb.org/guides/applications/logging
+      # See: http://hanamirb.org/guides/projects/logging
       #
       # Logger stream. It defaults to STDOUT.
       # logger.stream "log/development.log"
@@ -292,7 +292,7 @@ module <%= config[:classified_app_name] %>
       handle_exceptions false
 
       # Logger
-      # See: http://hanamirb.org/guides/applications/logging
+      # See: http://hanamirb.org/guides/projects/logging
       #
       # Logger level. It defaults to ERROR
       logger.level :error
@@ -307,7 +307,7 @@ module <%= config[:classified_app_name] %>
       # port   443
 
       # Logger
-      # See: http://hanamirb.org/guides/applications/logging
+      # See: http://hanamirb.org/guides/projects/logging
       #
       # Logger stream. It defaults to STDOUT.
       # logger.stream "log/production.log"
@@ -339,7 +339,7 @@ module <%= config[:classified_app_name] %>
 
         # Subresource Integrity
         #
-        # See: http://hanamirb.org/guides/assets/subresource-integrity
+        # See: http://hanamirb.org/guides/assets/content-delivery-network/#subresource-integrity
         subresource_integrity :sha256
       end
     end

data/lib/hanami/generators/generator.rb

@@ -36,7 +36,7 @@ module Hanami
         config = args.last.is_a?(Hash) ? args.pop : {}
         # Either prepend after the last comment line,
         # or the first line in the file, if there are no comments
-        config.merge!(after: /\A(?:^#.*$\s)*/)
+        config[:after] = /\A(?:^#.*$\s)*/
         @processor.insert_into_file(path, *(args << config), &block)
       end
     end

data/lib/hanami/rake_helper.rb

@@ -21,8 +21,10 @@ module Hanami
     # rubocop:disable Metrics/MethodLength
     def install
       desc "Load the full project"
-      task environment: :preload do
-        Components.resolve('apps')
+      task :environment do
+        require 'hanami/environment'
+        Hanami::Environment.new.require_project_environment
+        Components.resolve('all')
       end
 
       # Ruby ecosystem compatibility

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '0.9.1'.freeze
+    VERSION = '0.9.2'.freeze
 
     # @since 0.9.0
     # @api private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -239,6 +239,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - FEATURES.md
 - LICENSE.md
 - README.md