solr4r 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3dc3a37e421ae648cb13923219a9f386a50eb1d
-  data.tar.gz: 8ddb4ffb6df9364345554ca7b41ec32cad8f346e
+  metadata.gz: 586864696853144c04da2e5cea908d23f165ac93
+  data.tar.gz: a8b43ec8857d0a4d78ad29d659599e3460cac848
 SHA512:
-  metadata.gz: e617a5540b822c6c635d809aa6e3575f32b6d2a7dcd56a04bcdfd36d4014da5a239811ca254397babd285804010b98d4ef78978f293c8ae54c5c0184e066d765
-  data.tar.gz: 28a4a5c40629e990368ab284646ad53137e2a95d7991ab35b6049cd34109f9f14848165d012bf3320339ae71f6babef2954facb79f04b5824eb1226355b0856c
+  metadata.gz: b5cf30799e4a101d6eaddbdc7e80b9df1fc77c05f9c19a8c83e99d8880c229d76b0ac26f60ea7cc0229cdb970014b4a37d00dbd65507a9615dc179adb9172b4d
+  data.tar.gz: 5c821ebf42f7be62f81229adbb328f43e179a198aba53c91fa818f023e85532f8e970c8444608ad18a677ef17b156fc437c38007a16e3fac5ecf03752252af59

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for solr4r
 
+== 0.0.2 [2014-04-17]
+
+* Refactored Solr4R::Request away from curb.
+* Refactored Solr4R::Response away from ostruct.
+
 == 0.0.1 [2014-03-28]
 
 * Birthday :-)

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to solr4r version 0.0.1
+This documentation refers to solr4r version 0.0.2
 
 
 == DESCRIPTION
@@ -12,9 +12,10 @@ TODO
 
 == LINKS
 
-Documentation:: http://blackwinter.github.com/solr4r
-Source code::   http://github.com/blackwinter/solr4r
-RubyGem::       http://rubygems.org/gems/solr4r
+Documentation:: https://blackwinter.github.io/solr4r/
+Source code::   https://github.com/blackwinter/solr4r
+RubyGem::       https://rubygems.org/gems/solr4r
+Travis CI::     https://travis-ci.org/blackwinter/solr4r
 
 
 == AUTHORS

data/Rakefile

@@ -7,13 +7,13 @@ begin
     gem: {
       name:         %q{solr4r},
       version:      Solr4R::VERSION,
-      summary:      %q{A Ruby client for Apache Solr},
-      description:  %q{Access the Apache Solr search server from Ruby},
+      summary:      %q{A Ruby client for Apache Solr.},
+      description:  %q{Access the Apache Solr search server from Ruby.},
       author:       %q{Jens Wille},
       email:        %q{jens.wille@gmail.com},
       license:      %q{AGPL-3.0},
       homepage:     :blackwinter,
-      dependencies: { curb: ['~> 0.8', '> 0.8.5'], nokogiri: '~> 1.6' },
+      dependencies: { nokogiri: '~> 1.6' },
 
       required_ruby_version: '>= 1.9.3'
     }

data/TODO

@@ -1,3 +1,2 @@
-* request: https://github.com/taf2/curb/pull/196
 * documentation
 * specs

data/lib/solr4r/client.rb

@@ -23,14 +23,12 @@
 ###############################################################################
 #++
 
-require 'uri'
-
 module Solr4R
 
   class Client
 
     DEFAULT_HOST = 'localhost'
-    DEFAULT_PATH = 'solr/'
+    DEFAULT_PATH = 'solr'
     DEFAULT_PORT = 8983
 
     DEFAULT_PARAMS = {
@@ -49,22 +47,22 @@ module Solr4R
 
     def initialize(options = {})
       if options.is_a?(String)
-        url, options = options, {}
+        uri, options = options, {}
       else
-        url = options.fetch(:url, default_url(options))
+        uri = options.fetch(:uri, default_uri(options))
       end
 
-      self.url, self.options = URI.parse(url), options
+      self.options = options
 
-      self.request = options.fetch(:request, Request.new)
       self.builder = options.fetch(:builder, Builder.new)
+      self.request = options.fetch(:request, Request.new(uri))
 
       self.default_params = options.fetch(:default_params, DEFAULT_PARAMS)
 
       register_endpoints(options.fetch(:endpoints, DEFAULT_ENDPOINTS))
     end
 
-    attr_accessor :url, :options, :request, :builder, :default_params
+    attr_accessor :options, :builder, :request, :default_params
 
     def register_endpoints(endpoints)
       endpoints.each { |args| register_endpoint(*args) } if endpoints
@@ -150,14 +148,14 @@ module Solr4R
     end
 
     def inspect
-      '#<%s:0x%x @url=%p, @default_params=%p>' % [
-        self.class, object_id, url, default_params
+      '#<%s:0x%x @default_params=%p %s>' % [
+        self.class, object_id, default_params, request.request_line
       ]
     end
 
     private
 
-    def default_url(options)
+    def default_uri(options)
       'http://%s:%d/%s' % [
         options.fetch(:host, DEFAULT_HOST),
         options.fetch(:port, DEFAULT_PORT),
@@ -170,8 +168,8 @@ module Solr4R
     end
 
     def send_request(path, options, &block)
-      options = amend_options(options, :params, default_params)
-      request.execute(URI.join(url, path), options, &block)
+      request.execute(path,
+        amend_options(options, :params, default_params), &block)
     end
 
     def invalid_endpoint?(name)

data/lib/solr4r/request.rb

@@ -23,98 +23,117 @@
 ###############################################################################
 #++
 
-require 'curl'
+require 'net/https'
+
+require_relative 'request_extension'
+require_relative 'uri_extension'
 
 module Solr4R
 
-  class Request < Curl::Easy
+  class Request
 
-    DEFAULT_VERB = :get
+    DEFAULT_METHOD = :get
 
     DEFAULT_USER_AGENT = "Solr4R/#{VERSION}"
 
-    RESPONSE_ATTRIBUTES = {
-      # request
-      headers:            :request_headers,
-      last_effective_url: :request_url,
-      post_body:          :post_body,
-      params:             :request_params,
-      verb:               :request_verb,
-
-      # response
-      body_str:           :response_body,
-      content_type:       :content_type,
-      header_str:         :response_header,
-      response_code:      :response_code
-    }
-
-    def initialize(options = {})
-      if block_given?
-        raise ArgumentError,
-          'block argument not supported, use options hash instead'
-      end
+    def initialize(base_uri, http_options = {})
+      self.base_uri, self.http_options =
+        URI(base_uri).extend(BaseUriExtension), http_options
+    end
+
+    def start
+      self.http = Net::HTTP.start(base_uri.hostname, base_uri.port,
+        { use_ssl: base_uri.scheme == 'https' }.merge(http_options))
+
+      self
+    end
 
-      super()
+    def finish
+      http.finish if started?
+      self
+    end
 
-      self.options = options.merge(params: nil, verb: nil)
-      set_options
+    def started?
+      http && http.started?
     end
 
-    attr_accessor :options, :params, :verb
+    def execute(path, options = {}, &block)
+      start unless started?
 
-    def execute(request_url, options = {}, &block)
-      prepare_request(request_url, options, &block)
+      self.last_response = nil
 
-      send("http_#{verb}")
+      req = prepare_request(path, options, &block)
+      res = http.request(req)
 
-      Response.new { |response|
-        RESPONSE_ATTRIBUTES.each { |attribute, key|
-          response.send("#{key}=", send(attribute))
-        }
-      }
+      self.last_response = Response.new(
+        request_body:     req.body,
+        request_headers:  req.to_hash,
+        request_method:   req.method.downcase.to_sym,
+        request_params:   req.params,
+        request_url:      req.uri.to_s,
+
+        response_body:    res.body,
+        response_charset: res.type_params['charset'],
+        response_code:    res.code.to_i,
+        response_headers: res.to_hash
+      )
     end
 
-    def reset
-      super.tap {
-        set_options
-        headers['User-Agent'] ||= DEFAULT_USER_AGENT
-      }
+    def request_line
+      last_response ? last_response.request_line : "[#{base_uri}]"
     end
 
     def inspect
-      '#<%s:0x%x @options=%p, @verb=%p, @url=%p, @response_code=%p>' % [
-        self.class, object_id, options, verb, url, response_code
-      ]
+      '#<%s:0x%x %s>' % [self.class, object_id, request_line]
     end
 
     private
 
-    def set_options
-      options.each { |key, value| send("#{key}=", value) }
-    end
+    attr_accessor :base_uri, :http_options, :http, :last_response
+
+    def prepare_request(path, options)
+      uri = make_uri(path, options.fetch(:params, {}))
+
+      req = make_request(uri,
+        options.fetch(:method, DEFAULT_METHOD),
+        options.fetch(:data, {}))
 
-    def prepare_request(request_url, options)
-      reset
+      set_headers(req, options.fetch(:headers, {}))
+
+      yield req if block_given?
+
+      req
+    end
 
-      self.url = Curl.urlalize(request_url.to_s,
-        self.params = options.fetch(:params, {}))
+    def make_uri(path, params)
+      base_uri.merge(path).extend(RequestUriExtension).with_params(params)
+    end
 
-      case self.verb = options.fetch(:method, DEFAULT_VERB)
+    def make_request(uri, method, data)
+      case method
         when :get, :head
-          # ok
-        when :post, :delete, :patch
-          self.post_body = Curl.postalize(options[:data])
-        when :put
-          self.put_data = Curl.postalize(options[:data])
+          req = request_for(method, uri)
+        when :post
+          req = request_for(method, uri)
+          req.set_form_data(data)
         else
-          raise ArgumentError, "verb not supported: #{verb}"
+          raise ArgumentError, "method not supported: #{method}"
       end
 
-      headers.update(options[:headers]) if options[:headers]
+      req
+    end
+
+    def request_for(method, uri)
+      Net::HTTP.const_get(method.to_s.capitalize)
+        .extend(HTTPRequestExtension).from_uri(uri)
+    end
 
-      yield self if block_given?
+    def set_headers(req, headers)
+      req['User-Agent'] = DEFAULT_USER_AGENT
 
-      self
+      headers.each { |key, value|
+        Array(value).each { |val| req.add_field(key, val) }
+      }
     end
 
   end

data/lib/solr4r/request_extension.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+#--
+###############################################################################
+#                                                                             #
+# solr4r -- A Ruby client for Apache Solr                                     #
+#                                                                             #
+# Copyright (C) 2014 Jens Wille                                               #
+#                                                                             #
+# Mir is free software: you can redistribute it and/or modify it under the    #
+# terms of the GNU Affero General Public License as published by the Free     #
+# Software Foundation, either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# solr4r is distributed in the hope that it will be useful, but WITHOUT ANY   #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with solr4r. If not, see <http://www.gnu.org/licenses/>.              #
+#                                                                             #
+###############################################################################
+#++
+
+require 'cgi'
+
+module Solr4R
+
+  module HTTPRequestExtension
+
+    def self.extended(base)
+      base.send(:attr_accessor, :params)
+    end
+
+    def from_uri(uri)
+      req = new(uri)
+      req.params = uri.params
+      req
+    end
+
+  end
+
+end

data/lib/solr4r/response.rb

@@ -24,42 +24,39 @@
 #++
 
 require 'json'
-require 'ostruct'
-require 'webrick'
 
 module Solr4R
 
-  class Response < OpenStruct
-
-    REQUEST_LINE = %r{\AHTTP/.*\r?\n?}
-
-    CHARSET_RE = %r{;\s*charset=([\w-]+)}
+  class Response
 
     DEFAULT_CHARSET = 'UTF-8'
 
-    def initialize
-      super
-      yield self if block_given?
+    EVALUATE_METHODS = [:get, :post]
+
+    def initialize(options)
+      options.each { |key, value| send("#{key}=", value) }
+      @evaluate = EVALUATE_METHODS.include?(request_method)
     end
 
-    def result(options = {})
-      @result ||= evaluate_result(options)
+    attr_accessor :response_body, :response_charset, :response_code, :response_headers,
+      :request_body, :request_method, :request_params, :request_url, :request_headers
+
+    def request_line
+      '"%s %s" %d' % [request_method.upcase, request_url, response_code]
     end
 
-    def response_headers
-      @response_headers ||= evaluate_header
+    def result(options = {})
+      @result ||= evaluate_result(options) if @evaluate
     end
 
     def num_found
-      @num_found ||= evaluate_count('numFound')
+      @num_found ||= evaluate_count('numFound') if @evaluate
     end
 
-    def charset
-      @charset ||= response_headers.fetch('content-type')[0][CHARSET_RE, 1]
-    end
+    alias_method :to_i, :num_found
 
     def to_s
-      @to_s ||= response_body.to_s.force_encoding(charset || DEFAULT_CHARSET)
+      @to_s ||= response_body.to_s.force_encoding(response_charset || DEFAULT_CHARSET)
     end
 
     def inspect
@@ -79,10 +76,6 @@ module Solr4R
       end
     end
 
-    def evaluate_header
-      WEBrick::HTTPUtils.parse_header(response_header.sub(REQUEST_LINE, ''))
-    end
-
     def evaluate_count(name)
       case wt = request_params[:wt]
         # numFound="35"

data/lib/solr4r/uri_extension.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+#--
+###############################################################################
+#                                                                             #
+# solr4r -- A Ruby client for Apache Solr                                     #
+#                                                                             #
+# Copyright (C) 2014 Jens Wille                                               #
+#                                                                             #
+# Mir is free software: you can redistribute it and/or modify it under the    #
+# terms of the GNU Affero General Public License as published by the Free     #
+# Software Foundation, either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# solr4r is distributed in the hope that it will be useful, but WITHOUT ANY   #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with solr4r. If not, see <http://www.gnu.org/licenses/>.              #
+#                                                                             #
+###############################################################################
+#++
+
+require 'cgi'
+
+module Solr4R
+
+  module BaseUriExtension
+
+    def self.extended(uri)
+      uri.path << '/' unless uri.path.end_with?('/')
+    end
+
+  end
+
+  module RequestUriExtension
+
+    attr_accessor :params
+
+    def with_params(params)
+      self.params, query = params, [self.query].compact
+
+      params.each { |key, value|
+        key = URI.escape(key.to_s)
+        Array(value).each { |val| query << "#{key}=#{CGI.escape(val.to_s)}" }
+      }
+
+      self.query = query.join('&') unless query.empty?
+
+      self
+    end
+
+  end
+
+end

data/lib/solr4r/version.rb

@@ -4,7 +4,7 @@ module Solr4R
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

metadata

@@ -1,50 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: solr4r
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">"
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: hen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-description: Access the Apache Solr search server from Ruby
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
+description: Access the Apache Solr search server from Ruby.
 email: jens.wille@gmail.com
 executables: []
 extensions: []
@@ -62,7 +84,9 @@ files:
 - lib/solr4r/builder.rb
 - lib/solr4r/client.rb
 - lib/solr4r/request.rb
+- lib/solr4r/request_extension.rb
 - lib/solr4r/response.rb
+- lib/solr4r/uri_extension.rb
 - lib/solr4r/version.rb
 - spec/solr4r/builder_spec.rb
 - spec/spec_helper.rb
@@ -72,13 +96,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  solr4r-0.0.1 [2014-03-28]:
+  solr4r-0.0.2 [2014-04-17]:
 
-  * Birthday :-)
+  * Refactored Solr4R::Request away from curb.
+  * Refactored Solr4R::Response away from ostruct.
 
 rdoc_options:
 - "--title"
-- solr4r Application documentation (v0.0.1)
+- solr4r Application documentation (v0.0.2)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -102,5 +127,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A Ruby client for Apache Solr
+summary: A Ruby client for Apache Solr.
 test_files: []