rawscsi 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86f86c7cdcffe8c3735d3363da9165350a2b49cd
-  data.tar.gz: 92faed5076455890b0d0f60d9683bb2742e8f2a7
+  metadata.gz: 51e8395c614ecbf2c4863ffb244f02df2c99492a
+  data.tar.gz: 48aa9907d0bc2d5ac3e47206236818d0a29f0293
 SHA512:
-  metadata.gz: 633980519d0e44821520546247e7560c328425669ce702df7782d28d8a8846e0f8d63e4dd4461e3878aea1a089f333099e5c60d79a35dcf1a8f4bf8f198739cc
-  data.tar.gz: 2f4cadd804ab354b877908f9fad1eff10ce3982e967e24f82f473507fc701ad43d3d7cfa24e5c5b78e409279ba5c5c08867e3d476f6b1235a2cee16f393e1eb3
+  metadata.gz: 06663b97caefeaad42ecef69e3e2dbcd3851fdb0048720569cc728468a2fb146aa9e158dd229e1ab1a88d4e460892ce23221671346af1a187af7a4f05cecbb09
+  data.tar.gz: 4c457acc52b35eeb10a650c9751afee156b5087c2d79de5d2bf3e0f3333345e8a4337253394d8ed34806d7167578e8b46e56958ed20c6390c4f01b2532ba5619

data/README.md

@@ -178,6 +178,28 @@ search_songs.search(q: {and: [ {artist: "Cold Play"} ],
     { title: "Sparks"}]
 
 ```
+
+###### Sort by location
+Suppose your search domain has the `latlon` field for geographical location data. You can sort your results
+by geographical distance.
+
+```ruby
+# returns all theathers playing "The Big Lebowski" sorted by geographical proximity
+# where your location is 35.621966 latitude and -120.686706 longitude
+movie_theaters.search(q: {films: "The Big Lebowski" },
+            sort: "distance asc",
+            location: {latitude: 35.621966, longitude: -120.686706}
+            )
+```
+
+###### Weighing fields
+You can weigh fields in your search request.
+
+```ruby
+You care much more about matches in the title, than matches in the plot.
+movie_search.search(q: {and: [{title: "title", plot: "plot"}]}, weights: "{fields:['title^2','plot^0.5']}")
+```
+
 The default sort order is Amazon Cloudsearch's rank-score but you can use your own sort as well as a limiting the number of results.
 ```ruby
 search_songs.search(q: {and: [{genres: "Rock"}]}, sort: "rating desc", limit: 100)

data/lib/rawscsi/query/compound.rb

@@ -11,6 +11,8 @@ module Rawscsi
       def build
         [
           query,
+          distance,
+          qoptions,
           date,
           sort,
           start,
@@ -46,11 +48,21 @@ module Rawscsi
         encode("sort=#{query_hash[:sort]}")
       end
 
+      def distance
+        return nil unless location = query_hash[:location]
+        "expr.distance=haversin(#{location[:latitude]},#{location[:longitude]},location.latitude,location.longitude)"
+      end
+
+      def qoptions
+        return nil unless weights = query_hash[:weights]
+        "q.options=#{CGI.escape(weights)}"
+      end
+
       def start
         return nil unless query_hash[:start]
         "start=#{query_hash[:start]}"
       end
-     
+
       def limit
         return nil unless query_hash[:limit]
         "size=#{query_hash[:limit]}"

data/lib/rawscsi/version.rb

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

data/spec/lib/rawscsi/query/compound_spec.rb

@@ -9,11 +9,26 @@ describe Rawscsi::Query::Compound do
   end
 
   it "constructs a query that looks only at a single field and specifies fields" do
-    arg = {:q => {:and => [{:title => "star wars"}]}, :fields => [:title, :genres]}    
+    arg = {:q => {:and => [{:title => "star wars"}]}, :fields => [:title, :genres]}
     str = Rawscsi::Query::Compound.new(arg).build
     expect(str).to eq("q=(and%20title:%27star%20wars%27)&return=title,genres&q.parser=structured")
   end
 
+  it "constructs a query with distance" do
+    arg = { :q => { :and => [{:actors => "Arnold"}, {:title => "Terminator"},{:range => "rating:['8',}"}]},
+            :fields => [:title],
+            :location => {latitude: 35.621966, longitude: -120.686706}
+          }
+    str = Rawscsi::Query::Compound.new(arg).build
+    expect(str).to eq("q=(and%20actors:%27Arnold%27title:%27Terminator%27rating:%5B%278%27,%7D)&expr.distance=haversin(35.621966,-120.686706,location.latitude,location.longitude)&return=title&q.parser=structured")
+  end
+
+  it "constructs a query with qoptions" do
+    arg = {:q => {:and => [{:title => "star wars"}]}, :fields => [:title, :genres], weights: "{fields:['title^2','genres^0.1']}"}
+    str = Rawscsi::Query::Compound.new(arg).build
+    expect(str).to eq("q=(and%20title:%27star%20wars%27)&q.options=%7Bfields%3A%5B%27title%5E2%27%2C%27genres%5E0.1%27%5D%7D&return=title,genres&q.parser=structured")
+  end
+
   it "constructs a query with a numeric range" do
     arg = { :q => { :and => [{:actors => "Arnold"}, {:title => "Terminator"},{:range => "rating:['8',}"}]},
             :fields => [:title]
@@ -95,7 +110,7 @@ describe Rawscsi::Query::Compound do
 
   it "constructs a combination of conjunction and prefix query" do
     arg = {:q => {:and => [{:genres => "Action"},
-                           {:prefix => {:actor => "Stallone"}}]}} 
+                           {:prefix => {:actor => "Stallone"}}]}}
     str = Rawscsi::Query::Compound.new(arg).build
 
     expect(str).to eq("q=(and%20genres:%27Action%27(prefix%20field=actor%20%27Stallone%27))&q.parser=structured")

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rawscsi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Steven Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-03-24 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.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