solrb 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1a4e86c8d3d832b6dd104a1474572142853b9beeee194cccd5de280165a78b
-  data.tar.gz: 8c80eec04d5d0733ac7671e49f3bcaf5f9886d7cd0a62453ebde3b147b9931ad
+  metadata.gz: 71788f83e115a345f449b9acb74eee56c3eb539a0b0a479277f1802616bec583
+  data.tar.gz: b531dfec715fd83ea33ee2bf38591e2beddd672463e78b136534dbbc0f14c2a3
 SHA512:
-  metadata.gz: ae8d3cdf4df2a9979e20686460039f9f2d7df4d8c6ba9132b9a82de8f3ccef999d65229ab7eeb6bacb4333005c3886e6dbf906fdcf86682fabc0119c64f4e72d
-  data.tar.gz: 761e6862887e1c61fbd3b9a432b89e8ce540b957e40a9b1566cc5fd065fe8391abe7822d18a7296395ec82797b1ffac1fd44cb372b1643a23ad8561ebd84b920
+  metadata.gz: bb11372f134addee39b1fa7cb33ab9731aa1dee95658ba6e00697c199f085a358ed488b3238e56867bd00f90aa11d8e73b77a28137f18cde9010bbda4b5fbe0a
+  data.tar.gz: 6f209b29887ecb55dd7e90cc96ebca989ba322fb6694a08e14464079a26df49a07330cad34312f75d0656d728ce2c9a46afd6aa64518a09efe92e3336fc1c620

data/README.md

@@ -1,5 +1,6 @@
 [![CircleCI](https://circleci.com/gh/machinio/solrb/tree/master.svg?style=svg)](https://circleci.com/gh/machinio/solrb/tree/master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/81e84c1c42f10f9da801/maintainability)](https://codeclimate.com/github/machinio/solrb/maintainability)
+[![Gem Version](https://badge.fury.io/rb/solrb.svg)](https://badge.fury.io/rb/solrb)
 
 Solrb
 ======
@@ -29,6 +30,7 @@ Installation: `gem install solrb`
   * [Field list](#field-list)
 * [Deleting documents](#deleting-documents)
 * [Active Support instrumentation](#active-support-instrumentation)
+* [Testing](#running-specs)
 * [Running specs](#running-specs)
 
 
@@ -185,6 +187,24 @@ end
   request.run(page: 1, page_size: 10)
 ```
 
+### AND and OR filters
+
+```ruby
+  usa_filter =
+    Solr::Query::Request::AndFilter.new(
+      Solr::Query::Request::Filter.new(type: :equal, field: :contry, value: 'USA'),
+      Solr::Query::Request::Filter.new(type: :equal, field: :region, value: 'Idaho')
+    )
+  canada_filter =
+    Solr::Query::Request::AndFilter.new(
+      Solr::Query::Request::Filter.new(type: :equal, field: :contry, value: 'Canada'),
+      Solr::Query::Request::Filter.new(type: :equal, field: :region, value: 'Alberta')
+    )
+
+  location_filters = Solr::Query::Request::OrFilter.new(usa_filter, canada_filter)
+  request = Solr::Query::Request.new(search_term: 'term', filters: location_filters)
+  request.run(page: 1, page_size: 10)
+```
 
 ## Query with sorting
 
@@ -258,7 +278,7 @@ Example of usage:
   category_id_boosts = {3025 => 2.0, 3024 => 1.5, 3023 => 1.2}
   request.boosting = Solr::Query::Request::Boosting.new(
     multiplicative_boost_functions: [
-      Solr::Query::Request::Boosting::DictionaryBoostFunction.new(field: :category_id, 
+      Solr::Query::Request::Boosting::DictionaryBoostFunction.new(field: :category_id,
         dictionary: category_id_boosts)
     ]
   )
@@ -305,6 +325,24 @@ ActiveSupport::Notifications.subscribe('request.solrb')  do |*args|
 end
 ```
 
+# Testing
+
+It's possible to inspect the parameters for each solr query request done using Solrb by requiring
+`solr/testing` file in your test suite. The query parameters will be accessible by reading
+`Solr::Testing.last_solr_request_params` after each request.
+
+```ruby
+require 'solr/testing'
+
+RSpec.describe MyTest do
+  let(:query) { Solr::Query::Request.new(search_term: 'Solrb') }
+  it 'returns the last solr request params' do
+    query.run(page: 1, page_size: 10)
+    expect(Solr::Testing.last_solr_request_params).to eq({ ... })
+  end
+end
+```
+
 
 
 # Running specs

data/lib/solr/query/request/and_filter.rb

@@ -0,0 +1,18 @@
+module Solr
+  module Query
+    class Request
+      class AndFilter
+        attr_reader :filters
+
+        def initialize(*filters)
+          @filters = filters
+        end
+
+        def to_solr_s
+          subexpressions = @filters.map(&:to_solr_s)
+          "(#{subexpressions.join(' AND ')})"
+        end
+      end
+    end
+  end
+end

data/lib/solr/query/request/or_filter.rb

@@ -2,12 +2,14 @@ module Solr
   module Query
     class Request
       class OrFilter
+        attr_reader :filters
+
         def initialize(*filters)
           @filters = filters
         end
 
         def to_solr_s
-          subexpressions = @filters.map { |f| "#{f.solr_field}:(#{f.solr_value})" }
+          subexpressions = @filters.map(&:to_solr_s)
           "(#{subexpressions.join(' OR ')})"
         end
       end

data/lib/solr/query/request/runner.rb

@@ -23,9 +23,6 @@ module Solr
         def run
           raw_response = connection(PATH).post_as_json(request_params)
           response = Solr::Response.from_raw_response(raw_response)
-          # TODO: need to remove that later
-          Solr.instrument(name: '__testing_request_response.solrb',
-                          data: { request: request_params, response: raw_response })
           response
         end
 

data/lib/solr/query/request.rb

@@ -10,6 +10,7 @@ require 'solr/query/request/spellcheck'
 require 'solr/query/request/sorting/field'
 require 'solr/query/request/field_with_boost'
 require 'solr/query/request/or_filter'
+require 'solr/query/request/and_filter'
 require 'solr/query/request/runner'
 require 'solr/query/response'
 require 'solr/errors/solr_query_error'

data/lib/solr/testing.rb

@@ -1,19 +1,19 @@
 module Solr
   module Testing
     class << self
-      attr_reader :last_solr_request_params, :last_solr_response
-
-      def subscribe_to_events
-        if defined? ActiveSupport::Notifications
-          ActiveSupport::Notifications.subscribe('__testing_request_response.solrb') do |*args|
-            event = ActiveSupport::Notifications::Event.new(*args)
-            @last_solr_request_params = event.payload.dig(:request, :params)
-            @last_solr_response = event.payload[:response]
-          end
-        end
-      end
+      attr_accessor :last_solr_request_params
     end
   end
 end
 
-Solr::Testing.subscribe_to_events
+module Solr::Query::Request::RunnerExtension
+  def run
+    response = super
+    Solr::Testing.last_solr_request_params = request_params[:params]
+    response
+  end
+end
+
+class Solr::Query::Request::Runner
+  prepend Solr::Query::Request::RunnerExtension
+end

data/lib/solr/version.rb

@@ -1,3 +1,3 @@
 module Solr
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

data/solrb.gemspec

@@ -5,8 +5,8 @@ require 'solr/version'
 Gem::Specification.new do |spec|
   spec.name          = 'solrb'
   spec.version       = Solr::VERSION
-  spec.authors       = ['Adriano Luz', 'Valentin Vasilyev']
-  spec.email         = ['adriano.luz@machinio.com', 'valentin@machinio.com']
+  spec.authors       = ['Adriano Luz', 'Valentin Vasilyev', 'Vladislav Syabruk']
+  spec.email         = ['adriano.luz@machinio.com', 'valentin@machinio.com', 'vladislav.syabruk@machinio.com']
 
   spec.summary       = 'Solr Ruby client with a nice object-oriented API'
   spec.homepage      = 'https://github.com/machinio/solrb'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: solrb
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Adriano Luz
 - Valentin Vasilyev
+- Vladislav Syabruk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -155,6 +156,7 @@ description:
 email:
 - adriano.luz@machinio.com
 - valentin@machinio.com
+- vladislav.syabruk@machinio.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -190,6 +192,7 @@ files:
 - lib/solr/indexing/document.rb
 - lib/solr/indexing/request.rb
 - lib/solr/query/request.rb
+- lib/solr/query/request/and_filter.rb
 - lib/solr/query/request/boost_magnitude.rb
 - lib/solr/query/request/boosting.rb
 - lib/solr/query/request/boosting/dictionary_boost_function.rb