cmless 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb8a359f53083d2d2da6220c06da3f6701281639
-  data.tar.gz: b80f25065a23c1c85f55c0998ee7c18bb9d0b30f
+  metadata.gz: 4500759e27ced354cca8b411ffda462bf234558d
+  data.tar.gz: e939ee54802ca5362b5f1273265fc07d50ff71e1
 SHA512:
-  metadata.gz: d03df5485f2b8120c4af361e13d5253131a06cb36f71fe5c5d5d5bcacb970e105856d917ac9c1421fc62f4e2ed86468bdb79ea86fb7e74ae06a92de6fb37f553
-  data.tar.gz: 569223ae59ed582ab39e30a7d7200110a3026dcddc6f4fc44b2d2946e064183c838c2e29ea9ad03b39f3d093d03a7e6fe706d16c4c58aaa38ab291b22df0549a
+  metadata.gz: 393902304e99166f5ae52693a8feeee270947527874b4e58e3926456ab6a10220171d72ca84f15c025b344d4e34d8bc92bc0e479ec91121d0ae992ad443bae46
+  data.tar.gz: 0e5f31d1d646220b824083f7626833416ef08819372d99f0165773b12b6b63ceaf402a211cba49c7840be959f9944794f6b0883529bbc9bc16592b9fe0578f56

data/lib/cmless.rb

@@ -7,7 +7,7 @@ require 'singleton'
 require 'nokogiri'
 
 # CMS alternative: Content in markdown / Extract HTML and data for display
-class Cmless # rubocop:disable Metrics/ClassLength
+class Cmless
   attr_reader :path
   attr_reader :title
   attr_reader :title_html
@@ -15,7 +15,7 @@ class Cmless # rubocop:disable Metrics/ClassLength
   private
 
   # You should use find_by_path rather than creating your own instances.
-  def initialize(file_path) # rubocop:disable Metrics/MethodLength
+  def initialize(file_path)
     @path = self.class.path_from_file_path(file_path)
     Nokogiri::HTML(Markdowner.instance.render(File.read(file_path))).tap do |doc|
       html_methods = self.class.instance_methods
@@ -40,7 +40,13 @@ class Cmless # rubocop:disable Metrics/ClassLength
 
       html_methods.each do |method|
         h2_name = method.to_s.gsub(/\_html$/, '').gsub('_', ' ').capitalize
-        instance_variable_set("@#{method}", Cmless.extract_html(doc, h2_name))
+        value = Cmless.extract_html(doc, h2_name)
+        value ||= if parent # Look at parent if missing on self.
+                    parent.send(method)
+                  else
+                    fail(IndexError.new("Can't find '#{method}'"))
+                  end
+        instance_variable_set("@#{method}", value)
       end
 
       doc.text.strip.tap do |extra|
@@ -48,17 +54,24 @@ class Cmless # rubocop:disable Metrics/ClassLength
         fail("#{file_path} has extra unused text: '#{escaped}'") unless extra == ''
       end
     end
+  rescue => e
+    raise(e.message + ' in ' + file_path)
   end
 
   public
 
   # Instance methods:
 
+  def parent
+    ancestors.last
+  end
+
   def ancestors
     @ancestors ||= begin
       split = path.split('/')
       (1..split.size - 1).to_a.map do |i|
-        self.class.objects_by_path[split[0, i].join('/')]
+        # to avoid infinite recursion, only look at the ones already loaded.
+        self.class.objects_by_path_in_progress[split[0, i].join('/')]
       end
     end
   end
@@ -83,7 +96,9 @@ class Cmless # rubocop:disable Metrics/ClassLength
     end
 
     def all
-      objects_by_path.values
+      @all ||= objects_by_path.values.sort_by do |object|
+        object.head_html.gsub('<p>', '').to_f rescue object.path
+      end
     end
 
     def find_by_path(path)
@@ -93,18 +108,22 @@ class Cmless # rubocop:disable Metrics/ClassLength
                  "Expected one of #{objects_by_path.keys}"))
     end
 
-    def objects_by_path # rubocop:disable Metrics/MethodLength
+    def objects_by_path_in_progress
+      @object_by_path_in_progress
+    end
+
+    def objects_by_path
       @objects_by_path ||=
         begin
           unless File.directory?(self::ROOT)
             fail StandardError.new("#{self::ROOT} is not a directory")
           end
-          Hash[
-            Dir[Pathname(self::ROOT) + '**/*.md'].sort.map do |path|
-              object = new(path)
-              [object.path, object]
-            end
-          ]
+          @object_by_path_in_progress = {}
+          Dir[Pathname(self::ROOT) + '**/*.md'].sort.each do |full_path|
+            object = new(full_path)
+            @object_by_path_in_progress[object.path] = object
+          end
+          @object_by_path_in_progress
         end
     end
 
@@ -117,7 +136,7 @@ class Cmless # rubocop:disable Metrics/ClassLength
     def extract_html(doc, title)
       following_siblings = []
       doc.xpath("//h2[text()='#{title}']").first.tap do |header|
-        fail IndexError.new("Can't find header '#{title}'") unless header
+        return nil unless header
         while header.next_element && !header.next_element.name.match(/h2/)
           following_siblings.push(header.next_element.remove)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmless
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Chuck McCallum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet