rawscsi 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4c20697b5268a66d2391bdf053b7ff063044234
-  data.tar.gz: c0e2452a4b3e3ff54f6150183be70ffee6237da9
+  metadata.gz: 86f86c7cdcffe8c3735d3363da9165350a2b49cd
+  data.tar.gz: 92faed5076455890b0d0f60d9683bb2742e8f2a7
 SHA512:
-  metadata.gz: b0314657d7ed42473b848fa86f531c07e685191193253d2d684262a4b4411a204751a95dcea3fa54e6baea46de589caab0e12062d90cbb51500323331adc5553
-  data.tar.gz: e1f72c03b3aea4a3b9b8d8f67d0d86503d333ea78ea7a2e2d4417a33a53e85d81f521d3a581f86984ad8c55706fc162fab7cc61ebd2d89be0c79d1fd7bf8e432
+  metadata.gz: 633980519d0e44821520546247e7560c328425669ce702df7782d28d8a8846e0f8d63e4dd4461e3878aea1a089f333099e5c60d79a35dcf1a8f4bf8f198739cc
+  data.tar.gz: 2f4cadd804ab354b877908f9fad1eff10ce3982e967e24f82f473507fc701ad43d3d7cfa24e5c5b78e409279ba5c5c08867e3d476f6b1235a2cee16f393e1eb3

data/README.md

@@ -273,7 +273,7 @@ search_songs.search(q: {prefix: "To"})
 
 # you can specify the prefix for a certain field
 search_songs.search(q: {and: [{genres: "80s"},
-                              {prefix: "Every"})
+                              {prefix: {title: "Every"}})
 => [{song_id: 91485, title: "Everybody Wants to Rule the World", artist: "Tears for Fears"},
     {song_id: 96566, title: "Everything Counts", artist: "Depeche Mode"}]
 ```

data/lib/rawscsi/query/compound.rb

@@ -1,5 +1,3 @@
-require "pry"
-
 module Rawscsi
   module Query
     class Compound

data/lib/rawscsi/search.rb

@@ -2,17 +2,25 @@ require "httparty"
 
 module Rawscsi
   class Search < Base
-    def search(arg)
+    def search(arg, options = {})
       if arg.is_a?(String)  
         query = Rawscsi::Query::Simple.new(arg).build
+        raw = options[:raw]
       elsif arg.is_a?(Hash)
         query = Rawscsi::Query::Compound.new(arg).build
+        raw = arg[:raw]
       else
         raise "Unknown argument type"
       end
 
       response = send_request_to_aws(query)
-      build_results(response)
+      results = results_container(response)
+
+      if raw
+        results
+      else
+        build_results(results)
+      end
     end
 
     private
@@ -34,13 +42,17 @@ module Rawscsi
       HTTParty.get(url_query)
     end
 
-    def build_results(response)
+    def results_container(response)
       if is_active_record
-        Rawscsi::SearchHelpers::ResultsActiveRecord.new(response, model).build
+        Rawscsi::SearchHelpers::ResultsActiveRecord.new(response, model)
       else
-        Rawscsi::SearchHelpers::ResultsHash.new(response).build
+        Rawscsi::SearchHelpers::ResultsHash.new(response)
       end
     end
+
+    def build_results(results_container)
+      results_container.build
+    end
   end
 end
 

data/lib/rawscsi/search_helpers/results_active_record.rb

@@ -1,6 +1,8 @@
 module Rawscsi
   module SearchHelpers
     class ResultsActiveRecord
+      attr_reader :response
+
       def initialize(response, model)
         @response = response
         @model = model

data/lib/rawscsi/search_helpers/results_hash.rb

@@ -1,6 +1,8 @@
 module Rawscsi
   module SearchHelpers
     class ResultsHash
+      attr_reader :response
+
       def initialize(response)    
         @response = response
       end

data/lib/rawscsi/version.rb

@@ -1,3 +1,3 @@
 module Rawscsi
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/rawscsi.rb

@@ -1,9 +1,7 @@
 $:.unshift(File.expand_path("../", __FILE__))
 
-require "pry"
-
 module Rawscsi
-  autoload :Version,       'rawscsi/version'
+  autoload :VERSION,       'rawscsi/version'
   autoload :Base,          'rawscsi/base'
   autoload :Search,        'rawscsi/search'
   autoload :Index,         'rawscsi/index'

data/spec/lib/rawscsi/search_spec.rb

@@ -37,6 +37,14 @@ describe Rawscsi::Search do
       expect(result_titles).to include("Star Wars: Episode I - The Phantom Menace")
     end
   end
+
+  it "performs a simple search with raw fields container returned" do
+    VCR.use_cassette('search_spec/simple_search') do
+      results = @search_helper.search('star wars', :raw => true)
+
+      expect(results).to be_a Rawscsi::SearchHelpers::ResultsHash
+    end
+  end
   
   it "performs a search with specified return fields" do
     VCR.use_cassette("search_spec/fields") do
@@ -46,6 +54,14 @@ describe Rawscsi::Search do
     end
   end
 
+  it "performs a search with specified and raw option return fields" do
+    VCR.use_cassette("search_spec/fields") do
+      results = @search_helper.search(:q => {:and => [{:title => "Die Hard"}]}, :fields => [:title, :genres], :raw => true)
+
+      expect(results).to be_a Rawscsi::SearchHelpers::ResultsHash
+    end
+  end
+
   it "performs conjunction search over the same field" do
   # Find all movies starring both Kevin Bacon and Tom Hanks
     VCR.use_cassette("search_spec/and_same_field") do 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rawscsi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Steven Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-21 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
@@ -213,17 +213,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.4.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Adds service objects to upload and search active record models with AWS Cloud