delsolr 0.1.6 → 0.2.0

data/lib/delsolr/{query_builder.rb → client/query_builder.rb}

@@ -59,7 +59,7 @@ module DelSolr
         # remove params as we go so we can just pass whatever is left to solr...
 
         params << build_query(:q, opts.delete(:q))
-        params << {:wt => 'ruby'}
+        params << {:wt => 'json'}
         params << {:qt => query_name}
         params << {:rows => opts.delete(:rows)}
         params << {:start => opts.delete(:start)}

data/lib/delsolr/{response.rb → client/response.rb}

@@ -1,7 +1,5 @@
 module DelSolr
-  
   class Client
-  
     class Response
 
       attr_reader :query_builder
@@ -11,11 +9,13 @@ module DelSolr
         @from_cache = options[:from_cache]
         @logger = options[:logger]
         begin
-          @raw_response = eval(solr_response_buffer)
-        rescue SyntaxError, Exception => e
-          @logger.error(solr_response_buffer) if @logger
-          @logger.error(e) if @logger
-          @raw_response = nil
+          @raw_response = JSON.parse(solr_response_buffer)
+        rescue JSON::ParserError => e
+          if @logger
+            @logger.error(solr_response_buffer)
+            @logger.error(e.message)
+          end
+          raise e
         end
 
         # now define the shortcuts

data/lib/delsolr/document.rb

@@ -1,13 +1,13 @@
 module DelSolr
   #
   # DelSolr::Client::Document
-  # 
+  #
   # Generally, indexing consists of iterating over your database, creating a huge xml buffer, and
   # posting it to solr.  This wraps up the xml portion and DelSolr::Client wraps up the posting/batching
   # portions.
-  # 
+  #
   # This is what your indexing logic might look like if you're dealing w/ ActiveRecord objects:
-  # 
+  #
   #          client = DelSolr::Client.new(:server => 'solr1', :port => 8983, :timout => 500)
   #          models = SomeModel.find(:all)
   #          models.each do |model|
@@ -21,19 +21,19 @@ module DelSolr
   #          end
   #          client.post_update! # send the batch to solr
   #          client.commit! # send the commit so solr updates the index
-  #  
+  #
   # It's generally a good idea to experiment with different batch size.  500-2000 documents per post
   # is a good starting point depending on how large your documents are.
-  # 
+  #
   # You also may want to just update a signle document when it is changed.  Might looks like this:
-  # 
+  #
   #          def after_save
   #            doc = DelSolr::Document.new
   #            doc.add_field('id', model.id)
   #            doc.add_field('name', model.name)
   #            $client.update_and_commit!(doc) # post the document and immediately post the commit
   #          end
-  # 
+  #
   #
   class Document
 
@@ -47,14 +47,14 @@ module DelSolr
     #         is the value of the field you wish to be indexed
     # [<b><tt>options</tt></b>]
     #         <b><tt>:cdata</tt></b>  set to true if you want the value wrap in a CDATA tag
-    #         
+    #
     #         All other options are passed directly as xml attributes (see the solr documentation on usage)
     def add_field(field_name, value, options = {})
       field_buffer << construct_field_tag(field_name, value, options)
     end
 
     def xml
-      "<doc#{opts2str(@options)}>\n" + field_buffer + "</doc>"
+      "<doc#{@options.to_xml_attribute_string}>\n" + field_buffer + "</doc>"
     end
 
     private
@@ -64,8 +64,8 @@ module DelSolr
       options[:name] = name.to_s
       use_cdata = options.delete(:cdata)
 
-      return "<field#{opts2str(options)}>#{use_cdata ? cdata(value) : value}</field>\n"
-    end  
+      return "<field#{options.to_xml_attribute_string}>#{use_cdata ? cdata(value) : value}</field>\n"
+    end
 
     def cdata(str)
       "<![CDATA[#{str}]]>"
@@ -75,16 +75,6 @@ module DelSolr
       @buffer ||= ""
     end
 
-    def opts2str(options)
-      opts = []
-      options.each do |k,v|
-        opts.push "#{k}=\"#{v}\""
-      end
-      opts = opts.join(" ")
-      opts = " " + opts unless opts.blank?
-      opts
-    end
-
   end
-  
+
 end

data/lib/delsolr/extensions.rb

@@ -3,7 +3,7 @@
 #
 
 String.class_eval do
-  if !''.respond_to?(:blank?)    
+  if !''.respond_to?(:blank?)
     def blank?
       self == ''
     end
@@ -32,4 +32,18 @@ Fixnum.class_eval do
       self * 60 * 60
     end
   end
+end
+
+class Hash
+
+  def to_xml_attribute_string
+    opts = []
+    self.each do |k,v|
+      opts.push "#{k}=\"#{v}\""
+    end
+    opts = opts.join(" ")
+    opts = " " + opts unless opts.blank?
+    opts
+  end
+
 end

metadata

@@ -1,27 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: delsolr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2009-11-02 00:00:00.000000000Z
+date: 2009-11-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+- !ruby/object:Gem::Dependency
+  name: json
+  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'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2171652600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2171652600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Ruby wrapper for Lucene Solr
 email: 
 executables: []
@@ -29,44 +73,38 @@ extensions: []
 extra_rdoc_files: []
 files:
 - License.txt
-- README.txt
+- README.rdoc
+- Rakefile
 - lib/delsolr.rb
-- lib/delsolr/configuration.rb
-- lib/delsolr/extensions.rb
-- lib/delsolr/query_builder.rb
-- lib/delsolr/response.rb
+- lib/delsolr/client.rb
+- lib/delsolr/client/configuration.rb
+- lib/delsolr/client/query_builder.rb
+- lib/delsolr/client/response.rb
 - lib/delsolr/document.rb
-- test/test_client.rb
-- test/test_helper.rb
-- test/test_query_builder.rb
-- test/test_response.rb
+- lib/delsolr/extensions.rb
 homepage: http://github.com/avvo/delsolr
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 2.2.0.rc.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DelSolr is a light weight ruby wrapper for solr.  It's intention is to expose
   the full power of solr queries while keeping the interface as ruby-esque as possible.
-test_files:
-- test/test_client.rb
-- test/test_helper.rb
-- test/test_query_builder.rb
-- test/test_response.rb
+test_files: []
+has_rdoc: 

data/test/test_client.rb

@@ -1,268 +0,0 @@
-require File.expand_path(File.dirname(__FILE__)) + '/test_helper'
-require 'rubygems'
-gem 'mocha', '>=0.9.0'
-require 'mocha'
-
-class ClientTest < Test::Unit::TestCase
-
-  include Test::Unit::Assertions
-  
-  SUCCESS = '<result status="0"></result>'
-  FAILURE = '<result status="1"></result>'
-  CONTENT_TYPE = {'Content-type' => 'text/xml;charset=utf-8'}
-  
-  class TestCache    
-    def set(k,v,t)
-      @cache ||= {}
-      @cache[k] = v
-    end
-    
-    def get(k)
-      @cache ||= {}
-      @cache[k]
-    end    
-  end
-  
-  @@response_buffer = %{
-    {
-     'responseHeader'=>{
-      'status'=>0,
-      'QTime'=>151,
-      'params'=>{
-            'wt'=>'ruby',
-            'rows'=>'10',
-            'explainOther'=>'',
-            'start'=>'0',
-            'hl.fl'=>'',
-            'indent'=>'on',
-            'hl'=>'on',
-            'q'=>'index_type:widget',
-            'fl'=>'*,score',
-            'qt'=>'standard',
-            'version'=>'2.2'}},
-     'response'=>{'numFound'=>1522698,'start'=>0,'maxScore'=>1.5583541,'docs'=>[
-            {
-             'index_type'=>'widget',
-             'id'=>1,
-             'unique_id'=>'1_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>3,
-             'unique_id'=>'3_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>4,
-             'unique_id'=>'4_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>5,
-             'unique_id'=>'5_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>7,
-             'unique_id'=>'7_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>8,
-             'unique_id'=>'8_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>9,
-             'unique_id'=>'9_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>10,
-             'unique_id'=>'10_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>11,
-             'unique_id'=>'11_widget',
-             'score'=>1.5583541},
-            {
-             'index_type'=>'widget',
-             'id'=>12,
-             'unique_id'=>'12_widget',
-             'score'=>1.5583541}]
-     },
-     'facet_counts'=>{
-      'facet_queries'=>{
-        'city_idm:19596' => 392},
-      'facet_fields'=>{
-        'available_b'=>[
-          'false',1328],
-        'onsale_b'=>[
-          'false',1182,
-          'true',174]}},
-     'highlighting'=>{
-      '1_widget'=>{},
-      '3_widget'=>{},
-      '4_widget'=>{},
-      '5_widget'=>{},
-      '7_widget'=>{},
-      '8_widget'=>{},
-      '9_widget'=>{},
-      '10_widget'=>{},
-      '11_widget'=>{},
-      '12_widget'=>{}}}
-  }
-  
-  def test_create
-    s = nil
-    assert_nothing_raised do
-      s = DelSolr::Client.new(:server => 'localhost', :port => 8983)
-    end
-    assert(s)
-  end
-  
-  def test_commit_success
-    c = setup_client
-    c.connection.expects(:post).once.returns([nil,SUCCESS])
-    assert(c.commit!)
-  end
-
-  def test_commit_failure
-    c = setup_client
-    c.connection.expects(:post).once.returns([nil,FAILURE])
-    assert(!c.commit!)
-  end
-  
-  def test_optimize_success
-    c = setup_client
-    c.connection.expects(:post).once.returns([nil,SUCCESS])
-    assert(c.optimize!)
-  end
-
-  def test_optimize_failure
-    c = setup_client
-    c.connection.expects(:post).once.returns([nil,FAILURE])
-    assert(!c.optimize!)
-  end
-  
-  def test_update
-    c = setup_client
-    
-    doc = DelSolr::Document.new
-    doc.add_field(:id, 123)
-    doc.add_field(:name, 'mp3 player')
-    
-    expected_post_data = "<add>\n#{doc.xml}\n</add>\n"
-    
-    assert(c.update(doc))
-    assert_equal(1, c.pending_documents.length)
-    
-    c.connection.expects(:post).with('/solr/update', expected_post_data, CONTENT_TYPE).returns([nil,SUCCESS])
-    assert(c.post_update!)
-    assert_equal(0, c.pending_documents.length)
-  end
-
-  def test_update!
-    c = setup_client
-    
-    doc = DelSolr::Document.new
-    doc.add_field(:id, 123)
-    doc.add_field(:name, 'mp3 player')
-    
-    expected_post_data = "<add>\n#{doc.xml}\n</add>\n"
-    
-    c.connection.expects(:post).with('/solr/update', expected_post_data, CONTENT_TYPE).returns([nil,SUCCESS])
-    assert(c.update!(doc))
-    assert_equal(0, c.pending_documents.length)
-  end
-
-  def test_query_returns_nil_when_exception_thrown
-    c = setup_client
-
-    mock_query_builder = DelSolr::Client::QueryBuilder
-    mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder
-    DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder)
-    c.connection.expects(:post).raises(StandardError) # mock the connection
-    assert_nothing_raised do
-      r = c.query('standard', :query => '123')
-      assert_nil(r)
-    end
-  end
-  
-  def test_query_with_path
-    c = setup_client(:path => '/abcsolr')
-    
-    mock_query_builder = DelSolr::Client::QueryBuilder
-    mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder
-    DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder)
-    c.connection.expects(:post).with("/abcsolr/select", mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection
-    r = c.query('standard', :query => '123')
-    assert(r)
-    assert_equal([1,3,4,5,7,8,9,10,11,12], r.ids.sort)
-    assert(!r.from_cache?, 'should not be from cache')
-  end
-
-  def test_query_with_default_path
-    c = setup_client
-
-    mock_query_builder = DelSolr::Client::QueryBuilder
-    mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder
-    DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder)
-    c.connection.expects(:post).with("/solr/select", mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection
-    r = c.query('standard', :query => '123')
-    assert(r)
-    assert_equal([1,3,4,5,7,8,9,10,11,12], r.ids.sort)
-    assert(!r.from_cache?, 'should not be from cache')
-  end
-
-  
-  def test_query_from_cache
-    c = setup_client(:cache => TestCache.new)
-    
-    mock_query_builder = DelSolr::Client::QueryBuilder
-    mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder
-    DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder)
-    c.connection.expects(:post).with("/solr/select", mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection
-    r = c.query('standard', :query => '123', :enable_caching => true)
-    assert(r)
-    assert_equal([1,3,4,5,7,8,9,10,11,12], r.ids.sort)
-    assert(!r.from_cache?, 'should not be from cache')
-
-    r = c.query('standard', :query => '123', :enable_caching => true)
-    assert(r)
-    assert_equal([1,3,4,5,7,8,9,10,11,12], r.ids.sort)
-    assert(r.from_cache?, 'this one should be from the cache')
-  end
-
-  if RUBY_VERSION.to_f >= 1.9
-    def test_query_encoding_ruby19_ut8
-      c = setup_client
-
-      mock_query_builder = DelSolr::Client::QueryBuilder
-      mock_query_builder.stubs(:request_string).returns('/select?some_query') # mock the query builder
-      DelSolr::Client::QueryBuilder.stubs(:new).returns(mock_query_builder)
-      c.connection.expects(:post).with("/solr/select", mock_query_builder.request_string).returns([nil, @@response_buffer]) # mock the connection
-      r = c.query('standard', :query => '123')
-      assert(r)
-
-      ensure_encoding = lambda { |v|
-        case v
-          when String; assert_equal 'UTF-8', v.encoding.name
-          when Array; v.each(&ensure_encoding)
-          when Hash; (v.keys + v.values).each(&ensure_encoding)
-        end
-      }
-
-      ensure_encoding.call(r.raw_response)
-    end
-  end
-  
-  
-private
-  
-  def setup_client(options = {})
-    DelSolr::Client.new({:server => 'localhost', :port => 8983}.merge(options))
-  end
-
-end