roger 1.6.4 → 1.7.0

data/test/unit/cli/cli_base_test.rb

@@ -1,9 +1,32 @@
 require "test_helper"
 require "./lib/roger/cli"
 
+module Roger
+  # Just a noop command class for testing
+  class CliNoop < Cli::Command
+  end
+
+  # Open existing Cli::Base to add Noop method.
+  class Cli::Base < Thor
+    register(
+      CliNoop,
+      "noop",
+      "noop",
+      "noop"
+    )
+    tasks["noop"].options = Cli::Serve.class_options
+  end
+end
+
 module Roger
   # Test for roger base commands
   class CliBaseTest < ::Test::Unit::TestCase
+    include TestCli
+
+    def teardown
+      Cli::Base.project = nil
+    end
+
     def test_has_test_command
       assert_includes Cli::Base.tasks.keys, "test"
     end
@@ -23,5 +46,49 @@ module Roger
     def test_has_version_command
       assert_includes Cli::Base.tasks.keys, "version"
     end
+
+    # Option passing
+
+    def test_pass_options_to_project
+      run_command(%w(noop --path=henk))
+      assert_equal "henk", Cli::Base.project.options[:path]
+    end
+
+    def test_pass_roger_options_to_project
+      run_command(%w(noop --some_option=henk))
+      assert_equal "henk", Cli::Base.project.options[:some_option]
+    end
+
+    def test_pass_multiple_roger_options_to_project
+      run_command(%w(noop --option1=henk --option2=henk))
+      assert_equal "henk", Cli::Base.project.options[:option1]
+      assert_equal "henk", Cli::Base.project.options[:option2]
+    end
+
+    def test_pass_roger_options_without_equal_to_project
+      run_command(%w(noop --option1 henk --option2 pino))
+      assert_equal "henk", Cli::Base.project.options[:option1]
+      assert_equal "pino", Cli::Base.project.options[:option2]
+    end
+
+    def test_pass_roger_nested_options_to_project
+      run_command(%w(noop --level0:level1=henk))
+      assert_equal "henk", Cli::Base.project.options[:level0][:level1]
+    end
+
+    def test_pass_boolean_roger_options_to_project
+      run_command(%w(noop --istrue))
+      assert_equal true, Cli::Base.project.options[:istrue]
+    end
+
+    def test_pass_boolean_literal_true_roger_options_to_project
+      run_command(%w(noop --istrue=true))
+      assert_equal true, Cli::Base.project.options[:istrue]
+    end
+
+    def test_pass_boolean_literal_false_roger_options_to_project
+      run_command(%w(noop --isfalse=false))
+      assert_equal false, Cli::Base.project.options[:isfalse]
+    end
   end
 end

data/test/unit/cli/cli_generate_test.rb

@@ -3,26 +3,6 @@ require "./lib/roger/cli"
 
 require File.dirname(__FILE__) + "/../../helpers/cli"
 
-# CustomGenerators namespace
-module CustomGens
-  # The Generators namespace
-  module Generators
-    # Mock generator
-    class MockedGenerator < Roger::Generators::Base
-      desc "@mocked description"
-      argument :path, type: :string, required: false, desc: "Path to generate mockup into"
-      argument :another_arg, type: :string, required: false, desc: "Mocked or what?!"
-
-      def test
-        # Somewhat ugly way of checking
-        fail NotImplementedError
-      end
-    end
-
-    Roger::Generators.register :mocked, MockedGenerator
-  end
-end
-
 module Roger
   # These tests ar for the roger generate command
   class CliGenerateTest < ::Test::Unit::TestCase

data/test/unit/cli/cli_serve_test.rb

@@ -5,11 +5,26 @@ require File.dirname(__FILE__) + "/../../helpers/cli"
 
 module Roger
   module Cli
-    # Overwrite Roger::Cli::Serve#start method as we don't want
-    # to actually start the server
+    # Monkeypatching the server command for testing
     class Serve
-      def start
-        # Let's not start it.
+      # Stop start from being called
+      remove_invocation :start
+
+      # Wrap start so we can immediately stop it
+      def real_start
+        # Let's stop immediately so we can inspect output.
+        start do |server|
+          case server
+          when Puma::Launcher
+            # Most unfortunately we have to do it using an exception because
+            # Puma will yield before actually starting the server resulting in failures
+            fail "Stop"
+          else
+            server.stop
+          end
+        end
+      rescue # rubocop:disable all
+        # Nothing to do.
       end
     end
   end

data/test/unit/generators_test.rb

@@ -2,30 +2,7 @@
 require "test_helper"
 require "./lib/roger/generators.rb"
 
-module CustomGens
-  module Generators
-    # Simple Mock generator
-    class MockedGenerator < Roger::Generators::Base
-      desc "@mocked description"
-      argument :path, type: :string, required: false, desc: "Path to generate project into"
-      argument :another_arg, type: :string, required: false, desc: "Mocked or what?!"
-
-      def test
-        # Somewhat ugly way of checking
-        fail NotImplementedError
-      end
-    end
-
-    # Simple Mocku generator that has a project
-    class MockedWithProjectGenerator < Roger::Generators::Base
-      desc "Returns a project"
-      def test
-        # Somewhat ugly way of checking
-        fail StandardError if @project
-      end
-    end
-  end
-end
+require File.dirname(__FILE__) + "/../helpers/generators"
 
 module Roger
   # Test Roger Generators
@@ -39,7 +16,7 @@ module Roger
     end
 
     def test_working_project
-      Roger::Generators.register CustomGens::Generators::MockedWithProjectGenerator
+      Roger::Generators.register ::Generators::MockedWithProjectGenerator
       generators = Cli::Generate.new
 
       assert_raise StandardError do
@@ -48,14 +25,14 @@ module Roger
     end
 
     def test_register_generator
-      Roger::Generators.register CustomGens::Generators::MockedGenerator
+      Roger::Generators.register ::Generators::MockedGenerator
       assert_includes Cli::Generate.tasks, "mocked"
       assert_equal Cli::Generate.tasks["mocked"].description, "@mocked description"
       assert_equal Cli::Generate.tasks["mocked"].usage, "mocked PATH ANOTHER_ARG"
     end
 
     def test_register_generator_with_custom_name
-      Roger::Generators.register :mockery, CustomGens::Generators::MockedGenerator
+      Roger::Generators.register :mockery, ::Generators::MockedGenerator
       assert_includes Cli::Generate.tasks, "mockery"
     end
 
@@ -78,7 +55,7 @@ module Roger
     end
 
     def test_invoke_mocked_generator
-      Roger::Generators.register CustomGens::Generators::MockedGenerator
+      Roger::Generators.register ::Generators::MockedGenerator
 
       generators = Cli::Generate.new
       assert_raise NotImplementedError do

data/test/unit/rack/roger_test.rb

@@ -1,21 +1,37 @@
 require "test_helper"
-require File.dirname(__FILE__) + "../../../../lib/roger/rack/roger"
 
 module Roger
   module Rack
     # Test Roger Rack
     class ServerTest < ::Test::Unit::TestCase
       def setup
-        @project = Project.new(File.dirname(__FILE__) + "/../../project", rogerfile_path: false)
+        @project = Testing::MockProject.new
         @app = ::Roger::Rack::Roger.new(@project)
       end
 
+      def teardown
+        @project.destroy
+      end
+
       def test_middleware_renders_template
+        @project.construct.file "html/erb.html.erb", "ERB format"
         request = ::Rack::MockRequest.new(@app)
-        response = request.get("/formats/erb")
+        response = request.get("/erb")
 
         assert response.body.include?("ERB format")
       end
+
+      def test_renderer_options_are_passed
+        @project.options[:renderer][:layout] = "bracket"
+
+        @project.construct.file "layouts/bracket.html.erb", "[<%= yield %>]"
+        @project.construct.file "html/test.html.erb", "<%= 'test' %>"
+
+        request = ::Rack::MockRequest.new(@app)
+        response = request.get("/test")
+
+        assert_equal "[test]", response.body
+      end
     end
   end
 end

data/test/unit/release/finalizers/rsync_test.rb

@@ -27,25 +27,27 @@ module Roger
     end
 
     def test_basic_functionality
-      finalizer = Roger::Release::Finalizers::Rsync.new(
+      finalizer = Roger::Release::Finalizers::Rsync.new
+
+      finalizer.call(
+        @release,
         remote_path: @target_path.to_s,
         ask: false
       )
 
-      finalizer.call(@release)
-
       assert File.exist?(@target_path + "index.html"), @release.target_path.inspect
     end
 
     def test_rsync_command_works
-      finalizer = Roger::Release::Finalizers::Rsync.new(
-        rsync: "rsync-0123456789", # Let's hope nobody actually has this command
-        remote_path: @target_path.to_s,
-        ask: false
-      )
+      finalizer = Roger::Release::Finalizers::Rsync.new
 
       assert_raise(RuntimeError) do
-        finalizer.call(@release)
+        finalizer.call(
+          @release,
+          rsync: "rsync-0123456789", # Let's hope nobody actually has this command
+          remote_path: @target_path.to_s,
+          ask: false
+        )
       end
     end
   end

data/test/unit/release/processors/mockup_test.rb

@@ -43,6 +43,18 @@ module Roger
         @mockup.call(@release)
       end
     end
+
+    def test_renderer_options_are_passed
+      @release.project.options[:renderer][:layout] = "bracket"
+      @release.project.construct.file "layouts/bracket.html.erb", "[<%= yield %>]"
+      @release.project.construct.directory "build" do |dir|
+        dir.file "test.html.erb", "<%= 'test' %>"
+      end
+
+      @mockup.call(@release)
+
+      assert_equal "[test]", File.read(@release.build_path + "test.html")
+    end
   end
 
   # Test the target_path function of Mockup

data/test/unit/release_test.rb

@@ -33,14 +33,13 @@ module Roger
       @project.release.run!
 
       assert @project.release.stack.empty?
-      assert @project.release.finalizers.empty?
     end
 
     def test_release_should_add_mockup_processor_as_first_by_default
       release = @rogerfile.release
       release.run!
 
-      assert release.stack.length > 0
+      assert !release.stack.empty?
       assert_equal Roger::Release::Processors::Mockup, release.stack.first.first.class
     end
 
@@ -48,8 +47,16 @@ module Roger
       release = @rogerfile.release
       release.run!
 
-      assert release.stack.length > 0
-      assert_equal Roger::Release::Processors::UrlRelativizer, release.stack.last.first.class
+      assert !release.stack.empty?
+      assert_equal Roger::Release::Processors::UrlRelativizer, release.stack[-2].first.class
+    end
+
+    def test_release_should_add_dir_finalizer_by_default
+      release = @rogerfile.release
+      release.run!
+
+      assert !release.stack.empty?
+      assert_equal Roger::Release::Finalizers::Dir, release.stack.last.first.class
     end
 
     #  =============================
@@ -80,6 +87,22 @@ module Roger
       assert_equal build_path + "test.txt", build_path.children.first
     end
 
+    def test_release_should_use_html_path_as_default_source
+      # Create a file in the web dir
+      @project.construct.file "web/index.html"
+      @project.html_path = @project.path + "web"
+
+      # Blank release, just the copying
+      @rogerfile.release(blank: true, cleanup_build: false)
+
+      @project.release.run!
+
+      build_path = @project.release.build_path
+      assert build_path.exist?
+      assert_equal 1, build_path.children.size
+      assert_equal build_path + "index.html", build_path.children.first
+    end
+
     #  ============================
     #  = Banner and comment tests =
     #  ============================

data/test/unit/renderer/renderer_base_test.rb

@@ -36,6 +36,12 @@ module Roger
       assert_equal "file", result
     end
 
+    def test_render_file_relative_fails_from_top_level
+      assert_raise ArgumentError do
+        @renderer.render_file("file.html.erb")
+      end
+    end
+
     def test_render_file_prevent_recursive
       assert_raise(ArgumentError) do
         @renderer.render(@base + "html/renderer/recursive.html.erb")
@@ -55,6 +61,24 @@ module Roger
       assert_equal "<h1>h1</h1>\n", result
     end
 
+    def test_current_remplate
+      path = @base + "html/dir1/test.html.erb"
+      result = @renderer.render(
+        path,
+        source: "<%= renderer.current_template.source_path %>"
+      )
+      assert_equal((@base + "html/dir1/test.html.erb").to_s, result)
+    end
+
+    def test_parent_template
+      path = @base + "html/dir1/test.html.erb"
+      result = @renderer.render(
+        path,
+        source: "<%= partial 'test/parent_template' %>"
+      )
+      assert_equal((@base + "html/dir1/test.html.erb").to_s, result)
+    end
+
     def test_render_md_erb
       result = @renderer.render("test.md.erb", source: "<%= '# h1' %>")
       assert_equal "<h1>h1</h1>\n", result

data/test/unit/renderer/renderer_layout_test.rb

@@ -33,8 +33,32 @@ module Roger
       assert_equal "TEMPLATEB-PARTIAL-A", render_erb_template(template)
     end
 
-    def render_erb_template(template)
-      @renderer.render(@base + "html/layouts/test.html.erb", source: template)
+    def test_missing_layout
+      template = "---\nlayout: \"not-there\"\n---\nTEMPLATE"
+
+      assert_raise ArgumentError do
+        render_erb_template(template)
+      end
+    end
+
+    def test_default_layout
+      template = "TEMPLATE"
+      assert_equal "[TEMPLATE]", render_erb_template(template, layout: "bracket")
+    end
+
+    def test_default_layout_is_overriden_by_frontmatter
+      template = "---\nlayout: \"yield\"\n---\nTEMPLATE"
+      assert_equal "TEMPLATE", render_erb_template(template, layout: "bracket")
+    end
+
+    def test_default_layout_can_by_disabled_in_frontmatter
+      template = "---\nlayout: \n---\nTEMPLATE"
+      assert_equal "TEMPLATE", render_erb_template(template, layout: "bracket")
+    end
+
+    def render_erb_template(template, options = {})
+      options = {}.update(options).update(source: template)
+      @renderer.render(@base + "html/layouts/test.html.erb", options)
     end
   end
 end

data/test/unit/renderer/renderer_partial_test.rb

@@ -51,6 +51,16 @@ module Roger
       assert_equal result, "{ key: value }"
     end
 
+    def test_partial_pass_locals
+      result = render_erb_template "<%= partial 'test/locals', variable: 'variable' %>"
+      assert_equal result, "variable"
+    end
+
+    def test_partial_pass_options
+      result = render_erb_template "<%= partial 'test/locals', locals: {variable: 'variable'} %>"
+      assert_equal result, "variable"
+    end
+
     def test_partial_with_block
       result = render_erb_template "<% partial 'test/yield' do %>CONTENT<% end %>"
       assert_equal result, "B-CONTENT-A"
@@ -82,12 +92,12 @@ module Roger
     end
 
     def test_partial_ten_max_depth_recursion
-      r = render_erb_template "<%= partial 'test/max_depth', locals: {depth: 0, max_depth: 10} %>"
+      r = render_erb_template "<%= partial 'test/max_depth', {depth: 0, max_depth: 10} %>"
 
       assert_match(/Hammertime/, r)
 
       assert_raise(ArgumentError) do
-        render_erb_template "<%= partial 'test/max_depth', locals: {depth: 0, max_depth: 11} %>"
+        render_erb_template "<%= partial 'test/max_depth', {depth: 0, max_depth: 11} %>"
       end
     end
 

data/test/unit/server_test.rb

@@ -7,6 +7,38 @@ module Roger
     def setup
       @project = Project.new(File.dirname(__FILE__) + "/../../project", rogerfile_path: false)
       @server = Server.new(@project)
+      @host = "127.0.0.1"
+    end
+
+    def test_port_free
+      port = 5192
+
+      # Port is free
+      assert @server.send(:port_free?, @host, port)
+
+      s = TCPServer.new(@host, port)
+
+      # Port is not free
+      assert !@server.send(:port_free?, @host, port)
+    ensure
+      s.close
+    end
+
+    def test_free_port_for_host_above
+      port = 9000
+
+      # Make sure something is running on port
+      begin
+        s = TCPServer.new(@host, port)
+      rescue SocketError, Errno::EADDRINUSE # rubocop:disable all
+        # Something already must be running on port
+      end
+
+      next_port = @server.send(:free_port_for_host_above, @host, port)
+      assert next_port > port
+
+    ensure
+      s.close
     end
 
     # Test to see if env["roger.project"] is set

data/test/unit/test_helper.rb

@@ -1,10 +1,5 @@
-if ENV["CODECLIMATE_REPO_TOKEN"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-else
-  require "simplecov"
-  SimpleCov.start
-end
+require "simplecov"
+SimpleCov.start
 
 require "test/unit"
 require "mocha/test_unit"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.0
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,7 @@ files:
 - lib/roger/helpers/get_callable.rb
 - lib/roger/helpers/get_files.rb
 - lib/roger/helpers/logging.rb
+- lib/roger/helpers/registration.rb
 - lib/roger/project.rb
 - lib/roger/rack/roger.rb
 - lib/roger/rack/sleep.rb
@@ -260,6 +261,7 @@ files:
 - lib/roger/version.rb
 - roger.gemspec
 - test/helpers/cli.rb
+- test/helpers/generators.rb
 - test/project/.rvmrc
 - test/project/Gemfile
 - test/project/Gemfile.lock
@@ -286,6 +288,7 @@ files:
 - test/project/html/renderer/recursive.html.erb
 - test/project/html/static/non-relative.html.erb
 - test/project/html/static/relative.html.erb
+- test/project/layouts/bracket.html.erb
 - test/project/layouts/partial.html.erb
 - test/project/layouts/partial_with_block.html.erb
 - test/project/layouts/test.html.erb
@@ -303,8 +306,10 @@ files:
 - test/project/partials/test/erb.html.erb
 - test/project/partials/test/front_matter.html.erb
 - test/project/partials/test/json.json.erb
+- test/project/partials/test/locals.html.erb
 - test/project/partials/test/markdown.md
 - test/project/partials/test/max_depth.html.erb
+- test/project/partials/test/parent_template.html.erb
 - test/project/partials/test/recursive.html.erb
 - test/project/partials/test/simple.html.erb
 - test/project/partials/test/yield.html.erb
@@ -369,6 +374,7 @@ specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.
 test_files:
 - test/helpers/cli.rb
+- test/helpers/generators.rb
 - test/project/.rvmrc
 - test/project/Gemfile
 - test/project/Gemfile.lock
@@ -395,6 +401,7 @@ test_files:
 - test/project/html/renderer/recursive.html.erb
 - test/project/html/static/non-relative.html.erb
 - test/project/html/static/relative.html.erb
+- test/project/layouts/bracket.html.erb
 - test/project/layouts/partial.html.erb
 - test/project/layouts/partial_with_block.html.erb
 - test/project/layouts/test.html.erb
@@ -412,8 +419,10 @@ test_files:
 - test/project/partials/test/erb.html.erb
 - test/project/partials/test/front_matter.html.erb
 - test/project/partials/test/json.json.erb
+- test/project/partials/test/locals.html.erb
 - test/project/partials/test/markdown.md
 - test/project/partials/test/max_depth.html.erb
+- test/project/partials/test/parent_template.html.erb
 - test/project/partials/test/recursive.html.erb
 - test/project/partials/test/simple.html.erb
 - test/project/partials/test/yield.html.erb