rawscsi 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 760003135e883d26c8cd64bdd89b9dfbfd4157d9
-  data.tar.gz: a8b6715c316df621c23815f5ee39bd40e925af8e
+  metadata.gz: b4c20697b5268a66d2391bdf053b7ff063044234
+  data.tar.gz: c0e2452a4b3e3ff54f6150183be70ffee6237da9
 SHA512:
-  metadata.gz: e3e2bae8a4208571263e67638554b9d05a0009592c2c6a3f87f3d73e065cc0f87876913a6442ce40d0c3bfbfcf5827a942618ebee75a56304441f5243b2de5cb
-  data.tar.gz: 6ddc30ae9f1e9e2afcfa696680d05b4312a39f3e08b8c2b3552f4a55759fe847c5eb117055b5ed6918a7a3d3591877df64af0055fc0bbc77d7138e38d1b172af
+  metadata.gz: b0314657d7ed42473b848fa86f531c07e685191193253d2d684262a4b4411a204751a95dcea3fa54e6baea46de589caab0e12062d90cbb51500323331adc5553
+  data.tar.gz: e1f72c03b3aea4a3b9b8d8f67d0d86503d333ea78ea7a2e2d4417a33a53e85d81f521d3a581f86984ad8c55706fc162fab7cc61ebd2d89be0c79d1fd7bf8e432

data/README.md

@@ -261,6 +261,23 @@ search_songs.search(q: {and: [ {artist: "Cold Play"} ],
 
 ```
 
+### Prefix Matching
+
+Rawscsi supports prefix matching using the `prefix` key. 
+
+```ruby
+search_songs.search(q: {prefix: "To"})
+=> [{song_id: 54967, title: "Aenima", artist: "Tool"},
+    {song_id: 96566, title: "Lateralus", artist: "Tool"},
+    {song_id: 32356, title: "Today is the Day", artist: "Yo La Tengo"}]
+
+# you can specify the prefix for a certain field
+search_songs.search(q: {and: [{genres: "80s"},
+                              {prefix: "Every"})
+=> [{song_id: 91485, title: "Everybody Wants to Rule the World", artist: "Tears for Fears"},
+    {song_id: 96566, title: "Everything Counts", artist: "Depeche Mode"}]
+```
+
 ### Pagination
 
 ```ruby

data/lib/rawscsi/query/compound.rb

@@ -1,6 +1,10 @@
+require "pry"
+
 module Rawscsi
   module Query
     class Compound
+      include Rawscsi::Stringifier::Encode
+
       attr_reader :query_hash
       def initialize(query_hash)
         @query_hash = query_hash
@@ -20,7 +24,7 @@ module Rawscsi
 
       private
       def query
-      "q=" + compound_bool(query_hash[:q])
+        "q=" + Rawscsi::Query::Stringifier.new(query_hash[:q]).build
       end
 
       def date
@@ -62,59 +66,7 @@ module Rawscsi
         end
         "return=" + output.join(",")
       end
-
-      def compound_bool(hash)
-        if compound?(hash)
-          stringify_compound(hash)
-        else
-          stringify_noncompound(hash)
-        end
-      end
-
-      def compound?(hash) 
-        ar = hash.keys
-        ar.include?(:and) || ar.include?(:or)
-      end
-
-      def stringify_compound(hash)
-        bool_op = hash.keys.first
-        ar = hash[bool_op]
-        "(#{bool_op}" + encode(" #{bool_map(ar)}") + ")"
-      end
-
-      def stringify_noncompound(hash)
-        if not_hash = hash[:not]
-          "(not" + encode(" #{stringify(not_hash)}") + ")"
-        elsif range = hash[:range]
-          range 
-        else
-          encode(stringify(hash))
-        end
-      end
-
-     def bool_map(array)
-        output = ""
-        array.each do |pred|
-          output << compound_bool(pred)
-        end
-        output
-      end
-
-      def stringify(hash)
-        output_str = ""
-        hash.each do |k,v|
-          output_str << "#{k}:'#{v}'"
-        end
-        output_str
-      end
-
-      def encode(str)
-        # URI and CGI.escape don't quite work here
-        # For example, I need blank space as %20, but they encode it as +
-        # So I have to write my own
-        str.gsub(' ', '%20').gsub("'", '%27').gsub("[", '%5B').gsub("]",'%5D').gsub("{", '%7B').gsub("}", '%7D')
-      end
-    end
+   end
   end
 end
 

data/lib/rawscsi/query/stringifier.rb

@@ -0,0 +1,31 @@
+module Rawscsi
+  module Query
+    class Stringifier
+      attr_reader :bool_hash
+
+      def initialize(bool_hash)
+        @bool_hash = bool_hash
+      end
+
+      def build
+        if compound?(bool_hash)
+          Rawscsi::Stringifier::Compound.new(bool_hash).build
+        else
+          Rawscsi::Stringifier::Simple.new(bool_hash).build
+        end
+      end
+
+      private
+
+      def compound?(value)
+        if value.kind_of?(Hash)
+          ar = value.keys
+          ar.include?(:and) || ar.include?(:or)
+        else
+          false
+        end
+      end
+    end
+  end
+end
+

data/lib/rawscsi/stringifier/compound.rb

@@ -0,0 +1,34 @@
+module Rawscsi
+  module Stringifier
+    class Compound
+      include Rawscsi::Stringifier::Encode
+
+      attr_reader :bool_hash
+
+      def initialize(bool_hash)
+        @bool_hash = bool_hash
+      end
+
+      def build
+        bool_op = bool_hash.keys.first
+        ar = bool_hash[bool_op]
+        "(#{bool_op}" + encode(" #{bool_map(ar)}") + ")"
+      end
+
+      private
+
+      def bool_map(value)
+        output = ""
+        if value.kind_of?(Enumerable)
+          value.each do |v|
+            output << Rawscsi::Query::Stringifier.new(v).build
+          end
+        else
+          output = Rawscsi::Query::Stringifier.new(v).build
+        end
+        output
+      end
+    end
+  end
+end
+

data/lib/rawscsi/stringifier/encode.rb

@@ -0,0 +1,13 @@
+module Rawscsi
+  module Stringifier
+    module Encode
+      def encode(str)
+        # URI and CGI.escape don't quite work here
+        # For example, I need blank space as %20, but they encode it as +
+        # So I have to write my own
+        str.gsub(' ', '%20').gsub("'", '%27').gsub("[", '%5B').gsub("]",'%5D').gsub("{", '%7B').gsub("}", '%7D')
+      end
+    end
+  end
+end
+

data/lib/rawscsi/stringifier/simple.rb

@@ -0,0 +1,55 @@
+module Rawscsi
+  module Stringifier
+    class Simple
+      include Rawscsi::Stringifier::Encode
+
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def build
+        if value.kind_of?(Hash)
+          build_from_hash
+        else
+          encode(stringify(value))
+        end
+      end
+
+      private
+      def build_from_hash
+        if not_hash = value[:not]
+          "(not" + encode(" #{stringify(not_hash)}") + ")"
+        elsif pre_hash = value[:prefix]
+          "(prefix" + encode(" #{stringify(pre_hash, true)}") + ")"
+        elsif range = value[:range]
+          range
+        else
+          encode(stringify(value))
+        end
+      end
+
+      def stringify(value, prefix=false)
+        output_str = ""
+        if value.kind_of?(Hash)
+          value.each do |k,v|
+            output_str << kv_stringify(k, v, prefix)
+          end
+        else
+          output_str <<  "'#{value.to_s}'"
+        end
+        output_str
+      end
+
+      def kv_stringify(k, v, prefix=false) 
+        if prefix
+          "field=#{k} '#{v}'"
+        else
+          "#{k}:'#{v}'"
+        end
+      end
+    end
+  end
+end
+

data/lib/rawscsi/version.rb

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

data/lib/rawscsi.rb

@@ -1,5 +1,7 @@
 $:.unshift(File.expand_path("../", __FILE__))
 
+require "pry"
+
 module Rawscsi
   autoload :Version,       'rawscsi/version'
   autoload :Base,          'rawscsi/base'
@@ -9,6 +11,13 @@ module Rawscsi
   module Query
     autoload :Simple,      "rawscsi/query/simple"
     autoload :Compound,    "rawscsi/query/compound"
+    autoload :Stringifier,  "rawscsi/query/stringifier"
+  end
+
+  module Stringifier
+    autoload :Simple,      "rawscsi/stringifier/simple"
+    autoload :Compound,    "rawscsi/stringifier/compound"
+    autoload :Encode,      "rawscsi/stringifier/encode"
   end
 
   module SearchHelpers

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

@@ -86,5 +86,19 @@ describe Rawscsi::Query::Compound do
     str = Rawscsi::Query::Compound.new(arg).build
     expect(str).to eq("q=(and%20title:%27star%20wars%27)&start=2&size=3&q.parser=structured")
   end
+
+  it "constructs a prefix query" do
+    arg = {:q => {:prefix => "star wars"}}
+    str = Rawscsi::Query::Compound.new(arg).build
+    expect(str).to eq("q=(prefix%20%27star%20wars%27)&q.parser=structured")
+  end
+
+  it "constructs a combination of conjunction and prefix query" do
+    arg = {:q => {:and => [{:genres => "Action"},
+                           {: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")
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rawscsi
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Steven Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,9 +171,13 @@ files:
 - lib/rawscsi/index_helpers/sdf_delete.rb
 - lib/rawscsi/query/compound.rb
 - lib/rawscsi/query/simple.rb
+- lib/rawscsi/query/stringifier.rb
 - lib/rawscsi/search.rb
 - lib/rawscsi/search_helpers/results_active_record.rb
 - lib/rawscsi/search_helpers/results_hash.rb
+- lib/rawscsi/stringifier/compound.rb
+- lib/rawscsi/stringifier/encode.rb
+- lib/rawscsi/stringifier/simple.rb
 - lib/rawscsi/version.rb
 - rawscsi.gemspec
 - spec/fixtures/vcr/index_spec/delete.yml
@@ -219,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Adds service objects to upload and search active record models with AWS Cloud