dezi-client 1.0.0 → 1.1.0

data/lib/dezi/client.rb

@@ -22,12 +22,34 @@
 
 # dependencies
 require 'rubygems'
-require 'rest_client'
+require 'faraday_middleware'
 require 'uri'
-require 'json'
 require 'pathname'
 require 'mime/types'
 
+# monkey patch evil. Faraday 0.10 where are you?
+module Faraday
+  module Utils
+    def build_nested_query(value, prefix = nil)
+      case value
+      when Array
+        value.map { |v| build_nested_query(v, "#{prefix}") }.join("&")
+        #value.map { |v| build_nested_query(v, "#{prefix}%5B%5D") }.join("&")
+      when Hash
+        value.map { |k, v|
+          build_nested_query(v, prefix ? "#{prefix}#{escape(k)}" : escape(k))
+          #build_nested_query(v, prefix ? "#{prefix}%5B#{escape(k)}%5D" : escape(k))
+        }.join("&")
+      when NilClass
+        prefix
+      else
+        raise ArgumentError, "value must be a Hash" if prefix.nil?
+        "#{prefix}=#{escape(value)}"
+      end
+    end
+  end
+end
+
 # related classes
 require File.dirname(__FILE__) + '/response'
 require File.dirname(__FILE__) + '/doc'
@@ -84,9 +106,31 @@ class DeziClient
     attr_accessor :user_agent
     
     def version
-        return '1.0.0'
+        return "1.1.0"
     end
-    
+
+    def connection(uri)
+        opts = { 
+            :url => uri,
+            :headers => {
+                 'User-Agent'   => @user_agent,
+                 'Accept'       => 'application/json'
+            }   
+        }   
+        conn = Faraday.new(opts) do |faraday|
+            faraday.request :url_encoded
+            [:mashify, :json, :raise_error].each{|mw| faraday.response(mw) }
+            faraday.response :logger if @debug
+            faraday.adapter  :excon   # IMPORTANT this is last
+        end 
+
+        if (@un && @pw)
+            conn.request :basic_auth, @un, @pw
+        end
+
+        return conn
+    end
+ 
     def initialize(args)
         @debug = ENV['DEZI_DEBUG']
         
@@ -121,26 +165,26 @@ class DeziClient
             @search_uri = @server + args[:search]
             @index_uri  = @server + args[:index]
         else
-            response = RestClient.get @server, :accept => :json, :user_agent => @user_agent
+            conn = connection(@server)
+            response = conn.get '/'
 
-            if response.code != 200
-                raise "Bad about response from server #{@server}: " . response.to_str
+            if response.status != 200
+                raise "Bad about response from server #{@server}: " . response.body
             end
-        
-            @about_server = JSON.parse(response.to_str)
+            @about_server = response.body
             if @debug
-                #puts @about_server.inspect
+                puts @about_server.inspect
             end
         
-            @search_uri = @about_server['search']
-            @index_uri  = @about_server['index']
-            @commit_uri = @about_server['commit']
+            @search_uri   = @about_server['search']
+            @index_uri    = @about_server['index']
+            @commit_uri   = @about_server['commit']
             @rollback_uri = @about_server['rollback']
-            @fields     = @about_server['fields']
-            @facets     = @about_server['facets']
+            @fields       = @about_server['fields']
+            @facets       = @about_server['facets']
         end
         
-        @searcher   = RestClient::Resource.new( @search_uri )
+        @searcher = connection( @search_uri )
         
     end
     
@@ -184,12 +228,12 @@ class DeziClient
             puts "content_type="#{content_type}"
         end
         
-        resource = RestClient::Resource.new(@index_uri + server_uri, @un, @pw)
-        resp = resource.post( body_buf, 
-            :accept => :json, 
-            :content_type => content_type, 
-            :user_agent => @user_agent
-        )
+        conn = connection(@index_uri)
+        resp = conn.post do |req|
+            req.url @index_uri + server_uri
+            req.body = body_buf
+            req.headers['Content-Type'] = content_type
+        end
             
         return DeziResponse.new(resp)
     end
@@ -216,8 +260,8 @@ class DeziClient
     
     def delete(uri)
         doc_uri = @index_uri + '/' + uri
-        resource = RestClient::Resource.new(doc_uri, @un, @pw)
-        resp = resource.delete(:accept => :json, :user_agent => @user_agent)
+        conn = connection(doc_uri)
+        resp = conn.delete
         return DeziResponse.new(resp)
     end
     
@@ -225,8 +269,8 @@ class DeziClient
     # has "auto_commit" turned off.
      
     def commit()
-        ua = RestClient::Resource.new( @commit_uri, @un, @pw )
-        resp = ua.post('/', :accept => :json, :user_agent => @user_agent)
+        conn = connection(@commit_uri)
+        resp = conn.post
         return DeziResponse.new(resp)
     end
     
@@ -234,8 +278,8 @@ class DeziClient
     # has "auto_commit" turned off.
     
     def rollback()
-        ua = RestClient::Resource.new( @rollback_uri, @un, @pw )
-        resp = ua.post('/', :accept => :json, :user_agent => @user_agent)
+        conn = connection(@rollback_uri)
+        resp = conn.post 
         return DeziResponse.new(resp)
     end
     
@@ -244,11 +288,7 @@ class DeziClient
             raise "'q' param required"
         end
         
-        resp = @searcher.get(
-            :params => params, 
-            :accept => :json, 
-            :user_agent => @user_agent
-        )
+        resp = @searcher.get @search_uri, params
         dr = DeziResponse.new(resp)
         if (!dr.is_success())
             @last_response = dr

data/lib/dezi/response.rb

@@ -20,9 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'rubygems'
-require 'json'
-
 class DeziResponse
 
     # most attributes are assigned dynamically in initialize().
@@ -38,10 +35,10 @@ class DeziResponse
         @http_resp = http_resp
         
         #warn http_resp.headers.inspect
-        #warn "code=" + http_resp.code.to_s
+        #warn "code=" + http_resp.status.to_s
         
         @is_ok = false
-        if (http_resp.code.to_s =~ /^2\d\d/)
+        if (http_resp.status.to_s =~ /^2\d\d/)
             @is_ok = true
         end
         
@@ -51,7 +48,7 @@ class DeziResponse
         
         #warn "is_ok=#{@is_ok}"
         
-        body = JSON.parse(http_resp.to_s)
+        body = http_resp.body
         
         #warn body.inspect
         
@@ -70,27 +67,28 @@ class DeziResponse
             send("#{k}=",v)
         }
         
-        if !body.has_key?('results')
+        if body['results'].nil?
+            @results = []
             return
         end
+
+        #warn 'body[results] is not nil'
         
         # make each result Hash into a DeziDoc object
-        @results = []
-        body['results'].each {|r|
+        @results = body['results'].map {|r|
             result = r
             result['fields'] = {}
             @fields.each {|f|
                 result['fields'][f] = r.delete(f)
             }
         
-            doc = DeziDoc.new(result)
-            @results.push(doc)
+            DeziDoc.new(result)
         }
         
     end
     
     def status()
-        return @http_resp.code.to_s
+        return @http_resp.status
     end
     
     def is_success()

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dezi-client
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Peter Karman
@@ -15,65 +10,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-08 00:00:00 -06:00
-default_executable: 
+date: 2014-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: faraday
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: faraday_middleware
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: excon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
+  name: hashie
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: Ruby client for the Dezi search engine. See http://dezi.org/
 email: karpet@dezi.org
 executables: []
@@ -86,7 +90,6 @@ files:
 - lib/dezi/client.rb
 - lib/dezi/doc.rb
 - lib/dezi/response.rb
-has_rdoc: true
 homepage: https://github.com/karpet/dezi-client-ruby
 licenses: []
 
@@ -100,23 +103,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nowarning
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Ruby client for the Dezi search engine