ansr_blacklight 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDk3NWUxNDFiNTdiYWY1MjU1Y2E3NzA4MWFmNTE4NDZkNzQ5NDg1MQ==
+    YTJjYWIyMDhiNWVlNzNiYmRmNGFiMzdkMWQ3MTEyMDc0YmRiOTRmZQ==
   data.tar.gz: !binary |-
-    NjM0ZWI5NjhkMTIwNGIxYTJiMmQyNDVlMmVhM2I1ODNhMzYyYjE3YQ==
+    ZGQ3NDNkN2YzYzM4OTRiMDc3YWVlOGY2NGQwN2NmMjI2NzU2MWRkNw==
 SHA512:
   metadata.gz: !binary |-
-    MDcxMjYzZTA1MzliMThmOWFhYzk4YTQ2MWRmODIxZmM3MWNlZWQxOTQ1NjZm
-    ZDU5N2ExODMxMTczZWE3NWFhMjg5YjNjOTI0ZWE5YjgwZDE0MGRkZGM3OTlk
-    OGM1ZGMzZjUxNjQ5MWNkN2Q1ODc2ZDNlNTY4M2U3YjcxNDU2Mjg=
+    MWU2ZTEyMTNiOTIzNDU3ZjA5YTY4NmU1NTA0MGQ2OGMxNDRhMTJkYzgyYTk4
+    ZjYzNjIzNzgwNTMyMjZmMTQyNjI0Y2RlZDQ4ODc3YTE4MThhOTI5Yjc1OTY3
+    YmIyYWYyNGZlNWRkMDcxYWIxMjQ0MTY0YWE4YWViNWZhOGRiOTQ=
   data.tar.gz: !binary |-
-    M2MxNDgxMjE3YWIxMjc0MmY3NzBkYjg1YWMxMTMyZjUwNDIyZDAxMzA2NGY0
-    NWQwYzI0Y2MzYzY2MjU5ZmJmZWY4NzA4OWEwNjMzMDQ2MTU5ZWNmZTgwNDJi
-    NTA1OGZjYzE0NWY2YWUwY2NhZGIyNDk2MzYzMDIyY2M3MjIwMWE=
+    ZTIyNTdhOGI0OThmYjUyMjFiODgxMTdjZGRkY2Y5NjE3NjQ4NzFiM2EyNGI4
+    Yjg3YWNjYjYxNDUxNDE4Zjc5YmQ2YjlmMDlmZGVjMDBkZTkxNmE4NGMwNjFh
+    NmRiYzE3ZWMwODhmMjU0MzA1MTU1ODkzNzZiMzU2YTNlODFlNDk=

data/ansr_blacklight.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rest-client'
   spec.add_dependency 'loggable'
   spec.add_dependency "rails",     ">= 3.2.6", "< 5"
-#  spec.add_dependency 'blacklight', '>=5.1.0'
+  spec.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
+  spec.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
   spec.add_dependency 'sass-rails'
   spec.add_development_dependency("rake")
   spec.add_development_dependency("bundler", ">= 1.0.14")

data/lib/ansr_blacklight/relation.rb

@@ -46,5 +46,14 @@ module Ansr::Blacklight
       end
       arel
     end
+
+    def grouped?
+      loaded? ? response.grouped? : !group_values.blank?
+    end
+
+    def group_by(key=self.group_values.first)
+      loaded
+      response.grouped(model()).select { |x| x.key == key.to_s }
+    end
   end
 end

data/spec/lib/loaded_relation_spec.rb

@@ -4,7 +4,7 @@ describe Ansr::Blacklight::Relation do
 
   def create_response
     raw_response = eval(mock_query_response)
-    Blacklight::SolrResponse.new(raw_response, raw_response['params'])
+    Ansr::Blacklight::Solr::Response.new(raw_response, raw_response['params'])
   end
 
   def stub_solr
@@ -133,64 +133,64 @@ describe Ansr::Blacklight::Relation do
   it 'should provide the responseHeader params' do
     raw_response = eval(mock_query_response)
     raw_response['responseHeader']['params']['test'] = :test
-    r = Blacklight::SolrResponse.new(raw_response, raw_response['params'])
+    r = Ansr::Blacklight::Solr::Response.new(raw_response, raw_response['params'])
     r.params['test'].should == :test
   end
 
   it 'should provide the solr-returned params and "rows" should be 11' do
     raw_response = eval(mock_query_response)
-    r = Blacklight::SolrResponse.new(raw_response, {})
+    r = Ansr::Blacklight::Solr::Response.new(raw_response, {})
     r.params[:rows].to_s.should == '11'
   end
 
   it 'should provide the ruby request params if responseHeader["params"] does not exist' do
     raw_response = eval(mock_query_response)
     raw_response.delete 'responseHeader'
-    r = Blacklight::SolrResponse.new(raw_response, :rows => 999)
+    r = Ansr::Blacklight::Solr::Response.new(raw_response, :rows => 999)
     r.params[:rows].to_s.should == '999'
   end
 
   it 'should provide spelling suggestions for regular spellcheck results' do
     raw_response = eval(mock_response_with_spellcheck)
-    r = Blacklight::SolrResponse.new(raw_response,  {})
+    r = Ansr::Blacklight::Solr::Response.new(raw_response,  {})
     r.spelling.words.should include("dell")
     r.spelling.words.should include("ultrasharp")
   end
 
   it 'should provide spelling suggestions for extended spellcheck results' do
     raw_response = eval(mock_response_with_spellcheck_extended)
-    r = Blacklight::SolrResponse.new(raw_response, {})
+    r = Ansr::Blacklight::Solr::Response.new(raw_response, {})
     r.spelling.words.should include("dell")
     r.spelling.words.should include("ultrasharp")
   end
 
   it 'should provide no spelling suggestions when extended results and suggestion frequency is the same as original query frequency' do
     raw_response = eval(mock_response_with_spellcheck_same_frequency)
-    r = Blacklight::SolrResponse.new(raw_response, {})
+    r = Ansr::Blacklight::Solr::Response.new(raw_response, {})
     r.spelling.words.should == []
   end
 
   it 'should provide spelling suggestions for a regular spellcheck results with a collation' do
     raw_response = eval(mock_response_with_spellcheck_collation)
-    r = Blacklight::SolrResponse.new(raw_response, {})
+    r = Ansr::Blacklight::Solr::Response.new(raw_response, {})
     r.spelling.words.should include("dell")
     r.spelling.words.should include("ultrasharp")
   end
 
   it 'should provide spelling suggestion collation' do
     raw_response = eval(mock_response_with_spellcheck_collation)
-    r = Blacklight::SolrResponse.new(raw_response, {})
+    r = Ansr::Blacklight::Solr::Response.new(raw_response, {})
     r.spelling.collation.should == 'dell ultrasharp'
   end
 
   it "should provide MoreLikeThis suggestions" do
     raw_response = eval(mock_response_with_more_like_this)
-    r = Blacklight::SolrResponse.new(raw_response, {})
+    r = Ansr::Blacklight::Solr::Response.new(raw_response, {})
     r.more_like(double(:id => '79930185')).should have(2).items
   end
 
   it "should be empty when the response has no results" do
-    r = Blacklight::SolrResponse.new({}, {})
+    r = Ansr::Blacklight::Solr::Response.new({}, {})
     r.stub(:total => 0)
     expect(r).to be_empty
   end

data/spec/lib/queryable_relation_spec.rb

@@ -106,7 +106,6 @@ describe Ansr::Blacklight::Relation do
       let(:visitor) { @visitor }
 
       it "should accept valid parameters" do
-        config = Blacklight::Configuration.new
         query = visitor.accept subject.build_arel.ast
         expect(query.path).to eq('outside')
         expect(query.to_hash).to eq({"defType" => "had",

data/spec/lib/relation/grouping_spec.rb

@@ -26,7 +26,7 @@ describe Ansr::Blacklight do
 
   before do
     Object.const_set('GroupModel', Class.new(TestModel))
-    GroupModel.solr = stub_solr(sample_response)
+    GroupModel.solr = stub_solr(sample_response.to_s)
     GroupModel.configure do |config|
       config[:table_class] = TestTable
     end
@@ -37,11 +37,13 @@ describe Ansr::Blacklight do
   end
 
   let(:response) do
-    create_response(sample_response)
+    rel = GroupModel.group("result_group_ssi")
+    rel.load
+    rel
   end
 
   let(:group) do
-    response.grouped(GroupModel).select { |x| x.key == "result_group_ssi" }.first
+    response.group_by.first
   end
 
   subject do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansr_blacklight
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansr
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,34 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: rsolr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement