hanami 1.0.0 → 1.1.0.beta1

data/lib/hanami/middleware.rb

@@ -141,10 +141,8 @@ module Hanami
     # @since 0.2.0
     def load_default_stack
       @default_stack_loaded ||= begin
-        _load_assets_middleware
         _load_session_middleware
         _load_default_welcome_page
-        _load_method_override_middleware
 
         true
       end
@@ -170,29 +168,5 @@ module Hanami
         prepend(*configuration.sessions.middleware)
       end
     end
-
-    # Use static assets middleware
-    #
-    # @api private
-    # @since 0.6.0
-    def _load_assets_middleware
-      env = Hanami.environment
-
-      if !env.container? && (middleware = env.static_assets_middleware)
-        use middleware
-      end
-    end
-
-    # Use MethodOverride middleware
-    #
-    # @api private
-    # @since 0.8.0
-    def _load_method_override_middleware
-      env = Hanami.environment
-
-      if !env.container?
-        use Rack::MethodOverride
-      end
-    end
   end
 end

data/lib/hanami/static.rb

@@ -2,7 +2,7 @@ require 'rack/static'
 
 module Hanami
   # Serve static assets in deployment environments (production, staging) where
-  # the architecture doesn't include a web server.
+  # the stack doesn't include a web server.
   #
   # Web servers like Nginx are the ideal candidate to serve static assets.
   # They are faster than Ruby application servers (eg. Puma) and they should be

data/lib/hanami/templates/welcome.html.erb

@@ -32,7 +32,7 @@
 
       <h3>Hanami is Open Source Software for MVC web development with Ruby.</h3>
 
-      <p>Please generate a new action with:<br><code>bundle exec hanami generate action<%= application_name %> home#index --url=/</code></p>
+      <p>Please generate a new action with:<br><code>bundle exec hanami generate action <%= application_name %> home#index --url=/</code></p>
 
       <hr style="margin-top: 4em;"/>
       <div id="content">

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.1.0.beta1'.freeze
 
     # @since 0.9.0
     # @api private

data/lib/hanami/welcome.rb

@@ -21,26 +21,16 @@ module Hanami
 
     # @api private
     def application_name
-      " #{ app }" if container?
+      application_class.app_name
     end
 
     private
 
-    # @api private
-    def container?
-      Environment.new.container?
-    end
-
     # @api private
     def application_class
       Hanami.configuration.apps do |app|
         return app if @request_path.include?(app.path_prefix)
       end
     end
-
-    # @api private
-    def app
-      application_class.app_name
-    end
   end
 end

metadata

@@ -1,155 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: hanami-validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: hanami-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: hanami-controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: hanami-view
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: hanami-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: hanami-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: hanami-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.0.beta1
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -245,35 +245,87 @@ files:
 - lib/hanami/application_namespace.rb
 - lib/hanami/assets/asset.rb
 - lib/hanami/assets/static.rb
-- lib/hanami/cli.rb
-- lib/hanami/cli_base.rb
-- lib/hanami/cli_sub_commands/assets.rb
-- lib/hanami/cli_sub_commands/db.rb
-- lib/hanami/cli_sub_commands/destroy.rb
-- lib/hanami/cli_sub_commands/generate.rb
-- lib/hanami/commands/apps.rb
-- lib/hanami/commands/assets/precompile.rb
-- lib/hanami/commands/command.rb
-- lib/hanami/commands/console.rb
-- lib/hanami/commands/db/apply.rb
-- lib/hanami/commands/db/console.rb
-- lib/hanami/commands/db/create.rb
-- lib/hanami/commands/db/drop.rb
-- lib/hanami/commands/db/migrate.rb
-- lib/hanami/commands/db/prepare.rb
-- lib/hanami/commands/db/version.rb
-- lib/hanami/commands/generate/abstract.rb
-- lib/hanami/commands/generate/action.rb
-- lib/hanami/commands/generate/app.rb
-- lib/hanami/commands/generate/mailer.rb
-- lib/hanami/commands/generate/migration.rb
-- lib/hanami/commands/generate/model.rb
-- lib/hanami/commands/generate/secret_token.rb
-- lib/hanami/commands/new/abstract.rb
-- lib/hanami/commands/new/app.rb
-- lib/hanami/commands/new/container.rb
-- lib/hanami/commands/routes.rb
-- lib/hanami/commands/server.rb
+- lib/hanami/cli/commands.rb
+- lib/hanami/cli/commands/assets.rb
+- lib/hanami/cli/commands/assets/precompile.rb
+- lib/hanami/cli/commands/command.rb
+- lib/hanami/cli/commands/console.rb
+- lib/hanami/cli/commands/db.rb
+- lib/hanami/cli/commands/db/apply.rb
+- lib/hanami/cli/commands/db/console.rb
+- lib/hanami/cli/commands/db/create.rb
+- lib/hanami/cli/commands/db/drop.rb
+- lib/hanami/cli/commands/db/migrate.rb
+- lib/hanami/cli/commands/db/prepare.rb
+- lib/hanami/cli/commands/db/version.rb
+- lib/hanami/cli/commands/destroy.rb
+- lib/hanami/cli/commands/destroy/action.rb
+- lib/hanami/cli/commands/destroy/app.rb
+- lib/hanami/cli/commands/destroy/mailer.rb
+- lib/hanami/cli/commands/destroy/migration.rb
+- lib/hanami/cli/commands/destroy/model.rb
+- lib/hanami/cli/commands/generate.rb
+- lib/hanami/cli/commands/generate/action.rb
+- lib/hanami/cli/commands/generate/action/action.erb
+- lib/hanami/cli/commands/generate/action/action_spec.minitest.erb
+- lib/hanami/cli/commands/generate/action/action_spec.rspec.erb
+- lib/hanami/cli/commands/generate/action/action_without_view.erb
+- lib/hanami/cli/commands/generate/action/view.erb
+- lib/hanami/cli/commands/generate/action/view_spec.minitest.erb
+- lib/hanami/cli/commands/generate/action/view_spec.rspec.erb
+- lib/hanami/cli/commands/generate/app.rb
+- lib/hanami/cli/commands/generate/app/application.erb
+- lib/hanami/cli/commands/generate/app/favicon.ico
+- lib/hanami/cli/commands/generate/app/gitkeep.erb
+- lib/hanami/cli/commands/generate/app/layout.erb
+- lib/hanami/cli/commands/generate/app/layout_spec.minitest.erb
+- lib/hanami/cli/commands/generate/app/layout_spec.rspec.erb
+- lib/hanami/cli/commands/generate/app/routes.erb
+- lib/hanami/cli/commands/generate/app/template.erb.erb
+- lib/hanami/cli/commands/generate/app/template.haml.erb
+- lib/hanami/cli/commands/generate/app/template.slim.erb
+- lib/hanami/cli/commands/generate/mailer.rb
+- lib/hanami/cli/commands/generate/mailer/mailer.erb
+- lib/hanami/cli/commands/generate/mailer/mailer_spec.minitest.erb
+- lib/hanami/cli/commands/generate/mailer/mailer_spec.rspec.erb
+- lib/hanami/cli/commands/generate/migration.rb
+- lib/hanami/cli/commands/generate/migration/migration.erb
+- lib/hanami/cli/commands/generate/model.rb
+- lib/hanami/cli/commands/generate/model/entity.erb
+- lib/hanami/cli/commands/generate/model/entity_spec.minitest.erb
+- lib/hanami/cli/commands/generate/model/entity_spec.rspec.erb
+- lib/hanami/cli/commands/generate/model/migration.erb
+- lib/hanami/cli/commands/generate/model/repository.erb
+- lib/hanami/cli/commands/generate/model/repository_spec.minitest.erb
+- lib/hanami/cli/commands/generate/model/repository_spec.rspec.erb
+- lib/hanami/cli/commands/generate/secret.rb
+- lib/hanami/cli/commands/new.rb
+- lib/hanami/cli/commands/new/.env.development.erb
+- lib/hanami/cli/commands/new/.env.test.erb
+- lib/hanami/cli/commands/new/.gitkeep.erb
+- lib/hanami/cli/commands/new/Gemfile.erb
+- lib/hanami/cli/commands/new/README.md.erb
+- lib/hanami/cli/commands/new/config.ru.erb
+- lib/hanami/cli/commands/new/config/boot.erb
+- lib/hanami/cli/commands/new/config/environment.erb
+- lib/hanami/cli/commands/new/gitignore.erb
+- lib/hanami/cli/commands/new/gitignore_with_sqlite.erb
+- lib/hanami/cli/commands/new/hanamirc.erb
+- lib/hanami/cli/commands/new/lib/project.erb
+- lib/hanami/cli/commands/new/minitest/Rakefile.erb
+- lib/hanami/cli/commands/new/minitest/features_helper.erb
+- lib/hanami/cli/commands/new/minitest/spec_helper.erb
+- lib/hanami/cli/commands/new/rspec/Rakefile.erb
+- lib/hanami/cli/commands/new/rspec/capybara.erb
+- lib/hanami/cli/commands/new/rspec/features_helper.erb
+- lib/hanami/cli/commands/new/rspec/rspec.erb
+- lib/hanami/cli/commands/new/rspec/spec_helper.erb
+- lib/hanami/cli/commands/new/schema.sql.erb
+- lib/hanami/cli/commands/project.rb
+- lib/hanami/cli/commands/routes.rb
+- lib/hanami/cli/commands/server.rb
+- lib/hanami/cli/commands/templates.rb
+- lib/hanami/cli/commands/version.rb
 - lib/hanami/common_logger.rb
 - lib/hanami/components.rb
 - lib/hanami/components/app/assets.rb
@@ -295,68 +347,6 @@ files:
 - lib/hanami/environment.rb
 - lib/hanami/environment_application_configurations.rb
 - lib/hanami/frameworks.rb
-- lib/hanami/generators/action/action.rb.tt
-- lib/hanami/generators/action/action_spec.minitest.tt
-- lib/hanami/generators/action/action_spec.rspec.tt
-- lib/hanami/generators/action/action_without_view.rb.tt
-- lib/hanami/generators/action/template.tt
-- lib/hanami/generators/action/view.rb.tt
-- lib/hanami/generators/action/view_spec.minitest.tt
-- lib/hanami/generators/action/view_spec.rspec.tt
-- lib/hanami/generators/app/.gitkeep.tt
-- lib/hanami/generators/app/application.rb.tt
-- lib/hanami/generators/app/config/initializers/.gitkeep
-- lib/hanami/generators/app/config/routes.rb.tt
-- lib/hanami/generators/app/favicon.ico
-- lib/hanami/generators/app/templates/application.html.erb.tt
-- lib/hanami/generators/app/templates/application.html.haml.tt
-- lib/hanami/generators/app/templates/application.html.slim.tt
-- lib/hanami/generators/app/views/application_layout.rb.tt
-- lib/hanami/generators/application/container/.env.development.tt
-- lib/hanami/generators/application/container/.env.test.tt
-- lib/hanami/generators/application/container/.gitignore
-- lib/hanami/generators/application/container/.gitkeep
-- lib/hanami/generators/application/container/Gemfile.tt
-- lib/hanami/generators/application/container/Rakefile.minitest.tt
-- lib/hanami/generators/application/container/Rakefile.rspec.tt
-- lib/hanami/generators/application/container/capybara.rb.rspec.tt
-- lib/hanami/generators/application/container/config.ru.tt
-- lib/hanami/generators/application/container/config/boot.rb.tt
-- lib/hanami/generators/application/container/config/environment.rb.tt
-- lib/hanami/generators/application/container/config/initializers/.gitkeep
-- lib/hanami/generators/application/container/db/.gitkeep
-- lib/hanami/generators/application/container/features_helper.rb.minitest.tt
-- lib/hanami/generators/application/container/features_helper.rb.rspec.tt
-- lib/hanami/generators/application/container/gitignore.tt
-- lib/hanami/generators/application/container/gitignore_with_sqlite.tt
-- lib/hanami/generators/application/container/hanamirc.tt
-- lib/hanami/generators/application/container/lib/chirp/entities/.gitkeep
-- lib/hanami/generators/application/container/lib/chirp/mailers/.gitkeep
-- lib/hanami/generators/application/container/lib/chirp/mailers/templates/.gitkeep
-- lib/hanami/generators/application/container/lib/chirp/repositories/.gitkeep
-- lib/hanami/generators/application/container/lib/project.rb.tt
-- lib/hanami/generators/application/container/rspec.rspec.tt
-- lib/hanami/generators/application/container/schema.sql.tt
-- lib/hanami/generators/application/container/spec_helper.rb.minitest.tt
-- lib/hanami/generators/application/container/spec_helper.rb.rspec.tt
-- lib/hanami/generators/database_config.rb
-- lib/hanami/generators/generatable.rb
-- lib/hanami/generators/generator.rb
-- lib/hanami/generators/mailer/mailer.rb.tt
-- lib/hanami/generators/mailer/mailer_spec.rb.minitest.tt
-- lib/hanami/generators/mailer/mailer_spec.rb.rspec.tt
-- lib/hanami/generators/mailer/template.html.tt
-- lib/hanami/generators/mailer/template.txt.tt
-- lib/hanami/generators/migration/migration.rb.tt
-- lib/hanami/generators/model/entity.rb.tt
-- lib/hanami/generators/model/entity_spec.minitest.tt
-- lib/hanami/generators/model/entity_spec.rspec.tt
-- lib/hanami/generators/model/migration.rb.tt
-- lib/hanami/generators/model/repository.rb.tt
-- lib/hanami/generators/model/repository_spec.minitest.tt
-- lib/hanami/generators/model/repository_spec.rspec.tt
-- lib/hanami/generators/template_engine.rb
-- lib/hanami/generators/test_framework.rb
 - lib/hanami/hanamirc.rb
 - lib/hanami/mailer/glue.rb
 - lib/hanami/middleware.rb
@@ -391,9 +381,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11