hanami 2.0.0.beta2 → 2.0.0.beta4

data/lib/hanami/providers/settings.rb

@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/system/provider/source"
-require_relative "../constants"
-require_relative "../errors"
-
-module Hanami
-  module Providers
-    # The settings provider loads and registers the "settings" component in app and slice
-    # containers.
-    #
-    # To register this provider with a slice container, you should use
-    # {.register_with_slice}, which will register the provider only if settings are
-    # defined for the slice.
-    #
-    # @see Slice::ClassMethods.prepare_container_providers
-    #
-    # @api private
-    # @since 2.0.0
-    class Settings < Dry::System::Provider::Source
-      class << self
-        # Registers the provider with the slice's container, but only if settings are
-        # defined for the slice.
-        def register_with_slice(slice)
-          return unless settings_defined?(slice)
-
-          slice.register_provider(:settings, source: with_slice(slice))
-        end
-
-        # Creates a new subclass of the provider for the given slice.
-        #
-        # You must do this before registering the provider with a container. The provider
-        # uses the slice to locate the settings definition based on the slice's config.
-        def with_slice(slice)
-          Class.new(self) do |klass|
-            klass.instance_variable_set(:@slice, slice)
-          end
-        end
-
-        # Returns the slice for the provider
-        def slice
-          unless @slice
-            raise SliceLoadError, "a slice must be given to #{self} via `.with_slice(slice)`"
-          end
-
-          @slice
-        end
-
-        private
-
-        # Returns true if settings are defined for the slice.
-        #
-        # Settings are considered defined if a `Settings` class is already defined in the
-        # slice namespace, or a `config/settings.rb` exists under the slice root.
-        def settings_defined?(slice)
-          slice.namespace.const_defined?(SETTINGS_CLASS_NAME) ||
-            slice.root.join("#{SETTINGS_PATH}#{RB_EXT}").file?
-        end
-      end
-
-      def prepare
-        require_slice_settings unless slice_settings_class?
-      end
-
-      def start
-        settings = slice_settings_class.new(slice.config.settings_store)
-
-        register :settings, settings
-      end
-
-      private
-
-      def slice
-        self.class.slice
-      end
-
-      def slice_settings_class?
-        slice.namespace.const_defined?(SETTINGS_CLASS_NAME)
-      end
-
-      def slice_settings_class
-        slice.namespace.const_get(SETTINGS_CLASS_NAME)
-      end
-
-      def require_slice_settings
-        require "hanami/settings"
-
-        slice_settings_require_path = File.join(slice.root, SETTINGS_PATH)
-
-        begin
-          require slice_settings_require_path
-        rescue LoadError => e
-          raise e unless e.path == slice_settings_require_path
-        end
-      end
-    end
-  end
-end

data/lib/hanami/server.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami"
-require "rack"
-
-module Hanami
-  # Rack compatible server.
-  #
-  # It is run with:
-  #
-  #   `bundle exec hanami server`
-  #
-  # It runs the app, by using the server specified in your `Gemfile`
-  # (eg. Puma or Unicorn).
-  #
-  # @since 0.8.0
-  # @api private
-  class Server < ::Rack::Server
-    # Primarily this removes the ::Rack::Chunked middleware
-    # which is the cause of Safari content-length bugs.
-    #
-    # @since 0.8.0
-    def middleware
-      mw = ::Hash.new { |e, m| e[m] = [] }
-      mw["development"].concat([::Rack::ShowExceptions, ::Rack::Lint])
-      mw
-    end
-  end
-end

data/spec/integration/application_middleware_stack_spec.rb

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "App middleware stack", type: :integration do
-  it "mounts Rack middleware" do
-    with_project do
-      generate "action web home#index --url=/"
-      generate_middleware
-
-      # Add apps/web/middleware to the load paths
-      replace "apps/web/app.rb", "load_paths << [", "load_paths << ['middleware',"
-
-      # Require Rack::ETag
-      unshift "apps/web/app.rb", "require 'rack/etag'"
-
-      # Mount middleware
-      replace "apps/web/app.rb", "# middleware.use", "middleware.use 'Web::Middleware::Runtime'\nmiddleware.use 'Web::Middleware::Custom', 'OK'\nmiddleware.use Rack::ETag"
-
-      rewrite "apps/web/controllers/home/index.rb", <<~EOF
-        module Web::Controllers::Home
-          class Index
-            include Web::Action
-
-            def call(params)
-              self.body = "OK"
-            end
-          end
-        end
-      EOF
-
-      server do
-        get "/"
-
-        expect(last_response.status).to               eq(200)
-
-        expect(last_response.headers["X-Runtime"]).to eq("1ms")
-        expect(last_response.headers["X-Custom"]).to  eq("OK")
-        expect(last_response.headers["ETag"]).to_not  be_nil
-      end
-    end
-  end
-
-  private
-
-  def generate_middleware # rubocop:disable Metrics/MethodLength
-    write "apps/web/middleware/runtime.rb", <<~EOF
-      module Web
-        module Middleware
-          class Runtime
-            def initialize(app)
-              @app = app
-            end
-
-            def call(env)
-              status, headers, body = @app.call(env)
-              headers["X-Runtime"]  = "1ms"
-
-              [status, headers, body]
-            end
-          end
-        end
-      end
-    EOF
-
-    write "apps/web/middleware/custom.rb", <<~EOF
-      module Web
-        module Middleware
-          class Custom
-            def initialize(app, value)
-              @app   = app
-              @value = value
-            end
-
-            def call(env)
-              status, headers, body = @app.call(env)
-              headers["X-Custom"]   = @value
-
-              [status, headers, body]
-            end
-          end
-        end
-      end
-    EOF
-  end
-end

data/spec/integration/assets/cdn_spec.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "assets", type: :integration do
-  describe "CDN mode" do
-    it "servers assets with CDN url" do
-      with_project do
-        generate "action web home#index --url=/"
-
-        write "apps/web/assets/javascripts/app.css", <<~EOF
-          body { color: #333 };
-        EOF
-        rewrite "apps/web/templates/app.html.erb", <<~EOF
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <title>Web</title>
-              <%= favicon %>
-              <%= stylesheet 'app' %>
-            </head>
-            <body>
-              <%= yield %>
-            </body>
-          </html>
-        EOF
-
-        replace_last "apps/web/app.rb", "# scheme 'https'",           "scheme 'https'"
-        replace      "apps/web/app.rb", "# host   'cdn.example.org'", "host   'cdn.example.org'"
-        replace_last "apps/web/app.rb", "# port   443",               "port   443"
-
-        #
-        # Precompile
-        #
-        RSpec::Support::Env["HANAMI_ENV"]   = "production"
-        RSpec::Support::Env["DATABASE_URL"] = "sqlite://#{Pathname.new('db').join('bookshelf.sqlite')}"
-        RSpec::Support::Env["SMTP_HOST"]    = "localhost"
-        RSpec::Support::Env["SMTP_PORT"]    = "25"
-
-        hanami "assets precompile"
-
-        server do
-          visit "/"
-
-          expect(page.body).to include(%(<link href="https://cdn.example.org/assets/app-5df86b4e9cbd733a027762b2f6bf8693.css" type="text/css" rel="stylesheet" integrity="sha256-LxaTcWkL8TAWFQWeHJ7OqoSoEXXaYapNIS+TCvGNf48=" crossorigin="anonymous">))
-        end
-      end
-    end
-  end
-end

data/spec/integration/assets/fingerprint_spec.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "assets", type: :integration do
-  describe "fingerprint mode" do
-    it "servers assets with fingerprint url" do
-      with_project do
-        generate "action web home#index --url=/"
-
-        write "apps/web/assets/javascripts/app.css", <<~EOF
-          body { color: #333 };
-        EOF
-        rewrite "apps/web/templates/app.html.erb", <<~EOF
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <title>Web</title>
-              <%= favicon %>
-              <%= stylesheet 'app' %>
-            </head>
-            <body>
-              <%= yield %>
-            </body>
-          </html>
-        EOF
-        #
-        # Precompile
-        #
-        RSpec::Support::Env["HANAMI_ENV"]   = "production"
-        RSpec::Support::Env["DATABASE_URL"] = "sqlite://#{Pathname.new('db').join('bookshelf.sqlite')}"
-        RSpec::Support::Env["SMTP_HOST"]    = "localhost"
-        RSpec::Support::Env["SMTP_PORT"]    = "25"
-        hanami "assets precompile"
-
-        server do
-          visit "/"
-
-          expect(page.body).to include(%(<link href="/assets/app-5df86b4e9cbd733a027762b2f6bf8693.css" type="text/css" rel="stylesheet" integrity="sha256-LxaTcWkL8TAWFQWeHJ7OqoSoEXXaYapNIS+TCvGNf48=" crossorigin="anonymous">))
-        end
-      end
-    end
-  end
-end

data/spec/integration/assets/helpers_spec.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "assets", type: :integration do
-  describe "helpers" do
-    it "renders assets tags" do
-      with_project do
-        generate "action web home#index --url=/"
-
-        rewrite "apps/web/templates/app.html.erb", <<~EOF
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <title>Web</title>
-              <%= favicon %>
-              <%= stylesheet 'app' %>
-            </head>
-            <body>
-              <%= yield %>
-              <%= javascript 'app' %>
-            </body>
-          </html>
-        EOF
-
-        rewrite "apps/web/templates/home/index.html.erb", <<~EOF
-          <%= image('app.jpg') %>
-          <%= video('movie.mp4') %>
-          <%=
-          video do
-            text "Your browser does not support the video tag"
-            source src: view.asset_path('movie.mp4'), type: 'video/mp4'
-            source src: view.asset_path('movie.ogg'), type: 'video/ogg'
-          end
-          %>
-        EOF
-
-        server do
-          visit "/"
-
-          expect(page.body).to include(%(<link href="/assets/favicon.ico" rel="shortcut icon" type="image/x-icon">))
-          expect(page.body).to include(%(<link href="/assets/app.css" type="text/css" rel="stylesheet">))
-          expect(page.body).to include(%(<script src="/assets/app.js" type="text/javascript"></script>))
-
-          expect(page.body).to include(%(<img src="/assets/app.jpg" alt="App">))
-          expect(page.body).to include(%(<video src="/assets/movie.mp4"></video>))
-          expect(page.body).to include(%(<video>\nYour browser does not support the video tag\n<source src="/assets/movie.mp4" type="video/mp4">\n<source src="/assets/movie.ogg" type="video/ogg">\n</video>))
-        end
-      end
-    end
-  end
-end

data/spec/integration/assets/serve_spec.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "assets", type: :integration do
-  describe "serve" do
-    it "compiles and serves assets in development mode" do
-      project = "bookshelf_serve_assets"
-
-      with_project(project, gems: ['sassc']) do
-        generate "action web home#index --url=/"
-
-        write "apps/web/assets/javascripts/app.css.sass", <<~EOF
-          $font-family: Helvetica, sans-serif
-
-          body
-            font: 100% $font-family
-        EOF
-        rewrite "apps/web/templates/app.html.erb", <<~EOF
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <title>Web</title>
-              <%= favicon %>
-              <%= stylesheet 'app' %>
-            </head>
-            <body>
-              <%= yield %>
-            </body>
-          </html>
-        EOF
-
-        server do
-          visit "/"
-          expect(page.body).to include(%(<link href="/assets/app.css" type="text/css" rel="stylesheet">))
-
-          visit "/assets/app.css"
-          expect(page.body).to include(%(body {\n  font: 100% Helvetica, sans-serif; }\n))
-        end
-      end
-    end
-
-    it "serve assets with prefixes" do
-      with_project do
-        generate "action web home#index --url=/"
-
-        replace(
-          "apps/web/app.rb",
-          "# Specify sources for assets",
-          "prefix '/library/assets'\n# Specify sources for assets"
-        )
-
-        replace(
-          "apps/web/config/routes.rb",
-          "/",
-          "namespace :library { get '/', to: 'home#index' }"
-        )
-
-        write "apps/web/assets/javascripts/app.js", <<~EOF
-          console.log('test');
-        EOF
-
-        hanami "assets precompile"
-
-        server do
-          visit "/library/assets/app.js"
-          expect(page).to have_content("console.log('test');")
-        end
-      end
-    end
-  end
-end

data/spec/integration/assets/subresource_integrity_spec.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require "json"
-
-RSpec.describe "assets", type: :integration do
-  describe "subresource integrity" do
-    it "precompiles assets with checksums calculated with given algorithms" do
-      with_project do
-        generate "action web home#index --url=/"
-
-        write "apps/web/assets/javascripts/app.css", <<~EOF
-          body { font: Helvetica; }
-        EOF
-        rewrite "apps/web/templates/app.html.erb", <<~EOF
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <title>Web</title>
-              <%= favicon %>
-              <%= stylesheet 'app' %>
-            </head>
-            <body>
-              <%= yield %>
-            </body>
-          </html>
-        EOF
-
-        replace "apps/web/app.rb", "subresource_integrity :sha256", "subresource_integrity :sha256, :sha512"
-
-        #
-        # Precompile
-        #
-        RSpec::Support::Env["HANAMI_ENV"] = "production"
-        # FIXME: database connection shouldn't be required for `assets precompile`
-        RSpec::Support::Env["DATABASE_URL"] = "sqlite://#{Pathname.new('db').join('bookshelf.sqlite')}"
-        RSpec::Support::Env["SMTP_HOST"] = "localhost"
-        RSpec::Support::Env["SMTP_PORT"] = "25"
-
-        hanami "assets precompile"
-
-        manifest = File.read("public/assets.json")
-        expect(JSON.parse(manifest)).to be_kind_of(Hash) # assert it's a well-formed JSON
-
-        expect(manifest).to include(%("/assets/app.css":{"target":"/assets/app-068e7d97b3671a14824bc20437ac5d06.css","sri":["sha256-cHgODQTP2nNk9ER+ViDGp+lC+ddHRmuLgJk05glJ4+w=","sha512-TDyxo1Ow7UjBib6ykALJh7J1OHEcE0yX4X21s1714ZBAhwdOz7k9t8+QQDAwWAmeH97bNaZGY7oTfVrwyTQ3cw=="]}))
-        expect(manifest).to include(%("/assets/favicon.ico":{"target":"/assets/favicon-b0979f93c7f7246ac70949a80f7cbdfd.ico","sri":["sha256-PLEDhpDsTBpxl1KtXjzBjg+PUG67zpf05B1z2db4iJU=","sha512-9NvaW7aVAywbLPPi3fw5s4wtWwd37i8VpzgfEo9uCOyr/mDT2dbYJtGNjfTJa4R8TOw69yHr4NhazPQsLt1WHw=="]}))
-
-        server do
-          visit "/"
-          expect(page.body).to include(%(<link href="/assets/app-068e7d97b3671a14824bc20437ac5d06.css" type="text/css" rel="stylesheet" integrity="sha256-cHgODQTP2nNk9ER+ViDGp+lC+ddHRmuLgJk05glJ4+w= sha512-TDyxo1Ow7UjBib6ykALJh7J1OHEcE0yX4X21s1714ZBAhwdOz7k9t8+QQDAwWAmeH97bNaZGY7oTfVrwyTQ3cw==" crossorigin="anonymous">))
-        end
-      end
-    end
-  end
-end

data/spec/integration/body_parsers_spec.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "body parsers", type: :integration do
-  it "parses JSON payload for non-GET requests" do
-    with_project do
-      generate_action
-      enable_json_body_parser
-
-      server do
-        post "/books", %({"book": {"title": "CLI apps with Ruby"}}), "CONTENT_TYPE" => "app/json", "HTTP_ACCEPT" => "app/json"
-        expect(last_response.body).to eq(%({"book":{"title":"CLI apps with Ruby"}}))
-      end
-    end
-  end
-
-  it "doesn't eval untrusted JSON" do
-    with_project do
-      generate_action
-      enable_json_body_parser
-
-      server do
-        post "/books", %({"json_class": "Foo"}), "CONTENT_TYPE" => "app/json", "HTTP_ACCEPT" => "app/json"
-        expect(last_response.body).to eq(%({"json_class":"Foo"}))
-      end
-    end
-  end
-
-  private
-
-  def generate_action
-    generate "action web books#create --url=/books --method=POST"
-
-    rewrite "apps/web/controllers/books/create.rb", <<~EOF
-      require 'hanami/utils/json'
-      module Web::Controllers::Books
-        class Create
-          include Web::Action
-
-          def call(params)
-            self.body = Hanami::Utils::Json.generate(params.to_hash)
-          end
-        end
-      end
-    EOF
-  end
-
-  def enable_json_body_parser
-    inject_line_after "apps/web/app.rb", "configure do", "body_parsers :json"
-  end
-end

data/spec/integration/cli/assets/precompile_spec.rb

@@ -1,147 +0,0 @@
-# frozen_string_literal: true
-
-require "json"
-
-RSpec.describe "hanami assets", type: :integration do
-  describe "precompile" do
-    it "precompiles assets" do
-      gems = %w[sassc coffee-script]
-
-      Platform.match do
-        os(:linux).engine(:ruby)  { gems.push("therubyracer") }
-        os(:linux).engine(:jruby) { gems.push("therubyrhino") }
-      end
-
-      with_project("bookshelf_assets_precompile", gems: gems) do
-        #
-        # Web assets
-        #
-        write "apps/web/assets/javascripts/app.js.coffee", <<~EOF
-          class App
-            constructor: () ->
-              @init = true
-        EOF
-        write "apps/web/assets/stylesheets/_colors.scss", <<~EOF
-          $background-color: #f5f5f5;
-        EOF
-
-        write "apps/web/assets/stylesheets/app.css.scss", <<~EOF
-          @import 'colors';
-
-          body {
-            background-color: $background-color;
-          }
-        EOF
-        #
-        # Admin assets
-        #
-        generate "app admin"
-        write "apps/admin/assets/javascripts/dashboard.js.coffee", <<~EOF
-          class Dashboard
-            constructor: (@data) ->
-        EOF
-
-        #
-        # Precompile
-        #
-        RSpec::Support::Env["HANAMI_ENV"] = "production"
-        hanami "assets precompile"
-
-        # rubocop:disable Lint/ImplicitStringConcatenation
-
-        #
-        # Verify manifest
-        #
-        manifest = retry_exec(Errno::ENOENT) do
-          File.read("public/assets.json")
-        end
-
-        expect(JSON.parse(manifest)).to be_kind_of(Hash) # assert it's a well-formed JSON
-
-        expect(manifest).to include(%("/assets/admin/dashboard.js":{"target":"/assets/admin/dashboard-39744f9626a70683b6c2d46305798883.js","sri":["sha256-1myPVWoqrq+uAVP2DSkmAown+5dm0x61+E3AjlGOKEc="]}))
-        expect(manifest).to include(%("/assets/admin/favicon.ico":{"target":"/assets/admin/favicon-b0979f93c7f7246ac70949a80f7cbdfd.ico","sri":["sha256-PLEDhpDsTBpxl1KtXjzBjg+PUG67zpf05B1z2db4iJU="]}))
-        expect(manifest).to include(%("/assets/app.css":{"target":"/assets/app-adb4104884aadde9abfef0bd98ac461e.css","sri":["sha256-S6V565W2In9pWE0uzMASpp58xCg32TN3at3Fv4g9aRA="]}))
-        expect(manifest).to include(%("/assets/app.js":{"target":"/assets/app-bb8f10498d83d401db238549409dc4c5.js","sri":["sha256-9m4OTbWigbDPp4oCe1LZz9isqidvW1c3jNL6mXMj2xs="]}))
-        expect(manifest).to include(%("/assets/favicon.ico":{"target":"/assets/favicon-b0979f93c7f7246ac70949a80f7cbdfd.ico","sri":["sha256-PLEDhpDsTBpxl1KtXjzBjg+PUG67zpf05B1z2db4iJU="]}))
-
-        #
-        # Verify web assets (w/ checksum)
-        #
-        expect("public/assets/app-adb4104884aadde9abfef0bd98ac461e.css").to have_file_content <<~EOF
-          body {background-color: #f5f5f5}
-        EOF
-
-        expect("public/assets/app-bb8f10498d83d401db238549409dc4c5.js").to have_file_content \
-          """
-(function(){var App;App=(function(){function App(){this.init=true;}
-return App;})();}).call(this);
-"""
-
-        expect("public/assets/favicon-b0979f93c7f7246ac70949a80f7cbdfd.ico").to be_an_existing_file
-
-        #
-        # Verify web assets (w/o checksum)
-        #
-        expect("public/assets/app.css").to have_file_content <<~EOF
-          body {background-color: #f5f5f5}
-        EOF
-
-        expect("public/assets/app.js").to have_file_content \
-          """
-(function(){var App;App=(function(){function App(){this.init=true;}
-return App;})();}).call(this);
-"""
-
-        expect("public/assets/favicon.ico").to be_an_existing_file
-
-        #
-        # Verify admin assets (w/ checksum)
-        #
-        expect("public/assets/admin/dashboard-39744f9626a70683b6c2d46305798883.js").to have_file_content \
-          """
-(function(){var Dashboard;Dashboard=(function(){function Dashboard(data){this.data=data;}
-return Dashboard;})();}).call(this);
-"""
-
-        expect("public/assets/admin/favicon-b0979f93c7f7246ac70949a80f7cbdfd.ico").to be_an_existing_file
-
-        #
-        # Verify admin assets (w/o checksum)
-        #
-        expect("public/assets/admin/dashboard.js").to have_file_content \
-          """
-(function(){var Dashboard;Dashboard=(function(){function Dashboard(data){this.data=data;}
-return Dashboard;})();}).call(this);
-"""
-
-        expect("public/assets/admin/favicon.ico").to be_an_existing_file
-
-        # rubocop:enable Lint/ImplicitStringConcatenation
-      end
-    end
-
-    it "prints help message" do
-      with_project do
-        output = <<~OUT
-Command:
-  hanami assets precompile
-
-Usage:
-  hanami assets precompile
-
-Description:
-  Precompile assets for deployment
-
-Options:
-  --help, -h                        # Print this help
-
-Examples:
-  hanami assets precompile                       # Basic usage
-  hanami assets precompile HANAMI_ENV=production # Precompile assets for production environment
-OUT
-
-        run_cmd "hanami assets precompile --help", output
-      end
-    end
-  end
-end