roger 1.5.0 → 1.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTExNTllMmViNTJmMjIwNDJkZmQ3NWIyM2RiNDZmNWMzNDA2MDNiMw==
-  data.tar.gz: !binary |-
-    MjRlNGI2OWY2NTJmY2YxMTMyYjdkYzUyZTljN2Q5MTk1NGMxNWJhNg==
+SHA1:
+  metadata.gz: 9aa7b1fae76209ccfb5300d71b9bfc1c0a2c4ec7
+  data.tar.gz: d8ba78beae86ccad4f13c897dcad096c3e909c8e
 SHA512:
-  metadata.gz: !binary |-
-    ZDBlYWNhNzc3Zjk2YjMwY2RlYTBiYTZiZTkwYThmZTZmZGZiODNkM2QzMjE5
-    YjdlMDZhY2VhZjFjNDBmMTVhNDQ1YzhkOTg2MjEyZGQ5ZjA4N2M3NGY5YjVl
-    N2YyNDM5NTUyNmZmZTk2ODQyZDE3ZDcyNmQ2MTcxZjVhMDUzMWU=
-  data.tar.gz: !binary |-
-    ZTcxYWI2MGJlMWU0YTZmYTVmNjAxMDdiOGE1MzAxYzI0ZTFjZmFhMWY1MmQ1
-    YmRhNzMzMjczZDA1NTJiOTY1MjEwN2NhZGVlY2QwYjE1MDVjZWVhYTBmMWJi
-    ODAxZTFmNjNhYzQwMjc0MmYyMjMzNGJlMmJiNjU0NTVmNmRiZTU=
+  metadata.gz: 4c153e06e6af491d328830095840778aad088ef65141369d9066c41cfc1e7ec5c9da1092994e0010f770e7db41f50e053476ddd019741c2e00eaba37d6447c4f
+  data.tar.gz: f6edd854bc25ef440f412eb23cdd4157b9fedf10859f1d68cdcfab8a4b5cf70efdd9e444460dddf9adb9a21d6a5b609d2d16c892363442cb599215a32c6d7d2c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 1.6.0
+* Change the way template resolving works so if you have a file and directory with the same basename it will prefer to use the file instead of looking for name/index.xyz
+* Add `content_for?(:xyz)` helper so you can check if a `content_for` block exists in templates.
+* Fix bug with resolving of trailing slashes.
+
+## Version 1.5.1
+* Add MockShell object to stub out shell interactions. MockShell is also used by MockProject. This means all tests are silent on STDOUT/STDERR now.
+
 ## Version 1.5.0
 * Roger won't be tested on Ruby 1.9.x anymore
 * The way we render templates has been revamped. It is now possible to have multi-pass templates so you can do `.md.erb` which will first be processed by `erb` and then by the `md` tilt template handler. 

data/examples/default_template/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org/"
 
 gem "roger"

data/lib/roger/release/finalizers/git_branch.rb

@@ -39,7 +39,7 @@ module Roger::Release::Finalizers
 
       release.log(self, "Working git magic in #{clone_dir}")
 
-      commit_and_push_release(clone_dir, release, @options)
+      commit_and_push_release(clone_dir, release, branch, @options)
 
       if @options[:cleanup]
         FileUtils.rm_rf(tmp_dir)
@@ -50,7 +50,7 @@ module Roger::Release::Finalizers
 
     protected
 
-    def commit_and_push_release(clone_dir, release, options)
+    def commit_and_push_release(clone_dir, release, branch, options)
       ::Dir.chdir(clone_dir) do
         # 3. Copy changes
         FileUtils.rm_rf("*")

data/lib/roger/resolver.rb

@@ -135,8 +135,13 @@ module Roger
 
       results = filter_files(files, path, path_without_extension, template_extensions)
 
-      # Our result if any
-      results[0] && Pathname.new(results[0])
+      if !results[0]
+        # No results found, but maybe there is a directory
+        # with the same name and it contains an index.XYZ
+        find_template_path(File.join(name, "index")) if File.directory?(name)
+      else
+        Pathname.new(results[0])
+      end
     end
 
     # Filter a list of files to see wether or not we can process them.
@@ -175,9 +180,6 @@ module Roger
     def sanitize_name(name, prefer = nil)
       path = name.to_s
 
-      # If it's a directory append "index"
-      path = File.join(path, "index") if File.directory?(name)
-
       # Check if we haven't got an extension
       # we'll assume you're looking for prefer or "html" otherwise
       path += ".#{prefer || 'html'}" unless File.basename(path).include?(".")
@@ -188,7 +190,7 @@ module Roger
     # Split path in to extension an path without extension
     def split_path(path)
       path = path.to_s
-      extension = File.extname(path)[1..-1]
+      extension = File.extname(path)[1..-1] || ""
       path_without_extension = path.sub(/\.#{Regexp.escape(extension)}\Z/, "")
       [extension, path_without_extension]
     end

data/lib/roger/template/helpers/capture.rb

@@ -25,6 +25,15 @@ module Roger
           @_content_for_blocks[block_name] = capture(&block)
         end
 
+        # Check if a block will yield content
+        #
+        # ```
+        #   <% if content_for? :name %> bla bla <% end %>
+        # ```
+        def content_for?(block_name)
+          (!_content_for_blocks[block_name].nil? && !_content_for_blocks[block_name].empty?)
+        end
+
         # rubocop:disable Lint/Eval
         def capture(&block)
           unless template.current_tilt_template == Tilt::ERBTemplate

data/lib/roger/testing/mock_project.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + "/../project"
+require File.dirname(__FILE__) + "/mock_shell"
 require "test_construct"
 
 module Roger
@@ -30,7 +31,6 @@ module Roger
             construct.directory dir
           end
         end
-
         # Call super to initialize
         super(path, config)
       end
@@ -39,6 +39,10 @@ module Roger
       def destroy
         teardown_construct(construct) if construct
       end
+
+      def shell
+        @shell ||= MockShell.new
+      end
     end
   end
 end

data/lib/roger/testing/mock_shell.rb

@@ -0,0 +1,18 @@
+require "stringio"
+
+module Roger
+  # A shell that does not output to stdout but will
+  # just have two StringIO objects which can be accessed by using
+  # #stdout and #stderr methods.
+  class MockShell < Thor::Shell::Basic
+    public :stdout, :stderr
+
+    def stdout
+      @_stdout ||= StringIO.new
+    end
+
+    def stderr
+      @_stderr ||= StringIO.new
+    end
+  end
+end

data/lib/roger/version.rb

@@ -1,4 +1,4 @@
 # Roger main namespace
 module Roger
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/test/unit/renderer/renderer_content_for_test.rb

@@ -46,5 +46,21 @@ module Roger
 
       assert_equal "BAB-CONTENT-A", @renderer.render(@source_path, source: template_string)
     end
+
+    def test_content_for_check
+      # Is false when undefined
+      template = 'B<% if content_for? :one %><%= "one" %><% end %>A'
+      assert_equal "BA", @renderer.render(@source_path, source: template)
+
+      # Is false when empty
+      template =  "<% content_for :one do %><% end %>"
+      template << 'B<% if content_for? :one %><%= "one" %><% end %>A'
+      assert_equal "BA", @renderer.render(@source_path, source: template)
+
+      # Is true when set
+      template =  "<% content_for :one do %>one<% end %>"
+      template << "B<% if content_for? :one %><%= yield(:one) %><% end %>A"
+      assert_equal "BoneA", @renderer.render(@source_path, source: template)
+    end
   end
 end

data/test/unit/resolver_test.rb

@@ -76,6 +76,10 @@ module Roger
       )
     end
 
+    def test_trailing_slashes_break
+      assert !@resolver.url_to_relative_url("/de/", "/")
+    end
+
     def test_path_to_url_relative_to_absolute_path
       assert_equal(
         @resolver.path_to_url(
@@ -85,6 +89,10 @@ module Roger
         "../formats/erb.html.erb"
       )
     end
+
+    def test_return_filepath_when_dirname_and_filename_are_same
+      assert_find "formats/same.html", "formats/same"
+    end
   end
 
   # Test resolver with multiple load paths

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
@@ -256,6 +256,7 @@ files:
 - lib/roger/test.rb
 - lib/roger/testing/mock_project.rb
 - lib/roger/testing/mock_release.rb
+- lib/roger/testing/mock_shell.rb
 - lib/roger/version.rb
 - roger.gemspec
 - test/helpers/cli.rb
@@ -271,6 +272,8 @@ files:
 - test/project/html/formats/markdown.md
 - test/project/html/formats/preferred.html.erb
 - test/project/html/formats/preferred.json.erb
+- test/project/html/formats/same.html
+- test/project/html/formats/same/.gitkeep
 - test/project/html/front_matter/erb.html.erb
 - test/project/html/front_matter/markdown.md
 - test/project/html/layouts/content-for.html.erb
@@ -346,17 +349,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.
@@ -374,6 +377,8 @@ test_files:
 - test/project/html/formats/markdown.md
 - test/project/html/formats/preferred.html.erb
 - test/project/html/formats/preferred.json.erb
+- test/project/html/formats/same.html
+- test/project/html/formats/same/.gitkeep
 - test/project/html/front_matter/erb.html.erb
 - test/project/html/front_matter/markdown.md
 - test/project/html/layouts/content-for.html.erb