makasi 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0ca62cb4cd0c89f424818acd9744b33bc6dcf2c
-  data.tar.gz: 789692ee0f6e269dac5e024c647b6fe39b921b66
+  metadata.gz: 23dc8d1fc9c43883c42dedad1f34a810aa8aa03b
+  data.tar.gz: b20ce7337a730d5a4f0dcc6191956c3e22f81f22
 SHA512:
-  metadata.gz: 9a23e8f8e8fc26017d3c813b285a3451a3ddeb4f2cd8526da210101517be7807662094ff7160109a4db4e11cc6325c43a5e8708c8c4b218f3318d4a46b2bd28f
-  data.tar.gz: d411bd8acee5ad6e1b96f170e306da08d70c65485a4a4ba27aca8d1769c5c6c3378c09facf7eb579c9953c5e5047a619afe8423a72b1c0927d66eba8b960e7dc
+  metadata.gz: 0175a4a58df67675e03934803b2d8ac0384ee2013ebaab4b211ea2662f523e24f94ebba7ff81cde10fccd2653b9b5f5f1bb6c24cd989544eb15191d281bfd90d
+  data.tar.gz: cb968a176a61acabc9f58b5d7dcce0ca5a701168948dfa49a872770f6ef1ac37d3ae2d3f61bb04a0256d6913151760cc18d1ddecde65a424260b714860b79ad3

data/.gitignore

@@ -1 +1,5 @@
 /pkg
+.DS_Store
+.idea
+/*.tmproj
+**.swp

data/Rakefile

@@ -1,2 +1 @@
 require "bundler/gem_tasks"
-

data/lib/makasi.rb

@@ -1,9 +1,11 @@
 require "asari"
+require_relative "../app/models/cloud_search_document"
 require "makasi/asari_client"
 require "makasi/asari_result"
 require "makasi/config"
 require "makasi/search_index"
 require "makasi/version"
+require 'makasi/railtie' if defined?(Rails)
 
 module Makasi
 end

data/lib/makasi/asari_client.rb

@@ -9,7 +9,8 @@ module Makasi
     end
 
     def search(query, params={})
-      asari.search(query, params)
+      default_params = { return_fields: Makasi::Config.asari_return_fields }
+      asari.search(query, default_params.merge(params))
     end
 
     def search_resource_ids(query, resource_type)

data/lib/makasi/config.rb

@@ -20,6 +20,14 @@ module Makasi
       rails_config.website_url
     end
 
+    def self.content_selector
+      rails_config.content_selector || "[data-indexable]"
+    end
+
+    def self.resource_name_selector
+      rails_config.resource_name_selector || "[data-title]"
+    end
+
     def self.cloudsearch_api_version
       rails_config.cloudsearch_api_version.presence || "2013-01-01"
     end

data/lib/makasi/railtie.rb

@@ -0,0 +1,7 @@
+module Makasi
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      Dir["#{File.dirname(__FILE__)}/../tasks/*.rake"].sort.each { |ext| load ext }
+    end
+  end
+end

data/lib/makasi/search_index.rb

@@ -7,7 +7,8 @@ module Makasi
       sync_db_with_sitemap
 
       CloudSearchDocument.desc(:reindexed_at).each do |cloudsearch_doc|
-        html_doc = Nokogiri::HTML(load_page(cloudsearch_doc.url))
+        html_content = load_page(cloudsearch_doc.url)
+        html_doc = Nokogiri::HTML(html_content)
 
         if Rails.logger.debug?
           Rails.logger.debug ">>> URL: "              + cloudsearch_doc.url +
@@ -49,7 +50,7 @@ module Makasi
       url_nodes = Nokogiri::XML(read_sitemap).css('url loc')
 
       url_nodes.each do |url_node|
-        cloudsearch_doc = CloudSearchDocument.find_or_initialize_by(url: url_node.text)
+        cloudsearch_doc = CloudSearchDocument.find_or_initialize_by(url: url_node.text.strip)
         cloudsearch_doc.update_attributes(present_in_sitemap: true)
       end
 
@@ -70,7 +71,7 @@ module Makasi
       ## Patch for indexing from localhost
       if Rails.env.development?
         url += "/" unless url.ends_with?("/")
-        url.gsub! Makasi::Config.website_url, "localhost:3000"
+        url.gsub! Makasi::Config.website_url, "http://localhost:3000/"
       end
 
       parsed_url = URI.parse(url)
@@ -105,7 +106,7 @@ module Makasi
     end
 
     def content_of(doc)
-      content_nodes = doc.css("[data-indexable]")
+      content_nodes = doc.css(Makasi::Config.content_selector)
       if content_nodes.present?
         extract_text(content_nodes)
       else
@@ -134,7 +135,7 @@ module Makasi
     end
 
     def resource_name_of(doc)
-      content_nodes = doc.css("[data-title]")
+      content_nodes = doc.css(Makasi::Config.resource_name_selector)
       if content_nodes.present?
         HTMLEntities.new.decode content_nodes.map(&:text).join(" ")
       else

data/lib/makasi/version.rb

@@ -1,3 +1,3 @@
 module Makasi
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/tasks/search_reindex.rake

@@ -1,8 +1,10 @@
 namespace :makasi do
+  desc "Refresh sitemap and update indices on Amazon CloudSearch"
   task :search_reindex => [:environment, "sitemap:refresh"] do
     Makasi::SearchIndex.new.reindex
   end
 
+  desc "Delete all indices from Amazon CloudSearch and cleanup CloudSearchDocument model"
   task :search_truncate_index => :environment do
     Makasi::AsariClient.new.remove_all
     CloudSearchDocument.delete_all

data/makasi.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://slatestudio.com"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files`.split("\n")
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makasi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nataliia Kumeiko
@@ -73,7 +73,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -83,12 +82,11 @@ files:
 - app/models/cloud_search_document.rb
 - bin/console
 - bin/setup
-- lib/.DS_Store
 - lib/makasi.rb
-- lib/makasi/.DS_Store
 - lib/makasi/asari_client.rb
 - lib/makasi/asari_result.rb
 - lib/makasi/config.rb
+- lib/makasi/railtie.rb
 - lib/makasi/search_index.rb
 - lib/makasi/version.rb
 - lib/tasks/search_reindex.rake