rawscsi 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fc0ad24344cc027b92cb2c104f5f41df83e62b0
-  data.tar.gz: cbcbe38e345550bb1763f864f39caf1a1235f3a7
+  metadata.gz: 191d7e24f624e40fd9fa23e4302ca049dc000997
+  data.tar.gz: e6c546867bbcc27af129080cae9491da79924e5a
 SHA512:
-  metadata.gz: 0a7ce0b0815c543854ca49aad282ade4f0445774d8e9d116792e118990c587fb26df738c8b5479ea70b517907d34679568d56b49f1871031309328a6440ecf17
-  data.tar.gz: ead3c0f6f06b3e7f4e0493a12991190d46d6d88a53d536d4bc121adf4b2e21d48eb93ca58e2b4f46fdafb8175b75a9115cce16d498235da52f2857eea6480aad
+  metadata.gz: 4420bda7c0da056b5c4fa0f0a4d5029fcc27212b3aab312d5a914e56075d4c537f45bead88808954e5b48e82451d3cd9ccf176c7bd2aaf406d8911405db2d1a9
+  data.tar.gz: a34736aab813ccde1b89914c4e18b7a80d6e9f0c5d071f5f5cd7d62042f452ca63c54884aa0c0dcfcba1005f133870915c34f99d92a6467294eb8c4f55aa4ce2

data/lib/rawscsi/search_helpers/results_hash.rb

@@ -6,7 +6,7 @@ module Rawscsi
       end
 
       def build
-        @response["hits"]["hit"].map {|h| h["fields"]}
+        @response["hits"]["hit"].map {|h| h["fields"].merge("id" => h["id"])}
       end
     end
   end

data/lib/rawscsi/version.rb

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

data/spec/lib/rawscsi/search_spec.rb

@@ -41,8 +41,8 @@ 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"})
-      expect(results).to include({"genres"=>["Action", "Thriller"], "title" => "Die Hard 2"})
+      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"}])
+      expect(results).to eq([{"title" => "Apollo 13", "id"=>"tt0112384"}])
     end
   end
 
@@ -61,10 +61,10 @@ describe Rawscsi::Search do
       results = @search_helper.search(:q => {:and => [{:actors => "Arnold"},
                                                 {:title => "Terminator"}]},
                                       :fields => [:title])
-      expect(results).to eq([{"title"=>"Terminator"},
-                             {"title"=>"The Terminator"},
-                             {"title"=>"Terminator 2: Judgment Day"},
-                             {"title"=>"Terminator 3: Rise of the Machines"}])
+      expect(results).to eq([{"title"=>"Terminator", "id"=>"tt1340138"},
+                             {"title"=>"The Terminator", "id"=>"tt0088247"},
+                             {"title"=>"Terminator 2: Judgment Day", "id"=>"tt0103064"},
+                             {"title"=>"Terminator 3: Rise of the Machines", "id"=>"tt0181852"}])
     end
   end
 
@@ -76,8 +76,8 @@ describe Rawscsi::Search do
                                                  {:range => "rating:['8',}"}]
                                          },
                                       :fields => [:title])
-      expect(results).to eq([{"title"=>"The Terminator"},
-                             {"title"=>"Terminator 2: Judgment Day"}])
+      expect(results).to eq([{"title"=>"The Terminator", "id"=>"tt0088247"},
+                             {"title"=>"Terminator 2: Judgment Day", "id"=>"tt0103064"}])
     end
   end
 
@@ -89,9 +89,10 @@ describe Rawscsi::Search do
                                       :limit => 3,
                                       :fields => [:title])
       expect(results).to eq([
-              {"title"=> "Star Wars: Episode V - The Empire Strikes Back"},
-              {"title"=>"Inception"},
-              {"title"=>"The Matrix"}])
+        {"title"=>"Star Wars: Episode V - The Empire Strikes Back", "id"=>"tt0080684"},
+        {"title"=>"Inception", "id"=>"tt1375666"},
+        {"title"=>"The Matrix", "id"=>"tt0133093"}
+      ])
     end
   end
 
@@ -101,16 +102,18 @@ 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"},
-                             {"title"=>"Never Say Never Again"},
-                             {"title"=>"The Living Daylights"},
-                             {"title"=>"Tomorrow Never Dies"},
-                             {"title"=>"The World Is Not Enough"},
-                             {"title"=>"GoldenEye"},
-                             {"title"=>"Diamonds Are Forever"},
-                             {"title"=>"The Spy Who Loved Me"},
-                             {"title"=>"Die Another Day"},
-                             {"title"=>"Octopussy"}])
+      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
 
@@ -125,12 +128,18 @@ describe Rawscsi::Search do
                   :sort => "rating desc",
                   :fields => [:title],
                   :limit => 10)
-      expect(results).to include({"title"=>"The Deer Hunter"})
-      expect(results).to include({"title"=>"In the Name of the Father"})
-      expect(results).to include({"title"=>"The Graduate"})
-      expect(results).to include({"title"=>"There Will Be Blood"})
-      expect(results).to include({"title"=>"Papillon"})
-      expect(results).to include({"title"=>"All the President's Men"})
+      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"}
+      ])
     end
   end
 
@@ -147,16 +156,18 @@ describe Rawscsi::Search do
                   :sort => "rating desc",
                   :fields => [:title],
                   :limit => 10)
-      expect(results).to eq([{"title"=>"Terminator 2: Judgment Day"},
-                             {"title"=>"The Terminator"},
-                             {"title"=>"Predator"},
-                             {"title"=>"First Blood"},
-                             {"title"=>"Watchmen"},
-                             {"title"=>"Escape Plan"},
-                             {"title"=>"Jui kuen II"},
-                             {"title"=>"Total Recall"},
-                             {"title"=>"Kung Fu Panda 2"},
-                             {"title"=>"True Lies"}])
+      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,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rawscsi
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Steven Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,70 +56,70 @@ dependencies:
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
@@ -140,14 +140,14 @@ dependencies:
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby Amazon Web Services Cloud Search Interface
@@ -157,8 +157,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -209,17 +209,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Adds service objects to upload and search active record models with AWS Cloud