nanoc 4.0.0a2 → 4.0.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1055bcfad80c114e2f54b3e67d89468c828ce18
-  data.tar.gz: 121523a9ee6c375e4a4dc4fc56c680f7501b97ad
+  metadata.gz: 90ed92857b63ba5cdfc7ea40b6f8a47d028a9dd4
+  data.tar.gz: 634df8e12745fe703ff012cea92e430a90dc5880
 SHA512:
-  metadata.gz: 0da18d11db64365759e7be6dd9c6fd72334baa823813d39c7286d34f8ebf406cf73bb1059c2dc35d1955c0697495af986bb657a2003ac1ef7f88b8e1c19be249
-  data.tar.gz: 609b1ec27cad20f169346917dd688d08dbb4e8a12b4497d4884a1bb3f2dcf1492b36e34a9a4c6d27c77d58f6d346d98c4c6ee37933dc884932acb8dfebeefb3f
+  metadata.gz: 0fcd435c5cfd92929ce88041689e8ad9cfe370194335a40d70ead941acdb22579a4741d53a3331bf75ff1cf248496233289140d207c0a734893859398b34306c
+  data.tar.gz: 3e19e77f09ae7a5afbc52cfadf2a53f10e267e2c4dba4c436b75b749181ec1972adcf07f4795015074ec799fec2bd7afeaf1b7fbe2afd90b8983c6c0fca0ca8d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.0.0a2)
+    nanoc (4.0.0b1)
       cri (~> 2.3)
 
 GEM
@@ -9,6 +9,7 @@ GEM
   specs:
     CFPropertyList (2.3.1)
     RedCloth (4.2.9)
+    RedCloth (4.2.9-java)
     addressable (2.3.8)
     adsf (1.2.0)
       rack (>= 1.0.0)
@@ -49,6 +50,7 @@ GEM
     excon (0.45.3)
     execjs (2.5.2)
     ffi (1.9.8)
+    ffi (1.9.8-java)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.30.0)
@@ -127,7 +129,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (0.4.5)
+    fog-softlayer (0.4.6)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -154,11 +156,13 @@ GEM
       therubyracer (~> 0.12.1)
     handlebars-source (3.0.3)
     hitimes (1.2.2)
+    hitimes (1.2.2-java)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     json (1.8.2)
+    json (1.8.2-java)
     kramdown (1.7.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
@@ -185,6 +189,7 @@ GEM
     netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-java)
     pandoc-ruby (1.0.0)
     parser (2.2.2.2)
       ast (>= 1.1, < 3.0)
@@ -194,6 +199,11 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
@@ -245,6 +255,8 @@ GEM
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     temple (0.7.5)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
@@ -263,6 +275,7 @@ GEM
       json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
+    unf (0.1.4-java)
     unf_ext (0.0.7.1)
     vcr (2.9.3)
     w3c_validators (1.2)
@@ -276,6 +289,7 @@ GEM
     yuicompressor (1.3.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/NEWS.md

@@ -1,6 +1,28 @@
 # nanoc news
 
-## 4.0.0a2 (2015-05-??)
+## 4.0.0b1 (2015-05-??)
+
+Changes:
+
+* Removed tasks
+* Removed several private methods in the view API
+* Removed default `base_url` in tagging helper
+
+Enhancements:
+
+* Removed unused options from CLI
+* Added `Nanoc::Identifier#without_ext`
+* Made `Nanoc::Identifier#=~` work with a glob
+* Added `Nanoc::LayoutCollectionView#[]`
+* Added `--force` to `create-site` command (#549) [David Alexander]
+
+Fixes:
+
+* Fixed `#passthrough` for identifiers with extensions
+* Fixed rendering helper for identifiers with extensions
+* Fixed filtering helper
+
+## 4.0.0a2 (2015-05-12)
 
 Features:
 

data/lib/nanoc/base/compilation/compiler.rb

@@ -336,9 +336,10 @@ module Nanoc::Int
           compile_rep(rep)
           content_dependency_graph.delete_vertex(rep)
         rescue Nanoc::Int::Errors::UnmetDependency => e
-          content_dependency_graph.add_edge(e.rep, rep)
-          unless content_dependency_graph.vertices.include?(e.rep)
-            content_dependency_graph.add_vertex(e.rep)
+          other_rep = e.rep.unwrap rescue e.rep
+          content_dependency_graph.add_edge(other_rep, rep)
+          unless content_dependency_graph.vertices.include?(other_rep)
+            content_dependency_graph.add_vertex(other_rep)
           end
         end
       end

data/lib/nanoc/base/compilation/compiler_dsl.rb

@@ -194,11 +194,15 @@ module Nanoc::Int
 
       # Create routing rule
       routing_block = proc do
-        # This is a temporary solution until an item can map back to its data
-        # source.
-        # ATM item[:content_filename] is nil for items coming from the static
-        # data source.
-        item[:extension].nil? || (item[:content_filename].nil? && item.identifier =~ %r{#{item[:extension]}/$}) ? item.identifier.chop : item.identifier.chop + '.' + item[:extension]
+        if item.identifier.full?
+          item.identifier.to_s
+        else
+          # This is a temporary solution until an item can map back to its data
+          # source.
+          # ATM item[:content_filename] is nil for items coming from the static
+          # data source.
+          item[:extension].nil? || (item[:content_filename].nil? && item.identifier =~ %r{#{item[:extension]}/$}) ? item.identifier.chop : item.identifier.chop + '.' + item[:extension]
+        end
       end
       routing_rule = Nanoc::Int::Rule.new(create_pattern(identifier), rep_name, routing_block, snapshot_name: :last)
       @rules_collection.add_item_routing_rule(routing_rule)

data/lib/nanoc/base/compilation/filter.rb

@@ -185,6 +185,8 @@ module Nanoc
     #
     # @return [void]
     def depend_on(items)
+      items = items.map { |i| i.unwrap rescue i }
+
       # Notify
       items.each do |item|
         Nanoc::Int::NotificationCenter.post(:visit_started, item)

data/lib/nanoc/base/source_data/identifier.rb

@@ -43,13 +43,19 @@ module Nanoc
     end
 
     def =~(pat)
-      to_s =~ pat
+      Nanoc::Int::Pattern.from(pat).match?(to_s) ? 0 : nil
     end
 
     def <=>(other)
       to_s <=> other.to_s
     end
 
+    # @return [Boolean] True if this is a full-style identifier (i.e. includes
+    #   the extension), false otherwise
+    def full?
+      @style == :full
+    end
+
     # @return [String]
     def chop
       to_s.chop
@@ -97,6 +103,11 @@ module Nanoc
       end
     end
 
+    # @return [String]
+    def without_ext
+      with_ext('')
+    end
+
     def to_s
       @string
     end

data/lib/nanoc/base/views/item.rb

@@ -125,12 +125,9 @@ module Nanoc
       @item.raw_content
     end
 
-    # @api private
-    def reference
-      @item.reference
-    end
-
-    # @api private
+    # Returns the representations of this item.
+    #
+    # @return [Enumerable<Nanoc::ItemRepView>]
     def reps
       @item.reps.map { |r| Nanoc::ItemRepView.new(r) }
     end
@@ -139,15 +136,5 @@ module Nanoc
     def raw_filename
       @item.raw_filename
     end
-
-    # @api private
-    def forced_outdated?
-      @item.forced_outdated?
-    end
-
-    # @api private
-    def __nanoc_checksum
-      @item.__nanoc_checksum
-    end
   end
 end

data/lib/nanoc/base/views/item_collection.rb

@@ -50,6 +50,16 @@ module Nanoc
       item && view_class.new(item)
     end
 
+    # Finds all items whose identifier matches the given argument.
+    #
+    # @param [String, Regex] arg
+    #
+    # @return [Enumerable<Nanoc::ItemView>]
+    def find_all(arg)
+      pat = Nanoc::Int::Pattern.from(arg)
+      @items.select { |i| pat.match?(i.identifier) }
+    end
+
     # @overload [](string)
     #
     #   Finds the item whose identifier matches the given string.

data/lib/nanoc/base/views/item_rep.rb

@@ -60,89 +60,14 @@ module Nanoc
       Nanoc::ItemView.new(@item_rep.item)
     end
 
-    # @api private
-    def to_recording_proxy
-      @item_rep.to_recording_proxy
-    end
-
     # @api private
     def raw_path(params = {})
       @item_rep.raw_path(params)
     end
 
-    # @api private
-    def compiled?
-      @item_rep.compiled?
-    end
-
-    # @api private
-    def compiled=(new_compiled)
-      @item_rep.compiled = new_compiled
-    end
-
-    # @api private
-    def forget_progress
-      @item_rep.forget_progress
-    end
-
-    # @api private
-    def assigns
-      @item_rep.assigns
-    end
-
-    # @api private
-    def assigns=(new_assigns)
-      @item_rep.assigns = new_assigns
-    end
-
-    # @api private
-    def type
-      @item_rep.type
-    end
-
-    # @api private
-    def reference
-      @item_rep.reference
-    end
-
-    # @api private
-    def snapshot(snapshot_name, params = {})
-      @item_rep.snapshot(snapshot_name, params)
-    end
-
-    # @api private
-    def filter(filter_name, filter_args = {})
-      @item_rep.filter(filter_name, filter_args)
-    end
-
-    # @api private
-    def layout(layout, filter_name, filter_args)
-      @item_rep.layout(layout, filter_name, filter_args)
-    end
-
-    # @api private
-    def proxy?
-      @item_rep.proxy?
-    end
-
     # @api private
     def binary?
       @item_rep.binary?
     end
-
-    # @api private
-    def has_snapshot?(snapshot_name)
-      @item_rep.has_snapshot?(snapshot_name)
-    end
-
-    # @api private
-    def content
-      @item_rep.content
-    end
-
-    # @api private
-    def temporary_filenames
-      @item_rep.temporary_filenames
-    end
   end
 end

data/lib/nanoc/base/views/layout_collection.rb

@@ -28,5 +28,39 @@ module Nanoc
       @layouts.each { |l| yield view_class.new(l) }
       self
     end
+
+    # @overload [](string)
+    #
+    #   Finds the item whose identifier matches the given string.
+    #
+    #   If the glob syntax is enabled, the string can be a glob, in which case
+    #   this method finds the first item that matches the given glob.
+    #
+    #   @param [String] string
+    #
+    #   @return [nil] if no item matches the string
+    #
+    #   @return [Nanoc::ItemView] if an item was found
+    #
+    # @overload [](regex)
+    #
+    #   Finds the item whose identifier matches the given regular expression.
+    #
+    #   @param [Regex] regex
+    #
+    #   @return [nil] if no item matches the regex
+    #
+    #   @return [Nanoc::ItemView] if an item was found
+    def [](arg)
+      layout = @layouts.find { |l| l.identifier == arg }
+      return view_class.new(layout) if layout
+
+      # FIXME: this should only work if globs are enabled
+      pat = Nanoc::Int::Pattern.from(arg)
+      layout = @layouts.find { |l| pat.match?(l.identifier) }
+      return view_class.new(layout) if layout
+
+      nil
+    end
   end
 end

data/lib/nanoc/base/views/site.rb

@@ -11,25 +11,5 @@ module Nanoc
     def unwrap
       @site
     end
-
-    # @api private
-    def layouts
-      @site.layouts.map { |l| Nanoc::LayoutView.new(l) }
-    end
-
-    # @api private
-    def captures_store
-      @site.captures_store
-    end
-
-    # @api private
-    def captures_store_compiled_items
-      @site.captures_store_compiled_items
-    end
-
-    # @api private
-    def compiler
-      @site.compiler
-    end
   end
 end

data/lib/nanoc/cli/commands/compile.rb

@@ -17,9 +17,6 @@ SKIP - The item was deemed not outdated and was therefore not recompiled
 
 EOS
 
-option :a, :all,   '(ignored)'
-option :f, :force, '(ignored)'
-
 module Nanoc::CLI::Commands
   class Compile < ::Nanoc::CLI::CommandRunner
     extend Nanoc::Int::Memoization

data/lib/nanoc/cli/commands/create-site.rb

@@ -280,7 +280,7 @@ EOS
       data_source = options[:datasource] || 'filesystem_unified'
 
       # Check whether site exists
-      if File.exist?(path)
+      if File.exist?(path) && (!File.directory?(path) || !(Dir.entries(path) - %w{ . .. }).empty?)
         raise Nanoc::Int::Errors::GenericTrivial, "A site at '#{path}' already exists."
       end
 

data/lib/nanoc/cli/commands/shell.rb

@@ -4,7 +4,7 @@ usage 'shell'
 summary 'open a shell on the nanoc environment'
 aliases 'console'
 description "
-Open an IRB shell on a context that contains @items, @layouts, @config and @site.
+Open an IRB shell on a context that contains @items, @layouts, and @config.
 "
 
 module Nanoc::CLI::Commands

data/lib/nanoc/helpers/capturing.rb

@@ -90,7 +90,7 @@ module Nanoc::Helpers
 
         # Capture and store
         content = capture(&block)
-        @site.captures_store[@item, name.to_sym] = content
+        @site.unwrap.captures_store[@item, name.to_sym] = content
       else # Get content
         # Get args
         if args.size != 2
@@ -102,7 +102,7 @@ module Nanoc::Helpers
         name = args[1]
 
         # Create dependency
-        current_item = @site.compiler.dependency_tracker.top
+        current_item = @site.unwrap.compiler.dependency_tracker.top
         if item != current_item
           Nanoc::Int::NotificationCenter.post(:visit_started, item)
           Nanoc::Int::NotificationCenter.post(:visit_ended,   item)
@@ -111,8 +111,8 @@ module Nanoc::Helpers
           # item from which we use content. For this, we need to manually edit
           # the content attribute to reset it. :(
           # FIXME: clean this up
-          unless @site.captures_store_compiled_items.include? item
-            @site.captures_store_compiled_items << item
+          unless @site.unwrap.captures_store_compiled_items.include? item
+            @site.unwrap.captures_store_compiled_items << item
             item.forced_outdated = true
             item.reps.each do |r|
               raw_content = item.raw_content
@@ -123,7 +123,7 @@ module Nanoc::Helpers
         end
 
         # Get content
-        @site.captures_store[item, name.to_sym]
+        @site.unwrap.captures_store[item, name.to_sym]
       end
     end
 

data/lib/nanoc/helpers/filtering.rb

@@ -33,12 +33,12 @@ module Nanoc::Helpers
       # Find filter
       klass = Nanoc::Filter.named(filter_name)
       raise Nanoc::Int::Errors::UnknownFilter.new(filter_name) if klass.nil?
-      filter = klass.new(@item_rep.assigns)
+      filter = klass.new(@item_rep.unwrap.assigns)
 
       # Filter captured data
-      Nanoc::Int::NotificationCenter.post(:filtering_started, @item_rep, filter_name)
+      Nanoc::Int::NotificationCenter.post(:filtering_started, @item_rep.unwrap, filter_name)
       filtered_data = filter.setup_and_run(data, arguments)
-      Nanoc::Int::NotificationCenter.post(:filtering_ended, @item_rep, filter_name)
+      Nanoc::Int::NotificationCenter.post(:filtering_ended, @item_rep.unwrap, filter_name)
 
       # Append filtered data to buffer
       buffer = eval('_erbout', block.binding)

data/lib/nanoc/helpers/rendering.rb

@@ -77,8 +77,9 @@ module Nanoc::Helpers
     #   invoked with a block
     def render(identifier, other_assigns = {}, &block)
       # Find layout
-      layout = @site.layouts.find { |l| l.identifier == identifier.__nanoc_cleaned_identifier }
-      raise Nanoc::Int::Errors::UnknownLayout.new(identifier.__nanoc_cleaned_identifier) if layout.nil?
+      layout = @layouts[identifier]
+      layout ||= @layouts[identifier.__nanoc_cleaned_identifier]
+      raise Nanoc::Int::Errors::UnknownLayout.new(identifier) if layout.nil?
 
       # Visit
       Nanoc::Int::NotificationCenter.post(:visit_started, layout)
@@ -93,14 +94,14 @@ module Nanoc::Helpers
         item: @item,
         item_rep: @item_rep,
         items: @items,
-        layout: layout,
+        layout: Nanoc::LayoutView.new(layout),
         layouts: @layouts,
         config: @config,
         site: @site
       }.merge(other_assigns)
 
       # Get filter name
-      filter_name, filter_args = @site.compiler.rules_collection.filter_for_layout(layout)
+      filter_name, filter_args = @site.unwrap.compiler.rules_collection.filter_for_layout(layout)
       raise Nanoc::Int::Errors::CannotDetermineFilter.new(layout.identifier) if filter_name.nil?
 
       # Get filter class

data/lib/nanoc/helpers/tagging.rb

@@ -17,9 +17,8 @@ module Nanoc::Helpers
     # tags will be linked using the {#link_for_tag} function; the
     # HTML-escaping rules for {#link_for_tag} apply here as well.
     #
-    # @option params [String] base_url ("http://technorati.com/tag/") The URL
-    #   to which the tag will be appended to construct the link URL. This URL
-    #   must have a trailing slash.
+    # @option params [String] base_url The URL to which the tag will be appended
+    #   to construct the link URL. This URL must have a trailing slash.
     #
     # @option params [String] none_text ("(none)") The text to display when
     #   the item has no tags
@@ -29,7 +28,7 @@ module Nanoc::Helpers
     #
     # @return [String] A hyperlinked list of tags for the given item
     def tags_for(item, params = {})
-      base_url  = params[:base_url] || 'http://technorati.com/tag/'
+      base_url  = params.fetch(:base_url)
       none_text = params[:none_text] || '(none)'
       separator = params[:separator] || ', '
 

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current nanoc version.
-  VERSION = '4.0.0a2'
+  VERSION = '4.0.0b1'
 end

data/tasks/test.rake

@@ -26,7 +26,7 @@ namespace :test do
   end
 
   # test:...
-  %w( base cli data_sources extra filters helpers tasks ).each do |dir|
+  %w( base cli data_sources extra filters helpers ).each do |dir|
     desc "Run all #{dir} tests"
     task dir.to_sym do |_task|
       run_tests "test/#{dir}/**/"

data/test/base/test_compiler_dsl.rb

@@ -174,6 +174,35 @@ EOS
     end
   end
 
+  def test_passthrough_with_full_identifiers
+    with_site do
+      File.open('nanoc.yaml', 'w') do |io|
+        io << 'data_sources:' << "\n"
+        io << '  -' << "\n"
+        io << '    type: filesystem_unified' << "\n"
+        io << '    identifier_style: full' << "\n"
+      end
+
+      # Create rules
+      File.open('Rules', 'w') do |io|
+        io << 'passthrough \'*\''
+      end
+
+      # Create items
+      assert Dir['content/*'].empty?
+      File.open('content/robots.txt', 'w') do |io|
+        io.write 'Hello I am robots'
+      end
+
+      # Compile
+      site = Nanoc::Int::Site.new('.')
+      site.compile
+
+      # Check paths
+      assert_equal ['output/robots.txt'], Dir['output/*']
+    end
+  end
+
   def test_ignore
     with_site do
       # Create rules

data/test/cli/commands/test_create_site.rb

@@ -17,6 +17,16 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     end
   end
 
+  def test_can_compile_new_site_in_current_directory
+    FileUtils.mkdir('foo')
+
+    FileUtils.cd('foo') do
+      Nanoc::CLI.run %w( create_site ./ )
+      site = Nanoc::Int::Site.new('.')
+      site.compile
+    end
+  end
+
   def test_can_compile_new_site_with_binary_items
     Nanoc::CLI.run %w( create_site foo )
 

data/test/filters/test_markaby.rb

@@ -2,12 +2,6 @@
 
 class Nanoc::Filters::MarkabyTest < Nanoc::TestCase
   def test_filter
-    # Don’t run this test on 1.9.x, because it breaks and it annoys me
-    if RUBY_VERSION >= '1.9'
-      skip 'Markaby is not compatible with 1.9.x'
-      return
-    end
-
     if_have 'markaby' do
       # Create filter
       filter = ::Nanoc::Filters::Markaby.new

data/test/helper.rb

@@ -18,7 +18,6 @@ Coveralls.wear!
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'nanoc'
 require 'nanoc/cli'
-require 'nanoc/tasks'
 Nanoc::CLI.setup
 
 # Load miscellaneous requirements

data/test/helpers/test_capturing.rb

@@ -17,9 +17,11 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
               '<% end %> foot'
 
     # Build site
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('moo', {}, '/blah/')
-    @item.site = @site
+    site = Nanoc::Int::Site.new({})
+    item = Nanoc::Int::Item.new('moo', {}, '/blah/')
+    item.site = site
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(item)
 
     # Evaluate content
     result = ::ERB.new(content).result(binding)
@@ -33,8 +35,8 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
     require 'erb'
 
     # Build site
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('moo', {}, '/blah/')
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('moo', {}, '/blah/'))
 
     # Capture
     _erbout = 'foo'
@@ -67,8 +69,8 @@ head
 foot
 EOS
 
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('content', {}, '/')
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
 
     result = ::ERB.new(content).result(binding)
 
@@ -85,16 +87,16 @@ EOS
       io.write "route '*' do ; item.identifier + 'index.html' ; end\n"
     end
 
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('content', {}, '/')
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
     content = '<% content_for :a do %>Content One<% end %>'
     ::ERB.new(content).result(binding)
 
     assert_equal 'Content One', content_for(@item, :a)
     assert_equal nil,           content_for(@item, :b)
 
-    @site = Nanoc::Int::Site.new({})
-    @item = Nanoc::Int::Item.new('content', {}, '/')
+    @site = Nanoc::SiteView.new(Nanoc::Int::Site.new({}))
+    @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/'))
     content = '<% content_for :b do %>Content Two<% end %>'
     ::ERB.new(content).result(binding)
 

data/test/helpers/test_filtering.rb

@@ -14,6 +14,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
       # Mock item and rep
       @item_rep = mock
       @item_rep.expects(:assigns).returns({})
+      @item_rep = Nanoc::ItemRepView.new(@item_rep)
 
       # Evaluate content
       result = ::ERB.new(content).result(binding)
@@ -36,12 +37,14 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
       @item = mock
       @item.expects(:[]).with(:title).returns('Bar...')
       @item.expects(:identifier).returns('/blah/')
+      @item = Nanoc::ItemView.new(@item)
       @item_rep = mock
       @item_rep.expects(:name).returns('default')
       @item_rep.expects(:assigns).returns({
         item: @item,
         item_rep: @item_rep
       })
+      @item_rep = Nanoc::ItemRepView.new(@item_rep)
 
       # Evaluate content
       result = ::ERB.new(content).result(binding)
@@ -75,6 +78,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
       # Mock item and rep
       @item_rep = mock
       @item_rep.expects(:assigns).returns({})
+      @item_rep = Nanoc::ItemRepView.new(@item_rep)
 
       # Evaluate content
       result = ::ERB.new(content).result(binding)
@@ -93,6 +97,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
       # Mock item and rep
       @item_rep = mock
       @item_rep.expects(:assigns).returns({})
+      @item_rep = Nanoc::ItemRepView.new(@item_rep)
 
       # Evaluate content
       result = ::Haml::Engine.new(content).render(binding)
@@ -113,6 +118,7 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
     # Mock item and rep
     @item_rep = mock
     @item_rep.expects(:assigns).returns({})
+    @item_rep = Nanoc::ItemRepView.new(@item_rep)
 
     ::ERB.new(content).result(binding)
 

data/test/helpers/test_rendering.rb

@@ -5,8 +5,6 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
 
   def test_render
     with_site do |site|
-      @site = site
-
       File.open('Rules', 'w') do |io|
         io.write("layout '/foo/', :erb\n")
       end
@@ -15,13 +13,51 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write 'This is the <%= @layout.identifier %> layout.'
       end
 
+      @site = Nanoc::SiteView.new(site)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+
       assert_equal('This is the /foo/ layout.', render('/foo/'))
     end
   end
 
+  def test_render_with_non_cleaned_identifier
+    with_site do |site|
+      File.open('Rules', 'w') do |io|
+        io.write("layout '/foo/', :erb\n")
+      end
+
+      File.open('layouts/foo.erb', 'w') do |io|
+        io.write 'This is the <%= @layout.identifier %> layout.'
+      end
+
+      @site = Nanoc::SiteView.new(site)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+
+      assert_equal('This is the /foo/ layout.', render('/foo'))
+    end
+  end
+
+  def test_render_class
+    with_site do |site|
+      File.open('Rules', 'w') do |io|
+        io.write("layout '/foo/', :erb\n")
+      end
+
+      File.open('layouts/foo.erb', 'w') do |io|
+        io.write 'I am the <%= @layout.class %> class.'
+      end
+
+      @site = Nanoc::SiteView.new(site)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+
+      assert_equal('I am the Nanoc::LayoutView class.', render('/foo/'))
+    end
+  end
+
   def test_render_with_unknown_layout
     with_site do |site|
-      @site = site
+      @site = Nanoc::SiteView.new(site)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
 
       assert_raises(Nanoc::Int::Errors::UnknownLayout) do
         render '/dsfghjkl/'
@@ -31,14 +67,15 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
 
   def test_render_without_filter
     with_site do |site|
-      @site = site
-
       File.open('Rules', 'w') do |io|
         io.write("layout '/foo/', nil\n")
       end
 
       File.open('layouts/foo.erb', 'w').close
 
+      @site = Nanoc::SiteView.new(site)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+
       assert_raises(Nanoc::Int::Errors::CannotDetermineFilter) do
         render '/foo/'
       end
@@ -47,14 +84,15 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
 
   def test_render_with_unknown_filter
     with_site do |site|
-      @site = site
-
       File.open('Rules', 'w') do |io|
         io.write("layout '/foo/', :asdf\n")
       end
 
       File.open('layouts/foo.erb', 'w').close
 
+      @site = Nanoc::SiteView.new(site)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+
       assert_raises(Nanoc::Int::Errors::UnknownFilter) do
         render '/foo/'
       end
@@ -63,8 +101,6 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
 
   def test_render_with_block
     with_site do |site|
-      @site = site
-
       File.open('Rules', 'w') do |io|
         io.write("layout '/foo/', :erb\n")
       end
@@ -73,6 +109,9 @@ class Nanoc::Helpers::RenderingTest < Nanoc::TestCase
         io.write '[partial-before]<%= yield %>[partial-after]'
       end
 
+      @site = Nanoc::SiteView.new(site)
+      @layouts = Nanoc::LayoutCollectionView.new(site.layouts)
+
       _erbout = '[erbout-before]'
       result = render '/foo/' do
         _erbout << 'This is some extra content'

data/test/helpers/test_tagging.rb

@@ -10,7 +10,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     # Check
     assert_equal(
       '(none)',
-      tags_for(item)
+      tags_for(item, base_url: 'http://example.com/tag/')
     )
   end
 
@@ -33,7 +33,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
     # Check
     assert_equal(
       'no tags for you, fool',
-      tags_for(item, none_text: 'no tags for you, fool')
+      tags_for(item, none_text: 'no tags for you, fool', base_url: 'http://example.com/tag/')
     )
   end
 
@@ -43,9 +43,9 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
     # Check
     assert_equal(
-      "#{link_for_tag('foo', 'http://technorati.com/tag/')} ++ " \
-      "#{link_for_tag('bar', 'http://technorati.com/tag/')}",
-      tags_for(item, separator: ' ++ ')
+      "#{link_for_tag('foo', 'http://example.com/tag/')} ++ " \
+      "#{link_for_tag('bar', 'http://example.com/tag/')}",
+      tags_for(item, separator: ' ++ ', base_url: 'http://example.com/tag/')
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0a2
+  version: 4.0.0b1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -213,11 +213,6 @@ files:
 - lib/nanoc/helpers/tagging.rb
 - lib/nanoc/helpers/text.rb
 - lib/nanoc/helpers/xml_sitemap.rb
-- lib/nanoc/tasks.rb
-- lib/nanoc/tasks/clean.rake
-- lib/nanoc/tasks/clean.rb
-- lib/nanoc/tasks/deploy/rsync.rake
-- lib/nanoc/tasks/validate.rake
 - lib/nanoc/version.rb
 - nanoc.gemspec
 - tasks/doc.rake
@@ -278,7 +273,6 @@ files:
 - test/extra/core_ext/test_time.rb
 - test/extra/deployers/test_fog.rb
 - test/extra/deployers/test_rsync.rb
-- test/extra/test_file_proxy.rb
 - test/extra/test_filesystem_tools.rb
 - test/extra/test_link_collector.rb
 - test/extra/test_piper.rb
@@ -326,7 +320,6 @@ files:
 - test/helpers/test_tagging.rb
 - test/helpers/test_text.rb
 - test/helpers/test_xml_sitemap.rb
-- test/tasks/test_clean.rb
 - test/test_gem.rb
 homepage: http://nanoc.ws/
 licenses:

data/lib/nanoc/tasks.rb

@@ -1,11 +0,0 @@
-# encoding: utf-8
-
-require 'nanoc'
-require 'rake'
-
-# @api private
-module Nanoc::Tasks
-end
-
-Dir[File.dirname(__FILE__) + '/tasks/**/*.rb'].each   { |f| load f }
-Dir[File.dirname(__FILE__) + '/tasks/**/*.rake'].each { |f| Rake.application.add_import(f) }

data/lib/nanoc/tasks/clean.rake

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-desc 'Remove output files generated by nanoc'
-task :clean do
-  # Load site
-  site = Nanoc::Int::Site.new('.')
-  if site.nil?
-    $stderr.puts 'The current working directory does not seem to be a ' \
-                 'valid/complete nanoc site directory; aborting.'
-    exit 1
-  end
-
-  # Clean
-  clean = ::Nanoc::Tasks::Clean.new(site)
-  clean.run
-end

data/lib/nanoc/tasks/clean.rb

@@ -1,23 +0,0 @@
-# encoding: utf-8
-
-module Nanoc::Tasks
-  class Clean
-    def initialize(site)
-      @site = site
-    end
-
-    def run
-      filenames.each do |filename|
-        FileUtils.rm_f filename unless filename.nil?
-      end
-    end
-
-    private
-
-    def filenames
-      @site.items.map do |item|
-        item.reps.map(&:raw_path)
-      end.flatten
-    end
-  end
-end

data/lib/nanoc/tasks/deploy/rsync.rake

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-require 'nanoc/cli'
-
-namespace :deploy do
-  desc 'Upload the compiled site using rsync'
-  task :rsync do
-    dry_run     = ENV['dry_run']
-    config_name = ENV['config'] || :default
-
-    cmd = ['deploy', '-t', config_name]
-    cmd << '-n' if dry_run
-
-    Nanoc::CLI.run cmd
-  end
-end

data/lib/nanoc/tasks/validate.rake

@@ -1,30 +0,0 @@
-# encoding: utf-8
-
-namespace :validate do
-  desc 'Validate the site’s HTML files'
-  task :html do
-    Nanoc::CLI.run %w( validate_html )
-  end
-
-  desc 'Validate the site’s CSS files'
-  task :css do
-    Nanoc::CLI.run %w( validate_css )
-  end
-
-  namespace :links do
-    desc 'Validate the site’s internal links'
-    task :internal do
-      Nanoc::CLI.run %w( validate_links --internal )
-    end
-
-    desc 'Validate the site’s external links'
-    task :external do
-      Nanoc::CLI.run %w( validate_links --external )
-    end
-  end
-
-  desc 'Validate the site’s internal and external links'
-  task :links do
-    Nanoc::CLI.run %w( validate_links )
-  end
-end

data/test/extra/test_file_proxy.rb

@@ -1,15 +0,0 @@
-# encoding: utf-8
-
-class Nanoc::Extra::FileProxyTest < Nanoc::TestCase
-  def test_create_many
-    if_implemented do
-      # Create test file
-      File.open('test.txt', 'w') { |_io| }
-
-      # Create lots of file proxies
-      count = Process.getrlimit(Process::RLIMIT_NOFILE)[0] + 5
-      file_proxies = []
-      count.times { file_proxies << Nanoc::Extra::FileProxy.new('test.txt') }
-    end
-  end
-end

data/test/tasks/test_clean.rb

@@ -1,63 +0,0 @@
-# encoding: utf-8
-
-class Nanoc::Tasks::CleanTest < Nanoc::TestCase
-  def test_simple
-    if_have 'w3c_validators' do
-      # Stub items
-      items = [mock, mock]
-      reps  = [[mock, mock], [mock, mock]]
-      items[0].expects(:reps).returns(reps[0])
-      items[1].expects(:reps).returns(reps[1])
-
-      # Create sample files
-      [0, 1].each do |item_id|
-        [0, 1].each do |rep_id|
-          filename = "item-#{item_id}-rep-#{rep_id}.txt"
-          reps[item_id][rep_id].expects(:raw_path).returns(filename)
-          File.open(filename, 'w') { |io| io.write('hello') }
-          assert File.file?(filename)
-        end
-      end
-
-      # Stub site
-      site = mock
-      site.expects(:items).returns(items)
-
-      # Create clean task
-      clean = ::Nanoc::Tasks::Clean.new(site)
-
-      # Run
-      clean.run
-
-      # Check
-      [0, 1].each do |item_id|
-        [0, 1].each do |rep_id|
-          filename = "item-#{item_id}-rep-#{rep_id}.txt"
-          assert !File.file?(filename)
-        end
-      end
-    end
-  end
-
-  def test_with_nil_raw_path
-    if_have 'w3c_validators' do
-      # Stub items
-      item = mock
-      rep = mock
-      item.expects(:reps).returns([rep])
-
-      # Create sample file
-      rep.expects(:raw_path).returns(nil)
-
-      # Stub site
-      site = mock
-      site.expects(:items).returns([item])
-
-      # Create clean task
-      clean = ::Nanoc::Tasks::Clean.new(site)
-
-      # Run
-      clean.run
-    end
-  end
-end