ro 1.4.6 → 4.2.0

data/lib/ro/node.rb

@@ -1,478 +1,295 @@
 module Ro
   class Node
-    fattr :root
-    fattr :path
-    fattr :type
-    fattr :loaded
-    fattr :fields
+    include Klass
+
+    attr_reader :path, :root
 
     def initialize(path)
-      @path = Ro.realpath(path.to_s)
-      @id   = File.basename(@path)
-      @slug = Slug.for(@id)
-      @type = File.basename(File.dirname(@path))
-      @root = Ro::Root.new(File.dirname(File.dirname(@path)))
-      @loaded = false
-      @loading = false
-      @attributes = Map.new
-      @fields = Map.new
+      @path = Path.for(path)
+      @root = Root.for(@path.parent.parent)
+      @attributes = :lazyload
     end
 
-    def id
-      @id
+    def name
+      @path.name
     end
 
-    def _id
-      @id
+    def id
+      name
     end
 
     def type
-      attributes[:type] || @type
-    end
-
-    def _type
-      @type
-    end
-
-    def path
-      attributes[:path] || @path
-    end
-
-    def _path
-      @path
-    end
-
-    def slug
-      attributes[:slug] || @slug
-    end
-
-    def _slug
-      @slug
+      @path.parent.name
     end
 
     def identifier
-      "#{ _type }/#{ _id }"
-    end
-
-    def hash
-      identifier.hash
-    end
-
-    def ==(other)
-      attributes == other.attributes
+      File.join(type, id)
     end
 
     def inspect
       identifier
     end
 
-    def to_s
-      inspect
+    def collection
+      @root.collection_for(type)
     end
 
-    def basename
-      name
-    end
-
-    def node
-      self
-    end
-
-    def get(*args)
-      attributes.get(*args)
+    def attributes
+      load_attributes
+      @attributes
     end
 
-    def [](*args)
-      attributes.get(*args)
+    def load_attributes
+      load_attributes! if @attributes == :lazyload
     end
 
-    def asset_path(*args, &block)
-      File.join(relative_path, 'assets')
-    end
+    def load_attributes!
+      @attributes = Map.new
 
-    def asset_dir
-      File.join(path, 'assets')
-    end
+      _load_base_attributes
+      _load_asset_attributes
+      _load_meta_attributes
+      _load_file_attributes
 
-    def asset_paths
-      Dir.glob("#{ asset_dir }/**/**").select{|entry| test(?f, entry)}
+      @attributes
     end
 
-    def assets
-      asset_paths.map do |path|
-        name = path.sub(asset_dir + "/", "")
-        path_info = path.gsub(/^#{ Regexp.escape(Ro.root) }/, '')
-        url = File.join(Ro.route, path_info)
-        Asset.new(name, :path => path, :url => url)
-      end
-    end
-
-    def asset_urls
-      assets.map(&:url)
-    end
-
-    def asset_for(*args, &block)
-      options = Map.options_for!(args)
-
-      path_info = Ro.relative_path_for(args)
-
-      path = File.join(@path.to_s, 'assets', path_info)
-
-      glob = path_info.gsub(/[_-]/, '[_-]')
-
-      globs = 
-        [
-          File.join(@path.to_s, 'assets', "#{ glob }"),
-          File.join(@path.to_s, 'assets', "#{ glob }*"),
-          File.join(@path.to_s, 'assets', "**/#{ glob }*")
+    def _load_base_attributes
+      disallowed =
+        %w[
+          assets
+          _meta
         ]
 
-      candidates = globs.map{|glob| Dir.glob(glob, ::File::FNM_CASEFOLD)}.flatten.compact.uniq
+      glob =
+        "attributes.{yml,yaml,json}"
 
-      case candidates.size
-        when 0
-          raise ArgumentError.new("no asset matching #{ globs.inspect }")
-        else
-          path = candidates.first
-          name = path.sub(asset_dir + "/", "")
-          path_info = path.gsub(/^#{ Regexp.escape(Ro.root) }/, '')
-          url = File.join(Ro.route, path_info)
-      end
+      @path.glob(glob) do |file|
+        attrs = _render(file)
 
-      Asset.new(name, :path => path, :url => url)
-    end
+        disallowed.each do |key|
+          Ro.error!("#{ file } must not contain the key #{key.inspect}") if attrs.has_key?(key)
+        end
 
-    def asset_for?(*args, &block)
-      begin
-        asset_for(*args, &block)
-      rescue
-        nil
+        @attributes.update(attrs)
       end
     end
 
-    class Asset < ::String
-      fattr(:path)
-      fattr(:url)
-
-      def initialize(name, options = {})
-        super(name)
-      ensure
-        options = Map.for(options)
 
-        Asset.fattrs.each do |attr|
-          if options.has_key?(attr)
-            value = options[attr]
-            send(attr, value)
-          end
+    def _load_asset_attributes
+      {}.tap do |hash|
+        assets.each do |asset|
+          key = asset.name
+          value = { url: asset.url, path: asset.path.relative_to(@root), src: asset.src }
+          hash[key] = value
         end
-      end
 
-      def name
-        self
-      end
-
-      IMAGE_RE = %r/[.](jpg|jpeg|png|gif|tif|tiff)$/i
-
-      def image?
-        !!(self =~ IMAGE_RE)
+        @attributes.set(assets: hash)
       end
+    end
 
-      def extension
-        base, ext = basename.split('.', 2)
-        ext
-      end
-      alias_method(:ext, :extension)
+    def _load_meta_attributes
+      {}.tap do |hash|
+        hash.update(
+          identifier:,
+          type:,
+          id:,
+          urls:
+        )
 
-      def basename
-        File.basename(path.to_s)
+        @attributes.set(_meta: hash)
       end
     end
 
-    def url_for(*args, &block)
-      options = Map.options_for!(args)
-
-      opts = Map.new
+    def _load_file_attributes
+      ignored = _ignored_files
 
-      opts[:timestamp] = options.delete(:timestamp)
+      @path.files.each do |file|
+        next if ignored.include?(file)
 
-      args.push(options)
+        rel = file.relative_to(@path)
 
-      asset = asset_for(*args, &block)
+        key = rel.parts
+        basename = key.pop
+        base = basename.split('.', 2).first
+        key.push(base)
 
-      if ts = opts.delete(:timestamp)
-        if ts == true
-          opts[:_] = File.stat(asset.path).mtime.utc.to_i
-        else
-          opts[:_] = ts
+        if @attributes.has?(key)
+          raise Error.new("#{ @path } clobbers #{ key.inspect }!")
         end
-      end
 
-      if opts.empty?
-        asset.url
-      else
-        query_string = Ro.query_string_for(opts)
-        "#{ asset.url }?#{ query_string }"
-      end
-    end
+        value = _render(file)
 
-    def url_for?(*args, &block)
-      begin
-        url_for(*args, &block)
-      rescue
-        nil
+        @attributes.set(key => value)
       end
     end
 
-    def source_for(*args)
-      key = Ro.relative_path_for(:assets, :source, args).split('/')
-      get(key)
-    end
-
-    def route(*args)
-      path_info = Ro.absolute_path_for(Ro.route, relative_path)
-      [Ro.asset_host, path_info].compact.join('/')
-    end
+    def _ignored_files
+      ignored_files =
+        %w[
+          attributes.yml
+          attributes.yaml
+          attributes.json
+          ./assets/**/**
+        ].map do |glob|
+          @path.glob(glob).select(&:file?)
+        end
 
-    def relative_path
-      re = /^#{ Regexp.escape(Ro.root) }/
-      @path.to_s.gsub(re, '')
+      ignored_files.flatten
     end
 
-    def method_missing(method, *args, &block)
-      super if method.to_s == 'to_ary'
-
-      Ro.log "Ro::Node(#{ identifier })#method_missing(#{ method.inspect }, #{ args.inspect })"
-
-      key = method.to_s
+    def _render(file)
+      value = Ro.render(file, _render_context)
 
-      if @attributes.has_key?(key)
-        return @attributes[key]
+      if value.is_a?(Ro::Template::HTML)
+        html = value
+        value = Ro.expand_asset_urls(html, self)
       end
 
-      _load do
-        return(
-          if @attributes.has_key?(key)
-            @attributes[key]
-          else
-            super
-          end
-        )
-      end
+      value
     end
 
-    def attributes
-      _load{ @attributes }
+    def _render_context
+      to_hash.tap do |context|
+        context[:ro] ||= root
+        context[:collection] ||= collection
+      end
     end
 
-    def attributes=(attributes)
-      @attributes = attributes
-    end
-    
-    def instance_eval(*args, &block)
-      _load{ super }
+    def get(*args)
+      attributes.get(*args)
     end
 
-    def related(*args, &block)
-      _load{
-        related = @attributes.get(:related) || Map.new
-        nodes = List.new(root)
-        list = root.nodes
-        which = Coerce.list_of_strings(args) 
-
-        related.each do |relationship, value|
-          unless which.empty?
-            next unless which.include?(relationship.to_s)
-          end
-
-          type, names =
-            case value
-              when Hash
-                value.to_a.first
-              else
-                [relationship, value]
-            end
-
-          names = Coerce.list_of_strings(names)
-
-          names.each do |name|
-            identifier = "#{ type }/#{ name }"
-            node = list.index[identifier]
-            node._load{ nodes.add(node) }
-          end
-        end
-
-        case
-          when block.nil?
-            nodes
-
-          when block
-            nodes.where(&block)
-        end
-      }
+    def [](*args)
+      attributes.get(*args)
     end
 
-    def reload(&block)
-      @loaded = false
-      _load(&block)
+    def relative_path
+      path.relative_to(root)
     end
 
-    def loaded
-      attributes
+    def asset_dir
+      path.join('assets')
     end
 
-    def load!(&block)
-      _load(&block)
+    def asset_paths
+      asset_dir.select { |entry| entry.file? }.sort
     end
 
-    def _load(&block)
-      unless @loaded
-        if @loading
-          return(block ? block.call : :loading)
-        end
-
-        @loading = true
-        @loaded = _load_from_cache_or_disk
-        @loading = false
-      end
-
-      block ? block.call : @loaded
+    def assets
+      asset_paths.map { |path| Asset.for(path, node: self) }
     end
 
-    def _load_from_cache_or_disk
-      cache_key = _cache_key
-
-      cached = Ro.cache.read(cache_key)
+    def asset_urls
+      assets.map(&:url)
+    end
 
-      if cached
-        Ro.log "loading #{ identifier } from cache"
+    def asset_for(*args)
+      options = Map.options_for!(args)
 
-        @attributes = Map.new.update(cached)
+      path_info = Path.relative(args)
 
-        return :cache
-      else
-        Ro.log "loading #{ identifier } from disk"
+      path = @path.join('assets', path_info)
 
-        @attributes = Map.new
+      glob = path_info.gsub(/[_-]/, '[_-]')
 
-        _load_attributes_yml
-        _load_attribute_files
-        _load_sources
-        _load_assets
+      globs =
+        [
+          @path.call('assets', "#{glob}"),
+          @path.call('assets', "#{glob}*"),
+          @path.call('assets', "**/#{glob}*")
+        ]
 
-        Ro.cache.write(cache_key, @attributes)
+      candidates = globs.map { |glob| Dir.glob(glob, ::File::FNM_CASEFOLD) }.flatten.compact.uniq.sort
 
-        return :disk
+      case candidates.size
+      when 0
+        raise ArgumentError, "no asset matching #{globs.inspect}"
+      else
+        path = candidates.last
       end
-    end
-
-    def _load_attributes_yml
-      if test(?s, _attributes_yml)
-        buf = IO.binread(_attributes_yml)
-        data = YAML.load(buf)
-        data = data.is_a?(Hash) ? data : {'_' => data}
-
-        @attributes.update(data)
-
-        %w( assets ).each do |key|
-          raise ArgumentError.new("attributes.yml may not contain the key '#{ key }'") if @attributes.has_key?(key)
-        end
 
-        @attributes
-      end
+      Asset.for(path, node: self)
     end
 
-    def _load_attribute_files
-      glob = File.join(@path, '**/**')
-      node = self
-
-      Dir.glob(glob) do |path|
-        next if test(?d, path)
-
-        basename = File.basename(path)
-        next if basename == 'attributes.yml'
-
-        relative_path = Ro.relative_path(path, :to => @path)
-        next if relative_path =~ /^assets\//
+    def asset_for?(*args, &block)
+      asset_for(*args, &block)
+    rescue StandardError
+      nil
+    end
 
-        key = relative_path.split('.', 2).first.split('/')
+    def url_for(relative_path, options = {})
+      raise ArgumentError, relative_path if Path.absolute?(relative_path)
 
-        html = Ro.render(path, node)
-        html = Ro.expand_asset_urls(html, node)
+      fullpath = Path.for(path, relative_path).expand
+      raise ArgumentError, "#{relative_path.inspect} -- DOES NOT EXIST" unless fullpath.exist?
 
-        @attributes.set(key => html)
-      end
+      Ro.url_for(self.relative_path, relative_path, options)
     end
 
-    def _load_sources
-      glob = File.join(@path, 'assets/source/*')
-      node = self
-
-      Dir.glob(glob) do |path|
-        next if test(?d, path)
-
-        basename = File.basename(path)
-        key, ext = basename.split('.', 2)
+    def src_for(*args)
+      key = Path.relative(:assets, :src, args).split('/')
+      get(key)
+    end
 
-        next if basename == 'attributes.yml'
+    def method_missing(method, *args, &block)
+      key = method.to_s
 
-        value = Ro.render_source(path, node)
-        @attributes.set([:assets, :source, basename] => value)
+      if attributes.has_key?(key)
+        attributes[key]
+      else
+        super
       end
     end
 
-    def _load_assets
-      glob = File.join(@path, 'assets/**/**')
-      node = self
-
-      Dir.glob(glob) do |path|
-        next if test(?d, path)
-
-        relative_path = Ro.relative_path(path, :to => "#{ @path }/assets")
-
-        url = url_for(relative_path)
-        key = relative_path.split('/')
-
-        key.unshift('urls')
+    def to_hash
+      attributes.to_hash
+    end
 
-        @attributes.set(key => url)
-      end
+    def to_s(...)
+      to_json(...)
     end
 
-    def _binding
-      Kernel.binding
+    def to_json(...)
+      JSON.pretty_generate(to_hash, ...)
     end
 
-    def _cache_key
-      glob = File.join(@path, '**/**')
+    def as_json(...)
+      to_hash.as_json(...)
+    end
 
-      entries = []
+    def to_yaml(...)
+      to_hash.to_yaml(...)
+    end
 
-      Dir.glob(glob) do |entry|
-        stat =
-          begin
-            File.stat(entry)
-          rescue
-            next
-          end
+    def _mapify(data)
+      converted = 'this_recursively_converts_nested_hashes_into_maps'
 
-        timestamp = [stat.ctime, stat.mtime].max
-        relative_path = Ro.relative_path(entry, :to => @path)
-        entries.push([relative_path, timestamp.iso8601(2)]) 
-      end
+      Map.for(converted => data)[converted]
+    end
 
-      fingerprint = entries.map{|pair| pair.join('@')}.join(', ')
+    def files
+      path.glob('**/**').select { |entry| entry.file? }.sort
+    end
 
-      md5 = Ro.md5(fingerprint)
+    def urls
+      files.map { |file| url_for(file.relative_to(@path)) }.sort
+    end
 
-      [@path, md5]
+    def <=>(other)
+      sort_key <=> other.sort_key
     end
 
-    def _load_from_cache
-      false
+    def sort_key
+      default_sort_key
     end
 
-    def _attributes_yml
-      File.join(@path, 'attributes.yml')
+    def default_sort_key
+      position = (attributes[:position] ? Float(attributes[:position]) : 0.0)
+      published_at = (attributes[:published_at] ? Time.parse(attributes[:published_at].to_s) : Time.at(0)).utc.iso8601
+      created_at = (attributes[:created_at] ? Time.parse(attributes[:created_at].to_s) : Time.at(0)).utc.iso8601
+
+      [position, published_at, created_at, name]
     end
   end
 end

data/lib/ro/pagination.rb

@@ -8,9 +8,9 @@ module Ro
 
       page = [page.abs, 1].max
       per = [per.abs, 1].max
-
+d
       offset = (page - 1) * per
-      length = per 
+      length = per
 
       slice = dup.slice(offset, length)
       slice.page = page
@@ -23,12 +23,13 @@ module Ro
       @page = page
     end
 
-    def page(*args)
+    def page(*_args)
+      paginate unless @page
       @page
     end
 
     def current_page
-      @page
+      page
     end
 
     def per=(per)
@@ -36,6 +37,7 @@ module Ro
     end
 
     def per
+      paginate unless @per
       @per
     end
 
@@ -44,6 +46,7 @@ module Ro
     end
 
     def num_pages
+      paginate unless @num_pages
       @num_pages
     end