markdown_record 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cf70bc7bfe4be124645f86a8182c31f2026a5c8c1736b79852e1ca17981b835
-  data.tar.gz: 7ff16d507f7fec68fcf09ecebfa7012cf5c8e700f4ebe74d73e163b83a02cea4
+  metadata.gz: 269413176d8f175aac4611a05b3e877a8f6e35e8d2578693a61b8137ba3e468c
+  data.tar.gz: 9bd2e4bbcfd47f25d95bd89cee4fa55ef702ef12c1c02b3ffb3def240210f034
 SHA512:
-  metadata.gz: 4f28579beda2d8605428020e04db510d9df937513560e5c1c8fb0768767e43573f785584316c7c5748516d9d4881ce0b32db1430a8f658906486af634daf110f
-  data.tar.gz: 5882b40b524c9a121aac21ef9adadc32868e1138c92adc47e8dfbbadc84e71e130526831f3e0a78148f9a04298cdecbae8ac068334542ea788e38d3a0fe16676
+  metadata.gz: cfa28a6d993347abcc68d6a0d28163ea238c67516bb82b0293e4bb1779499db6ac027b508c1c56c9edd88136a6310ee9a3d265226bee2e966e629e8f8e6389c4
+  data.tar.gz: 1ffc583808ddd0886ec481997b52f36fabfeb457bb3c7447c58e3dabd40558111141ec3372634ae5da8a334ce2caec650b2ef7319dfc4334538215dc6c247d19

data/README.md

@@ -2,6 +2,8 @@
 
 Welcome to MarkdownRecord. This project is still in BETA stage, and as such is subject to rapid change. There are many things that still need improving, so bear that in mind. That said, please feel free to test this project out and provide feedback in the form of GitHub issues! Thank you.
 
+You can find the complete usage guide [here](https://markdown-record-docs.herokuapp.com/).
+
 MarkdownRecord is a Rails engine that allows you to write markdown with embedded json like this:
 
 ```md
@@ -100,19 +102,24 @@ The above command will install the engine, resulting in the following output and
       create  markdown_record/content
       create  markdown_record/layouts
       create  markdown_record/rendered
+       exist  app/models
+   identical  app/models/dsl_command.rb
+   identical  app/models/section.rb
        exist  markdown_record/content
-      create  markdown_record/content/controller_helpers.md.erb
-      create  markdown_record/content/configuration.md.erb
-      create  markdown_record/content/sandbox/foo.md
-      create  markdown_record/content/home.md.erb
-      create  markdown_record/content/installation.md.erb
-      create  markdown_record/content/rendering_basics.md.erb
-      create  markdown_record/content/content_dsl.md.erb
-      create  markdown_record/content/routes.md.erb
-      create  markdown_record/content/model_basics.md.erb
-      create  markdown_record/content/content_frags.md.erb
-      create  markdown_record/content/erb_syntax_and_view_helpers.md.erb
-      create  markdown_record/content/custom_models_and_associations.md.erb
+      create  markdown_record/content/10_custom_models_and_associations.md.erb
+      create  markdown_record/content/11_controller_helpers.md.erb
+      create  markdown_record/content/12_configuration.md.erb
+      create  markdown_record/content/13_sandbox/1_foo.md
+      create  markdown_record/content/13_sandbox/2_sandbox_nested/1_bar.md
+      create  markdown_record/content/1_home.md.erb
+      create  markdown_record/content/2_installation.md.erb
+      create  markdown_record/content/3_rendering_basics.md.erb
+      create  markdown_record/content/4_content_dsl.md.erb
+      create  markdown_record/content/5_routes.md.erb
+      create  markdown_record/content/6_model_basics.md.erb
+      create  markdown_record/content/7_content_frags.md.erb
+      create  markdown_record/content/8_erb_syntax_and_view_helpers.md.erb
+      create  markdown_record/content/9_layouts.md.erb
        exist  markdown_record/layouts
       create  markdown_record/layouts/_concatenated_layout.html.erb
       create  markdown_record/layouts/_custom_layout.html.erb
@@ -124,6 +131,7 @@ The above command will install the engine, resulting in the following output and
       create  Thorfile
       create  lib/tasks/render_content.thor
         gsub  config/routes.rb
+        gsub  config/routes.rb
 ```
 
 The files and folders inside `markdown_record/content` are for demo purposes only, and can be deleted once you are ready to create your own content.
@@ -146,56 +154,67 @@ You should see the following output:
 
 ```bash
 ---------------------------------------------------------------
-rendering html and json content with options {:concat=>true, :deep=>true, :save=>true, :layout=>"_concatenated_layout.html.erb", :render_content_fragment_json=>true} ...
+rendering html and json content with options {:concat=>true, :deep=>true, :save=>true, :render_content_fragment_json=>true} ...
 ---------------------------------------------------------------
 rendered: /markdown_record/rendered/content_fragments.json
 rendered: /markdown_record/rendered/content.json
-rendered: /markdown_record/rendered/content/custom_models_and_associations_fragments.json
-rendered: /markdown_record/rendered/content/custom_models_and_associations.json
-rendered: /markdown_record/rendered/content/erb_syntax_and_view_helpers_fragments.json
-rendered: /markdown_record/rendered/content/erb_syntax_and_view_helpers.json
-rendered: /markdown_record/rendered/content/content_frags_fragments.json
-rendered: /markdown_record/rendered/content/content_frags.json
-rendered: /markdown_record/rendered/content/model_basics_fragments.json
-rendered: /markdown_record/rendered/content/model_basics.json
-rendered: /markdown_record/rendered/content/routes_fragments.json
-rendered: /markdown_record/rendered/content/routes.json
-rendered: /markdown_record/rendered/content/content_dsl_fragments.json
-rendered: /markdown_record/rendered/content/content_dsl.json
 rendered: /markdown_record/rendered/content/rendering_basics_fragments.json
 rendered: /markdown_record/rendered/content/rendering_basics.json
-rendered: /markdown_record/rendered/content/installation_fragments.json
-rendered: /markdown_record/rendered/content/installation.json
 rendered: /markdown_record/rendered/content/home_fragments.json
 rendered: /markdown_record/rendered/content/home.json
+rendered: /markdown_record/rendered/content/controller_helpers_fragments.json
+rendered: /markdown_record/rendered/content/controller_helpers.json
+rendered: /markdown_record/rendered/content/erb_syntax_and_view_helpers_fragments.json
+rendered: /markdown_record/rendered/content/erb_syntax_and_view_helpers.json
+rendered: /markdown_record/rendered/content/layouts_fragments.json
+rendered: /markdown_record/rendered/content/layouts.json
+rendered: /markdown_record/rendered/content/configuration_fragments.json
+rendered: /markdown_record/rendered/content/configuration.json
 rendered: /markdown_record/rendered/content/sandbox_fragments.json
 rendered: /markdown_record/rendered/content/sandbox.json
+rendered: /markdown_record/rendered/content/sandbox/sandbox_nested_fragments.json
+rendered: /markdown_record/rendered/content/sandbox/sandbox_nested.json
+rendered: /markdown_record/rendered/content/sandbox/sandbox_nested/bar_fragments.json
+rendered: /markdown_record/rendered/content/sandbox/sandbox_nested/bar.json
 rendered: /markdown_record/rendered/content/sandbox/foo_fragments.json
 rendered: /markdown_record/rendered/content/sandbox/foo.json
-rendered: /markdown_record/rendered/content/configuration_fragments.json
-rendered: /markdown_record/rendered/content/configuration.json
-rendered: /markdown_record/rendered/content/controller_helpers_fragments.json
-rendered: /markdown_record/rendered/content/controller_helpers.json
+rendered: /markdown_record/rendered/content/content_frags_fragments.json
+rendered: /markdown_record/rendered/content/content_frags.json
+rendered: /markdown_record/rendered/content/content_dsl_fragments.json
+rendered: /markdown_record/rendered/content/content_dsl.json
+rendered: /markdown_record/rendered/content/routes_fragments.json
+rendered: /markdown_record/rendered/content/routes.json
+rendered: /markdown_record/rendered/content/model_basics_fragments.json
+rendered: /markdown_record/rendered/content/model_basics.json
+rendered: /markdown_record/rendered/content/installation_fragments.json
+rendered: /markdown_record/rendered/content/installation.json
+rendered: /markdown_record/rendered/content/custom_models_and_associations_fragments.json
+rendered: /markdown_record/rendered/content/custom_models_and_associations.json
 rendered: /markdown_record/rendered/content.html
-rendered: /markdown_record/rendered/content/custom_models_and_associations.html
-rendered: /markdown_record/rendered/content/erb_syntax_and_view_helpers.html
-rendered: /markdown_record/rendered/content/content_frags.html
-rendered: /markdown_record/rendered/content/model_basics.html
-rendered: /markdown_record/rendered/content/routes.html
-rendered: /markdown_record/rendered/content/content_dsl.html
 rendered: /markdown_record/rendered/content/rendering_basics.html
-rendered: /markdown_record/rendered/content/installation.html
 rendered: /markdown_record/rendered/content/home.html
+rendered: /markdown_record/rendered/content/controller_helpers.html
+rendered: /markdown_record/rendered/content/erb_syntax_and_view_helpers.html
+rendered: /markdown_record/rendered/content/layouts.html
+rendered: /markdown_record/rendered/content/configuration.html
 rendered: /markdown_record/rendered/content/sandbox.html
+rendered: /markdown_record/rendered/content/sandbox/sandbox_nested.html
+rendered: /markdown_record/rendered/content/sandbox/sandbox_nested/bar.html
 rendered: /markdown_record/rendered/content/sandbox/foo.html
-rendered: /markdown_record/rendered/content/configuration.html
-rendered: /markdown_record/rendered/content/controller_helpers.html
+rendered: /markdown_record/rendered/content/content_frags.html
+rendered: /markdown_record/rendered/content/content_dsl.html
+rendered: /markdown_record/rendered/content/routes.html
+rendered: /markdown_record/rendered/content/model_basics.html
+rendered: /markdown_record/rendered/content/installation.html
+rendered: /markdown_record/rendered/content/custom_models_and_associations.html
 ---------------------------------------------------------------
-42 files rendered.
-42 files saved.
+51 files rendered.
+51 files saved.
 ```
 
-Congratulations! You have installed MarkdownRecord. If you are not viewing this from the host application already, go ahead and start your Rails server and navigate to http://localhost:3000/mdr/content/home to continue following this guide.
+Congratulations! You have installed MarkdownRecord. If you are not viewing this from the host application already, go ahead and start your Rails server with `rails s` and navigate to http://localhost:3000/mdr/content/home to continue following this guide.
+
+Alternatively, you can find the complete usage guide [here](https://markdown-record-docs.herokuapp.com/).
 
 ## Contributing
 
@@ -220,6 +239,7 @@ To test a local version of this gem in a local app, simply add the `path` parame
 
 - Make the Content DSL extensible
 - Add support for raw JSON files as source content
+- Support semantic versioning in numeric filename prefixes
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/helpers/markdown_record/application_helper.rb

@@ -1,4 +1,27 @@
 module MarkdownRecord
   module ApplicationHelper
+    def method_missing(method, *args, &block)
+      if method.to_s.end_with?('_path') || method.to_s.end_with?('_url')
+        if main_app.respond_to?(method)
+          main_app.send(method, *args)
+        else
+          super
+        end
+      else
+        super
+      end
+    end
+
+    def respond_to?(method)
+      if method.to_s.end_with?('_path') || method.to_s.end_with?('_url')
+        if main_app.respond_to?(method)
+          true
+        else
+          super
+        end
+      else
+        super
+      end
+    end
   end
 end

data/app/helpers/markdown_record/controller_helpers.rb

@@ -33,7 +33,7 @@ module MarkdownRecord
     end
 
     def content_fragment(content_path = params[:content_path])
-      ::MarkdownRecord::ContentFragment.find(content_path)
+      @content_fragment ||= ::MarkdownRecord::ContentFragment.find(content_path)
     end
   end
 end

data/app/helpers/markdown_record/view_helpers.rb

@@ -59,7 +59,7 @@ module MarkdownRecord
       path_to_markdown_record(model, "json", download)
     end
 
-    def url_for_markdown_record_html(model, download = false)
+    def url_for_markdown_record_json(model, download = false)
       path = path_to_markdown_record_json(model, download)
 
       "#{root_url}/#{path}"
@@ -77,8 +77,14 @@ module MarkdownRecord
       "/#{path}"
     end
 
-    def render_html_example(example)
-      CGI.escapeHTML(example)
+    def render_fragment(fragment_or_model)
+      unless fragment_or_model.is_a?(MarkdownRecord::ContentFragment)
+        fragment = fragment_or_model.fragment 
+      end
+
+      fragment ||= fragment_or_model
+      
+      raw(fragment.read_html)
     end
   end
 end

data/{lib → app/models}/markdown_record/base.rb

@@ -9,6 +9,8 @@ module MarkdownRecord
     attribute :type, :type => String
     attribute :subdirectory, :type => String
     attribute :filename, :type => String
+    attribute :scope, :type => String
+    attribute :scoped_id, :type => String
 
     def self.new_association(base_filters = {}, search_filters = {})
       MarkdownRecord::Association.new(base_filters, search_filters)
@@ -21,5 +23,13 @@ module MarkdownRecord
     def self.json_klass
       name.underscore
     end
+
+    def model_name
+      OpenStruct.new param_key: type
+    end
+
+    def to_key
+      scope.nil? ? [id] : ["#{scope}::id"]
+    end
   end
 end

data/{lib → app/models}/markdown_record/content_fragment.rb

@@ -5,6 +5,8 @@ module MarkdownRecord
     attribute :meta, :type => Object
     attribute :concatenated, :type => Boolean
 
+    attribute :__scope__
+
     def initialize(attributes = nil, options = {})
       super
 
@@ -19,12 +21,17 @@ module MarkdownRecord
       MarkdownRecord::Association.new(base_filters, search_filters).fragmentize
     end
 
+    def find_relative(relative_id)
+      real_id = Pathname.new(id).parent.join(relative_id).to_s
+      self.class.find(real_id)
+    end
+
     def fragment_id
       id
     end
 
     def name
-      meta[:name]
+      meta[:name] || Pathname.new(id).basename.to_s
     end
 
     def exists?
@@ -69,7 +76,14 @@ module MarkdownRecord
     end
 
     def parent
-      self.class.find(meta[:parent_id] || subdirectory)
+      if meta[:parent_id].present?
+        self.class.find(meta[:parent_id])
+      elsif meta[:relative_parent_id].present?
+        real_id = Pathname.new(id).parent.join(meta[:relative_parent_id])
+        self.class.find(real_id)
+      else
+        self.class.find(subdirectory)
+      end
     end
 
     def ancestors_from(ancestor)
@@ -94,6 +108,7 @@ module MarkdownRecord
     def parents_from(ancestor)
       ancestor = self.class.find(ancestor) if ancestor.is_a?(String)
 
+
       parents = []
       current_parent = self
 

data/lib/generators/markdown_record_generator.rb

@@ -4,6 +4,7 @@ require "rails/generators"
 class MarkdownRecordGenerator < Rails::Generators::Base
   source_root File.expand_path("../../templates", __dir__)
   class_option :demo, type: :boolean, aliases: :d
+  class_option :tests, type: :boolean, aliases: :t
 
   desc "This generator creates the default directories required for markdown_record and copies the default layout into the default location."
   def create_directories
@@ -14,9 +15,14 @@ class MarkdownRecordGenerator < Rails::Generators::Base
 
   def copy_demo_or_base
     if options[:demo]
+      directory "demo/models", "app/models"
       directory "demo/content", "markdown_record/content"
       directory "demo/layouts", "markdown_record/layouts"
       directory "demo/assets/images", "app/assets/images"
+    elsif options[:tests]
+      directory "tests/content", "markdown_record/content"
+      directory "tests/layouts", "markdown_record/layouts"
+      directory "tests/assets/images", "app/assets/images"
     else
       directory "base/content", "markdown_record/content"
       directory "base/layouts", "markdown_record/layouts"

data/lib/markdown_record/configuration.rb

@@ -19,6 +19,8 @@ module MarkdownRecord
     attr_accessor :render_content_fragment_json
     attr_accessor :render_controller
     attr_accessor :ignore_numeric_prefix
+    attr_accessor :filename_sorter
+    attr_accessor :always_concatenate_json
 
     RENDER_STRATEGIES = [:full, :directory, :file]
 
@@ -33,6 +35,7 @@ module MarkdownRecord
       @global_layout_path = "_global_layout.html.erb"
       @public_layout = "layouts/application"
       @render_strategy = :full
+      @always_concatenate_json = true
       @html_routes = [:show]
       @json_routes = [:show]
       @content_routes = [:show]
@@ -40,6 +43,7 @@ module MarkdownRecord
       @render_content_fragment_json = true
       @render_controller = nil
       @ignore_numeric_prefix = true
+      @filename_sorter = MarkdownRecord::FileSorting::Base.new
     end
 
     def render_strategy_options(strategy = nil)

data/lib/markdown_record/file_sorting/base.rb

@@ -0,0 +1,25 @@
+module MarkdownRecord
+  module FileSorting
+    class Base
+
+      def initialize(sort_regex = /^(\d+)_/)
+        @sort_regex = sort_regex
+      end
+
+      def path_to_sort_value(path)
+        m = path.split("/").last.match(@sort_regex)
+        to_sort_value(m.try(:[], 1))
+      end
+
+      def to_sort_value(value)
+        value.to_i
+      end
+
+      def remove_prefix(filename_or_id)
+        parts = filename_or_id.split("/")
+        parts = parts.map { |p| p.sub(@sort_regex,"")}
+        parts.join("/")
+      end
+    end
+  end
+end

data/lib/markdown_record/file_sorting/date_sorter.rb

@@ -0,0 +1,14 @@
+module MarkdownRecord
+  module FileSorting
+    class DateSorter < MarkdownRecord::FileSorting::Base
+      def initialize(sort_regex = /^(\d\d\d\d?_\d\d?_\d\d?)/, date_pattern = "%Y_%m_%d")
+        super(sort_regex)
+        @date_pattern = date_pattern || "%Y_%m_%d"
+      end
+
+      def to_sort_value(value)
+        Date.strptime(value, @date_pattern)
+      end
+    end
+  end
+end

data/lib/markdown_record/file_sorting/sem_ver_sorter.rb

@@ -0,0 +1,47 @@
+module MarkdownRecord
+  module FileSorting
+    class SemVerSorter < MarkdownRecord::FileSorting::Base
+      def initialize(sort_regex = /(\d+(?:_\d+)*)(?:_|$)/)
+        super(sort_regex)
+      end
+
+      def to_sort_value(value)
+        SemVer.new(value)
+      end
+
+      class SemVer
+        include Comparable
+
+        attr_reader :parts
+
+        def initialize(sem_ver_string)
+          @parts = sem_ver_string.split(/\D/).map(&:to_i)
+        end
+
+        def <=>(other)
+          result = 0
+          index = 0
+
+          while result == 0
+            if parts[index].nil? && other.parts[index].nil?
+              return 0
+            end
+
+            if other.parts[index].nil?
+              return 1
+            end
+
+            if parts[index].nil?
+              return -1
+            end
+
+            result = parts[index] <=> other.parts[index]
+            index += 1
+          end
+          
+          result
+        end
+      end
+    end
+  end
+end

data/lib/markdown_record/{association.rb → models/association.rb}

@@ -2,6 +2,8 @@ require "markdown_record/errors/duplicate_id_error"
 
 module MarkdownRecord
   class Association
+    include MarkdownRecord::PathUtilities
+    
     attr_accessor :base_filters
     attr_accessor :search_filters
     attr_reader :fulfilled
@@ -12,6 +14,7 @@ module MarkdownRecord
       @search_filters = search_filters
       @data = []
       @fulfilled = false
+      @force_render = false
     end
 
     def execute
@@ -22,11 +25,17 @@ module MarkdownRecord
       else
         final_filters.merge!(:exclude_fragments => true)
       end
-      results = MarkdownRecord::ModelInflator.new.where(final_filters)
+      results = MarkdownRecord::ModelInflator.new(@force_render).where(final_filters)
       @data.push(*results)
       @fulfilled = true
     end
 
+    def force_render
+      reset
+      @force_render = true
+      self
+    end
+
     def fragmentize
       reset
       @include_fragments = true
@@ -120,11 +129,19 @@ module MarkdownRecord
       @data.fourth(...)
     end
 
-    def __find__(id)
+    def __find__(id, scope = nil)
       reset
-      search_filters.merge!({:id => id})
+
+      if scope.nil?
+        search_filters.merge!({:id => id, :scope => scope})
+      else
+        search_filters.merge!({:scoped_id => to_scoped_id(scope, id)})
+      end
+      
       execute
+
       raise ::MarkdownRecord::Errors::DuplicateIdError.new(@base_filters[:klass].name, id) if @data.count > 1
+
       @data.first
     end
   end

data/lib/markdown_record/{associations.rb → models/associations.rb}

@@ -11,7 +11,7 @@ module MarkdownRecord
         foreign_key = "#{self.name.demodulize.underscore}_id".to_sym
         
         define_method(association) do
-          klass.new_association({:klass => klass, foreign_key => self.id})
+          klass.new_association({:klass => klass, :scope => self.scope, foreign_key => self.id})
         end
       end
 
@@ -22,7 +22,7 @@ module MarkdownRecord
         foreign_key = "#{self.name.demodulize.underscore}_id".to_sym
         
         define_method(association) do
-          results = klass.new_association({:klass => klass, foreign_key => self.id}).all
+          results = klass.new_association({:klass => klass, :scope => self.scope, foreign_key => self.id}).all
           if results.count > 1
             raise ArgumentError.new("Multiple MarkdownRecords belong to the same record in a has_one_content assocition: #{self.class.name} has a has_one_content #{association} and the following records ids were found #{ results.map(&:id) } ")
           end
@@ -40,7 +40,7 @@ module MarkdownRecord
         self.attribute foreign_key unless self.attributes[foreign_key].present?
         
         define_method(association) do
-          klass.find(self[foreign_key])
+          klass.find(self[foreign_key], self.scope)
         end
       end
 
@@ -52,8 +52,16 @@ module MarkdownRecord
         new_association({ :klass => self }, filters)
       end
 
-      def find(id)
-        new_association({ :klass => self }).__find__(id)
+      def force_render_where(filters = {})
+        new_association({ :klass => self }, filters).force_render
+      end
+
+      def find(id, scope = nil)
+        new_association({ :klass => self }).__find__(id, scope)
+      end
+
+      def force_render_find(id, scope = nil)
+        new_association({ :klass => self }).force_render.__find__(id, scope)
       end
 
       def infer_klass(association, options)
@@ -69,20 +77,20 @@ module MarkdownRecord
     end
 
     def siblings(filters = {})
-      self.class.new_association(filters.merge({:subdirectory => subdirectory}).merge!(not_self))
+      self.class.new_association(filters.merge({:subdirectory => subdirectory, :scope => scope}).merge!(not_self))
     end
 
     def class_siblings(filters = {})
-      self.class.new_association(filters.merge({:klass => self.class, :subdirectory => subdirectory, :__not__ => { :id => self.id }}))
+      self.class.new_association(filters.merge({:klass => self.class, :scope => scope, :subdirectory => subdirectory, :__not__ => { :id => self.id }}))
     end
 
     def children(filters = {})
       sub_start = "#{subdirectory}/".delete_prefix("/")
-      self.class.new_association(filters.merge({:subdirectory => Regexp.new("#{sub_start}[\\S|\\w]+")}).merge!(not_self))
+      self.class.new_association(filters.merge({:scope => scope, :subdirectory => Regexp.new("#{sub_start}[\\S|\\w]+")}).merge!(not_self))
     end
 
     def fragment
-      self.class.new_association.fragmentize.__find__(fragment_id)
+      @fragment ||= self.class.new_association.fragmentize.__find__(fragment_id)
     end
 
   private

data/lib/markdown_record/{content_associations.rb → models/content_associations.rb}

@@ -1,6 +1,7 @@
 module MarkdownRecord
   module ContentAssociations
     extend ActiveSupport::Concern
+    include MarkdownRecord::PathUtilities
 
     class_methods do
       def has_many_content(association, **options)
@@ -11,7 +12,7 @@ module MarkdownRecord
         raise ArgumentError.new("#{self} does not have the #{foreign_key} attribute required for this association.") unless self.attribute_names.include?(foreign_key)
 
         define_method(association) do
-          klass.new_association({:klass => klass, :id => self[foreign_key.to_sym]})
+          klass.new_association({:klass => klass, :scoped_id => self[foreign_key.to_sym]})
         end
       end
 
@@ -27,7 +28,8 @@ module MarkdownRecord
         raise ArgumentError.new("#{self} does not have the #{foreign_key} attribute required for this association.") unless self.attribute_names.include?(foreign_key)
         
         define_method(association) do
-          klass.find(self[foreign_key])
+          assoc_scope, assoc_id = scoped_id_to_parts(self[foreign_key])
+          klass.find(assoc_id, assoc_scope)
         end
       end
 

data/lib/markdown_record/models/filtering.rb

@@ -0,0 +1,13 @@
+require "markdown_record/models/filters"
+
+module MarkdownRecord
+  module Models
+    module Filtering
+      def filter_for(filter_value, attribute_value)
+        klass = MarkdownRecord::Models::Filters::FILTER_MAPPING[filter_value.class.name] || MarkdownRecord::Models::BaseFilter
+        
+        klass.new(filter_value, attribute_value)
+      end
+    end
+  end
+end

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

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