europeana-blacklight 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2eb749d05d56671137600760ee94c54860076f
-  data.tar.gz: 3d1fdf6a5191730cea50dc15547f4875217eb395
+  metadata.gz: fdc8eda7f1866737f406348228cc88fd59b228ce
+  data.tar.gz: 95920756f24cf7dd857f01b1aa3c6b0bb265817c
 SHA512:
-  metadata.gz: 28a19de2bda541663185b1905884d9b00b57a0c381af2df47cab66d7f5d05bae9df4339c70e9fd88fa6bd5fc5665ea2b8b36ca339efb131a332adc571240b9b0
-  data.tar.gz: f0bcbbdb6315dcfe4afc20347c3aba852fe747299eb4871566bdce9537c2dc5f6ef7fabdf864782d9c2b8029c6aa9e98222501e3619d0ee0d71ac72edf752ee8
+  metadata.gz: 78009641836391f5b337581d9d49982f9771f5d5c65c1aad42c73ae6a4211699da39b81322da55b7d8402fbfd37c831190bb5b4e110bb5c6de8c81efbd2e4d91
+  data.tar.gz: 5c2915e1e65cdd4e55c572426eee17eac8a2ab03639c238820af4d28bc76d5c20d7ffeb26ea030652ebdf245305ac3af25ec6f11c15e3c939c32f08c54658cce

data/QUICKSTART.md

@@ -16,7 +16,7 @@ cd culture_vulture
 ## Bundle europeana-blacklight
 Add to the Gemfile:
 ```ruby
-gem 'europeana-blacklight', '~> 0.3'
+gem 'europeana-blacklight', '~> 0.3', '< 0.4'
 ```
 
 ## Get a Europeana API key 
@@ -26,6 +26,7 @@ From http://labs.europeana.eu/api/
 ```
 bundle install
 bundle exec rails generate blacklight:install --devise
+# This will ask if you want to overwrite some files; just say yes in a new app.
 bundle exec rails generate europeana:blacklight:install YOUR_API_KEY
 bundle exec rake db:migrate
 ```

data/europeana-blacklight.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'blacklight', '~> 6.0.0'
-  spec.add_dependency 'europeana-api', '~> 0.4.1'
+  spec.add_dependency 'europeana-api', '~> 0.5.0'
   spec.add_dependency 'iso-639', '~> 0.2.5'
   spec.add_dependency 'rails', '>= 4.2.2', '< 5'
 

data/lib/europeana/blacklight/response/facets.rb

@@ -49,6 +49,10 @@ module Europeana
             @options[:offset] || default_offset
           end
 
+          # Expected by {Blacklight::Facet#facet_paginator}
+          def prefix
+          end
+
           def sort
             # Europeana API does not support facet sorting
             nil

data/lib/europeana/blacklight/routes.rb

@@ -8,7 +8,7 @@ module Europeana
       end
 
       def call(mapper, _options = {})
-        constraints id: %r{[^/]+/[^/]+} do
+        mapper.constraints id: %r{[^/]+/[^/]+} do
           mapper.post 'record/*id/track', action: 'track', as: 'track'
           mapper.get 'record/*id', action: 'show', as: 'show'
         end

data/lib/europeana/blacklight/version.rb

@@ -1,5 +1,5 @@
 module Europeana
   module Blacklight
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.4.1'.freeze
   end
 end

data/lib/europeana/blacklight.rb

@@ -1,4 +1,5 @@
 require 'blacklight'
+require 'europeana/api'
 require 'europeana/blacklight/engine'
 
 module Europeana

data/lib/generators/europeana/blacklight/install_generator.rb

@@ -6,7 +6,8 @@ module Europeana
       argument :europeana_api_key, type: :string
       argument :controller_name, type: :string, default: 'catalog'
 
-      def disable_rsolr_gem
+      def disable_solr_gems
+        comment_lines('Gemfile', /gem 'solr_wrapper'/)
         comment_lines('Gemfile', /gem 'rsolr'/)
       end
 

data/spec/europeana/blacklight/repository_spec.rb

@@ -24,13 +24,13 @@ RSpec.describe Europeana::Blacklight::Repository do
 
     it 'should send a record query to the API' do
       subject.find(record_id)
-      expect(a_request(:get, "www.europeana.eu/api/v2/record#{record_id}.json").
+      expect(a_request(:get, "https://www.europeana.eu/api/v2/record#{record_id}.json").
         with(query: hash_including({ 'wskey' => api_key }))).to have_been_made
     end
 
     it 'should pass on API query params' do
       subject.find(record_id, callback: 'showRecord')
-      expect(a_request(:get, "www.europeana.eu/api/v2/record#{record_id}.json").
+      expect(a_request(:get, "https://www.europeana.eu/api/v2/record#{record_id}.json").
         with(query: hash_including({ 'wskey' => api_key, 'callback' => 'showRecord' }))).to have_been_made
     end
 
@@ -44,7 +44,7 @@ RSpec.describe Europeana::Blacklight::Repository do
 
     it 'should send a search query to the API' do
       subject.search('query' => query)
-      expect(a_request(:get, 'www.europeana.eu/api/v2/search.json').
+      expect(a_request(:get, 'https://www.europeana.eu/api/v2/search.json').
         with(query: hash_including({ 'wskey' => api_key, 'query' => query }))).to have_been_made
     end
 

data/spec/spec_helper.rb

@@ -25,11 +25,11 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    stub_request(:get, %r{http://www.europeana.eu/api/v2/record/[^/]+/[^/.]+\.json}).
+    stub_request(:get, %r{https://www.europeana.eu/api/v2/record/[^/]+/[^/.]+\.json}).
       with(query: hash_including(:wskey)).
       to_return(body: '{"success":true}', headers: { 'content-type' => 'application/json' })
 
-    stub_request(:get, 'http://www.europeana.eu/api/v2/search.json').
+    stub_request(:get, 'https://www.europeana.eu/api/v2/search.json').
       with(query: hash_including(:wskey, :query)).
       to_return(body: '{"success":true}', headers: { 'content-type' => 'application/json' })
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europeana-blacklight
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Richard Doe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Europeana REST API adapter for Blacklight
@@ -312,3 +312,4 @@ test_files:
 - spec/models/europeana/blacklight/document_spec.rb
 - spec/presenters/europeana/blacklight/document_presenter_spec.rb
 - spec/spec_helper.rb
+has_rdoc: