rawscsi 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191d7e24f624e40fd9fa23e4302ca049dc000997
-  data.tar.gz: e6c546867bbcc27af129080cae9491da79924e5a
+  metadata.gz: 760003135e883d26c8cd64bdd89b9dfbfd4157d9
+  data.tar.gz: a8b6715c316df621c23815f5ee39bd40e925af8e
 SHA512:
-  metadata.gz: 4420bda7c0da056b5c4fa0f0a4d5029fcc27212b3aab312d5a914e56075d4c537f45bead88808954e5b48e82451d3cd9ccf176c7bd2aaf406d8911405db2d1a9
-  data.tar.gz: a34736aab813ccde1b89914c4e18b7a80d6e9f0c5d071f5f5cd7d62042f452ca63c54884aa0c0dcfcba1005f133870915c34f99d92a6467294eb8c4f55aa4ce2
+  metadata.gz: e3e2bae8a4208571263e67638554b9d05a0009592c2c6a3f87f3d73e065cc0f87876913a6442ce40d0c3bfbfcf5827a942618ebee75a56304441f5243b2de5cb
+  data.tar.gz: 6ddc30ae9f1e9e2afcfa696680d05b4312a39f3e08b8c2b3552f4a55759fe847c5eb117055b5ed6918a7a3d3591877df64af0055fc0bbc77d7138e38d1b172af

data/README.md

@@ -108,6 +108,13 @@ book_indexer.upload([
 ```ruby
 song_indexer.delete([3244, 53452, 5435, 64545, 34342, 4545])
 # To delete records in the search domain, you just pass an array of ids (the cloud search record id)
+
+# you can also pass in an array of active record objects to be deleted
+song_indexer.delete([
+  # active record objects
+  <id: 4567, title: "Saturdays Reprise", artist: "Cut Copy", album: "Bright Like Neon Love">
+  <id: 5456, title: "Common Burn", artist: "Mazzy Star", album: "Seasons of Your Day">
+])
 ```
 
 ##### Automatically Batches on cloud search's 5Mb Upload Limit 

data/lib/rawscsi/index_helpers/sdf_delete.rb

@@ -1,18 +1,29 @@
 module Rawscsi
   module IndexHelpers
     class SdfDelete
-      attr_reader :id
+      attr_reader :obj_or_id
 
-      def initialize(id)       
-        @id = id
+      def initialize(obj_or_id)       
+        @obj_or_id = obj_or_id
       end
   
       def build
         {
           :type => "delete",
-          :id => id
+          :id => doc_id
         }
       end
+
+      private
+      def doc_id
+        if obj_or_id.kind_of?(String) || obj_or_id.kind_of?(Numeric)
+          obj_or_id
+        elsif obj_or_id.kind_of?(Hash)
+          obj_or_id[:id]
+        else
+          "#{obj_or_id.class}_#{obj_or_id.id}"
+        end
+      end
     end
   end
 end

data/lib/rawscsi/search_helpers/results_active_record.rb

@@ -7,7 +7,7 @@ module Rawscsi
       end
 
       def build
-        id_array = @response["hits"]["hit"].map {|h| h["id"].to_i }
+        id_array = @response["hits"]["hit"].map {|h| model_id(h["id"]) }
         return [] if id_array.empty?
         results =
           if ActiveRecord::VERSION::MAJOR > 2
@@ -22,6 +22,10 @@ module Rawscsi
       def klass
         @model.constantize 
       end
+
+      def model_id(doc_id)
+        doc_id.split('_').last.to_i
+      end
     end
   end
 end

data/lib/rawscsi/version.rb

@@ -1,3 +1,3 @@
 module Rawscsi
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/rawscsi.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   unless RUBY_VERSION == "1.8.7"
     spec.add_development_dependency "activerecord", "> 2.0"
     spec.add_dependency "httparty", "~> 0.11"
-    spec.add_dependency "faraday", "0.9.0"
+    spec.add_dependency "faraday", "0.9.1"
     spec.add_dependency "faraday_middleware"
   else
     spec.add_development_dependency "activerecord", "2.0"

data/spec/lib/rawscsi/index_helpers/sdf_delete_spec.rb

@@ -7,5 +7,11 @@ describe Rawscsi::IndexHelpers::SdfDelete do
     sdf_hash = Rawscsi::IndexHelpers::SdfDelete.new(id).build
     expect(sdf_hash).to eq({:type => "delete", :id => 4})
   end
+
+  it "constructs an sdf delete json for an active record object" do
+    obj = Movie.new(293428934, "Slingblade", ["Billy Bob Thorton", "Dwight Yokam"], 9)
+    sdf_hash = Rawscsi::IndexHelpers::SdfDelete.new(obj).build
+    expect(sdf_hash).to eq({:type => "delete", :id => "Movie_293428934"})
+  end
 end
 

data/spec/lib/rawscsi/search_spec.rb

@@ -41,7 +41,7 @@ describe Rawscsi::Search do
   it "performs a search with specified return fields" do
     VCR.use_cassette("search_spec/fields") do
       results = @search_helper.search(:q => {:and => [{:title => "Die Hard"}]}, :fields => [:title, :genres])
-      expect(results).to include({"genres"=>["Action", "Thriller"], "title" => "Die Hard", "id" => "tt0095016"})
+      expect(results).to include({"genres"=>["Action", "Thriller"], "title" => "Die Hard", "id"=>"tt0095016"})
       expect(results).to include({"genres"=>["Action", "Thriller"], "title" => "Die Hard 2", "id"=>"tt0099423"})
     end
   end
@@ -52,7 +52,7 @@ describe Rawscsi::Search do
       results = @search_helper.search(:q => {:and => [{:actors => "Kevin Bacon"}, {:actors => "Tom Hanks"}]},
                                       :fields => [:title])
 
-      expect(results).to eq([{"title" => "Apollo 13", "id"=>"tt0112384"}])
+      expect(results).to eq([{"title"=>"Apollo 13", "id"=>"tt0112384"}])
     end
   end
 
@@ -77,7 +77,7 @@ describe Rawscsi::Search do
                                          },
                                       :fields => [:title])
       expect(results).to eq([{"title"=>"The Terminator", "id"=>"tt0088247"},
-                             {"title"=>"Terminator 2: Judgment Day", "id"=>"tt0103064"}])
+                             {"title"=>"Terminator 2: Judgment Day", "id"=>"tt0103064" }])
     end
   end
 
@@ -89,10 +89,9 @@ describe Rawscsi::Search do
                                       :limit => 3,
                                       :fields => [:title])
       expect(results).to eq([
-        {"title"=>"Star Wars: Episode V - The Empire Strikes Back", "id"=>"tt0080684"},
-        {"title"=>"Inception", "id"=>"tt1375666"},
-        {"title"=>"The Matrix", "id"=>"tt0133093"}
-      ])
+              {"title"=> "Star Wars: Episode V - The Empire Strikes Back", "id"=>"tt0080684"},
+              {"title"=>"Inception", "id"=>"tt1375666"},
+              {"title"=>"The Matrix", "id"=>"tt0133093"}])
     end
   end
 
@@ -102,18 +101,20 @@ describe Rawscsi::Search do
       results = @search_helper.search(:q => {:and => [{:plot => "James Bond"}]},
                                       :date => { :release_date => "['1970-01-01',}" },
                                       :fields => [:title])
-      expect(results).to eq([
-        {"title"=>"Moonraker", "id"=>"tt0079574"},
-        {"title"=>"Never Say Never Again", "id"=>"tt0086006"},
-        {"title"=>"The Living Daylights", "id"=>"tt0093428"},
-        {"title"=>"Tomorrow Never Dies", "id"=>"tt0120347"},
-        {"title"=>"The World Is Not Enough", "id"=>"tt0143145"},
-        {"title"=>"GoldenEye", "id"=>"tt0113189"},
-        {"title"=>"Diamonds Are Forever", "id"=>"tt0066995"},
-        {"title"=>"The Spy Who Loved Me", "id"=>"tt0076752"},
-        {"title"=>"Die Another Day", "id"=>"tt0246460"},
-        {"title"=>"Octopussy", "id"=>"tt0086034"}                            
-      ])
+      expect(results).to eq(
+        [
+          {"title"=>"Moonraker", "id"=>"tt0079574"},
+          {"title"=>"Never Say Never Again", "id"=>"tt0086006"},
+          {"title"=>"The Living Daylights", "id"=>"tt0093428"},
+          {"title"=>"Tomorrow Never Dies", "id"=>"tt0120347"},
+          {"title"=>"The World Is Not Enough", "id"=>"tt0143145"},
+          {"title"=>"GoldenEye", "id"=>"tt0113189"},
+          {"title"=>"Diamonds Are Forever", "id"=>"tt0066995"},
+          {"title"=>"The Spy Who Loved Me", "id"=>"tt0076752"},
+          {"title"=>"Die Another Day", "id"=>"tt0246460"},
+          {"title"=>"Octopussy", "id"=>"tt0086034"}
+        ]
+      )
     end
   end
 
@@ -128,18 +129,12 @@ describe Rawscsi::Search do
                   :sort => "rating desc",
                   :fields => [:title],
                   :limit => 10)
-      expect(results).to eq([
-        {"title"=>"Léon", "id"=>"tt0110413"},
-        {"title"=>"The Deer Hunter", "id"=>"tt0077416"},
-        {"title"=>"In the Name of the Father", "id"=>"tt0107207"},
-        {"title"=>"The Graduate", "id"=>"tt0061722"},
-        {"title"=>"There Will Be Blood", "id"=>"tt0469494"},
-        {"title"=>"Papillon", "id"=>"tt0070511"},
-        {"title"=>"All the President's Men", "id"=>"tt0074119"},
-        {"title"=>"Rain Man", "id"=>"tt0095953"},
-        {"title"=>"JFK", "id"=>"tt0102138"},
-        {"title"=>"Midnight Cowboy", "id"=>"tt0064665"}
-      ])
+      expect(results).to include({"title"=>"The Deer Hunter", "id"=>"tt0077416"})
+      expect(results).to include({"title"=>"In the Name of the Father", "id"=>"tt0107207"})
+      expect(results).to include({"title"=>"The Graduate", "id"=>"tt0061722"})
+      expect(results).to include({"title"=>"There Will Be Blood", "id"=>"tt0469494"})
+      expect(results).to include({"title"=>"Papillon", "id"=>"tt0070511" })
+      expect(results).to include({"title"=>"All the President's Men", "id"=>"tt0074119"})
     end
   end
 
@@ -156,18 +151,20 @@ describe Rawscsi::Search do
                   :sort => "rating desc",
                   :fields => [:title],
                   :limit => 10)
-      expect(results).to eq([
-        {"title"=>"Terminator 2: Judgment Day", "id"=>"tt0103064"},
-        {"title"=>"The Terminator", "id"=>"tt0088247"},
-        {"title"=>"Predator", "id"=>"tt0093773"},
-        {"title"=>"First Blood", "id"=>"tt0083944"},
-        {"title"=>"Watchmen", "id"=>"tt0409459"},
-        {"title"=>"Escape Plan", "id"=>"tt1211956"},
-        {"title"=>"Jui kuen II", "id"=>"tt0111512"},
-        {"title"=>"Total Recall", "id"=>"tt0100802"},
-        {"title"=>"Kung Fu Panda 2", "id"=>"tt1302011"},
-        {"title"=>"True Lies", "id"=>"tt0111503"}
-      ])
+      expect(results).to eq(
+        [
+          {"title"=>"Terminator 2: Judgment Day", "id"=>"tt0103064"},
+          {"title"=>"The Terminator", "id"=>"tt0088247"},
+          {"title"=>"Predator", "id"=>"tt0093773"},
+          {"title"=>"First Blood", "id"=>"tt0083944"},
+          {"title"=>"Watchmen", "id"=>"tt0409459"},
+          {"title"=>"Escape Plan", "id"=>"tt1211956"},
+          {"title"=>"Jui kuen II", "id"=>"tt0111512"},
+          {"title"=>"Total Recall", "id"=>"tt0100802"},
+          {"title"=>"Kung Fu Panda 2", "id"=>"tt1302011"},
+          {"title"=>"True Lies", "id"=>"tt0111503"}
+        ]
+      )
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rawscsi
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Steven Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds service objects to upload and search active record models with AWS Cloud