asari 0.3.0 → 0.3.4

data/lib/asari.rb

@@ -8,9 +8,12 @@ require "json"
 require "cgi"
 
 class Asari
-  class << self
-    attr_accessor :mode
-    @mode = :sandbox
+  def self.mode
+    @@mode
+  end
+
+  def self.mode=(mode)
+    @@mode = mode
   end
 
   attr_writer :api_version
@@ -83,7 +86,11 @@ class Asari
   #
   def add_item(id, fields)
     return nil if self.class.mode == :sandbox
-    query = { "type" => "add", "id" => id, "version" => 1, "lang" => "en" }
+    query = { "type" => "add", "id" => id.to_s, "version" => 1, "lang" => "en" }
+    fields.each do |k,v|
+      fields[k] = "" if v.nil?
+    end
+
     query["fields"] = fields
     doc_request(query)
   end
@@ -123,7 +130,7 @@ class Asari
   def remove_item(id)
     return nil if self.class.mode == :sandbox
 
-    query = { "type" => "delete", "id" => id, "version" => 2 }
+    query = { "type" => "delete", "id" => id.to_s, "version" => 2 }
     doc_request query
   end
 
@@ -149,3 +156,5 @@ class Asari
     nil
   end
 end
+
+Asari.mode = :sandbox # default to sandbox

data/lib/asari/active_record.rb

@@ -2,7 +2,7 @@ class Asari
   # Public: This module should be included in any class inheriting from
   # ActiveRecord::Base that needs to be indexed. Every time this module is
   # included, asari_index *must* be called (see below). Including this module
-  # will automatically create before_delete, after_create, and after_update AR
+  # will automatically create before_destroy, after_create, and after_update AR
   # callbacks to remove, add, and update items in the CloudSearch index
   # (respectively).
   #
@@ -10,9 +10,11 @@ class Asari
     def self.included(base)
       base.extend(ClassMethods)
 
-      base.before_delete :asari_remove_from_index
-      base.after_create :asari_add_to_index
-      base.after_update :asari_update_in_index
+      base.class_eval do
+        before_destroy :asari_remove_from_index
+        after_create :asari_add_to_index
+        after_update :asari_update_in_index
+      end
     end
 
     def asari_remove_from_index
@@ -46,40 +48,48 @@ class Asari
       #       asari_index("my-companies-users-asglkj4rsagkjlh34", [:name, :email])
       #
       def asari_index(search_domain, fields)
-        @asari = Asari.new(search_domain)
-        @fields = fields
+        self.class_variable_set(:@@asari, Asari.new(search_domain))
+        self.class_variable_set(:@@fields, fields)
+      end
+
+      def asari_instance
+        self.class_variable_get(:@@asari)
+      end
+
+      def asari_fields
+        self.class_variable_get(:@@fields)
       end
 
       # Internal: method for adding a newly created item to the CloudSearch
       # index. Should probably only be called from asari_add_to_index above.
       def asari_add_item(obj)
         data = {}
-        @fields.each do |field|
-          data[field] = obj.send(field)
+        self.asari_fields.each do |field|
+          data[field] = obj.send(field) || ""
         end
-        @asari.add_item(obj.send(:id), data)
+        self.asari_instance.add_item(obj.send(:id), data)
       rescue Asari::DocumentUpdateException => e
-        asari_on_error(e)
+        self.asari_on_error(e)
       end
 
       # Internal: method for updating a freshly edited item to the CloudSearch
       # index. Should probably only be called from asari_update_in_index above.
       def asari_update_item(obj)
         data = {}
-        @fields.each do |field|
+        self.asari_fields.each do |field|
           data[field] = obj.send(field)
         end
-        @asari.update_item(obj.send(:id), data)
+        self.asari_instance.update_item(obj.send(:id), data)
       rescue Asari::DocumentUpdateException => e
-        asari_on_error(e)
+        self.asari_on_error(e)
       end
 
       # Internal: method for removing a soon-to-be deleted item from the CloudSearch
       # index. Should probably only be called from asari_remove_from_index above.
       def asari_remove_item(obj)
-        @asari.remove_item(obj.send(:id))
+        self.asari_instance.remove_item(obj.send(:id))
       rescue Asari::DocumentUpdateException => e
-        asari_on_error(e)
+        self.asari_on_error(e)
       end
 
       # Public: method for searching the index for the specified term and
@@ -91,7 +101,7 @@ class Asari
       # Raises: an Asari::SearchException error if there are issues
       #   communicating with the CloudSearch server.
       def asari_find(term)
-        ids = @asari.search(term).map { |id| id.to_i }
+        ids = self.asari_instance.search(term).map { |id| id.to_i }
         begin
           self.find(*ids)
         rescue ::ActiveRecord::RecordNotFound

data/lib/asari/version.rb

@@ -1,3 +1,3 @@
 class Asari
-  VERSION = "0.3.0"
+  VERSION = "0.3.4"
 end

data/spec/active_record_spec.rb

@@ -5,11 +5,11 @@ describe Asari do
     describe "when CloudSearch is responding without error" do
       before :each do
         @asari = double()
-        ActiveRecordFake.instance_variable_set(:@asari, @asari)
+        ActiveRecordFake.class_variable_set(:@@asari, @asari)
       end
 
-      it "correctly sets up a before_delete listener" do
-        expect(ActiveRecordFake.instance_variable_get(:@before_delete)).to eq(:asari_remove_from_index)
+      it "correctly sets up a before_destroy listener" do
+        expect(ActiveRecordFake.instance_variable_get(:@before_destroy)).to eq(:asari_remove_from_index)
       end
 
       it "correctly sets up an after_create listener" do
@@ -60,7 +60,7 @@ describe Asari do
 
     describe "When CloudSearch is being a problem" do
       before :each do
-        ActiveRecordFake.instance_variable_set(:@asari, Asari.new("test-domain"))
+        ActiveRecordFake.class_variable_set(:@@asari, Asari.new("test-domain"))
         stub_const("HTTParty", double())
         HTTParty.stub(:post).and_return(fake_error_response)
         HTTParty.stub(:get).and_return(fake_error_response)

data/spec_helper.rb

@@ -2,6 +2,9 @@ require 'asari'
 require 'asari/active_record'
 require 'ostruct'
 
+# Fake production mode to test.
+Asari.mode = :production
+
 RSpec.configuration.expect_with(:rspec) { |c| c.syntax = :expect }
 
 def fake_response
@@ -29,8 +32,8 @@ end
 
 class ActiveRecordFake
   class << self
-    def before_delete(sym)
-      @before_delete = sym
+    def before_destroy(sym)
+      @before_destroy = sym
     end
 
     def after_create(sym)
@@ -68,10 +71,6 @@ class ActiveRecordFake
 end
 
 class ActiveRecordFakeWithErrorOverride < ActiveRecordFake
-  include Asari::ActiveRecord
-
-  asari_index("test-domain", [:name, :email])
-
   def self.asari_on_error(exception)
     false
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asari
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70106563512800 !ruby/object:Gem::Requirement
+  requirement: &70351657843560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106563512800
+  version_requirements: *70351657843560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70106563528480 !ruby/object:Gem::Requirement
+  requirement: &70351657841900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70106563528480
+  version_requirements: *70351657841900
 description: Asari s a Ruby interface for AWS CloudSearch
 email:
 - tommy@wellbredgrapefruit.com