oss_rb 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 815f0b43a11334680f8f50b8fab3037fbf2df2c7
-  data.tar.gz: 1714fe080a3ad9f234e6f0a5a296b69c35067920
+  metadata.gz: 3044cabe261b39f26814fc907b63f7291a3e80ec
+  data.tar.gz: 9719d4a84617265be04efcc6debceec8be489291
 SHA512:
-  metadata.gz: 6fc52574172fff5cdff96c70bdc0d1616365cc12515971d91a7b92f18ce78a99ce6d50df6986f452510c6757a3a8f323e5bf6a5fe220ed180205603012e4b0a6
-  data.tar.gz: 7ca333c4ac47084fbca8145f5966e9fdfe88ea59b596544b83333df56657a3d3e69794759a1a6b836e487bfb468346d26bdb50c99201a35720c262c06f98cebd
+  metadata.gz: cf175a661bbc9f2279d4e8d36ab39561c414327861e9bdb0f1f7f222899cfee020ba7df8a36c8b0b340a03c78b026ddc4675683c7c5c5003aa3665397f2a27b6
+  data.tar.gz: 1f02e6b845dfec7719e14bc4b655a0ec5c3ce4ec2a907e4796d1760f6f8a807c55f94987e99d46af774568b461994b2b6e1c38fe25c971eb17dcf7d66d2c6357

data/lib/oss_rb.rb

@@ -6,6 +6,7 @@ module Oss
     attr_accessor :documents, :name
     def initialize(name, host = 'http://localhost:8080', login = nil, key = nil)
       @name = name
+      @urlname = URI.encode(name)
       @documents = Array.new
       @host = host
       @credentials = {:login=>login,:key=>key}
@@ -20,92 +21,92 @@ module Oss
     # Create a new index with the given template name
     # http://github.com/jaeksoft/opensearchserver/wiki/Index-create
     def create(template = 'WEB_CRAWLER')
-      api_post "services/rest/index/#{@name}/template/#{template}"
+      api_post "services/rest/index/#{@urlname}/template/#{template}"
     end
 
     # Delete the index
     # http://github.com/jaeksoft/opensearchserver/wiki/Index-delete
     def delete!
-      api_delete "services/rest/index/#{@name}"
+      api_delete "services/rest/index/#{@urlname}"
     end
 
     # Create or update the field defined by the given hash
     # http://github.com/jaeksoft/opensearchserver/wiki/Field-create-update
     def set_field(field_params)
-      api_put_json "services/rest/index/#{@name}/field/#{URI.encode(field_params['name'])}", field_params
+      api_put_json "services/rest/index/#{@urlname}/field/#{URI.encode(field_params['name'])}", field_params
     end
 
     # Set the default field and the unique field
     # http://github.com/jaeksoft/opensearchserver/wiki/Field-set-default-unique
     def set_field_default_unique(default, unique)
       params = { 'unique' => unique, 'default' => default }
-      api_post "services/rest/index/#{@name}/field", '', params
+      api_post "services/rest/index/#{@urlname}/field", '', params
     end
 
     # Delete the field matching the give name
     # http://github.com/jaeksoft/opensearchserver/wiki/Field-delete
     def delete_field(field_name = nil)
-      api_delete "services/rest/index/#{@name}/field/#{field_name}"
+      api_delete "services/rest/index/#{@urlname}/field/#{URI.encode(field_name)}"
     end
 
     # Delete the document matching the given field and values
     # http://github.com/jaeksoft/opensearchserver/wiki/Document-delete
     def delete_document_by_value(field_name, *values)
-      api_delete "services/rest/index/#{@name}/document/#{field_name}/#{values.join('/')}"
+      api_delete "services/rest/index/#{@urlname}/document/#{URI.encode(field_name)}/#{values.join('/')}"
     end
 
     # Delete the document matching the given query
     def delete_document_by_query(query)
       params = { 'query' => query }
-      api_delete "services/rest/index/#{@name}/document", params
+      api_delete "services/rest/index/#{@urlname}/document", params
     end
 
     # Put document in the index
     # http://github.com/jaeksoft/opensearchserver/wiki/Document-put-JSON
     def index!
-      api_put_json "services/rest/index/#{@name}/document", @documents
+      api_put_json "services/rest/index/#{@urlname}/document", @documents
       @documents = []
     end
 
     # Execute a search (using pattern)
     def search_pattern( body = nil)
-      JSON.parse(api_post_json("services/rest/index/#{@name}/search/pattern", body))
+      JSON.parse(api_post_json("services/rest/index/#{@urlname}/search/pattern", body))
     end
 
     # Execute a search (using field)
     # http://github.com/jaeksoft/opensearchserver/wiki/Search-field
     def search_field(body = nil)
-      JSON.parse(api_post_json("services/rest/index/#{@name}/search/field", body))
+      JSON.parse(api_post_json("services/rest/index/#{@urlname}/search/field", body))
     end
 
     # Execute a search based on an existing template
     # http://github.com/jaeksoft/opensearchserver/wiki/Search-pattern
     def search_template_pattern(template,  body = nil)
-      JSON.parse(api_post_json("services/rest/index/#{@name}/search/pattern/#{template}", body))
+      JSON.parse(api_post_json("services/rest/index/#{@urlname}/search/pattern/#{template}", body))
     end
 
     # Execute a search based on an existing template
     # http://github.com/jaeksoft/opensearchserver/wiki/Search-template-field
     def search_template_field(template,  body = nil)
-      JSON.parse(api_post_json("services/rest/index/#{@name}/search/field/#{template}", body))
+      JSON.parse(api_post_json("services/rest/index/#{@urlname}/search/field/#{template}", body))
     end
 
     # Create/update a search template (pattern search)
     # http://github.com/jaeksoft/opensearchserver/wiki/Search-template-pattern-set
     def search_store_template_pattern(template,  body = nil)
-      api_put_json "services/rest/index/#{@name}/search/pattern/#{template}", body
+      api_put_json "services/rest/index/#{@urlname}/search/pattern/#{template}", body
     end
 
     # Create/update a search template (field search)
     # http://github.com/jaeksoft/opensearchserver/wiki/Search-template-field-set
     def search_store_template_field(template,  body = nil)
-      api_put_json"services/rest/index/#{@name}/search/field/#{template}", body
+      api_put_json"services/rest/index/#{@urlname}/search/field/#{template}", body
     end
 
     # Delete a search template matching the given name
     # http://github.com/jaeksoft/opensearchserver/wiki/Search-template-delete
     def search_template_delete(template)
-      api_delete "services/rest/index/#{@name}/search/template/#{template}"
+      api_delete "services/rest/index/#{@urlname}/search/template/#{template}"
     end
 
     private

data/lib/oss_rb/version.rb

@@ -1,3 +1,3 @@
 module Oss
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/api/api_v1_spec.rb

@@ -139,12 +139,12 @@ describe Oss::Index do
     it 'index docs, delete document by value' do
       @index.delete_document_by_value('id', 1, 2, 3)
     end
+  end
 
-    describe '#delete document by query' do
-      it 'index docs, delete document by query' do
-        @index.delete_document_by_query('user:john4')
-        @index.delete_document_by_query('user:john5')
-      end
+  describe '#delete document by query' do
+    it 'index docs, delete document by query' do
+      @index.delete_document_by_query('user:john4')
+      @index.delete_document_by_query('user:john5')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oss_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ori Pekelman
@@ -77,7 +77,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,97 +0,0 @@
-PATH
-  remote: .
-  specs:
-    oss_rb (0.1.2)
-      activesupport
-      rest-client
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    coderay (1.0.9)
-    diff-lcs (1.2.4)
-    ffi (1.3.1)
-    formatador (0.2.4)
-    guard (1.8.1)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-bundler (1.0.0)
-      bundler (~> 1.0)
-      guard (~> 1.1)
-    guard-rack (1.3.1)
-      ffi (~> 1.3.1)
-      guard (~> 1.1)
-      libnotify (~> 0.1.3)
-      rb-inotify (>= 0.5.1)
-      spoon (~> 0.0.1)
-    i18n (0.6.5)
-    libnotify (0.1.4)
-      ffi (>= 0.6.2)
-    listen (1.2.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.4)
-    method_source (0.8.1)
-    mime-types (1.25)
-    minitest (4.7.5)
-    multi_json (1.8.1)
-    net-http-spy (0.2.1)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.2)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    slop (3.4.5)
-    spoon (0.0.4)
-      ffi
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  guard
-  guard-bundler
-  guard-rack
-  net-http-spy
-  oss_rb!
-  pry
-  rack-test
-  rake
-  rspec
-  rspec-core
-  rspec-expectations
-  rspec-mocks