searchyll 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91963903247ac43790bf0f7a55ae0a5cc0f0815d
-  data.tar.gz: 24c9aece4997afeac573169de55459230036638a
+  metadata.gz: 6d90b594ea9e60eb7814951eb5dbd3c5cb4940c1
+  data.tar.gz: 9aefa9b3395bf9164930749a55a86131f4ae4cf0
 SHA512:
-  metadata.gz: 9e5134e6f59e7dd618b3d5365a48909af64b892d31a9cd4c08fdc3b194face394b7215c9d24ba76a665f494665dc93e7c7e6dc263ca7fce69061a18e30573986
-  data.tar.gz: 440ed70523bf1c6b341cb038171c93c2dd27ab40e9bc5882bcb1a8f1931ef29de6cfae777b2dcc9103bbe9e75528fc6019d26ff4281fb80156da259ef5d0dbf6
+  metadata.gz: 4411dd6cba9f869a4dd0f485fdafd18f6fca7ca55e3d93c472a93acc903f9fdd10e3dc58dc187d8760372cf7682d2efaa495ac172081d5c1311db2e2e5c60a66
+  data.tar.gz: eef95afba94a4177bfe5c19c9c37adb97cca12d755ebf83f6a9b742c5ade8f9353a1e200c589383ead6d7862d6da293e157465f478362a9b576e5e0ae8e3e377

data/lib/searchyll/indexer.rb

@@ -49,7 +49,7 @@ module Searchyll
 
     # Prepare our indexing run by creating a new index.
     def prepare_index
-      create_index = http_post("/#{elasticsearch_index_name}")
+      create_index = http_put("/#{elasticsearch_index_name}")
       create_index.body = {
         index: {
           number_of_shards:   configuration.elasticsearch_number_of_shards,
@@ -98,6 +98,7 @@ module Searchyll
     def http_request(klass, path)
       req = klass.new(path)
       req.content_type = 'application/json'
+      req['Accept']    = 'application/json'
       req.basic_auth(uri.user, uri.password)
       req
     end
@@ -161,13 +162,16 @@ module Searchyll
 
       # delete old indices
       cleanup_indices = http_delete("/#{old_indices.join(',')}")
+      puts %(       Old indices: #{old_indices.join(', ')})
 
       # run the prepared requests
       http_start do |http|
         http.request(refresh)
         http.request(add_replication)
         http.request(update_aliases)
-        http.request(cleanup_indices)
+        if !old_indices.empty?
+          http.request(cleanup_indices)
+        end
       end
     end
 

data/lib/searchyll/version.rb

@@ -1,3 +1,3 @@
 module Searchyll
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/searchyll.rb

@@ -19,14 +19,33 @@ begin
     indexers[site].finish
   end
 
-  Jekyll::Hooks.register :posts, :post_render do |post|
+  # gets random pages like your home page
+  Jekyll::Hooks.register :pages, :post_render do |page|
     # strip html
-    nokogiri_doc = Nokogiri::HTML(post.output)
+    nokogiri_doc = Nokogiri::HTML(page.output)
 
-    indexer = indexers[post.site]
-    indexer << post.data.merge({
-      id:     post.id,
-      text: nokogiri_doc.xpath("//article//text()").to_s.gsub(/\s+/, " ")
+    puts %(        indexing page #{page.url})
+
+    indexer = indexers[page.site]
+    indexer << page.data.merge({
+      id:     page.name,
+      url:    page.url,
+      text:   nokogiri_doc.xpath("//article//text()").to_s.gsub(/\s+/, " ")
+    })
+  end
+
+  # gets both posts and collections
+  Jekyll::Hooks.register :documents, :post_render do |document|
+    # strip html
+    nokogiri_doc = Nokogiri::HTML(document.output)
+
+    puts %(        indexing document #{document.url})
+
+    indexer = indexers[document.site]
+    indexer << document.data.merge({
+      id:     document.id,
+      url:    document.url,
+      text:   nokogiri_doc.xpath("//article//text()").to_s.gsub(/\s+/, " ")
     })
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchyll
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Nick Zadrozny
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-07 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to index your Jekyll pages into Elasticsearch.