hanami 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 744c995f7c17f73345a0e1eefe34b988c6d9ea75
-  data.tar.gz: a159b8f7ac8e22531cf5d37ff2ec3652fe6cbb12
+  metadata.gz: 8b7009c4b87b140d19b16be7a2dcf3b7809c1519
+  data.tar.gz: 2593b7fce5f032a478e6977ff407e33237189c6d
 SHA512:
-  metadata.gz: a7027ad8ca9cb7a80fb5485a6cacf5a2a15e73c5f5e1202c5d594068193d9e0377fcf102de18cf3de85812767fc95177f21c88a8b39c45016b65ec30049a5e1a
-  data.tar.gz: 7a340b00d09af67d7a23957beb974f5a2f103ab4ec45277ba730cc4391a959fde13d262730a70df01ce687674ea4cc1f88b547576eaa95628a7a1395e7fbca5e
+  metadata.gz: 5b718475924f9d0af9892d412cef58cf97e8eb24a54f7977be6d0061ece7703082cdca2f77a1ca7eaf9d05b9c32bd1fc6d01f3ff290bf60d6f4a300cbde8fc12
+  data.tar.gz: 754321b70b997b1416732336de62a5822e675e879475e994572d5b616161ee40844292415b5b68b4176bae25ec211c48695b83e060046a8d632e3d4624e69734

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Hanami
 The web, with simplicity.
 
+## v0.7.1 - 2016-02-05
+### Fixed
+- [Anton Davydov] Fixed routing issue when static assets server tried to hijiack requests belonging to dynamic endpoints
+- [Anatolii Didukh] Ensure to fallback to default engine for `hanami console`
+
 ## v0.7.0 - 2016-01-22
 ### Changed
 - [Luca Guidi] Renamed the project

data/lib/hanami/application.rb

@@ -40,42 +40,6 @@ module Hanami
       end
     end
 
-    # Registry of Hanami applications in the current Ruby process
-    #
-    # @return [Set] a set of all the registered applications
-    #
-    # @since 0.2.0
-    # @api private
-    def self.applications
-      synchronize do
-        @@applications ||= Set.new
-      end
-    end
-
-    # Configure the application.
-    # It yields the given block in the context of the configuration
-    #
-    # @param environment [Symbol,nil] the configuration environment name
-    # @param blk [Proc] the configuration block
-    #
-    # @since 0.1.0
-    #
-    # @see Hanami::Configuration
-    #
-    # @example
-    #   require 'hanami'
-    #
-    #   module Bookshelf
-    #     Application < Hanami::Application
-    #       configure do
-    #         # ...
-    #       end
-    #     end
-    #   end
-    def self.configure(environment = nil, &blk)
-      configuration.configure(environment, &blk)
-    end
-
     # Return the routes for this application
     #
     # @return [Hanami::Router] a route set
@@ -111,78 +75,6 @@ module Hanami
       self.class.load!(self)
     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 self.load!(application = self)
-      Hanami::Loader.new(application).load!
-    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 self.preload!
-      synchronize do
-        applications.each(&:load!)
-      end
-
-      nil
-    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 self.preload_applications!
-      synchronize do
-        applications.each { |app| app.new }
-      end
-
-      nil
-    end
-
     # Return the configuration for this application
     #
     # @since 0.1.0
@@ -229,15 +121,126 @@ module Hanami
       @middleware ||= configuration.middleware
     end
 
-    private
+    class << self
+
+      # Registry of Hanami applications in the current Ruby process
+      #
+      # @return [Set] a set of all the registered applications
+      #
+      # @since 0.2.0
+      # @api private
+      def applications
+        synchronize do
+          @@applications ||= Set.new
+        end
+      end
 
-    # Yields the given block in a critical section
-    #
-    # @since 0.2.0
-    # @api private
-    def self.synchronize
-      Mutex.new.synchronize do
-        yield
+      # Configure the application.
+      # It yields the given block in the context of the configuration
+      #
+      # @param environment [Symbol,nil] the configuration environment name
+      # @param blk [Proc] the configuration block
+      #
+      # @since 0.1.0
+      #
+      # @see Hanami::Configuration
+      #
+      # @example
+      #   require 'hanami'
+      #
+      #   module Bookshelf
+      #     Application < Hanami::Application
+      #       configure do
+      #         # ...
+      #       end
+      #     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!
+      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
+
+        nil
+      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
+
+        nil
+      end
+
+      private
+
+      # Yields the given block in a critical section
+      #
+      # @since 0.2.0
+      # @api private
+      def synchronize
+        Mutex.new.synchronize do
+          yield
+        end
       end
     end
   end

data/lib/hanami/commands/console.rb

@@ -22,7 +22,7 @@ module Hanami
         'irb'  => 'IRB'
       }.freeze
 
-      DEFAULT_ENGINE = 'irb'.freeze
+      DEFAULT_ENGINE = ['irb'].freeze
 
       # @since 0.1.0
       attr_reader :options

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

@@ -15,7 +15,7 @@ module Hanami
         DEFAULT_ARCHITECTURE = 'container'.freeze
         DEFAULT_APPLICATION_BASE_URL = '/'.freeze
 
-        attr_reader :options, :target_path, :database_config
+        attr_reader :options, :target_path, :database_config, :test_framework
 
         def initialize(options, name)
           @options = Hanami::Utils::Hash.new(options).symbolize!
@@ -28,6 +28,7 @@ module Hanami
 
           @hanami_model_version = '~> 0.5'
           @database_config = Hanami::Generators::DatabaseConfig.new(options[:database], app_name)
+          @test_framework = Hanami::Generators::TestFramework.new(hanamirc, @options[:test])
         end
 
         def start
@@ -41,10 +42,6 @@ module Hanami
 
         private
 
-        def test_framework
-          @test_framework ||= Hanami::Generators::TestFramework.new(hanamirc, options[:test])
-        end
-
         def hanamirc
           @hanamirc ||= Hanamirc.new(Pathname.new('.'))
         end
@@ -103,7 +100,7 @@ module Hanami
 
         def assert_name!
           if @name.nil? || @name.strip == '' || @name.include?(File::SEPARATOR)
-            raise ArgumentError.new("APPLICATION_NAME is requried and must not contain #{File::SEPARATOR}.")
+            raise ArgumentError.new("APPLICATION_NAME is required and must not contain #{File::SEPARATOR}.")
           end
         end
 

data/lib/hanami/rendering_policy.rb

@@ -48,7 +48,7 @@ module Hanami
     end
 
     def _render_status_page(action, response)
-      if render_status_page?(action, response)
+      if render_status_page?(action)
         Hanami::Views::Default.render(@templates, response[STATUS], response: response, format: :html)
       end
     end
@@ -61,7 +61,7 @@ module Hanami
       SUCCESSFUL_STATUSES.include?(response[STATUS])
     end
 
-    def render_status_page?(action, response)
+    def render_status_page?(action)
       RENDERABLE_FORMATS.include?(action.format)
     end
 

data/lib/hanami/static.rb

@@ -6,6 +6,10 @@ module Hanami
     PATH_INFO        = 'PATH_INFO'.freeze
     PUBLIC_DIRECTORY = Hanami.public_directory.join('**', '*').to_s.freeze
 
+    # @since x.x.x
+    # @api private
+    URL_SEPARATOR       = '/'.freeze
+
     def initialize(app)
       super(app, root: Hanami.public_directory, header_rules: _header_rules)
       @sources = _sources_from_applications
@@ -14,9 +18,9 @@ module Hanami
     def call(env)
       path           = env[PATH_INFO]
 
-      prefix, config = @sources.find {|p, _| path.start_with?(p) }
-      original       = if prefix && config
-        config.sources.find(path.sub(prefix, ''))
+      prefix, config = @sources.find { |p, _| path.start_with?(p) }
+      if prefix && config
+        original = config.sources.find(path.sub(prefix, ''))
       end
 
       if can_serve(path, original)
@@ -31,8 +35,9 @@ module Hanami
     private
 
     def can_serve(path, original = nil)
+      file_path = path.gsub(URL_SEPARATOR, ::File::SEPARATOR)
       destination = Dir[PUBLIC_DIRECTORY].find do |file|
-        file.index(path).to_i > 0
+        file.end_with?(file_path)
       end
 
       (super(path) || !!destination) && _fresh?(original, destination)

data/lib/hanami/version.rb

@@ -2,5 +2,5 @@ module Hanami
   # Defines the version
   #
   # @since 0.1.0
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/lib/hanami/views/null_view.rb

@@ -9,7 +9,7 @@ module Hanami
         @body = body
       end
 
-      def render(context)
+      def render(_context)
         @body
       end
     end

data/lib/hanami/welcome.rb

@@ -5,7 +5,7 @@ require 'hanami/utils/string'
 
 module Hanami
   class Welcome
-    def initialize(app)
+    def initialize(_app)
       @root = Pathname.new(__dir__).join('templates').realpath
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils