lei 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88432e6baf81ba924cbd6854c36e7db67687bbae8868bc3d7ef0c20c8e61a396
-  data.tar.gz: b91686862fef7821ba0eeb77535e8f6649a682fdaddd9b62abc4083bb23ea31c
+  metadata.gz: 000f325a9a0e5c76dbcdde0b1abc680d845ef5448f5626cb585d5e27038091e0
+  data.tar.gz: f0699fbe2e6145cf33e51b2eb0bc3e1e9bda7d8c3bd989a1fc1868b395888b02
 SHA512:
-  metadata.gz: 8e42031363973f6bf6f9ac4f2899291616e87b716a85cd93931a2feb0b72294a9a465ae444f481660f4769adc46ee412221e5078a63d57e88fab62f4d3fa28b4
-  data.tar.gz: 9eefaa9d7e99adcf60af755e4fa9dce2045143ff66a48e578407eb8f0d819d88b21cedb6622241c0fddfbb3bcba270b354412c41db517efaeafe8434ba8e81dd
+  metadata.gz: 93a6ee8f6f9bc41e7eceb7148c6c2039b652b8de30cc5e4a57f43c2e207e3fa6ca2f0e1c0cd3a960a01e5dd6602374ce4e1838503cc351f21b1e44dfc434f830
+  data.tar.gz: 852035dc81a85eeaa041dfeffe8d4b3b103765e8b14948ad4a68468011998ee21ba00c1a7a23ca1859e2a7756f5efc9092190c3657aa9898e879a9ae436b11dc

data/bin/_app/_controllers.rb

@@ -44,25 +44,6 @@ content = <<~CONTENT
             }
         end
 
-        get "/filter" do
-            content = ContentHelpers.get_content(settings.content_dir)
-
-            ContentHelpers.filter_content(content, params)
-            redirect 404 if content.length == 0
-
-            url = request.url
-
-            ContentHelpers.time_sort(content)
-            contentParts = ContentHelpers.paginate(content, params, url)
-
-            slim :search_results, locals: {
-                **contentParts,
-                style: ContentHelpers.load_css(settings.stylesheet),
-                title: "Filtered Results",
-                url: url
-            }
-        end
-
         not_found do
             slim :notfound, locals: { **ContentHelpers.nf_404, url: request.url }
         end
@@ -106,11 +87,62 @@ custom = <<~CUSTOM
     end
 CUSTOM
 
+search = <<~SEARCH
+    puts "\\tController: Search"
+
+    class SearchController < Sinatra::Base
+
+        set :content_dir, "\#{$root}/{\#{ContentHelpers.get_content_dirs.join(",")}}"
+        set :stylesheet, "search"
+        set :public_folder, $assets_root
+        set :views, $views
+
+        get "/" do
+            url = request.url
+
+            slim :search, locals: {
+                style: ContentHelpers.load_css(settings.stylesheet),
+                title: "Search",
+                url: url
+            }
+        end
+
+        post "/query" do
+            redirect ContentHelpers.get_searchdest(params)
+        end
+
+        get "/results" do
+            content = ContentHelpers.get_content(settings.content_dir)
+
+            ContentHelpers.filter_content(content, params)
+            redirect 404 if content.length == 0
+
+            url = request.url
+
+            ContentHelpers.time_sort(content)
+            contentParts = ContentHelpers.paginate(content, params, url)
+
+            slim :search_results, locals: {
+                **contentParts,
+                style: ContentHelpers.load_css("\#{settings.stylesheet}_results"),
+                title: "Filtered Results",
+                url: url
+            }
+        end
+
+        not_found do
+            slim :notfound, locals: { **ContentHelpers.nf_404, url: request.url }
+        end
+
+    end
+SEARCH
+
 files = {
     "content.rb": content,
-    "custom.rb": custom
+    "custom.rb": custom,
+    "search.rb": search
 }
 
 loc = "$(pwd)/controllers"
 
-makeFiles(files, loc)
+makeFiles(files, loc)

data/bin/_app/_helpers.rb

@@ -46,6 +46,10 @@ content = <<~CONTENT
             all - classified
         end
 
+        def self.get_content_dirs
+            YAML.load_file($contentDirs)
+        end
+
         def self.get_post(contentDir, title)
             content = self.get_content(contentDir)
 
@@ -54,6 +58,35 @@ content = <<~CONTENT
             content.include?(post) ? [ post ] : []
         end
 
+        def self.get_searchdest(params)
+            parts = {}
+    
+            term = params["term"]
+    
+            parts["term"] = self.sanitize_term(term) if !term.nil? && term != ""
+    
+            whenp = params["when"]
+            specificity = params["specificity"]
+    
+            if !whenp.nil? && whenp != "" && !specificity.nil? && specificity != ""
+                begin
+                    whenRange = Date.parse(whenp)
+                    year = "year=\#{whenRange.strftime("%Y")}"
+                    month = "month=\#{whenRange.strftime("%m")}"
+                    day = "day=\#{whenRange.strftime("%d")}"
+    
+                    parts["year"] = year if specificity.match?(/^(year|month|day)$/)
+                    parts["month"] = month if specificity.match?(/^(month|day)$/)
+                    parts["day"] = day if specificity == "day"
+                rescue => exception
+                    \# TODO: Implement exception handling.
+                    \# This block just serves to swallow the exception.
+                end
+            end
+    
+            return self.mp_eu("search/results", parts, {})
+        end
+
         <<~load_css
             This function reads and returns the contents of a CSS file as a string.
             Its return value gets stored in a variable for ease of interpolation in
@@ -64,6 +97,7 @@ content = <<~CONTENT
             `cat \#{$style_root}/\#{filename}.css`
         end
 
+        \# Merge Params, Encode URL.
         def self.mp_eu(path, params, replacement)
             newParams = {}
             params.each { |k, v| newParams[k] = v }
@@ -125,6 +159,15 @@ content = <<~CONTENT
                 CARPET.render(content)
             end
         end
+
+        def self.sanitize_term(path)
+            bannedChars = YAML.load_file($bannedChars)
+    
+            processed = path
+            bannedChars.each { |char| processed = path.gsub(char, "") }
+    
+            return processed
+        end
         
         def self.time_sort(content)
             content.sort_by! { |c| File::Stat.new(c).mtime }
@@ -153,6 +196,8 @@ module GlobalUtils
         $views = "\#{$root}/views"
 
         $banlist = "\#{$root}/banlist.yml"
+        $contentDirs = "\#{$root}/contentlist.yml"
+        $bannedChars = "\#{$root}/illegalchars.yml"
 
         <<~AMP
             AMP Static Header Parts, as of 15 APR 2018:
@@ -177,7 +222,19 @@ module GlobalUtils
 
         $amp_bind = "<script async custom-element=\\"amp-bind\\" src=\\"https://cdn.ampproject.org/v0/amp-bind-0.1.js\\"></script>"
     end
-    
+
+    def self.assemble_query(params)
+        return "" if params.nil? || params.length == 0
+
+        queryString = ""
+        params.each_index do |idx|
+            sym = idx == 0 ? "?" : "&"
+            queryString += "\#{sym}\#{params[idx]}"
+        end
+
+        return queryString
+    end
+
 end
 GLOBAL
 
@@ -188,4 +245,4 @@ files = {
 
 loc = "$(pwd)/helpers"
 
-makeFiles(files, loc)
+makeFiles(files, loc)

data/bin/_app/_root.rb

@@ -51,6 +51,13 @@ config = <<~CONFIG
     end
 CONFIG
 
+contentlist = <<~CONTENTLIST
+    ---
+    - content
+    - welcome
+    ...
+CONTENTLIST
+
 controllerlist = <<~CONTROLLERLIST
     ---
     -
@@ -61,6 +68,10 @@ controllerlist = <<~CONTROLLERLIST
       file: content
       name: ContentController
       path: /content
+    -
+      file: search
+      name: SearchController
+      path: /search
     ...
 CONTROLLERLIST
 
@@ -76,15 +87,19 @@ customlist = <<~CUSTOMLIST
 CUSTOMLIST
 
 dockerfile = <<~DOCKERFILE
-    FROM starefossen/ruby-node:2-10-alpine
+    FROM starefossen/ruby-node:2-10
+
+    RUN gem install lei
+
+    WORKDIR /Users/EMC3/Projects/test
 
-    WORKDIR #{`pwd`}
     COPY . .
 
-    RUN gem install bundler
-    RUN gem install lei
+    RUN bundle install
+
+    EXPOSE 80
 
-    CMD [ "lei", "install_deps" ]
+    CMD puma -b tcp://0.0.0.0:80
 DOCKERFILE
 
 gems = <<~GEMS
@@ -123,7 +138,9 @@ gulp = <<~GULP
                 gulp.dest(cssDest)
             ],
             function(err) {
-                console.log("--- err:", err);
+                if (err) {
+                    console.log("--- err:", err);
+                }
             }
         );
     }
@@ -156,10 +173,17 @@ ignore = <<~IGNORE
     # *.md
 IGNORE
 
+illegalchars = <<~ILLEGALCHARS
+    ---
+    - "."
+    - "/"
+    ...
+ILLEGALCHARS
+
 launch = <<~LAUNCH
-    #!/bin/bash
+    \#!/bin/bash
 
-    # Provide port number as argument.
+    \# Provide port number as argument.
     puma -b tcp://0.0.0.0:$1
 LAUNCH
 
@@ -200,13 +224,15 @@ files = {
     ".gitignore": ignore,
     "banlist.yml": banlist,
     "config.ru": config,
+    "contentlist.yml": contentlist,
     "controllerlist.yml": controllerlist,
     "customlist.yml": customlist,
     "Dockerfile": dockerfile,
     "Gemfile": gems,
     "gulpfile.js": gulp,
+    "illegalchars.yml": illegalchars,
     "launch.sh": launch,
     "package.json": package
 }
 
-makeFiles(files, loc)
+makeFiles(files, loc)

data/bin/_app/_src.rb

@@ -1,6 +1,10 @@
 require_relative "../functions"
 
 common = <<~COMMON
+    @anim-bg-color: {
+        transition: background-color 0.35s, color 0.35s;
+    };
+
     @center-vert: {
         display: flex;
         flex-direction: column;
@@ -24,11 +28,47 @@ common = <<~COMMON
         font-weight: 300;
     };
 
+    @full-bar-dark: {
+        background-color: rgba(0, 0, 0, 0.9);
+        box-sizing: border-box;
+        color: white;
+        width: 100vw;
+    };
+
+    @full-bar-light: {
+        background-color: rgba(0, 0, 0, 0.1);
+        box-sizing: border-box;
+        width: 100vw;
+    };
+
     @full-page: {
+        font-size: 14px;
         width: 100vw;
         min-height: 100vh;
     };
 
+    @link-content: {
+        color: black;
+        font-weight: bold;
+    };
+
+    @link-ad: {
+        color: white;
+        text-decoration: none;
+    };
+
+    @link-al: {
+        color: black;
+        text-decoration: none;
+    };
+
+    @spread-vert: {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+    };
+
     @std-content: {
         max-width: 50em;
         width: 80vw;
@@ -44,7 +84,7 @@ common = <<~COMMON
 
     .base-page {
         -webkit-tap-highlight-color: transparent;
-        font-family: "Lato", sans-serif;
+        font-family: 'Lato', sans-serif;
         background-color: rgb(240, 240, 240);
         @std-margin();
 
@@ -66,11 +106,61 @@ common = <<~COMMON
         .space-to-left {
             padding-left: 1em;
         }
-        
+
         .space-to-right {
             padding-right: 1em;
         }
     };
+
+    .main-icon {
+        @fs10();
+        padding: 0em;
+    }
+
+    .std-mp {
+        @std-margin();
+        @std-padding();
+    };
+
+    .page-nav-button {
+        padding: 0em;
+
+        a {
+            .std-mp;
+            @anim-bg-color();
+            @full-bar-light();
+            @link-al();
+            bottom: 0vh;
+            display: block;
+            text-align: center;
+        }
+
+        a:hover {
+            @anim-bg-color();
+            @full-bar-dark();
+            @link-ad();
+        }
+    }
+
+    .index-section {
+        @full-page();
+        @spread-vert();
+
+        p:nth-child(2) {
+            .main-icon;
+        }
+
+        p:last-child {
+            .page-nav-button;
+        }
+    }
+
+    .return-previous {
+        p:first-child {
+            .page-nav-button;
+        }
+    }
+
 COMMON
 
 content = <<~CONTENT
@@ -124,6 +214,72 @@ notfound = <<~NOTFOUND
     }
 NOTFOUND
 
+search = <<~SEARCH
+    @import "_common";
+
+    html, body {
+        .base-page;
+    }
+
+    h1 {
+        @fw300();
+    }
+
+    #search {
+        @center-vert();
+        @full-page();
+
+        input, select {
+            border: 1px solid rgb(100, 100, 100);
+            border-radius: 0.2em;
+            display: block;
+            font-size: 1.6em;
+            margin-bottom: 1em;
+            padding: 0.4em;
+        }
+
+        input[type="submit"], select {
+            width: 100%;
+        }
+
+        input:focus, select:focus {
+            outline: none;
+            box-shadow: 0 0 0 0.05em rgba(0, 123, 255, .5);
+        }
+
+        select {
+            -webkit-appearance: none;
+            -moz-appearance: none;
+            appearance: none;
+        }
+    }
+SEARCH
+
+searchresults = <<~SEARCHRESULTS
+    @import "_common";
+
+    html, body {
+        .base-page;
+    }
+
+    h1 {
+        @fw300();
+    }
+
+    #results {
+        @center-vert();
+        @full-page();
+    }
+
+    .content {
+        padding-bottom: 8px;
+        padding-left: 24px;
+        padding-right: 24px;
+        padding-top: 24px;
+        @std-content();
+    }
+SEARCHRESULTS
+
 welcome = <<~WELCOME
     @import "_common";
 
@@ -140,7 +296,7 @@ welcome = <<~WELCOME
             @fw300();
             text-align: center;
         }
-    
+
         h2 {
             @fs2();
             @fw300();
@@ -162,9 +318,11 @@ files = {
     "_common.less": common,
     "content.less": content,
     "notfound.less": notfound,
+    "search.less": search,
+    "search_results.less": searchresults,
     "welcome.less": welcome
 }
 
 filesLoc = "#{dirLoc}/styles"
 
-makeFiles(files, filesLoc)
+makeFiles(files, filesLoc)

data/bin/_app/_static.rb

@@ -4,4 +4,4 @@ dirs = [ "styles" ]
 
 loc = "$(pwd)/static"
 
-makeDirs(dirs, loc)
+makeDirs(dirs, loc)

data/bin/_app/_views.rb

@@ -78,6 +78,38 @@ results = <<~RESULTS
                     == post
 RESULTS
 
+search = <<~SEARCH
+    doctype html
+    html[amp]
+        == slim :"global_partials/head",
+                locals: { title: title, style: style, url: url }
+        body
+            div#search
+                h1.content Search
+                form[action="/search/query" method="POST"]
+                    input[
+                        class="search-input"
+                        name="term"
+                        placeholder="Search term"
+                        type="text"
+                    ]
+                    input[
+                        class="search-input"
+                        name="when"
+                        type="date"
+                    ]
+                    select[name="specificity"]
+                        option[value="" selected=true] (All time)
+                        option[value="year"] Year
+                        option[value="month"] Month
+                        option[value="year"] Day
+                    input[
+                        class="search-input"
+                        name="submit"
+                        type="submit"
+                    ]
+SEARCH
+
 welcome = <<~WELCOME
     doctype html
     html[amp]
@@ -103,6 +135,7 @@ files = {
     "content.slim": content,
     "notfound.slim": notfound,
     "post.slim": post,
+    "search.slim": search,
     "search_results.slim": results,
     "welcome.slim": welcome
 }
@@ -119,4 +152,4 @@ contentFiles = { "pagination.slim": pagination }
 
 contentPartialsLoc = "#{dirLoc}/content_partials"
 
-makeFiles(contentFiles, contentPartialsLoc)
+makeFiles(contentFiles, contentPartialsLoc)

data/bin/_app/_welcome.rb

@@ -10,4 +10,4 @@ files = {
 
 loc = "$(pwd)/welcome"
 
-makeFiles(files, loc)
+makeFiles(files, loc)

data/bin/_new/_content.rb

@@ -25,9 +25,10 @@ def add_new(name)
         end
     CONTENT
 
-    initialContent = "# #{capitalizedName}\nYour content goes here."
+    initialContent = "# #{capitalizedName}\n\nYour content goes here."
 
     cwd = Dir.pwd
+
     controllers = YAML.load_file("#{cwd}/controllerlist.yml")
     controllers.select! { |c| c["file"] != downcasedName }
 
@@ -37,8 +38,18 @@ def add_new(name)
         "path" => "/#{downcasedName}"
     }
 
+    controllers.sort! { |a, b| a["file"] <=> b["file"] }
+
+    content = YAML.load_file("#{cwd}/contentlist.yml")
+    content.select! { |c| c != downcasedName }
+
+    content << downcasedName
+
+    content.sort!
+
     `echo '#{controllers.to_yaml}' > #{cwd}/controllerlist.yml`
+    `echo '#{content.to_yaml}' > #{cwd}/contentlist.yml`
     `mkdir #{cwd}/#{downcasedName}`
     `echo '#{initialContent}' > #{cwd}/#{downcasedName}/#{downcasedName}.md`
     `echo '#{contentController}' > #{cwd}/controllers/#{downcasedName}.rb`
-end
+end

data/bin/_new/_custom.rb

@@ -10,6 +10,7 @@ def add_new(name)
     capitalizedName = name.capitalize
 
     cwd = Dir.pwd
+
     custom = YAML.load_file("#{cwd}/customlist.yml")
     custom.select! { |c| c["file"] != downcasedName }
 
@@ -20,6 +21,15 @@ def add_new(name)
         "content" => [ "#{downcasedName}.md" ]
     }
 
+    custom.sort! { |a, b| a["name"] <=> b["name"] }
+
+    content = YAML.load_file("#{cwd}/contentlist.yml")
+    content.select! { |c| c != downcasedName }
+
+    content << downcasedName
+
+    content.sort!
+
     customView = <<~VIEW
         doctype html
         html[amp]
@@ -60,12 +70,13 @@ def add_new(name)
         }
     STYLE
 
-    initialContent = "# #{capitalizedName}\nYour content goes here."
+    initialContent = "# #{capitalizedName}\n\nYour content goes here."
 
     `echo '#{custom.to_yaml}' > #{cwd}/customlist.yml`
+    `echo '#{content.to_yaml}' > #{cwd}/contentlist.yml`
     `mkdir #{cwd}/#{downcasedName}`
     `echo '#{initialContent}' > #{cwd}/#{downcasedName}/#{downcasedName}.md`
     `echo '#{customView}' > #{cwd}/views/#{downcasedName}.slim`
     `echo '#{customStyle}' > #{cwd}/src/styles/#{downcasedName}.less`
     `gulp shrink`
-end
+end

data/bin/docker_utils.rb

@@ -0,0 +1,15 @@
+def dockerExists
+    versionStdout = `docker -v`
+
+    return versionStdout != nil && versionStdout != ""
+end
+
+def dockerNameArgIsValid(nameArg)
+    return nameArg != nil && nameArg != "" && nameArg.match(/^\w+$/)
+end
+
+def dockerVersionArgIsValid(versionArg)
+    return versionArg != nil &&
+        versionArg != "" &&
+        versionArg.match(/^[0-9]\.[0-9]\.[0-9]$/)
+end

data/bin/functions.rb

@@ -4,4 +4,4 @@ end
 
 def makeFiles(files, loc)
     files.each { |k, v| `touch #{loc}/#{k}; echo '#{v}' > #{loc}/#{k}` }
-end
+end

data/bin/lei

@@ -6,6 +6,7 @@ class Lei
         @validArg0 = [
             "content",
             "custom",
+            "docker_deploy",
             "help",
             "install",
             "install_deps"
@@ -15,22 +16,23 @@ class Lei
     def help
         puts <<~MAN
 
-            Usage: lei @(content|custom|help|install) ?(ARG)
+            Usage: lei @(content|custom|help|install|install_deps|docker_deploy) ?(ARG) ?(ARG)
 
             `content`: Generates new serial, filterable content section with pagination. `ARG`: Content subject; should be camel-case!
             `custom`: Generates a single, new, custom page. `ARG`: Page subject.
             `help`: Get info about Lei and its commands.
             `install`: Generates a brand-new installation of Lei.
             `install_deps`: Installs dependencies only, for use with existing app.
+            `docker_deploy`: Builds Docker image based on Dockerfile and deploys image to your registry (requires Docker).
 
         MAN
     end
 
     def install
         require "#{@root}/_app/_root.rb"
-    
+
         Dir.glob("#{@root}/_app/_*.rb").each { |f| require f }
-    
+
         install_deps
     end
 
@@ -42,25 +44,55 @@ class Lei
         `chmod +x launch.sh`
     end
 
+    def docker_deploy
+        require "#{@root}/docker_utils"
+
+        if !dockerExists
+            puts "Docker does not exist; please install it before running this command."
+
+            return
+        end
+
+        arg1 = ARGV[1]
+        arg2 = ARGV[2]
+
+        if !dockerNameArgIsValid(arg1)
+            puts "Please supply project name (one word, alphanumeric only, _ allowed)."
+
+            return
+        end
+
+        if !dockerVersionArgIsValid(arg2)
+            puts "Invalid version format; please adhere to SemVer (Major.Minor.Patch)."
+
+            return
+        end
+
+        `docker build -t #{arg1}:#{arg2} .`
+        `docker push #{arg1}:#{arg2}`
+    end
+
     def go
         arg0 = ARGV[0]
-    
+
         if !@validArg0.include?(arg0)
             puts "Invalid first argument: `#{arg0}`."
             puts "Use argument `help` to get info about Lei and its commands."
-            
+
             return
         end
-    
+
         case arg0
         when "install"
             install
+        when "install_deps"
+            install_deps
+        when "docker_deploy"
+            docker_deploy
         when "content", "custom"
             require "#{@root}/_new/_#{arg0}"
-    
+
             add_new(ARGV[1])
-        when "install_deps"
-            install_deps
         when "help"
             help
         else
@@ -70,4 +102,4 @@ class Lei
 end
 
 lei = Lei.new
-lei.go
+lei.go

data/example/controllers/content.rb

@@ -1,7 +1,7 @@
 puts "\tController: Content"
 
 class ContentController < Sinatra::Base
-    
+
     set :content_dir, "#{$root}/content"
     set :stylesheet, "content"
     set :public_folder, $assets_root
@@ -41,27 +41,8 @@ class ContentController < Sinatra::Base
         }
     end
 
-    get "/filter" do
-        content = ContentHelpers.get_content(settings.content_dir)
-
-        ContentHelpers.filter_content(content, params)
-        redirect 404 if content.length == 0
-
-        url = request.url
-
-        ContentHelpers.time_sort(content)
-        contentParts = ContentHelpers.paginate(content, params, url)
-
-        slim :search_results, locals: {
-            **contentParts,
-            style: ContentHelpers.load_css(settings.stylesheet),
-            title: "Filtered Results",
-            url: url
-        }
-    end
-
     not_found do
         slim :notfound, locals: { **ContentHelpers.nf_404, url: request.url }
     end
 
-end
+end

data/example/controllers/custom.rb

@@ -1,7 +1,7 @@
 puts "\tController: Custom"
 
 class CustomController < Sinatra::Base
-    
+
     set :public_folder, $assets_root
     set :views, $views
 
@@ -30,4 +30,4 @@ class CustomController < Sinatra::Base
         slim :notfound, locals: { **ContentHelpers.nf_404, url: request.url }
     end
 
-end
+end

data/example/controllers/search.rb

@@ -0,0 +1,47 @@
+puts "\tController: Search"
+
+class SearchController < Sinatra::Base
+
+    set :content_dir, "#{$root}/{#{ContentHelpers.get_content_dirs.join(",")}}"
+    set :stylesheet, "search"
+    set :public_folder, $assets_root
+    set :views, $views
+
+    get "/" do
+        url = request.url
+
+        slim :search, locals: {
+            style: ContentHelpers.load_css(settings.stylesheet),
+            title: "Search",
+            url: url
+        }
+    end
+
+    post "/query" do
+        redirect ContentHelpers.get_searchdest(params)
+    end
+
+    get "/results" do
+        content = ContentHelpers.get_content(settings.content_dir)
+
+        ContentHelpers.filter_content(content, params)
+        redirect 404 if content.length == 0
+
+        url = request.url
+
+        ContentHelpers.time_sort(content)
+        contentParts = ContentHelpers.paginate(content, params, url)
+
+        slim :search_results, locals: {
+            **contentParts,
+            style: ContentHelpers.load_css("#{settings.stylesheet}_results"),
+            title: "Filtered Results",
+            url: url
+        }
+    end
+
+    not_found do
+        slim :notfound, locals: { **ContentHelpers.nf_404, url: request.url }
+    end
+
+end

data/example/controllers/test.rb

@@ -3,10 +3,10 @@ require "#{$root}/controllers/content"
 puts "\tController: Test"
 
 class TestController < ContentController
-    
+
     set :content_dir, "#{$root}/test"
     set :stylesheet, "content"
     set :public_folder, $assets_root
     set :views, $views
 
-end
+end

data/example/helpers/content_helpers.rb

@@ -19,30 +19,34 @@ module ContentHelpers
                 !post.match?(Regexp.new(term, true))
             end
         end
-    
+
         yyyy = params["year"]
         if !yyyy.nil? && yyyy.length == 4
             content.reject! { |c| File::Stat.new(c).mtime.year != yyyy.to_i }
         end
-    
+
         mm = params["month"]
         if !mm.nil? && mm.length == 2
             content.reject! { |c| File::Stat.new(c).mtime.month != mm.to_i }
         end
-    
+
         dd = params["day"]
         if !dd.nil? && dd.length == 2
             content.reject! { |c| File::Stat.new(c).mtime.day != dd.to_i }
         end
     end
-    
+
     def self.get_content(contentDir)
         all = Dir.glob("#{contentDir}/*.md")
         classified = YAML.load_file($banlist)
-    
+
         all - classified
     end
 
+    def self.get_content_dirs
+        YAML.load_file($contentDirs)
+    end
+
     def self.get_post(contentDir, title)
         content = self.get_content(contentDir)
 
@@ -51,6 +55,35 @@ module ContentHelpers
         content.include?(post) ? [ post ] : []
     end
 
+    def self.get_searchdest(params)
+        parts = {}
+
+        term = params["term"]
+
+        parts["term"] = self.sanitize_term(term) if !term.nil? && term != ""
+
+        whenp = params["when"]
+        specificity = params["specificity"]
+
+        if !whenp.nil? && whenp != "" && !specificity.nil? && specificity != ""
+            begin
+                whenRange = Date.parse(whenp)
+                year = "year=#{whenRange.strftime("%Y")}"
+                month = "month=#{whenRange.strftime("%m")}"
+                day = "day=#{whenRange.strftime("%d")}"
+
+                parts["year"] = year if specificity.match?(/^(year|month|day)$/)
+                parts["month"] = month if specificity.match?(/^(month|day)$/)
+                parts["day"] = day if specificity == "day"
+            rescue => exception
+                # TODO: Implement exception handling.
+                # This block just serves to swallow the exception.
+            end
+        end
+
+        return self.mp_eu("search/results", parts, {})
+    end
+
     <<~load_css
         This function reads and returns the contents of a CSS file as a string.
         Its return value gets stored in a variable for ease of interpolation in
@@ -61,6 +94,7 @@ module ContentHelpers
         `cat #{$style_root}/#{filename}.css`
     end
 
+    # Merge Params, Encode URL.
     def self.mp_eu(path, params, replacement)
         newParams = {}
         params.each { |k, v| newParams[k] = v }
@@ -76,16 +110,16 @@ module ContentHelpers
             style: self.load_css("notfound")
         }
     end
-    
+
     def self.paginate(content, params, url)
         pageParam = params["page"].to_i
-    
+
         page = pageParam != 0 ? pageParam : 1
         pages = (content.length / 5.0).ceil
         
         firstIndex = (page - 1) * 5
         lastIndex = page * 5 - 1
-    
+
         path = URI(url).path
         pageUrls = [ nil, nil, nil, nil ]
         
@@ -95,14 +129,14 @@ module ContentHelpers
             prev = (page - 1).to_s
             pageUrls[1] = self.mp_eu(path, params, { "page" => prev })
         end
-    
+
         if page < pages
             foll = (page + 1).to_s
             pageUrls[2] = self.mp_eu(path, params, { "page" => foll })
 
             pageUrls[3] = self.mp_eu(path, params, { "page" => pages.to_s })
         end
-    
+
         {
             content: self.parse_md(content[firstIndex..lastIndex]),
             page: page,
@@ -122,10 +156,19 @@ module ContentHelpers
             CARPET.render(content)
         end
     end
-    
+
+    def self.sanitize_term(path)
+        bannedChars = YAML.load_file($bannedChars)
+
+        processed = path
+        bannedChars.each { |char| processed = path.gsub(char, "") }
+
+        return processed
+    end
+
     def self.time_sort(content)
         content.sort_by! { |c| File::Stat.new(c).mtime }
         content.reverse!
     end
 
-end
+end

data/example/helpers/global_utils.rb

@@ -16,6 +16,8 @@ module GlobalUtils
         $views = "#{$root}/views"
 
         $banlist = "#{$root}/banlist.yml"
+        $contentDirs = "#{$root}/contentlist.yml"
+        $bannedChars = "#{$root}/illegalchars.yml"
 
         <<~AMP
             AMP Static Header Parts, as of 15 APR 2018:
@@ -40,5 +42,17 @@ module GlobalUtils
 
         $amp_bind = "<script async custom-element=\"amp-bind\" src=\"https://cdn.ampproject.org/v0/amp-bind-0.1.js\"></script>"
     end
-    
-end
+
+    def self.assemble_query(params)
+        return "" if params.nil? || params.length == 0
+
+        queryString = ""
+        params.each_index do |idx|
+            sym = idx == 0 ? "?" : "&"
+            queryString += "#{sym}#{params[idx]}"
+        end
+
+        return queryString
+    end
+
+end

data/example/spec/spec_helper.rb

@@ -97,4 +97,4 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 =end
-end
+end

data/example/spec/test/content_helper_spec.rb

@@ -12,28 +12,16 @@ RSpec.describe "Tests Module: ContentHelpers" do
     content = ContentHelpers.get_content(fixtures)
 
     it "Tests variable $banlist: Verifies exclusion" do
-        expect(content.length).not_to eq 7
+        expect(content.length).to eq 6
         expect(content).not_to include "#{fixtures}/md-2.md"
     end
 
-    it "Tests method time_sort: Correctly sorts by mtime" do
-        ContentHelpers.time_sort(content)
-
-        expect(content.first).to eq "#{fixtures}/md-1.md"
-        expect(content.last).to eq "#{fixtures}/md-3.md"
-    end
-
     just6 = []
     for i in 1..7
         just6 << "#{fixtures}/md-#{i}.md" if i != 2
     end
     ContentHelpers.time_sort(just6)
 
-    it "Tests method get_content: Correctly retrieves content" do
-        expect(content.length).to eq 6
-        expect(content).to eq just6
-    end
-
     it "Tests method get_post: Correctly retrieves post" do
         post = ContentHelpers.get_post(fixtures, "md-4")
         ContentHelpers.time_sort(post)
@@ -115,52 +103,6 @@ RSpec.describe "Tests Module: ContentHelpers" do
         expect(filtered[0]).to eq "#{fixtures}/md-3.md"
     end
 
-    it "Tests method filter_content: Correctly filters on year" do
-        params = { "year" => "2018" }
-        filtered = just6.clone
-        ContentHelpers.filter_content(filtered, params)
-
-        expect(filtered.length).to eq 6
-
-        params2 = { "year" => "2017" }
-        ContentHelpers.filter_content(filtered, params2)
-
-        expect(filtered.length).to eq 0
-    end
-
-    it "Tests method filter_content: Correctly filters on month" do
-        params = { "year" => "2018", "month" => "05" }
-        filtered = just6.clone
-        ContentHelpers.filter_content(filtered, params)
-
-        expect(filtered.length).to eq 6
-
-        params2 = { "year" => "2018", "month" => "04" }
-        ContentHelpers.filter_content(filtered, params2)
-
-        expect(filtered.length).to eq 0
-    end
-
-    it "Tests method filter_content: Correctly filters on day" do
-        params = { "year" => "2018", "month" => "05", "day" => "03" }
-        filtered = just6.clone
-        ContentHelpers.filter_content(filtered, params)
-
-        expect(filtered.length).to eq 4
-
-        params2 = { "year" => "2018", "month" => "05", "day" => "10" }
-        filtered2 = just6.clone
-        ContentHelpers.filter_content(filtered2, params2)
-
-        expect(filtered2.length).to eq 1
-
-        params3 = { "year" => "2018", "month" => "05", "day" => "04" }
-        filtered3 = just6.clone
-        ContentHelpers.filter_content(filtered3, params3)
-
-        expect(filtered3.length).to eq 1
-    end
-
     it "Tests method parse_md: Correctly generates HTML from Markdown" do
         converted = ContentHelpers.parse_md([ "#{fixtures}/md-1.md" ])
 
@@ -170,7 +112,7 @@ RSpec.describe "Tests Module: ContentHelpers" do
     it "Tests method load_css: Correctly returns CSS file contents" do
         processed = ContentHelpers.load_css("test")
 
-        expect(processed).to eq ".mock{display: none;}"
+        expect(processed).to eq ".mock{display: none;}\n"
     end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lei
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - Ezra Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,10 +57,12 @@ files:
 - bin/_app/_welcome.rb
 - bin/_new/_content.rb
 - bin/_new/_custom.rb
+- bin/docker_utils.rb
 - bin/functions.rb
 - bin/lei
 - example/controllers/content.rb
 - example/controllers/custom.rb
+- example/controllers/search.rb
 - example/controllers/test.rb
 - example/helpers/content_helpers.rb
 - example/helpers/global_utils.rb
@@ -85,8 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A springboard for AMP-ready static sites