nanoc 4.0.0b1 → 4.0.0b2

data/test/helpers/test_breadcrumbs.rb

@@ -4,38 +4,46 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
   include Nanoc::Helpers::Breadcrumbs
 
   def test_breadcrumbs_trail_at_root
-    @items = Nanoc::Int::ItemArray.new({})
-    @items << Nanoc::Int::Item.new('root', {}, '/')
-    @item = @items.last
+    @items = Nanoc::Int::IdentifiableCollection.new({})
+    item = Nanoc::Int::Item.new('root', {}, '/')
+    @items << item
+    @item = item
 
-    assert_equal [@items[0]], breadcrumbs_trail
+    assert_equal [item], breadcrumbs_trail
   end
 
   def test_breadcrumbs_trail_with_1_parent
-    @items = Nanoc::Int::ItemArray.new({})
-    @items << Nanoc::Int::Item.new('parent', {}, '/')
-    @items << Nanoc::Int::Item.new('child',  {}, '/foo/')
-    @item = @items.last
-
-    assert_equal [@items[0], @items[1]], breadcrumbs_trail
+    @items = Nanoc::Int::IdentifiableCollection.new({})
+    parent_item = Nanoc::Int::Item.new('parent', {}, '/')
+    child_item  = Nanoc::Int::Item.new('child',  {}, '/foo/')
+    @items << parent_item
+    @items << child_item
+    @item = child_item
+
+    assert_equal [parent_item, child_item], breadcrumbs_trail
   end
 
   def test_breadcrumbs_trail_with_many_parents
-    @items = Nanoc::Int::ItemArray.new({})
-    @items << Nanoc::Int::Item.new('grandparent', {}, '/')
-    @items << Nanoc::Int::Item.new('parent',      {}, '/foo/')
-    @items << Nanoc::Int::Item.new('child',       {}, '/foo/bar/')
-    @item = @items.last
-
-    assert_equal [@items[0], @items[1], @items[2]], breadcrumbs_trail
+    @items = Nanoc::Int::IdentifiableCollection.new({})
+    grandparent_item = Nanoc::Int::Item.new('grandparent', {}, '/')
+    parent_item      = Nanoc::Int::Item.new('parent',      {}, '/foo/')
+    child_item       = Nanoc::Int::Item.new('child',       {}, '/foo/bar/')
+    @items << grandparent_item
+    @items << parent_item
+    @items << child_item
+    @item = child_item
+
+    assert_equal [grandparent_item, parent_item, child_item], breadcrumbs_trail
   end
 
   def test_breadcrumbs_trail_with_nils
-    @items = Nanoc::Int::ItemArray.new({})
-    @items << Nanoc::Int::Item.new('grandparent', {}, '/')
-    @items << Nanoc::Int::Item.new('child',       {}, '/foo/bar/')
-    @item = @items.last
-
-    assert_equal [@items[0], nil, @items[1]], breadcrumbs_trail
+    @items = Nanoc::Int::IdentifiableCollection.new({})
+    grandparent_item = Nanoc::Int::Item.new('grandparent', {}, '/')
+    child_item       = Nanoc::Int::Item.new('child',       {}, '/foo/bar/')
+    @items << grandparent_item
+    @items << child_item
+    @item = child_item
+
+    assert_equal [grandparent_item, nil, child_item], breadcrumbs_trail
   end
 end

data/test/helpers/test_xml_sitemap.rb

@@ -14,25 +14,29 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_xml_sitemap
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = []
+      @items = Nanoc::Int::IdentifiableCollection.new({})
 
       # Create item 1
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'))
-      create_item_rep(@items.last.unwrap, :one_a, '/item-one/a/')
-      create_item_rep(@items.last.unwrap, :one_b, '/item-one/b/')
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'))
+      @items << item
+      create_item_rep(item.unwrap, :one_a, '/item-one/a/')
+      create_item_rep(item.unwrap, :one_b, '/item-one/b/')
 
       # Create item 2
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 2', { is_hidden: true }, '/item-two/'))
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 2', { is_hidden: true }, '/item-two/'))
+      @items << item
 
       # Create item 3
       attrs = { mtime: Time.parse('2004-07-12'), changefreq: 'daily', priority: 0.5 }
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 3', attrs, '/item-three/'))
-      create_item_rep(@items.last.unwrap, :three_a, '/item-three/a/')
-      create_item_rep(@items.last.unwrap, :three_b, '/item-three/b/')
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 3', attrs, '/item-three/'))
+      @items << item
+      create_item_rep(item.unwrap, :three_a, '/item-three/a/')
+      create_item_rep(item.unwrap, :three_b, '/item-three/b/')
 
       # Create item 4
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 4', {}, '/item-four/'))
-      create_item_rep(@items.last.unwrap, :four_a, nil)
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 4', {}, '/item-four/'))
+      @items << item
+      create_item_rep(item.unwrap, :four_a, nil)
 
       # Create sitemap item
       @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'))
@@ -71,11 +75,12 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_sitemap_with_items_as_param
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = []
+      @items = Nanoc::Int::IdentifiableCollection.new({})
       @items << nil
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'))
-      create_item_rep(@items.last.unwrap, :one_a, '/item-one/a/')
-      create_item_rep(@items.last.unwrap, :one_b, '/item-one/b/')
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'))
+      @items << item
+      create_item_rep(item.unwrap, :one_a, '/item-one/a/')
+      create_item_rep(item.unwrap, :one_b, '/item-one/b/')
       @items << nil
 
       # Create sitemap item
@@ -85,7 +90,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' })
 
       # Build sitemap
-      res = xml_sitemap(items: [@items[1]])
+      res = xml_sitemap(items: [item])
 
       # Check
       doc = Nokogiri::XML(res)
@@ -107,10 +112,11 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_filter
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = []
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'))
-      create_item_rep(@items.last.unwrap, :one_a, '/item-one/a/')
-      create_item_rep(@items.last.unwrap, :one_b, '/item-one/b/')
+      @items = Nanoc::Int::IdentifiableCollection.new({})
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/item-one/'))
+      @items << item
+      create_item_rep(item.unwrap, :one_a, '/item-one/a/')
+      create_item_rep(item.unwrap, :one_b, '/item-one/b/')
 
       # Create sitemap item
       @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'))
@@ -137,16 +143,19 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
   def test_sorted
     if_have 'builder', 'nokogiri' do
       # Create items
-      @items = []
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/george/'))
-      create_item_rep(@items.last.unwrap, :a_alice,   '/george/alice/')
-      create_item_rep(@items.last.unwrap, :b_zoey,    '/george/zoey/')
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/walton/'))
-      create_item_rep(@items.last.unwrap, :a_eve,     '/walton/eve/')
-      create_item_rep(@items.last.unwrap, :b_bob,     '/walton/bob/')
-      @items << Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/lucas/'))
-      create_item_rep(@items.last.unwrap, :a_trudy,   '/lucas/trudy/')
-      create_item_rep(@items.last.unwrap, :b_mallory, '/lucas/mallory/')
+      @items = Nanoc::Int::IdentifiableCollection.new({})
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/george/'))
+      @items << item
+      create_item_rep(item.unwrap, :a_alice,   '/george/alice/')
+      create_item_rep(item.unwrap, :b_zoey,    '/george/zoey/')
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/walton/'))
+      @items << item
+      create_item_rep(item.unwrap, :a_eve,     '/walton/eve/')
+      create_item_rep(item.unwrap, :b_bob,     '/walton/bob/')
+      item = Nanoc::ItemView.new(Nanoc::Int::Item.new('some content 1', {}, '/lucas/'))
+      @items << item
+      create_item_rep(item.unwrap, :a_trudy,   '/lucas/trudy/')
+      create_item_rep(item.unwrap, :b_mallory, '/lucas/mallory/')
 
       # Create sitemap item
       @item = Nanoc::ItemView.new(Nanoc::Int::Item.new('sitemap content', {}, '/sitemap/'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.0.0b1
+  version: 4.0.0b2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -96,6 +96,7 @@ files:
 - lib/nanoc/base/directed_graph.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
@@ -106,18 +107,19 @@ files:
 - 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/item_array.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/config.rb
+- lib/nanoc/base/views/identifiable_collection.rb
 - lib/nanoc/base/views/item.rb
 - lib/nanoc/base/views/item_collection.rb
 - lib/nanoc/base/views/item_rep.rb
 - lib/nanoc/base/views/layout.rb
 - lib/nanoc/base/views/layout_collection.rb
 - lib/nanoc/base/views/mutable_config.rb
+- lib/nanoc/base/views/mutable_identifiable_collection.rb
 - lib/nanoc/base/views/mutable_item.rb
 - lib/nanoc/base/views/mutable_item_collection.rb
 - lib/nanoc/base/views/mutable_layout.rb

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

@@ -1,86 +0,0 @@
-# encoding: utf-8
-
-module Nanoc::Int
-  # Acts as an array, but allows fetching items using identifiers, e.g. `@items['/blah/']`.
-  #
-  # @api private
-  class ItemArray
-    include Enumerable
-
-    extend Forwardable
-
-    EXCLUDED_METHODS  = [
-      :[], :at, :slice, :class, :singleton_class, :clone, :dup, :initialize_dup, :initialize_clone,
-      :freeze, :methods, :singleton_methods, :protected_methods, :private_methods, :public_methods,
-      :instance_variables, :instance_variable_get, :instance_variable_set, :instance_variable_defined?,
-      :instance_of?, :kind_of?, :is_a?, :tap, :send, :public_send, :respond_to?, :respond_to_missing?,
-      :extend, :display, :method, :public_method, :define_singleton_method, :object_id, :equal?,
-      :instance_eval, :instance_exec, :__send__, :__id__
-    ]
-
-    DELEGATED_METHODS = (Array.instance_methods + Enumerable.instance_methods).map(&:to_sym) - EXCLUDED_METHODS
-    def_delegators :@items, *DELEGATED_METHODS
-
-    def initialize(config)
-      @config = config
-
-      @items = []
-    end
-
-    def freeze
-      @items.freeze
-      build_mapping
-      super
-    end
-
-    def [](*args)
-      if 1 == args.size && args.first.is_a?(String)
-        item_with_identifier(args.first) || item_matching_glob(args.first)
-      elsif 1 == args.size && args.first.is_a?(Regexp)
-        @items.select { |i| i.identifier.to_s =~ args.first }
-      else
-        @items[*args]
-      end
-    end
-    alias_method :slice, :[]
-
-    def at(arg)
-      if arg.is_a?(String)
-        item_with_identifier(arg)
-      else
-        @items[arg]
-      end
-    end
-
-    protected
-
-    def item_with_identifier(identifier)
-      if self.frozen?
-        @mapping[identifier.to_s]
-      else
-        @items.find { |i| i.identifier == identifier }
-      end
-    end
-
-    def item_matching_glob(glob)
-      if use_globs?
-        pat = Nanoc::Int::Pattern.from(glob)
-        @items.find { |i| pat.match?(i.identifier) }
-      else
-        nil
-      end
-    end
-
-    def build_mapping
-      @mapping = {}
-      @items.each do |item|
-        @mapping[item.identifier.to_s] = item
-      end
-      @mapping.freeze
-    end
-
-    def use_globs?
-      @config[:pattern_syntax] == 'glob'
-    end
-  end
-end