layout.rb in nanoc-4.0.0a1

- old
+ new

@@ -1,47 +1,37 @@
 # encoding: utf-8
 
-module Nanoc
+module Nanoc::Int
   # Represents a layout in a nanoc site. It has content, attributes, an
   # identifier and a modification time (to speed up compilation).
+  #
+  # @api private
   class Layout
-    extend Nanoc::Memoization
+    extend Nanoc::Int::Memoization
 
     # @return [String] The raw content of this layout
     attr_reader :raw_content
 
     # @return [Hash] This layout's attributes
     attr_reader :attributes
 
-    # @return [String] This layout's identifier, starting and ending with a
-    #   slash
+    # @return [Nanoc::Identifier] This layout's identifier
     attr_accessor :identifier
 
     # Creates a new layout.
     #
     # @param [String] raw_content The raw content of this layout.
     #
     # @param [Hash] attributes A hash containing this layout's attributes.
     #
     # @param [String] identifier This layout's identifier.
     #
-    # @param [Time, Hash] params Extra parameters. For backwards
-    #   compatibility, this can be a Time instance indicating the time when
-    #   this layout was last modified (mtime).
-    #
-    # @option params [Time, nil] :mtime (nil) The time when this layout was
-    #   last modified. Deprecated; pass the modification time as the `:mtime`
-    #   attribute instead.
-    def initialize(raw_content, attributes, identifier, params = nil)
+    # @param [Hash] params Extra parameters. Unused.
+    def initialize(raw_content, attributes, identifier, params = {})
       @raw_content  = raw_content
-      @attributes   = attributes.symbolize_keys_recursively
-      @identifier   = identifier.cleaned_identifier.freeze
-
-      # Set mtime
-      params ||= {}
-      params = { mtime: params } if params.is_a?(Time)
-      @attributes.merge(mtime: params[:mtime]) if params[:mtime]
+      @attributes   = attributes.__nanoc_symbolize_keys_recursively
+      @identifier   = Nanoc::Identifier.new(identifier)
     end
 
     # Requests the attribute with the given key.
     #
     # @param [Symbol] key The name of the attribute to fetch.
@@ -49,10 +39,14 @@
     # @return [Object] The value of the requested attribute.
     def [](key)
       @attributes[key]
     end
 
+    def []=(key, value)
+      @attributes[key] = value
+    end
+
     # Returns the type of this object. Will always return `:layout`, because
     # this is a layout. For items, this method returns `:item`.
     #
     # @api private
     #
@@ -63,11 +57,11 @@
 
     # Prevents all further modifications to the layout.
     #
     # @return [void]
     def freeze
-      attributes.freeze_recursively
+      attributes.__nanoc_freeze_recursively
       identifier.freeze
       raw_content.freeze
     end
 
     # Returns an object that can be used for uniquely identifying objects.
@@ -83,14 +77,14 @@
       "<#{self.class} identifier=\"#{identifier}\">"
     end
 
     # @return [String] The checksum for this object. If its contents change,
     #   the checksum will change as well.
-    def checksum
-      Nanoc::Checksummer.calc(self)
+    def __nanoc_checksum
+      Nanoc::Int::Checksummer.calc(self)
     end
-    memoize :checksum
+    memoize :__nanoc_checksum
 
     def hash
       self.class.hash ^ identifier.hash
     end
 
@@ -112,13 +106,8 @@
 
     def marshal_load(source)
       @raw_content,
       @attributes,
       @identifier = *source
-    end
-
-    # @deprecated Access the modification time using `layout[:mtime]` instead.
-    def mtime
-      self[:mtime]
     end
   end
 end