makasi 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1d8cd6806f4cf0dff6229a06860871637114ff6
-  data.tar.gz: 73dee94fad87099d4562381c85d9451554e28e1e
+  metadata.gz: b5526f72e030783699186fd2b99ee0a9a9eb4ee5
+  data.tar.gz: 3c20ffec77ebc98474facacb2fbeee196efc2ec7
 SHA512:
-  metadata.gz: 45a003e1e07c7d4320c3280fee68670da796f45f22ee9d8dd61054d7e3bb78a41215ee47737e51a40e39266dd5eb06fdc41eeb36c9bb4595a6c8febb00cedb69
-  data.tar.gz: 1229e154569406c45bba8be8659603be501152bf5d51d901ec9de043d9f005a694050922e91301062db86d84e66bbf27c7306510e07d45c7763b17b2677f3ff1
+  metadata.gz: e70a7df63169995ce69f380aa573dca3394df8d2a081f5c7b1c4ca7cc72d3bce5560acbc48dc75c4e8c4a1a9b898fc1fb5f934a97bcb97b336f3462811c95245
+  data.tar.gz: f7370894bf1e9d7af162a6818f99bc42621e037cb08f0b22c85734e611e77449d91c07e54420219767c584862723df630ead21d95b76b16df4a75e28c02b27b0

data/lib/makasi.rb

@@ -1,4 +1,5 @@
 require "asari"
+require "makasi/asari_patch"
 require_relative "../app/models/cloud_search_document"
 require "makasi/asari_client"
 require "makasi/asari_result"

data/lib/makasi/asari_patch.rb

@@ -0,0 +1,69 @@
+# Allow the new api syntax of version 2013-01-01
+
+class Asari
+  class Collection
+    def initialize(httparty_response, page_size)
+      resp = httparty_response.parsed_response
+      @total_entries = resp["hits"]["found"]
+      @page_size = page_size
+
+      complete_pages = (@total_entries / @page_size)
+      @total_pages = (@total_entries % @page_size > 0) ? complete_pages + 1 : complete_pages
+      # There's always one page, even for no results
+      @total_pages = 1 if @total_pages == 0
+
+      start = resp["hits"]["start"]
+      @current_page = (start / page_size) + 1
+      if resp["hits"]["hit"].first && resp["hits"]["hit"].first["fields"]
+        @data = {}
+        resp["hits"]["hit"].each { |hit|  @data[hit["id"]] = hit["fields"]}
+      else
+        @data = resp["hits"]["hit"].map { |hit| hit["id"] }
+      end
+    end
+  end
+
+  def search(term, options = {})
+    return Asari::Collection.sandbox_fake if self.class.mode == :sandbox
+    term,options = "",term if term.is_a?(Hash) and options.empty?
+
+    if options[:filter]
+      bq = boolean_query(options[:filter])
+      bq = "(and '#{term.to_s.gsub("'", " ")}' #{bq})" if term.present?
+    end
+    page_size = options[:page_size].nil? ? 10 : options[:page_size].to_i
+
+    url = "http://search-#{search_domain}.#{aws_region}.cloudsearch.amazonaws.com/#{api_version}/search"
+    if options[:filter]
+      url += "?q.parser=structured&q=#{CGI.escape(bq)}"
+    else
+      url += "?q=#{CGI.escape(term.to_s)}"
+    end
+    url += "&size=#{page_size}"
+    url += "&return-fields=#{options[:return_fields].join ','}" if options[:return_fields]
+
+    if options[:page]
+      start = (options[:page].to_i - 1) * page_size
+      url << "&start=#{start}"
+    end
+
+    if options[:rank]
+      rank = normalize_rank(options[:rank])
+      url << "&rank=#{rank}"
+    end
+
+    begin
+      response = HTTParty.get(url)
+    rescue Exception => e
+      ae = Asari::SearchException.new("#{e.class}: #{e.message} (#{url})")
+      ae.set_backtrace e.backtrace
+      raise ae
+    end
+
+    unless response.response.code == "200"
+      raise Asari::SearchException.new("#{response.response.code}: #{response.response.msg} (#{url})")
+    end
+
+    Asari::Collection.new(response, page_size)
+  end
+end

data/lib/makasi/version.rb

@@ -1,3 +1,3 @@
 module Makasi
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/makasi.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "asari"
+  spec.add_dependency "asari", "0.10.4"
   spec.add_dependency "sitemap_generator"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makasi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nataliia Kumeiko
@@ -42,16 +42,16 @@ dependencies:
   name: asari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: sitemap_generator
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +84,7 @@ files:
 - bin/setup
 - lib/makasi.rb
 - lib/makasi/asari_client.rb
+- lib/makasi/asari_patch.rb
 - lib/makasi/asari_result.rb
 - lib/makasi/config.rb
 - lib/makasi/railtie.rb