ansr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjdhOTQ4ZmY2ZTY3OTFkM2YwZjQwNDI3MWI4NmEzYTYwMTc3YzkwZg==
+    ZTlkMGM1Njk2MWE1ZTFhOTVjMWRkZDE5NjZiYjFkNDE5YTM0ZDAyYg==
   data.tar.gz: !binary |-
-    ZDI1ODllMmMxOGMxMjg5MDI3MWEyYjIwZjQ5ODdkYWNhOGZjZTZhOA==
+    MWFjZTYxMTg3Y2I0NGM1MTQ0MzI0YjkxZjIxNjI5YmU4MTlkZTk2MQ==
 SHA512:
   metadata.gz: !binary |-
-    MzhhMjYwMTA5YjljZjFhZmU3M2RmOWViNjZkMzg3YzA2ODIxOTRlYzc2M2Yy
-    NWUyNDI2NzY1ZTY5YzQ1ZTJhMTNmNzlmOWJjYWM1MzJlYjUyY2RiZjNkNzIx
-    ZjVlNzMyZjBlNzBjM2ZjOTNkMmI5NmRkOTZhZGQxNjJiYmI5YzE=
+    NWM2NGM0ZjgwYzZkNzYyY2ZhOTE2OTA3YmI1ZjMyNGZjZmJhMzE1YWYxYzlj
+    ZGQyZjMwNWNlY2RiOWE4MmI0MmZiZjI0Mzk0Mjg0MTE1MWE2ZWU0Y2I1ZGUw
+    MjMyMTNhMzYxOWU2Yzg5ZGU5ZWUwNzE3NWYzYTI1ZTY1NjQ4NzI=
   data.tar.gz: !binary |-
-    ZTlhMjE0NjczMjk0NDk1ZThmMzlkMGY0NWYwYzQ1OTU5NWVhMDA2NDY0N2Ux
-    YjE1ZGI5NTdiYTRmNGRjZmMyMmNjMzQ2ZWVlYjU4OTllN2FhNTlhYzNhMjk4
-    NDc1NjJmYTZhMGM0YTEzOTNkMjRmYmJmZDQzZTcxODQxMmI2Mjg=
+    OTU1MGNkZGNjZDZkZjRhNzlhMjI0ZjA4MWM5ZTI4NDQ2OTlkM2Y2OTBjN2Jl
+    Y2ZhNDFlZjE2OTMzYTA5YTgwZmM1YzA0YmQ2NDlhMjdhZWQ1YjIzMGRjNjJi
+    MWZlYjNiZDQ3MzE2ZDU1OGQyODMzYTVmOTNjY2E1NDk1ZDg5NTk=

data/ansr_blacklight/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/ansr_blacklight/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/ansr_blacklight/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/ansr_blacklight/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/ansr_blacklight/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

data/ansr_dpla/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ansr_dpla (0.0.1)
-      ansr (= 0.0.1)
+    ansr_dpla (0.0.3)
+      ansr (= 0.0.3)
       blacklight (>= 5.1.0)
       json-ld
       loggable
@@ -12,43 +12,43 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.0.4)
+      actionpack (= 4.0.4)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
+    actionpack (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
+    activerecord (4.0.4)
+      activemodel (= 4.0.4)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
+      activesupport (= 4.0.4)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    ansr (0.0.1)
-      blacklight (>= 5.1.0)
+    ansr (0.0.3)
+      activerecord
+      arel
       loggable
     arel (4.0.2)
-    atomic (1.1.15)
-    blacklight (5.2.0)
+    blacklight (5.3.0)
       bootstrap-sass (~> 3.0)
       deprecation
       kaminari (~> 0.13)
       nokogiri (~> 1.6)
       rails (>= 3.2.6, < 5)
       rsolr (~> 1.0.6)
-    bootstrap-sass (3.1.1.0)
+    bootstrap-sass (3.1.1.1)
       sass (~> 3.2)
     builder (3.1.4)
     deprecation (0.1.0)
@@ -57,8 +57,8 @@ GEM
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.9)
-    json-ld (1.1.1)
-      rdf (>= 1.0.8)
+    json-ld (1.1.3.1)
+      rdf (~> 1.1)
     kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -67,33 +67,33 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     minitest (4.7.5)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.0.4)
+      actionmailer (= 4.0.4)
+      actionpack (= 4.0.4)
+      activerecord (= 4.0.4)
+      activesupport (= 4.0.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
+      railties (= 4.0.4)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+    railties (4.0.4)
+      actionpack (= 4.0.4)
+      activesupport (= 4.0.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    rdf (1.1.2.1)
+    rdf (1.1.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rsolr (1.0.9)
+    rsolr (1.0.10)
       builder (>= 2.1.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -103,12 +103,12 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sass (3.3.2)
+    sass (3.3.5)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sprockets (2.12.0)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -117,9 +117,8 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot

data/ansr_dpla/lib/ansr_dpla/relation.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'blacklight'
 module Ansr::Dpla
   class Relation < ::Ansr::Relation
 
@@ -41,10 +40,10 @@ module Ansr::Dpla
 
         if v['total'] != 0
           items = v['terms'].collect do |term|
-            Blacklight::SolrResponse::Facets::FacetItem.new(:value => term['term'], :hits => term['count'])
+            Ansr::Facets::FacetItem.new(:value => term['term'], :hits => term['count'])
           end
           options = {:sort => 'asc', :offset => 0}
-          h[k] = Blacklight::SolrResponse::Facets::FacetField.new k, items, options
+          h[k] = Ansr::Facets::FacetField.new k, items, options
         end
         h
       end

data/ansr_dpla/spec/lib/relation/facet_spec.rb

@@ -65,7 +65,7 @@ describe Ansr::Dpla::Relation do
       test.load
       fkey = test.filters.keys.first
       facet = test.filters[fkey]
-      expect(facet).to be_a(Blacklight::SolrResponse::Facets::FacetField)
+      expect(facet).to be_a(Ansr::Facets::FacetField)
       facet.items
     end
     it 'should dispatch a query with no docs requested if not loaded' do
@@ -73,7 +73,7 @@ describe Ansr::Dpla::Relation do
       @mock_api.should_receive(:items).with(:q => 'kittens', :page_size=>0).once.and_return(@faceted)
       fkey = test.filters.keys.first
       facet = test.filters[fkey]
-      expect(facet).to be_a(Blacklight::SolrResponse::Facets::FacetField)
+      expect(facet).to be_a(Ansr::Facets::FacetField)
       expect(test.loaded?).to be_false
       test.filters # make sure we memoized the facet values
     end

data/lib/ansr/arel/big_table.rb

@@ -27,7 +27,11 @@ module Ansr
       end
 
       def primary_key
-        @primary_key ||= self.class.primary_key
+        @primary_key ||= ::Arel::Attribute.new( self, self.class.primary_key )
+      end
+
+      def primary_key=(key)
+        @primary_key = ::Arel::Attribute.new( self, key.to_s )
       end
 
       def [] name

data/lib/ansr/relation.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'blacklight'
+require 'kaminari'
 module Ansr
   class Relation < ::ActiveRecord::Relation
     attr_reader :response
@@ -9,7 +9,7 @@ module Ansr
     
     include Sanitization::ClassMethods
     include QueryMethods
-    include Kaminari::PageScopeMethods
+    include ::Kaminari::PageScopeMethods
     alias :total_count :count
 
     def initialize(klass, table, values = {})
@@ -98,6 +98,14 @@ module Ansr
       s
     end
 
+    def grouped?
+      false
+    end
+
+    def group_by(key=self.group_values.first)
+      []
+    end
+
     private
 
     # override to prevent default selection of all fields

data/lib/ansr/version.rb

@@ -1,5 +1,5 @@
 module Ansr
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
   def self.version
   	VERSION
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansr
 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: loggable