nanoc 4.0.0b3 → 4.0.0b4

data/test/filters/test_xsl.rb

@@ -87,9 +87,11 @@ EOS
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN,
                              {},
                              '/content/')
+      item = Nanoc::ItemView.new(item)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL,
                                  {},
                                  '/layout/')
+      layout = Nanoc::LayoutView.new(layout)
 
       # Create an instance of the filter
       assigns = {
@@ -111,9 +113,11 @@ EOS
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_PARAMS,
                              {},
                              '/content/')
+      item = Nanoc::ItemView.new(item)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_PARAMS,
                                  {},
                                  '/layout/')
+      layout = Nanoc::LayoutView.new(layout)
 
       # Create an instance of the filter
       assigns = {
@@ -136,9 +140,11 @@ EOS
       item = Nanoc::Int::Item.new(SAMPLE_XML_IN_WITH_OMIT_XML_DECL,
                              {},
                              '/content/')
+      item = Nanoc::ItemView.new(item)
       layout = Nanoc::Int::Layout.new(SAMPLE_XSL_WITH_OMIT_XML_DECL,
                                  {},
                                  '/layout/')
+      layout = Nanoc::LayoutView.new(layout)
 
       # Create an instance of the filter
       assigns = {

data/test/helpers/test_capturing.rb

@@ -17,7 +17,6 @@ class Nanoc::Helpers::CapturingTest < Nanoc::TestCase
     # Build 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)
 

data/test/helpers/test_filtering.rb

@@ -11,7 +11,6 @@ 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
@@ -25,29 +24,19 @@ class Nanoc::Helpers::FilteringTest < Nanoc::TestCase
 
   def test_filter_with_assigns
     if_have 'rubypants' do
-      # Build content to be evaluated
       content = "<p>Foo...</p>\n" \
                 "<% filter :erb do %>\n" \
                 " <p><%%= @item[:title] %></p>\n" \
                 "<% end %>\n"
 
-      # Mock item and rep
-      @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)
+      item = Nanoc::Int::Item.new('stuff', { title: 'Bar...' }, '/foo.md')
+      item_rep = Nanoc::Int::ItemRep.new(item, :default)
+
+      @item = Nanoc::ItemView.new(item)
+      @item_rep = Nanoc::ItemRepView.new(item_rep)
 
-      # Evaluate content
       result = ::ERB.new(content).result(binding)
 
-      # Check
       assert_match('<p>Foo...</p>', result)
       assert_match('<p>Bar...</p>', result)
     end
@@ -75,7 +64,6 @@ 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
@@ -94,7 +82,6 @@ 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
@@ -115,7 +102,6 @@ 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_tagging.rb

@@ -3,7 +3,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_without_tags
     # Create item
-    item = Nanoc::Int::Item.new('content', {}, '/path/')
+    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', {}, '/path/'))
 
     # Check
     assert_equal(
@@ -14,7 +14,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_base_url
     # Create item
-    item = Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/')
+    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'))
 
     # Check
     assert_equal(
@@ -26,7 +26,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_none_text
     # Create item
-    item = Nanoc::Int::Item.new('content', { tags: [] }, '/path/')
+    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', { tags: [] }, '/path/'))
 
     # Check
     assert_equal(
@@ -37,7 +37,7 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_tags_for_with_custom_separator
     # Create item
-    item = Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/')
+    item = Nanoc::ItemView.new(Nanoc::Int::Item.new('content', { tags: %w(foo bar) }, '/path/'))
 
     # Check
     assert_equal(
@@ -49,11 +49,11 @@ class Nanoc::Helpers::TaggingTest < Nanoc::TestCase
 
   def test_items_with_tag
     # Create items
-    @items = [
+    @items = Nanoc::ItemCollectionView.new([
       Nanoc::Int::Item.new('item 1', { tags: [:foo]       }, '/item1/'),
       Nanoc::Int::Item.new('item 2', { tags: [:bar]       }, '/item2/'),
       Nanoc::Int::Item.new('item 3', { tags: [:foo, :bar] }, '/item3/')
-    ]
+    ])
 
     # Find items
     items_with_foo_tag = items_with_tag(:foo)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0b3
+  version: 4.0.0b4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -66,6 +66,7 @@ files:
 - NEWS.md
 - README.md
 - Rakefile
+- TODO.md
 - bin/nanoc
 - doc/yardoc_handlers/identifier.rb
 - doc/yardoc_templates/default/layout/html/footer.erb
@@ -78,8 +79,6 @@ files:
 - lib/nanoc/base/compilation/compiler_dsl.rb
 - lib/nanoc/base/compilation/dependency_tracker.rb
 - lib/nanoc/base/compilation/filter.rb
-- lib/nanoc/base/compilation/item_rep_proxy.rb
-- lib/nanoc/base/compilation/item_rep_recorder_proxy.rb
 - lib/nanoc/base/compilation/outdatedness_checker.rb
 - lib/nanoc/base/compilation/outdatedness_reasons.rb
 - lib/nanoc/base/compilation/rule.rb
@@ -94,23 +93,31 @@ files:
 - lib/nanoc/base/core_ext/pathname.rb
 - lib/nanoc/base/core_ext/string.rb
 - lib/nanoc/base/directed_graph.rb
+- lib/nanoc/base/entities.rb
+- lib/nanoc/base/entities/content.rb
+- lib/nanoc/base/entities/document.rb
+- lib/nanoc/base/entities/identifier.rb
+- lib/nanoc/base/entities/layout.rb
+- lib/nanoc/base/entities/pattern.rb
 - lib/nanoc/base/error.rb
 - lib/nanoc/base/errors.rb
 - lib/nanoc/base/identifiable_collection.rb
 - lib/nanoc/base/memoization.rb
-- lib/nanoc/base/notification_center.rb
-- lib/nanoc/base/pattern.rb
 - lib/nanoc/base/plugin_registry.rb
 - lib/nanoc/base/result_data/item_rep.rb
+- lib/nanoc/base/services.rb
+- lib/nanoc/base/services/executor.rb
+- lib/nanoc/base/services/item_rep_writer.rb
+- lib/nanoc/base/services/notification_center.rb
+- lib/nanoc/base/services/recording_executor.rb
+- lib/nanoc/base/services/temp_filename_factory.rb
 - lib/nanoc/base/source_data/code_snippet.rb
 - lib/nanoc/base/source_data/configuration.rb
 - lib/nanoc/base/source_data/data_source.rb
-- lib/nanoc/base/source_data/identifier.rb
 - lib/nanoc/base/source_data/item.rb
-- lib/nanoc/base/source_data/layout.rb
 - lib/nanoc/base/source_data/site.rb
 - lib/nanoc/base/store.rb
-- lib/nanoc/base/temp_filename_factory.rb
+- lib/nanoc/base/views.rb
 - lib/nanoc/base/views/config.rb
 - lib/nanoc/base/views/identifiable_collection.rb
 - lib/nanoc/base/views/item.rb
@@ -119,6 +126,8 @@ files:
 - lib/nanoc/base/views/item_rep_collection.rb
 - lib/nanoc/base/views/layout.rb
 - lib/nanoc/base/views/layout_collection.rb
+- lib/nanoc/base/views/mixins/document.rb
+- lib/nanoc/base/views/mixins/mutable_document.rb
 - lib/nanoc/base/views/mutable_config.rb
 - lib/nanoc/base/views/mutable_identifiable_collection.rb
 - lib/nanoc/base/views/mutable_item.rb
@@ -220,7 +229,6 @@ files:
 - tasks/doc.rake
 - tasks/rubocop.rake
 - tasks/test.rake
-- test/base/checksummer_spec.rb
 - test/base/core_ext/array_spec.rb
 - test/base/core_ext/hash_spec.rb
 - test/base/core_ext/pathname_spec.rb
@@ -238,7 +246,6 @@ files:
 - test/base/test_item.rb
 - test/base/test_item_array.rb
 - test/base/test_item_rep.rb
-- test/base/test_item_rep_recorder_proxy.rb
 - test/base/test_layout.rb
 - test/base/test_memoization.rb
 - test/base/test_notification_center.rb

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

@@ -1,109 +0,0 @@
-module Nanoc::Int
-  # Represents an item representation, but provides an interface that is
-  # easier to use when writing compilation and routing rules. It is also
-  # responsible for fetching the necessary information from the compiler, such
-  # as assigns.
-  #
-  # The API provided by item representation proxies allows layout identifiers
-  # to be given as literals instead of as references to {Nanoc::Int::Layout}.
-  #
-  # @api private
-  class ItemRepProxy
-    extend Forwardable
-
-    def_delegators :@item_rep, :item, :name, :binary, :binary?, :compiled_content, :has_snapshot?, :raw_path, :path
-    def_delegator :@item_rep, :snapshot
-
-    # @param [Nanoc::Int::ItemRep] item_rep The item representation that this
-    #   proxy should behave like
-    #
-    # @param [Nanoc::Int::Compiler] compiler The compiler that will provide the
-    #   necessary compilation-related functionality.
-    def initialize(item_rep, compiler)
-      @item_rep = item_rep
-      @compiler = compiler
-    end
-
-    # Runs the item content through the given filter with the given arguments.
-    # This method will replace the content of the `:last` snapshot with the
-    # filtered content of the last snapshot.
-    #
-    # This method is supposed to be called only in a compilation rule block
-    # (see {Nanoc::Int::CompilerDSL#compile}).
-    #
-    # @see Nanoc::Int::ItemRep#filter
-    #
-    # @param [Symbol] name The name of the filter to run the item
-    #   representations' content through
-    #
-    # @param [Hash] args The filter arguments that should be passed to the
-    #   filter's #run method
-    #
-    # @return [void]
-    def filter(name, args = {})
-      set_assigns
-      @item_rep.filter(name, args)
-    end
-
-    # Lays out the item using the given layout. This method will replace the
-    # content of the `:last` snapshot with the laid out content of the last
-    # snapshot.
-    #
-    # This method is supposed to be called only in a compilation rule block
-    # (see {Nanoc::Int::CompilerDSL#compile}).
-    #
-    # @see Nanoc::Int::ItemRep#layout
-    #
-    # @param [String] layout_identifier The identifier of the layout to use
-    #
-    # @return [void]
-    def layout(layout_identifier, extra_filter_args = {})
-      set_assigns
-
-      layout = layout_with_identifier(layout_identifier)
-      filter_name, filter_args = @compiler.rules_collection.filter_for_layout(layout)
-      filter_args = filter_args.merge(extra_filter_args)
-
-      @item_rep.layout(layout, filter_name, filter_args)
-    end
-
-    # Returns true because this item is already a proxy, and therefore doesn’t
-    # need to be wrapped anymore.
-    #
-    # @api private
-    #
-    # @return [true]
-    #
-    # @see Nanoc::Int::ItemRep#proxy?
-    # @see Nanoc::Int::ItemRepRecorderProxy#proxy?
-    def proxy?
-      true
-    end
-    alias_method :is_proxy?, :proxy?
-
-    private
-
-    def set_assigns
-      @item_rep.assigns = @compiler.assigns_for(@item_rep)
-    end
-
-    def layouts
-      @compiler.site.layouts
-    end
-
-    def layout_with_identifier(layout_identifier)
-      req_id = layout_identifier.__nanoc_cleaned_identifier
-      layout = layouts.find { |l| l.identifier == req_id }
-      if layout.nil? && use_globs?
-        pat = Nanoc::Int::Pattern.from(layout_identifier)
-        layout = layouts.find { |l| pat.match?(l.identifier) }
-      end
-      raise Nanoc::Int::Errors::UnknownLayout.new(layout_identifier) if layout.nil?
-      layout
-    end
-
-    def use_globs?
-      @compiler.site.config[:string_pattern_type] == 'glob'
-    end
-  end
-end

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

@@ -1,97 +0,0 @@
-module Nanoc::Int
-  # Represents a fake iem representation that does not actually perform any
-  # actual filtering, layouting or snapshotting, but instead keeps track of
-  # what would happen if a real item representation would have been used
-  # instead. It therefore “records” the actions that happens upon it.
-  #
-  # The list of recorded actions is used during compilation to determine
-  # whether an item representation needs to be recompiled: if the list of
-  # actions is different from the list of actions from the previous
-  # compilation run, the item needs to be recompiled; if it is the same, it
-  # may not need to be recompiled.
-  #
-  # @api private
-  class ItemRepRecorderProxy
-    extend Forwardable
-
-    def_delegators :@item_rep, :item, :name, :binary, :binary?, :compiled_content, :has_snapshot?, :raw_path, :path, :assigns, :assigns=
-
-    # @example The compilation rule and the corresponding rule memory
-    #
-    #     # rule
-    #     compile '/foo/' do
-    #       filter :erb
-    #       filter :myfilter, :arg1 => 'stuff'
-    #       layout 'meh'
-    #     end
-    #
-    #     # memory
-    #     [
-    #       [ :filter, :erb, {} ],
-    #       [ :filter, :myfilter, { :arg1 => 'stuff' } ],
-    #       [ :layout, 'meh' ]
-    #     ]
-    #
-    # @return [Array] The list of recorded actions (“rule memory”)
-    attr_reader :rule_memory
-
-    # @param [Nanoc::Int::ItemRep] item_rep The item representation that this
-    #   proxy should behave like
-    def initialize(item_rep)
-      @item_rep = item_rep
-      @rule_memory = []
-    end
-
-    # @return [void]
-    #
-    # @see Nanoc::Int::ItemRepProxy#filter, Nanoc::Int::ItemRep#filter
-    def filter(name, args = {})
-      @rule_memory << [:filter, name, args]
-    end
-
-    # @return [void]
-    #
-    # @see Nanoc::Int::ItemRepProxy#layout, Nanoc::Int::ItemRep#layout
-    def layout(layout_identifier, extra_filter_args = nil)
-      if extra_filter_args
-        @rule_memory << [:layout, layout_identifier, extra_filter_args]
-      else
-        @rule_memory << [:layout, layout_identifier]
-      end
-    end
-
-    # @return [void]
-    #
-    # @see Nanoc::Int::ItemRep#snapshot
-    def snapshot(snapshot_name, params = {})
-      @rule_memory << [:snapshot, snapshot_name, params]
-
-      # Count
-      existing = Set.new
-      names = @rule_memory.select { |r| r[0] == :snapshot }.map { |r| r[1] }
-      names.each do |n|
-        if existing.include?(n)
-          raise Nanoc::Int::Errors::CannotCreateMultipleSnapshotsWithSameName.new(@item_rep, snapshot_name)
-        end
-        existing << n
-      end
-    end
-
-    # @return [{}]
-    def content
-      {}
-    end
-
-    # Returns true because this item is already a proxy, and therefore doesn’t
-    # need to be wrapped anymore.
-    #
-    # @return [true]
-    #
-    # @see Nanoc::Int::ItemRep#proxy?
-    # @see Nanoc::Int::ItemRepProxy#proxy?
-    def proxy?
-      true
-    end
-    alias_method :is_proxy?, :proxy?
-  end
-end