markdown_record 0.1.3 → 0.1.4

data/lib/markdown_record/models/filters/base_filter.rb

@@ -0,0 +1,35 @@
+module MarkdownRecord
+  module Models
+    module Filters
+      class BaseFilter
+
+        def initialize(filter_value, attribute_value)
+          @filter_value = filter_value
+          @attribute_value = attribute_value
+        end
+
+        def passes_filter?
+          case @attribute_value.class.name
+          when Integer.name
+            @filter_value.to_i == @attribute_value
+          when Float
+            @filter_value.to_f == @attribute_value
+          when String.name
+            @filter_value.to_s == @attribute_value
+          when TrueClass.name
+            [:true, "true", true].include?(@filter_value)
+          when FalseClass.name
+            [:false, "false", false].include?(@filter_value)
+          else
+            @filter_value == @attribute_value
+          end
+        end
+
+        def filter_for(filter_value, attribute_value)
+          klass = MarkdownRecord::Models::Filters::FILTER_MAPPING[filter_value.class.name] || MarkdownRecord::Models::Filters::BaseFilter
+          klass.new(filter_value, attribute_value)
+        end
+      end
+    end
+  end
+end

data/lib/markdown_record/models/filters/hash_filter.rb

@@ -0,0 +1,81 @@
+module MarkdownRecord
+  module Models
+    module Filters
+      class HashFilter < MarkdownRecord::Models::Filters::BaseFilter
+
+        class SubHashFilter < MarkdownRecord::Models::Filters::BaseFilter
+          def passes_filter?
+            return true if @filter_value.nil?
+
+            passes = true
+            @filter_value.each do |key, value|
+              passes &&= filter_for(value, @attribute_value[key]).passes_filter?
+            end
+            passes
+          end
+        end
+
+        class SubArrayfilter < MarkdownRecord::Models::Filters::BaseFilter
+          def passes_filter?
+            return false if @filter_value.nil?
+            return false unless @filter_value[:__include__].present?
+
+            @attribute_value.include?(@filter_value[:__include__])
+          end
+        end
+
+        class SubNotFilter < MarkdownRecord::Models::Filters::BaseFilter
+          def passes_filter?
+            return true if @filter_value.nil?
+
+            passes = true
+            @filter_value.each do |key, value|
+              passes &&= !filter_for(value, @attribute_value[key]).passes_filter?
+            end
+            passes
+          end
+        end
+
+        class SubOrFilter < MarkdownRecord::Models::Filters::BaseFilter
+          def passes_filter?
+            return true if @filter_value.nil?
+
+            passes = false
+            @filter_value.each do |filters|
+              passes ||= filter_for(filters, @attribute_value).passes_filter?
+            end
+            passes
+          end
+        end
+        
+        HASH_FILTER_MAPPING = {
+          ActiveSupport::HashWithIndifferentAccess => SubHashFilter,
+          Array => SubArrayfilter
+        }
+
+        def passes_filter?
+          not_filters = @filter_value.delete(:__not__)
+          or_filters = @filter_value.delete(:__or__)
+          and_filters = @filter_value.delete(:__and__)
+
+          if @attribute_value.is_a?(Hash)
+            @attribute_value = @attribute_value.with_indifferent_access 
+          end
+
+          passes = true
+          passes &&= sub_filter&.passes_filter?
+
+          passes &&= SubNotFilter.new(not_filters, @attribute_value).passes_filter?
+          passes &&= SubOrFilter.new(or_filters, @attribute_value).passes_filter?
+          passes &&= SubHashFilter.new(and_filters, @attribute_value).passes_filter?
+          
+          passes
+        end
+
+        def sub_filter
+          HASH_FILTER_MAPPING[@attribute_value.class]&.new(@filter_value, @attribute_value)
+        end
+      end
+    end
+  end
+end

data/lib/markdown_record/models/filters/nil_filter.rb

@@ -0,0 +1,11 @@
+module MarkdownRecord
+  module Models
+    module Filters
+      class NilFilter < MarkdownRecord::Models::Filters::BaseFilter
+        def passes_filter?
+          @attribute_value.nil?
+        end
+      end
+    end
+  end
+end

data/lib/markdown_record/models/filters/range_filter.rb

@@ -0,0 +1,11 @@
+module MarkdownRecord
+  module Models
+    module Filters
+      class RangeFilter < MarkdownRecord::Models::Filters::BaseFilter
+        def passes_filter?
+          @filter_value.member?(@attribute_value)
+        end
+      end
+    end
+  end
+end

data/lib/markdown_record/models/filters/regexp_filter.rb

@@ -0,0 +1,11 @@
+module MarkdownRecord
+  module Models
+    module Filters
+      class RegexpFilter < MarkdownRecord::Models::Filters::BaseFilter
+        def passes_filter?
+          @attribute_value =~ @filter_value
+        end
+      end
+    end
+  end
+end

data/lib/markdown_record/models/filters/symbol_filter.rb

@@ -0,0 +1,14 @@
+module MarkdownRecord
+  module Models
+    module Filters
+      class SymbolFilter < MarkdownRecord::Models::Filters::BaseFilter
+        def passes_filter?
+          passes = false
+          passes ||= @filter_value == :not_null && !@attribute_value.nil?
+          passes ||= @filter_value == :null && @attribute_value.nil?
+          passes
+        end
+      end
+    end
+  end
+end

data/lib/markdown_record/models/filters.rb

@@ -0,0 +1,22 @@
+require "markdown_record/models/filters/base_filter"
+require "markdown_record/models/filters/array_filter"
+require "markdown_record/models/filters/hash_filter"
+require "markdown_record/models/filters/nil_filter"
+require "markdown_record/models/filters/range_filter"
+require "markdown_record/models/filters/regexp_filter"
+require "markdown_record/models/filters/symbol_filter"
+
+module MarkdownRecord
+  module Models
+    module Filters
+      FILTER_MAPPING = {
+        Array.name => MarkdownRecord::Models::Filters::ArrayFilter,
+        Symbol.name => MarkdownRecord::Models::Filters::SymbolFilter,
+        Hash.name => MarkdownRecord::Models::Filters::HashFilter,
+        nil.class.name => MarkdownRecord::Models::Filters::NilFilter,
+        Regexp.name => MarkdownRecord::Models::Filters::RegexpFilter,
+        Range.name => MarkdownRecord::Models::Filters::RangeFilter,
+      }
+    end
+  end
+end

data/lib/markdown_record/models/model_inflator.rb

@@ -0,0 +1,65 @@
+require "markdown_record/path_utilities"
+
+module MarkdownRecord
+  class ModelInflator
+    include ::MarkdownRecord::PathUtilities
+    include ::MarkdownRecord::Models::Filtering
+
+    def initialize(force_render = false)
+      @force_render = force_render
+    end
+    
+    def where(filters, subdirectory = nil)
+      models = constantized_models(filters, subdirectory)
+      
+      models.select do |model|
+        passes_filters?(filters.dup, model.attributes.with_indifferent_access)
+      end
+    end
+
+    def json_source(path)
+      if Pathname.new(path).exist? && !@force_render
+        json_hash = JSON.parse(File.read(path))
+        return json_hash
+      end
+
+      json_hash = ::MarkdownRecord::JsonRenderer.new.render_models_for_subdirectory(subdirectory: "",:concat => true, :deep => true, :save => false, :render_content_fragment_json => true)
+
+      json_hash
+    end
+
+    def json(filters, subdirectory)
+      path = json_path(filters, subdirectory)
+      json_hash = json_source(path)
+      
+      json_hash.delete(::MarkdownRecord::ContentFragment.json_klass) if filters.delete(:exclude_fragments)
+      json_hash = filters[:klass].present? ? json_hash[filters.delete(:klass).json_klass] : json_hash.values.flatten
+      json_hash ||= []
+      json_hash
+    end
+
+    def json_path(filters, subdirectory)
+      if subdirectory.nil?
+        file_path = base_rendered_path
+        file_path = "#{file_path}_fragments" if filters[:klass] == ::MarkdownRecord::ContentFragment
+        "#{file_path}.json"
+      else
+        file_path = subdirectory
+        file_path = "#{file_path}_fragments" if filters[:klass] == ::MarkdownRecord::ContentFragment
+        "#{base_rendered_path}/#{file_path}.json"
+      end
+    end
+
+    def constantized_models(filters, subdirectory)
+      json_hash = json(filters, subdirectory)
+      
+      json_hash.map do |model|
+        model["type"].camelize.safe_constantize&.new(model)
+      end
+    end
+
+    def passes_filters?(filters, attributes)
+      filter_for(filters, attributes).passes_filter?
+    end
+  end
+end

data/lib/markdown_record/path_utilities.rb

@@ -7,17 +7,17 @@ module MarkdownRecord
       rendered_path = Pathname.new("/").join(full_path)
       
       filename = clean_path(rendered_path.basename)
-      filename = remove_numeric_prefixes(filename)
+      filename = remove_prefix(filename)
       
       subdirectory = clean_path(rendered_path.parent)
-      subdirectory = remove_numeric_prefixes(subdirectory)
+      subdirectory = remove_prefix(subdirectory)
 
       [filename, subdirectory, full_path.to_s.split(".").last]
     end
 
     def rendered_path(full_path)
       rendered_path = clean_path(full_path.to_s)
-      rendered_path = remove_numeric_prefixes(rendered_path)
+      rendered_path = remove_prefix(rendered_path)
       Pathname.new(rendered_path)
     end
 
@@ -25,7 +25,17 @@ module MarkdownRecord
       rendered_path(full_path).to_s
     end
 
-    def base_content_path
+    def to_scoped_id(scope, id)
+      return id.to_s unless scope.present?
+
+      "#{scope}:s:#{id}"
+    end
+
+    def scoped_id_to_parts(scoped_id)
+      scoped_id.split(":s:")
+    end
+
+    def base_content_root_name
       basename = ::MarkdownRecord.config.content_root.basename
 
       # must use "/" so that `.parent` returns correctly
@@ -38,13 +48,14 @@ module MarkdownRecord
       
       frag_id = path_to_fragment_id(full_path)
 
-      fragment = ::MarkdownRecord::ContentFragment.find(frag_id)
+      fragment = ::MarkdownRecord::ContentFragment.force_render_find(frag_id)
       
       {
         filename: filename, 
         subdirectory: subdirectory, 
         frag_id: frag_id,
-        fragment: fragment
+        fragment: fragment,
+        scope: fragment.__scope__
       }
     end
 
@@ -55,7 +66,7 @@ module MarkdownRecord
       
       {
         id: frag_id,
-        type: MarkdownRecord::ContentFragment.name.underscore,
+        type: ::MarkdownRecord::ContentFragment.name.underscore,
         subdirectory: subdirectory,
         filename: filename
       }.stringify_keys
@@ -73,11 +84,9 @@ module MarkdownRecord
       clean_path(::MarkdownRecord.config.rendered_content_root.to_s)
     end
 
-    def remove_numeric_prefixes(filename_or_id)
+    def remove_prefix(filename_or_id)
       if MarkdownRecord.config.ignore_numeric_prefix
-        parts = filename_or_id.split("/")
-        parts = parts.map { |p| p.gsub(/^\d+_/,"")}
-        parts.join("/")
+        MarkdownRecord.config.filename_sorter.remove_prefix(filename_or_id)
       else
         filename_or_id
       end

data/lib/markdown_record/rendering/content_dsl/attribute.rb

@@ -0,0 +1,22 @@
+module MarkdownRecord
+  module ContentDsl
+    module Attribute
+      REGEX = /<!--\s*attribute\s*:\s*(\w+)\s*(?::((?:html|md|int|float|string)?))?-->/
+      ENCODED_REGEX = /&lt;!--\s*attribute\s*:\s*(\w+)\s*(?::((?:html|md|int|float|string)?))?--&gt;/
+
+      def attribute_dsl(text)
+        match = text.match(REGEX)
+
+        if match
+          [match[1].strip, match[2]&.strip]
+        else
+          nil
+        end
+      end
+
+      def self.remove_dsl(text)
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
+      end
+    end
+  end
+end

data/lib/markdown_record/{content_dsl → rendering/content_dsl}/directory_fragment.rb

@@ -1,8 +1,8 @@
 module MarkdownRecord
   module ContentDsl
     module DirectoryFragment
-      REGEX = /(?<!`|`\\n|`html\\n)<!--\s*directory_fragment\s*({[\s"'\\\w:,.\[\]\{\}_\/]*})\s*-->(?!`|\\n`)/
-      ENCODED_REGEX = /(?<!<code>|<code class="html">)&lt;!--\s*directory_fragment\s*({[\s"'\\\w:,.\[\]\{\}_\/]*})\s*--&gt;(?!<\/code>)/
+      REGEX = /<!--\s*directory_fragment\s*({[\s"'\\\w:,.\[\]\{\}_\/|\-]*})\s*-->/
+      ENCODED_REGEX = /&lt;!--\s*directory_fragment\s+({[\s"'\\\w:,.\[\]\{\}_\/|\-]*})\s*--&gt;/
 
       def directory_fragment_dsl(text)
         match = text.match(REGEX)
@@ -15,7 +15,7 @@ module MarkdownRecord
       end
 
       def self.remove_dsl(text)
-        text.gsub(ENCODED_REGEX, "")
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
       end
     end
   end

data/lib/markdown_record/{content_dsl → rendering/content_dsl}/disable.rb

@@ -2,7 +2,7 @@ module MarkdownRecord
   module ContentDsl
     module Disable
       REGEX = /<!--\s*disable\s*-->/
-      ENCODED_REGEX = /(?<!<code>|<code class="html">)&lt;!--\s*disable\s*--&gt;(?!<\/code>)/
+      ENCODED_REGEX = /&lt;!--\s*disable\s*--&gt;/
 
       def disable_dsl(text)
         match = text.match(REGEX)
@@ -15,7 +15,7 @@ module MarkdownRecord
       end
 
       def self.remove_dsl(text)
-        text.gsub(ENCODED_REGEX, "")
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
       end
     end
   end

data/lib/markdown_record/{content_dsl → rendering/content_dsl}/enable.rb

@@ -2,7 +2,7 @@ module MarkdownRecord
   module ContentDsl
     module Enable
       REGEX = /<!--\s*enable\s*-->/
-      ENCODED_REGEX = /(?<!<code>|<code class="html">)&lt;!--\s*enable\s*--&gt;(?!<\/code>)/
+      ENCODED_REGEX = /&lt;!--\s*enable\s*--&gt;/
 
       def enable_dsl(text)
         match = text.match(REGEX)
@@ -15,7 +15,7 @@ module MarkdownRecord
       end
 
       def self.remove_dsl(text)
-        text.gsub(ENCODED_REGEX, "")
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
       end
     end
   end

data/lib/markdown_record/{content_dsl → rendering/content_dsl}/end_attribute.rb

@@ -1,8 +1,8 @@
 module MarkdownRecord
   module ContentDsl
     module EndAttribute
-      REGEX = /(?<!`|`\\n|`html\\n)<!--\s*end_attribute\s*-->(?!`|\\n`)/
-      ENCODED_REGEX = /(?<!<code>|<code class="html">)&lt;!--\s*end_attribute\s*--&gt;(?!<\/code>)/
+      REGEX = /<!--\s*end_attribute\s*-->/
+      ENCODED_REGEX = /&lt;!--\s*end_attribute\s*--&gt;/
 
       def end_attribute_dsl(text)
         match = text.match(REGEX)
@@ -15,7 +15,7 @@ module MarkdownRecord
       end
 
       def self.remove_dsl(text)
-        text.gsub(ENCODED_REGEX, "")
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
       end
     end
   end

data/lib/markdown_record/{content_dsl → rendering/content_dsl}/end_model.rb

@@ -1,8 +1,8 @@
 module MarkdownRecord
   module ContentDsl
     module EndModel
-      REGEX = /(?<!`|`\\n|`html\\n)<!--\s*end_model\s*-->(?!`|\\n`)/
-      ENCODED_REGEX = /(?<!<code>|<code class="html">)&lt;!--\s*end_model\s*--&gt;(?!<\/code>)/
+      REGEX = /<!--\s*end_model\s*-->/
+      ENCODED_REGEX = /&lt;!--\s*end_model\s*--&gt;/
 
       def end_model_dsl(text)
         match = text.match(REGEX)
@@ -15,7 +15,7 @@ module MarkdownRecord
       end
 
       def self.remove_dsl(text)
-        text.gsub(ENCODED_REGEX, "")
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
       end
     end
   end

data/lib/markdown_record/{content_dsl → rendering/content_dsl}/fragment.rb

@@ -1,8 +1,8 @@
 module MarkdownRecord
   module ContentDsl
     module Fragment
-      REGEX = /(?<!`|`\\n|`html\\n)<!--\s*fragment\s*({[\s"'\\\w:,.\[\]\{\}_\/]*})\s*-->(?!`|\\n`)/
-      ENCODED_REGEX = /(?<!<code>|<code class="html">)&lt;!--\s*fragment\s+({[\s"'\\\w:,.\[\]\{\}_\/]*})\s*--&gt;(?!<\/code>)/
+      REGEX = /<!--\s*fragment\s*({[\s"'\\\w:,.\[\]\{\}_\/|\-]*})\s*-->/
+      ENCODED_REGEX = /&lt;!--\s*fragment\s+({[\s"'\\\w:,.\[\]\{\}_\/|\-]*})\s*--&gt;/
 
       def fragment_dsl(text)
         match = text.match(REGEX)
@@ -15,7 +15,7 @@ module MarkdownRecord
       end
 
       def self.remove_dsl(text)
-        text.gsub(ENCODED_REGEX, "")
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
       end
     end
   end

data/lib/markdown_record/rendering/content_dsl/model.rb

@@ -0,0 +1,22 @@
+module MarkdownRecord
+  module ContentDsl
+    module Model
+      REGEX = /<!--\s*model\s*({[\s"'\\\w:,.\[\]\{\}_\/|\-]*})\s*-->/
+      ENCODED_REGEX = /&lt;!--\s*model\s*({[\s"'\\\w:,.\[\]\{\}_\/|\-]*})\s*--&gt;/
+
+      def model_dsl(text)
+        match = text.match(REGEX)
+
+        if match
+          JSON.parse(match[1])
+        else
+          nil
+        end
+      end
+
+      def self.remove_dsl(text)
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
+      end
+    end
+  end
+end

data/lib/markdown_record/rendering/content_dsl/scope.rb

@@ -0,0 +1,22 @@
+module MarkdownRecord
+  module ContentDsl
+    module Scope
+      REGEX = /<!--\s*scope\s*:\s*(.*)\s*-->/
+      ENCODED_REGEX = /&lt;!--\s*scope\s*:\s*(.*)\s*--&gt;/
+
+      def scope_dsl(text)
+        match = text.match(REGEX)
+
+        if match
+          match[1].strip
+        else
+          nil
+        end
+      end
+
+      def self.remove_dsl(text)
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
+      end
+    end
+  end
+end

data/lib/markdown_record/{content_dsl → rendering/content_dsl}/use_layout.rb

@@ -1,8 +1,8 @@
 module MarkdownRecord
   module ContentDsl
     module UseLayout
-      REGEX = /(?<!`|`\\n|`html\\n)<!--\s*use_layout\s*:\s*(.*)\s*-->(?!`|\\n`)/
-      ENCODED_REGEX = /(?<!<code>|<code class="html">)&lt;!--\s*use_layout\s*:\s*(.*)\s*--&gt;(?!<\/code>)/
+      REGEX = /<!--\s*use_layout\s*:\s*(.*)\s*-->/
+      ENCODED_REGEX = /&lt;!--\s*use_layout\s*:\s*(.*)\s*--&gt;/
 
       def use_layout_dsl(text)
         match = text.match(REGEX)
@@ -15,7 +15,7 @@ module MarkdownRecord
       end
 
       def self.remove_dsl(text)
-        text.gsub(ENCODED_REGEX, "")
+        text.gsub(REGEX, "").gsub(ENCODED_REGEX, "")
       end
     end
   end

data/lib/markdown_record/rendering/content_dsl.rb

@@ -0,0 +1,45 @@
+require "markdown_record/rendering/content_dsl/scope"
+require "markdown_record/rendering/content_dsl/model"
+require "markdown_record/rendering/content_dsl/attribute"
+require "markdown_record/rendering/content_dsl/end_attribute"
+require "markdown_record/rendering/content_dsl/end_model"
+require "markdown_record/rendering/content_dsl/fragment"
+require "markdown_record/rendering/content_dsl/directory_fragment"
+require "markdown_record/rendering/content_dsl/use_layout"
+require "markdown_record/rendering/content_dsl/disable"
+require "markdown_record/rendering/content_dsl/enable"
+
+module MarkdownRecord
+  module ContentDsl
+    include Scope
+    include Model
+    include Attribute
+    include EndAttribute
+    include EndModel
+    include DirectoryFragment
+    include Fragment
+    include UseLayout
+    include Disable
+    include Enable
+
+    HTML_COMMENT_REGEX = /(<!--(?:(?:\s|.)(?!-->))*(?:.|\s)-->)/
+
+    def remove_json_dsl_commands(text)
+      text = Scope.remove_dsl(text)
+      text = Model.remove_dsl(text)
+      text = Attribute.remove_dsl(text)
+      text = EndAttribute.remove_dsl(text)
+      text = EndModel.remove_dsl(text)
+      text = DirectoryFragment.remove_dsl(text)
+      text = Fragment.remove_dsl(text)
+      text = Disable.remove_dsl(text)
+      text = Enable.remove_dsl(text)
+      text
+    end
+
+    def remove_html_dsl_command(text)
+      text = UseLayout.remove_dsl(text)
+      text
+    end
+  end
+end

data/lib/markdown_record/rendering/html_renderer.rb

@@ -0,0 +1,22 @@
+require "redcarpet"
+require "htmlbeautifier"
+
+module MarkdownRecord
+  class HtmlRenderer < ::Redcarpet::Render::HTML
+
+    def initialize(
+        file_saver: ::MarkdownRecord::FileSaver.new)
+      super(::MarkdownRecord.config.html_render_options)
+      @markdown = ::Redcarpet::Markdown.new(self, ::MarkdownRecord.config.markdown_extensions)
+      @file_saver = file_saver
+    end
+
+    def render_html_for_subdirectory(subdirectory: "", **options)
+      
+      start_path = ::MarkdownRecord.config.content_root.join(subdirectory)
+      node = MarkdownRecord::Rendering::Nodes::HtmlDirectory.new(start_path, @markdown, options)
+
+      node.render(@file_saver)
+    end
+  end
+end

data/lib/markdown_record/{indexer.rb → rendering/indexer.rb}

@@ -8,16 +8,6 @@ module MarkdownRecord
       index
     end
 
-    def file(path)
-      file_path = ::MarkdownRecord.config.content_root.join(path)
-
-      if Pathname.new(path).extname == ".md" && file_path.exist?
-        File.read(file_path)
-      else
-        nil
-      end
-    end
-
     def recursive_index(parent_dir_path, index)
       parent_root = Dir.new(parent_dir_path)
       parent_root.children.each do |child|

data/lib/markdown_record/rendering/json_renderer.rb

@@ -0,0 +1,20 @@
+require "redcarpet"
+require "redcarpet/render_strip"
+
+module MarkdownRecord
+  class JsonRenderer
+    include ::MarkdownRecord::PathUtilities
+    include ::MarkdownRecord::ContentDsl
+
+    def initialize(file_saver: ::MarkdownRecord::FileSaver.new)
+      @file_saver = file_saver
+    end
+
+    def render_models_for_subdirectory(subdirectory: "", **options)
+      start_path = ::MarkdownRecord.config.content_root.join(subdirectory)
+      node = MarkdownRecord::Rendering::Nodes::JsonDirectory.new(start_path, options, true)
+      node.render(@file_saver)
+      node.json_models
+    end
+  end
+end