hanami 1.0.0.beta2 → 1.0.0.beta3

data/lib/hanami/commands/new/app.rb

@@ -1,14 +1,19 @@
 require 'hanami/commands/new/abstract'
 
 module Hanami
+  # @api private
   module Commands
+    # @api private
     class New
+      # @api private
       class App < Abstract
 
+        # @api private
         def initialize(options, name)
           super(options, name)
         end
 
+        # @api private
         def map_templates
           add_application_templates
           add_empty_directories
@@ -17,6 +22,7 @@ module Hanami
           add_git_templates
         end
 
+        # @api private
         def template_options
           {
             app_name:             app_name,
@@ -33,12 +39,14 @@ module Hanami
           }
         end
 
+        # @api private
         def post_process_templates
           init_git
         end
 
         private
 
+        # @api private
         def add_application_templates
           add_mapping('hanamirc.tt', '.hanamirc')
           add_mapping('.env.development.tt', '.env.development')
@@ -54,6 +62,7 @@ module Hanami
           add_mapping('favicon.ico', 'app/assets/favicon.ico')
         end
 
+        # @api private
         def add_test_templates
           if test_framework.rspec?
             add_mapping('Rakefile.rspec.tt', 'Rakefile')
@@ -68,6 +77,7 @@ module Hanami
           end
         end
 
+        # @api private
         def add_empty_directories
           add_mapping('.gitkeep', 'config/initializers/.gitkeep')
           add_mapping('.gitkeep', 'app/controllers/.gitkeep')
@@ -95,18 +105,23 @@ module Hanami
             add_mapping('.gitkeep', 'db/.gitkeep')
           end
         end
+
+        # @api private
         def template_source_path
           Pathname.new(::File.dirname(__FILE__)).join('..', '..', 'generators', 'application', 'app').realpath
         end
 
+        # @api private
         def upcase_app_name
           app_name.to_env_s
         end
 
+        # @api private
         def classified_app_name
           Utils::String.new(app_name).classify.tr('::', '')
         end
 
+        # @api private
         alias app_name project_name
       end
     end

data/lib/hanami/commands/new/container.rb

@@ -2,12 +2,17 @@ require 'hanami/commands/generate/app'
 require 'hanami/commands/new/abstract'
 
 module Hanami
+  # @api private
   module Commands
+    # @api private
     class New
+      # @api private
       class Container < Abstract
 
+        # @api private
         DEFAULT_APPLICATION_NAME = 'web'.freeze
 
+        # @api private
         def map_templates
           add_application_templates
           add_empty_directories
@@ -16,6 +21,7 @@ module Hanami
           add_git_templates
         end
 
+        # @api private
         def template_options
           {
             project_name:         project_name,
@@ -30,6 +36,7 @@ module Hanami
           }
         end
 
+        # @api private
         def post_process_templates
           init_git
           generate_app
@@ -37,6 +44,7 @@ module Hanami
 
         private
 
+        # @api private
         def add_application_templates
           add_mapping('hanamirc.tt', '.hanamirc')
           add_mapping('.env.development.tt', '.env.development')
@@ -48,6 +56,7 @@ module Hanami
           add_mapping('lib/project.rb.tt', "lib/#{ project_name }.rb")
         end
 
+        # @api private
         def add_test_templates
           if test_framework.rspec?
             add_mapping('Rakefile.rspec.tt', 'Rakefile')
@@ -62,6 +71,7 @@ module Hanami
           end
         end
 
+        # @api private
         def add_empty_directories
           add_mapping('.gitkeep', 'public/.gitkeep')
           add_mapping('.gitkeep', 'config/initializers/.gitkeep')
@@ -81,20 +91,24 @@ module Hanami
           end
         end
 
+        # @api private
         def generate_app
           Hanami::Commands::Generate::App.new(app_options, app_slice_name).start
         end
 
+        # @api private
         def app_options
           {
             application_base_url: application_base_url
           }
         end
 
+        # @api private
         def app_slice_name
           options.fetch(:application_name, DEFAULT_APPLICATION_NAME)
         end
 
+        # @api private
         def template_source_path
           Pathname.new(::File.dirname(__FILE__)).join('..', '..', 'generators', 'application', 'container').realpath
         end

data/lib/hanami/commands/routes.rb

@@ -1,6 +1,7 @@
 require 'hanami/commands/command'
 
 module Hanami
+  # @api private
   module Commands
     # Display application/container routes.
     #
@@ -16,6 +17,7 @@ module Hanami
       # Display to STDOUT application routes
       #
       # @since 0.1.0
+      # @api private
       def start
         puts requirements['routes.inspector'].inspect
       end

data/lib/hanami/commands/server.rb

@@ -1,6 +1,7 @@
 require 'hanami/commands/command'
 
 module Hanami
+  # @api private
   module Commands
     # Server command (`hanami server`)
     #
@@ -9,6 +10,7 @@ module Hanami
     class Server < Command
       requires 'code_reloading'
 
+      # @api private
       def initialize(options)
         super(options)
 
@@ -16,12 +18,14 @@ module Hanami
         @server = Hanami::Server.new
       end
 
+      # @api private
       def start
         server.start
       end
 
       protected
 
+      # @api private
       attr_reader :server
     end
   end

data/lib/hanami/components/app/assets.rb

@@ -1,5 +1,9 @@
 module Hanami
+  # @since 0.9.0
+  # @api private
   module Components
+    # @since 0.9.0
+    # @api private
     module App
       # hanami-assets configuration for a sigle Hanami application in the project.
       #

data/lib/hanami/components/app/controller.rb

@@ -2,7 +2,11 @@ require 'hanami/action/session'
 require 'hanami/action/routing_helpers'
 
 module Hanami
+  # @since 0.9.0
+  # @api private
   module Components
+    # @since 0.9.0
+    # @api private
     module App
       # hanami-controller configuration for a sigle Hanami application in the project.
       #

data/lib/hanami/components/app/routes.rb

@@ -2,7 +2,11 @@ require 'hanami/routes'
 require 'hanami/routing/default'
 
 module Hanami
+  # @since 0.9.0
+  # @api private
   module Components
+    # @since 0.9.0
+    # @api private
     module App
       # hanami-router configuration for a sigle Hanami application in the project.
       #
@@ -26,6 +30,8 @@ module Hanami
           Components.resolved("#{app.app_name}.routes", routes)
         end
 
+        # @since 0.9.0
+        # @api private
         def self.application_routes(app) # rubocop:disable Metrics/MethodLength
           config      = app.configuration
           namespace   = app.namespace

data/lib/hanami/components/app/view.rb

@@ -1,5 +1,9 @@
 module Hanami
+  # @since 0.9.0
+  # @api private
   module Components
+    # @since 0.9.0
+    # @api private
     module App
       # hanami-view configuration for a sigle Hanami application in the project.
       #

data/lib/hanami/components/component.rb

@@ -1,4 +1,6 @@
 module Hanami
+  # @since 0.9.0
+  # @api private
   module Components
     # Base component
     #

data/lib/hanami/components/components.rb

@@ -13,7 +13,7 @@ module Hanami
     # @since 0.9.0
     # @api private
     register 'all' do
-      requires 'logger', 'mailer', 'code', 'model', 'apps', 'finalizers'
+      requires 'logger', 'code', 'mailer', 'model', 'apps', 'finalizers'
 
       resolve { true }
     end
@@ -50,11 +50,12 @@ module Hanami
       end
     end
 
+    # @api private
     register 'code' do
       run do
         directory = Hanami.root.join('lib')
 
-        if Hanami.code_reloading?
+        if Components['environment'].code_reloading?
           Utils.reload!(directory)
         else
           Utils.require!(directory)
@@ -77,6 +78,10 @@ module Hanami
     register 'model' do
       requires 'logger', 'model.configuration', 'model.sql'
 
+      prepare do
+        Hanami::Model.disconnect if Components['model.configuration']
+      end
+
       resolve do
         if Components['model.configuration']
           Hanami::Model.load!
@@ -177,9 +182,11 @@ module Hanami
       end
 
       resolve do |configuration|
-        Hanami::Mailer.configuration = Hanami::Mailer::Configuration.new if Hanami.code_reloading?
-        Hanami::Mailer.configure(&configuration.mailer)
-        Hanami::Mailer.configuration
+        unless configuration.mailer.nil?
+          Hanami::Mailer.configuration = Hanami::Mailer::Configuration.new if Hanami.code_reloading?
+          Hanami::Mailer.configure(&configuration.mailer)
+          Hanami::Mailer.configuration
+        end
       end
     end
 

data/lib/hanami/components/routes_inspector.rb

@@ -2,6 +2,8 @@ require 'hanami/routing/default'
 require_relative './app/routes'
 
 module Hanami
+  # @since 0.9.0
+  # @api private
   module Components
     # Project's routes inspector
     #

data/lib/hanami/config/cookies.rb

@@ -1,4 +1,5 @@
 module Hanami
+  # @api private
   module Config
     # Cookies configuration
     #

data/lib/hanami/config/framework_configuration.rb

@@ -1,4 +1,5 @@
 module Hanami
+  # @api private
   module Config
     # Collects all the settings for a given framework configuration and then
     # forwards them when the application is loaded.

data/lib/hanami/config/load_paths.rb

@@ -1,17 +1,20 @@
 require 'hanami/utils'
 
 module Hanami
+  # @api private
   module Config
     # Define the load paths where the application should load
     #
     # @since 0.1.0
     # @api private
     class LoadPaths < Utils::LoadPaths
+      # @api private
       def initialize(root)
         super()
         @root = root
       end
 
+      # @api private
       def load!
         each do |path|
           Utils.require!(path)
@@ -20,6 +23,7 @@ module Hanami
 
       protected
 
+      # @api private
       def realpath(path)
         @root.join(path).realpath
       end

data/lib/hanami/config/mapper.rb

@@ -1,19 +1,26 @@
 require 'hanami/utils/kernel'
 
 module Hanami
+  # @since 0.1.0
+  # @api private
   module Config
     # Block or file mapper
     #
     # @since 0.1.0
     # @api private
     class Mapper
+      # @api private
       EXTNAME = '.rb'
 
+      # @since 0.1.0
+      # @api private
       def initialize(root, path, &blk)
         @path, @blk = path, blk
         @path = root.join(path) if root && path
       end
 
+      # @since 0.1.0
+      # @api private
       def to_proc
         return @blk if @blk
 
@@ -22,12 +29,16 @@ module Hanami
       end
 
       private
+      # @since 0.1.0
+      # @api private
       def realpath
         Utils::Kernel.Pathname("#{ @path }#{ EXTNAME }").realpath
       rescue Errno::ENOENT
         raise ArgumentError, error_message
       end
 
+      # @since 0.1.0
+      # @api private
       def error_message
         'You must specify a block or a file.'
       end

data/lib/hanami/config/routes.rb

@@ -1,6 +1,8 @@
 require 'hanami/config/mapper'
 
 module Hanami
+  # @since 0.1.0
+  # @api private
   module Config
     # Defines a route set
     #
@@ -8,6 +10,8 @@ module Hanami
     # @api private
     class Routes < Mapper
       private
+      # @since 0.1.0
+      # @api private
       def error_message
         'You must specify a block or a file for routes definitions.'
       end

data/lib/hanami/config/security.rb

@@ -1,4 +1,6 @@
 module Hanami
+  # @since 0.3.0
+  # @api private
   module Config
     # Security policies are stored here.
     #