hanami 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5372a7522c384925f3944349192e57986d50d80
-  data.tar.gz: 04e0cce2379b2c6a715a4651bcb20fc95283f193
+  metadata.gz: 231fd3e7e51ec7e9c6ccd1e9d8f91ba32b76e075
+  data.tar.gz: c7b8808423c4e968156bee4592a1595f511767d7
 SHA512:
-  metadata.gz: 873a49c091e733de1f09092484baacc97c618c3ffc6666d68890b4bed9df50d3245db8f4c9af505b14883355b3c30c19e33fdb3271bb505d1d7a0bccca4b9899
-  data.tar.gz: 760ba2f3f321c42cecaf25ffd2c9b25c60ccbbf79d1a9a65063eeb19f2df40902eac3f99cd5d028fffc91959976e874c740e1027e421cab2a9cb1b2d1f24787f
+  metadata.gz: 05b89fb3ac8d80064d0fa272ccea7a6344692d316f165d5cec0b58d8761442e7ec83b2231620a8b863d4a868dc47eea69861b8eaccc2ecb8af5f0ffb3c068aeb
+  data.tar.gz: 0d25225c8892dfcbb1c16e3031099ee33bf1dba14710b74ca2709cc0888586d6cf3b319d30468c824ae84fdbd6cd07e808fb2c0732565c43f18ba87a1a773901

data/CHANGELOG.md

@@ -1,6 +1,29 @@
 # Hanami
 The web, with simplicity.
 
+## v0.9.0 - 2016-11-15
+### Added
+- [Christophe Philemotte] Introduced `hanami secret` to generate and print a new sessions secret
+
+### Fixed
+- [Bruz Marzolf] Skip project code preloading when code reloading is enabled
+- [Bruz Marzolf] Ensure to generate project in current directory when running `hanami new .`
+- [Pascal Betz] Fix constant lookup within the project namespace
+- [Sean Collins] Ensure consistent order of code loading across operating systems
+- [Luca Guidi] Ensure to load the project configurations only once
+- [Luca Guidi] Fix duplicated Rack middleware in single Hanami application stacks
+
+### Changed
+- [Luca Guidi] Official support for Ruby MRI 2.3+
+- [Luca Guidi] Removed support for "application" architecture
+- [Luca Guidi] Removed `Hanami::Container.new` in favor of `Hanami.app`
+- [Luca Guidi] Removed `Hanami::Container.configure` in favor of `Hanami.configure`
+- [Luca Guidi] Configure model and mailer within `Hanami.configure` block in `config/environment.rb`
+- [Luca Guidi] Removed `mapping` from model configuration
+- [Luca Guidi] Removed `Hanami::Application.preload!` in favor of `Hanami.boot`
+- [Luca Guidi] Removed experimental code support for `entr(1)`
+- [Luca Guidi & Sean Collins] Renamed assets configuration `digest` into `fingerprint`
+
 ## v0.8.0 - 2016-07-22
 ### Added
 - [Luca Guidi] Generate new projects with Subresurce Integrity enabled in production (security).

data/FEATURES.md

@@ -3,6 +3,19 @@
 
 ## Features
 
+## v0.9.0 - (unreleased)
+
+- Experimental repositories associations (only "has many")
+- Database automapping for SQL databases
+- Entities schema
+- Immutable entities
+- Removed dirty tracking for entities
+- Repositories CRUD operations can accept both entities and/or data
+- Removed Memory and File System adapters
+- SQLite is the default adapter for new projects
+- Native support for PostgreSQL types
+- CLI: `hanami secret` to generate and print a new session secret for a single Hanami app
+
 ## v0.8.0 - 2016-07-22
 
 - New validation syntax based on predicates

data/README.md

@@ -50,7 +50,7 @@ You can give back to Open Source, by supporting Hanami development via a [donati
 
 ## Rubies
 
-__Hanami__ supports Ruby (MRI) 2+
+__Hanami__ supports Ruby (MRI) 2.3+
 
 ## Installation
 
@@ -112,6 +112,33 @@ vim Gemfile # edit with: gem 'hanami', path: '..'
 bundle
 ```
 
+### Development Requirements
+
+  * Ruby 2.3+ / JRuby 9.1.5.0+
+  * Bundler
+  * Qt (MacOS)
+  * Node.js (MacOS)
+
+### Testing
+
+In order to simulate installed gems on developers' computers, the build installs
+all the gems locally in `vendor/cache`, including `hanami` code from `lib/`.
+
+**Before to run a test please make sure to have a fresh version of the code:**
+
+```shell
+% ./script/setup
+% bundle exec rspec spec/path/to/file_spec.rb
+```
+
+### Build / CI
+
+To run all the tests, please use:
+
+```shell
+% ./script/ci
+```
+
 ## Versioning
 
 __Hanami__ uses [Semantic Versioning 2.0.0](http://semver.org)

data/hanami.gemspec

@@ -8,30 +8,33 @@ Gem::Specification.new do |spec|
   spec.version       = Hanami::VERSION
   spec.authors       = ['Luca Guidi', 'Trung Lê', 'Alfonso Uceda Pompa']
   spec.email         = ['me@lucaguidi.com', 'trung.le@ruby-journal.com', 'uceda73@gmail.com']
-  spec.summary       = %q{The web, with simplicity.}
-  spec.description   = %q{Hanami is a web framework for Ruby}
+  spec.summary       = 'The web, with simplicity'
+  spec.description   = 'Hanami is a web framework for Ruby'
   spec.homepage      = 'http://hanamirb.org'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -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 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']
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_dependency 'hanami-utils',       '~> 0.8'
-  spec.add_dependency 'hanami-validations', '~> 0.6'
-  spec.add_dependency 'hanami-router',      '~> 0.7'
-  spec.add_dependency 'hanami-controller',  '~> 0.7'
-  spec.add_dependency 'hanami-view',        '~> 0.7'
-  spec.add_dependency 'hanami-helpers',     '~> 0.4'
-  spec.add_dependency 'hanami-mailer',      '~> 0.3'
-  spec.add_dependency 'hanami-assets',      '~> 0.3'
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
+  spec.add_dependency 'hanami-utils',       '~> 0.9'
+  spec.add_dependency 'hanami-validations', '~> 0.7'
+  spec.add_dependency 'hanami-router',      '~> 0.8'
+  spec.add_dependency 'hanami-controller',  '~> 0.8'
+  spec.add_dependency 'hanami-view',        '~> 0.8'
+  spec.add_dependency 'hanami-helpers',     '~> 0.5'
+  spec.add_dependency 'hanami-mailer',      '~> 0.4'
+  spec.add_dependency 'hanami-assets',      '~> 0.4'
+  spec.add_dependency 'concurrent-ruby',    '~> 1.0'
   spec.add_dependency 'thor',               '~> 0.19'
-  spec.add_dependency 'bundler',            '~> 1.6'
+  spec.add_dependency 'bundler',            '~> 1.13'
 
-  spec.add_development_dependency 'minispec-metadata', '~> 3.2.1'
-  spec.add_development_dependency 'minitest',          '~> 5'
-  spec.add_development_dependency 'rack-test',         '~> 0.6'
-  spec.add_development_dependency 'rake',              '~> 10'
+  spec.add_development_dependency 'rspec',     '~>  3.5'
+  spec.add_development_dependency 'rack-test', '~>  0.6'
+  spec.add_development_dependency 'aruba',     '~>  0.14'
+  spec.add_development_dependency 'rake',      '~> 11.3'
 end

data/lib/hanami.rb

@@ -1,8 +1,4 @@
-require 'hanami/version'
-require 'hanami/application'
-require 'hanami/container'
-require 'hanami/environment'
-require 'hanami/server'
+require 'thread'
 
 # A complete web framework for Ruby
 #
@@ -10,8 +6,100 @@ require 'hanami/server'
 #
 # @see http://hanamirb.org
 module Hanami
+  require 'hanami/version'
+  require 'hanami/frameworks'
+  require 'hanami/environment'
+  require 'hanami/app'
+  require 'hanami/application'
+  require 'hanami/components'
+  require 'hanami/configuration'
+
+  # @api private
+  # @since 0.6.0
   DEFAULT_PUBLIC_DIRECTORY = 'public'.freeze
 
+  # @api private
+  # @since 0.9.0
+  @_mutex = Mutex.new
+
+  # Configure Hanami project
+  #
+  # Please note that the code for this method is generated by `hanami new`.
+  #
+  # @param blk [Proc] the configuration block
+  #
+  # @since 0.9.0
+  #
+  # @example
+  #   # config/environment.rb
+  #
+  #   # ...
+  #
+  #   Hanami.configure do
+  #     mount Admin::Application, at: "/admin"
+  #     mount Web::Application,   at: "/"
+  #
+  #     model do
+  #       adapter :sql, ENV['DATABASE_URL']
+  #
+  #       migrations "db/migrations"
+  #       schema     "db/schema.sql"
+  #     end
+  #
+  #     mailer do
+  #       root "lib/bookshelf/mailers"
+  #
+  #       delivery do
+  #         development :test
+  #         test        :test
+  #         # production :smtp, address: ENV['SMTP_HOST'], port: 1025
+  #       end
+  #     end
+  #   end
+  def self.configure(&blk)
+    @_mutex.synchronize do
+      @_configuration = Hanami::Configuration.new(&blk)
+    end
+  end
+
+  # Hanami configuration
+  #
+  # @return [Hanami::Configuration] the configuration
+  #
+  # @see Hanami.configure
+  #
+  # @since 0.9.0
+  # @api private
+  def self.configuration
+    @_mutex.synchronize do
+      raise "Hanami not configured" unless defined?(@_configuration)
+      @_configuration
+    end
+  end
+
+  # Boot Hanami project
+  #
+  # @since 0.9.0
+  # @api private
+  def self.boot
+    Components.resolve('all')
+  end
+
+  # Main application that mounts many Rack and/or Hanami applications.
+  #
+  # This is used as integration point for:
+  #
+  #   * `config.ru` (`run Hanami.app`)
+  #   * Feature tests (`Capybara.app = Hanami.app`)
+  #
+  # @return [Hanami::App] the app
+  #
+  # @since 0.9.0
+  # @api private
+  def self.app
+    App.new(configuration, environment)
+  end
+
   # Return root of the project (top level directory).
   #
   # @return [Pathname] root path
@@ -24,6 +112,15 @@ module Hanami
     environment.root
   end
 
+  # Project public directory
+  #
+  # @return [Pathname] public directory
+  #
+  # @since 0.6.0
+  # @api private
+  #
+  # @example
+  #   Hanami.public_directory # => #<Pathname:/Users/luca/Code/bookshelf/public>
   def self.public_directory
     root.join(DEFAULT_PUBLIC_DIRECTORY)
   end
@@ -70,13 +167,15 @@ module Hanami
     environment.environment?(*names)
   end
 
-  # Return environment
+  # Current environment
   #
   # @return [Hanami::Environment] environment
   #
   # @api private
   # @since 0.3.2
   def self.environment
-    Environment.new
+    Components.resolved('environment') do
+      Environment.new
+    end
   end
 end

data/lib/hanami/action/routing_helpers.rb

@@ -25,13 +25,13 @@ module Hanami
     #   end
     module RoutingHelpers
       def self.included(base)
-        factory = "#{ Utils::String.new(base).namespace }::Routes"
+        factory = "#{Utils::String.new(base).namespace}.routes"
 
         base.class_eval <<-END_EVAL, __FILE__, __LINE__
           private
 
           def routes
-            #{ factory }
+            #{factory}
           end
         END_EVAL
       end

data/lib/hanami/app.rb

@@ -0,0 +1,72 @@
+require 'rack'
+require 'rack/builder'
+require 'hanami/router'
+require 'hanami/components'
+
+module Hanami
+  # Main application that mounts many Rack and/or Hanami applications.
+  #
+  # @see Hanami.app
+  #
+  # @since 0.9.0
+  # @api private
+  class App
+    # Initialize a new instance
+    #
+    # @param configuration [Hanami::Configuration] general configuration
+    # @param environment [Hanami::Environment] current environment
+    #
+    # @since 0.9.0
+    # @api private
+    def initialize(configuration, environment)
+      Components.resolve('apps')
+
+      @builder = Rack::Builder.new
+      @routes  = Hanami::Router.new
+
+      mount(configuration)
+      middleware(environment)
+      builder.run(routes)
+    end
+
+    # Implements Rack SPEC
+    #
+    # @param env [Hash] a Rack env
+    #
+    # @return [Array] a serialized Rack response
+    #
+    # @since 0.9.0
+    # @api private
+    def call(env)
+      builder.call(env)
+    end
+
+    private
+
+    # @since 0.9.0
+    # @api private
+    attr_reader :builder
+
+    # @since 0.9.0
+    # @api private
+    attr_reader :routes
+
+    # @since 0.9.0
+    # @api private
+    def mount(configuration)
+      configuration.mounted.each do |klass, app|
+        routes.mount(klass, at: app.path_prefix)
+      end
+    end
+
+    # @since 0.9.0
+    # @api private
+    def middleware(environment)
+      if middleware = environment.static_assets_middleware # rubocop:disable Lint/AssignmentInCondition
+        builder.use middleware
+      end
+
+      builder.use Rack::MethodOverride
+    end
+  end
+end

data/lib/hanami/application.rb

@@ -1,10 +1,10 @@
-require 'hanami/utils/class_attribute'
-require 'hanami/frameworks'
-require 'hanami/configuration'
-require 'hanami/loader'
-require 'hanami/logger'
+require 'thread'
+require 'concurrent'
+require 'hanami/application_name'
+require 'hanami/application_namespace'
+require 'hanami/application_configuration'
+require 'hanami/environment_application_configurations'
 require 'hanami/rendering_policy'
-require 'hanami/middleware'
 
 module Hanami
   # A full stack Hanami application
@@ -28,116 +28,105 @@ module Hanami
     def self.inherited(base)
       super
 
-      base.class_eval do
-        include Hanami::Utils::ClassAttribute
-
-        class_attribute :configuration
-        self.configuration = Configuration.new
-      end
-
-      synchronize do
-        applications.add(base)
+      base.extend(ClassMethods)
+      base.namespace.module_eval do
+        class << self
+          # Logger for this application
+          #
+          # @return [Hanami::Logger] the logger for this Hanami application
+          #
+          # @since 0.9.0
+          # @api public
+          #
+          # @example
+          #
+          #   Web.logger
+          #   Admin.logger
+          attr_accessor :logger
+
+          # Routes for this application
+          #
+          # @return [Hanami::Routes] the routes for this Hanami application
+          #
+          # @since 0.9.0
+          # @api public
+          #
+          # @example
+          #
+          #   Web.routes
+          #   Admin.routes
+          attr_accessor :routes
+        end
       end
     end
 
-    # @since 0.8.0
-    # @api private
-    LOCK = Mutex.new
-
-    # Return the routes for this application
+    # Class interface for Hanami applications
     #
-    # @return [Hanami::Router] a route set
-    #
-    # @since 0.1.0
-    #
-    # @see Hanami::Configuration#routes
-    attr_reader :routes
+    # @since 0.9.0
+    module ClassMethods
+      # Override Ruby's Class#extended
+      #
+      # @since 0.9.0
+      # @api private
+      #
+      # @see http://www.ruby-doc.org/core/Class.html#method-i-extended
+      def self.extended(base) # rubocop:disable Metrics/MethodLength
+        super
 
-    # Set the routes for this application
-    #
-    # @param [Hanami::Router]
-    #
-    # @since 0.1.0
-    # @api private
-    attr_writer :routes
+        base.class_eval do
+          @namespace      = ApplicationNamespace.resolve(name)
+          @configurations = EnvironmentApplicationConfigurations.new
+          @_lock          = Mutex.new
 
-    # Rendering policy
-    #
-    # @param [Hanami::RenderingPolicy]
-    #
-    # @since 0.2.0
-    # @api private
-    attr_accessor :renderer
+          class << self
+            # @since 0.9.0
+            # @api private
+            attr_reader :namespace
 
-    # Initialize and load a new instance of the application
-    #
-    # @return [Hanami::Application] a new instance of the application
-    #
-    # @since 0.1.0
-    def initialize(options = {})
-      self.class.configuration.path_prefix options[:path_prefix]
-      self.class.load!(self)
-    end
-
-    # Return the configuration for this application
-    #
-    # @since 0.1.0
-    # @api private
-    #
-    # @see Hanami::Application.configuration
-    def configuration
-      self.class.configuration
-    end
+            # @since 0.9.0
+            # @api private
+            attr_reader :configurations
 
-    # Return the application name
-    #
-    # @since 0.2.0
-    # @api private
-    def name
-      self.class.name
-    end
-
-    # Process a request.
-    # This method makes Hanami applications compatible with the Rack protocol.
-    #
-    # @param env [Hash] a Rack env
-    #
-    # @return [Array] a serialized Rack response
-    #
-    # @since 0.1.0
-    #
-    # @see http://rack.github.io
-    # @see Hanami::RenderingPolicy#render
-    # @see Hanami::Application#middleware
-    def call(env)
-      renderer.render(env, middleware.call(env))
-    end
-
-    # Rack middleware stack
-    #
-    # @return [Hanami::Middleware] the middleware stack
-    #
-    # @since 0.1.0
-    # @api private
-    #
-    # @see Hanami::Middleware
-    def middleware
-      @middleware ||= configuration.middleware
-    end
+            # @since 0.9.0
+            # @api private
+            attr_reader :configuration
+          end
+        end
+      end
 
-    class << self
-      # @since 0.2.0
+      # Hanami application name
+      #
+      # @return [String] the Hanami application name
+      #
+      # @since 0.9.0
       # @api private
-      @@applications = Set.new
+      #
+      # @example
+      #   require 'hanami'
+      #
+      #   module Web
+      #     class Application < Hanami::Application
+      #     end
+      #   end
+      #
+      #   Web::Application.app_name # => "web"
+      def app_name
+        ApplicationName.new(name).to_s
+      end
 
-      # Registry of Hanami applications in the current Ruby process
+      # Set configuration
+      #
+      # @param configuration [Hanami::ApplicationConfiguration] the application configuration
       #
-      # @return [Set] a set of all the registered applications
+      # @raise [RuntimeError] if the configuration is assigned more than once
       #
-      # @since 0.2.0
+      # @since 0.1.0
       # @api private
-      def applications
-        @@applications
+      def configuration=(configuration)
+        @_lock.synchronize do
+          raise "Can't assign configuration more than once (#{app_name})" unless @configuration.nil?
+          @configuration = configuration
+        end
       end
 
       # Configure the application.
@@ -148,7 +137,7 @@ module Hanami
       #
       # @since 0.1.0
       #
-      # @see Hanami::Configuration
+      # @see Hanami::ApplicationConfiguration
       #
       # @example
       #   require 'hanami'
@@ -161,92 +150,64 @@ module Hanami
       #     end
       #   end
       def configure(environment = nil, &blk)
-        configuration.configure(environment, &blk)
-      end
-
-      # Eager load the application configuration, by activating the framework
-      # duplication mechanisms.
-      #
-      # @param application [Hanami::Application, Class<Hanami::Application>]
-      # @return void
-      #
-      # @since 0.1.1
-      #
-      # @example
-      #   require 'hanami'
-      #
-      #   module OneFile
-      #     class Application < Hanami::Application
-      #       configure do
-      #         routes do
-      #           get '/', to: 'dashboard#index'
-      #         end
-      #       end
-      #
-      #       load!
-      #     end
-      #
-      #     module Controllers::Dashboard
-      #       class Index
-      #         include OneFile::Action
-      #
-      #         def call(params)
-      #           self.body = 'Hello!'
-      #         end
-      #       end
-      #     end
-      #   end
-      def load!(application = self)
-        Hanami::Loader.new(application).load!
+        configurations.add(environment, &blk)
       end
+    end
 
-      # Preload all the registered applications, by yielding their configurations
-      # and preparing the frameworks.
-      #
-      # This is useful for testing suites, where we want to make Hanami frameworks
-      # ready, but not preload applications code.
-      #
-      # This allows to test components such as views or actions in isolation and
-      # to have faster boot times.
-      #
-      # @return [void]
-      #
-      # @since 0.2.0
-      def preload!
-        synchronize do
-          applications.each(&:load!)
-        end
+    # Initialize and load a new instance of the application
+    #
+    # @return [Hanami::Application] a new instance of the application
+    #
+    # @since 0.1.0
+    def initialize
+      @renderer   = RenderingPolicy.new(configuration)
+      @middleware = configuration.middleware
+    end
 
-        nil
-      end
+    # Process a request.
+    # This method makes Hanami applications compatible with the Rack protocol.
+    #
+    # @param env [Hash] a Rack env
+    #
+    # @return [Array] a serialized Rack response
+    #
+    # @since 0.1.0
+    #
+    # @see http://rack.github.io
+    # @see Hanami::RenderingPolicy#render
+    # @see Hanami::Application#middleware
+    def call(env)
+      renderer.render(env, middleware.call(env))
+    end
 
-      # Full preload for all the registered applications.
-      #
-      # This is useful in console where we want all the application code available.
-      #
-      # @return [void]
-      #
-      # @since 0.2.1
-      # @api private
-      def preload_applications!
-        synchronize do
-          applications.each { |app| app.new }
-        end
+    private
 
-        nil
-      end
+    # Return the configuration for this application
+    #
+    # @since 0.1.0
+    # @api private
+    #
+    # @see Hanami::Application.configuration
+    def configuration
+      self.class.configuration
+    end
 
-      private
+    # Rendering policy
+    #
+    # @since 0.2.0
+    # @api private
+    #
+    # @see Hanami::RenderingPolicy
+    attr_reader :renderer
 
-      # Yields the given block in a critical section
-      #
-      # @since 0.2.0
-      # @api private
-      def synchronize
-        LOCK.synchronize do
-          yield
-        end
-      end
-    end
+    # Rack middleware stack
+    #
+    # @return [Hanami::Middleware] the middleware stack
+    #
+    # @since 0.1.0
+    # @api private
+    #
+    # @see Hanami::Middleware
+    attr_reader :middleware
   end
 end