jekyll_pages_api_search 0.3.2 → 0.4.0

data/lib/jekyll_pages_api_search/standalone.rb

@@ -1,7 +1,7 @@
 # @author Mike Bland (michael.bland@gsa.gov)
 
-require_relative 'compressor'
-require_relative 'site'
+require_relative './compressor'
+require_relative './site'
 require 'fileutils'
 require 'jekyll_pages_api'
 
@@ -30,7 +30,7 @@ module JekyllPagesApiSearch
         File.open(outfile, 'w') {|f| f << content}
       end
       Compressor::gzip_in_memory_content output
-      JavascriptCopier::copy_to_basedir site.source
+      Assets::copy_to_basedir site.source
     end
   end
 end

data/lib/jekyll_pages_api_search/tags.rb

@@ -7,9 +7,14 @@ module JekyllPagesApiSearch
     NAME = 'jekyll_pages_api_search_interface'
     Liquid::Template.register_tag(NAME, self)
     CODE = File.read(File.join(File.dirname(__FILE__), 'search.html'))
+    TEMPLATE = Liquid::Template.parse(CODE)
 
     def render(context)
-      CODE
+      site = context.registers[:site]
+      baseurl = site.config['baseurl'] || ''
+      search_endpoint = site.config['search_endpoint'] || 'search/'
+      search_endpoint = "/#{baseurl}/#{search_endpoint}/".gsub('//', '/')
+      TEMPLATE.render('search_endpoint' => search_endpoint)
     end
   end
 
@@ -29,4 +34,13 @@ module JekyllPagesApiSearch
         "</script>"
     end
   end
+
+  class SearchResultsTag < Liquid::Tag
+    NAME = 'jekyll_pages_api_search_results'
+    Liquid::Template.register_tag(NAME, self)
+
+    def render(context)
+      '<ol id=\'search-results\'></ol>'
+    end
+  end
 end

data/lib/jekyll_pages_api_search/version.rb

@@ -1,5 +1,5 @@
 # @author Mike Bland (michael.bland@gsa.gov)
 
 module JekyllPagesApiSearch
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_pages_api_search
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Mike Bland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll_pages_api
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -165,11 +151,15 @@ files:
 - assets/js/search-bundle.js
 - assets/js/search-bundle.js.gz
 - assets/js/search.js
+- assets/png/search.png
+- assets/svg/search.svg
 - bin/jekyll_pages_api_search
 - lib/jekyll_pages_api_search.rb
 - lib/jekyll_pages_api_search/assets.rb
 - lib/jekyll_pages_api_search/compressor.rb
-- lib/jekyll_pages_api_search/js_copier.rb
+- lib/jekyll_pages_api_search/config.rb
+- lib/jekyll_pages_api_search/generator.rb
+- lib/jekyll_pages_api_search/layouts/search-results.html
 - lib/jekyll_pages_api_search/lunr.min.js
 - lib/jekyll_pages_api_search/sass.rb
 - lib/jekyll_pages_api_search/sass/jekyll_pages_api_search.scss
@@ -177,6 +167,8 @@ files:
 - lib/jekyll_pages_api_search/search.js
 - lib/jekyll_pages_api_search/search.rb
 - lib/jekyll_pages_api_search/search_hook.rb
+- lib/jekyll_pages_api_search/search_page.rb
+- lib/jekyll_pages_api_search/search_page_layouts.rb
 - lib/jekyll_pages_api_search/site.rb
 - lib/jekyll_pages_api_search/standalone.rb
 - lib/jekyll_pages_api_search/tags.rb

data/lib/jekyll_pages_api_search/js_copier.rb

@@ -1,33 +0,0 @@
-# @author Mike Bland (michael.bland@gsa.gov)
-
-require 'fileutils'
-require 'jekyll/static_file'
-
-module JekyllPagesApiSearch
-  class JavascriptCopier
-    SOURCE = File.realpath(File.join(File.dirname(__FILE__), '..', '..'))
-    ASSETS_DIR = File.join('assets', 'js')
-    BEGIN_PATH = SOURCE.size + File::SEPARATOR.size
-
-    def self.copy_to_site(site)
-      self.search_bundle_paths do |f|
-        site.static_files << ::Jekyll::StaticFile.new(
-          site, SOURCE, File.dirname(f), File.basename(f))
-      end
-    end
-
-    def self.copy_to_basedir(basedir)
-      target_path = File.join basedir, ASSETS_DIR
-      FileUtils.mkdir_p target_path
-      self.search_bundle_paths {|f| FileUtils.cp f, target_path}
-    end
-
-    private
-
-    def self.search_bundle_paths
-      Dir.glob(File.join(SOURCE, ASSETS_DIR, 'search-bundle.js*')) do |f|
-        yield f[BEGIN_PATH..-1]
-      end
-    end
-  end
-end