europeana-blacklight 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dffb082424290fd5b9bc9dd1b8cd87d71444535
-  data.tar.gz: afc2cf62dcc397c80ba298085940a94cb6c77665
+  metadata.gz: e06e950f7d8839a8f3adcf6383f6ad14d90fe04b
+  data.tar.gz: 5d98016e3a0bd6b6dd627bc0cdd239c4c52ae529
 SHA512:
-  metadata.gz: 6c731bb9b10a12a12efa8deb62720c33734aaf0ed2a9cd97e5ec734681f9a84c6e4dd6e1ec514a3e291a8532637186dd6b8ae06fb6e21ac50b70827d59372952
-  data.tar.gz: 65d3cbcdd1d8648f3df4bfbcaccc69f8f477cafd1e0a9eafe9ae9455356afa7725faca1fe3d330abc7217abc63652d156ed2c77b90bff3a305e2e46aa900b9ef
+  metadata.gz: 6c19a7a7227141539622f58bcb0b7225125d6b5a2f391a047829e82194785ca8683d588b908cb7726d5039ac45e95981c0513444c9d7e77b525f583ebfc354e8
+  data.tar.gz: 1da07143ac3430f3941f82ad205ab608fd900d4afbf18cd9a89c8474c14847579fc06d14b21a91f04bea5d91487e34584354f2bb8abc73b12ca49d9d01c4399f

data/.gitignore

@@ -1,3 +1,4 @@
+.ruby-version
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in europeana-blacklight.gemspec
 gemspec
 
+gem 'europeana-api', github: 'europeana/europeana-api-client-ruby', branch: 'develop'
+
 group :test do
   gem 'coveralls', require: false
 end

data/app/models/europeana/blacklight/document/more_like_this.rb

@@ -47,7 +47,7 @@ module Europeana
           return nil unless string_terms.present?
 
           or_terms = string_terms.map do |v|
-            '"' + Europeana::API::Search.escape(v) + '"'
+            '"' + Europeana::API.record.escape(v) + '"'
           end.join(' OR ')
           "#{param}: (#{or_terms})^#{boost}"
         end

data/lib/europeana/blacklight/repository.rb

@@ -13,7 +13,7 @@ module Europeana
       # @return (see blacklight_config.response_model)
       def find(id, params = {})
         id = "/#{id}" unless id[0] == '/'
-        res = connection.record(id, params)
+        res = connection.record.fetch(params.merge(id: id))
 
         blacklight_config.response_model.new(
           res, params, document_model: blacklight_config.document_model,
@@ -22,7 +22,7 @@ module Europeana
       end
 
       def search(params = {})
-        res = connection.search(params)
+        res = connection.record.search(params.to_h)
 
         blacklight_config.response_model.new(
           res, params, document_model: blacklight_config.document_model,
@@ -42,23 +42,7 @@ module Europeana
 
       def build_connection
         Europeana::API.tap do |api|
-          api.api_key = blacklight_config.connection_config[:europeana_api_key]
-          api.cache_store = cache_store
-          api.cache_expires_in = cache_expires_in
-        end
-      end
-
-      protected
-
-      def cache_store
-        @cache_store ||= begin
-          blacklight_config.europeana_api_cache || ActiveSupport::Cache::NullStore.new
-        end
-      end
-
-      def cache_expires_in
-        @expires_in ||= begin
-          blacklight_config.europeana_api_cache_expires_in || 24.hours
+          api.key = blacklight_config.connection_config[:europeana_api_key]
         end
       end
     end

data/lib/europeana/blacklight/search_builder.rb

@@ -22,7 +22,12 @@ module Europeana
 
       delegate :to_query, :delete, to: :to_hash
 
-      STANDALONE_FACETS = %w(COLOURPALETTE MEDIA REUSABILITY)
+      STANDALONE_FACETS = %w(COLOURPALETTE MEDIA REUSABILITY THUMBNAIL).freeze
+
+      MEDIA_FACETS = %w(COLOURPALETTE IMAGE_ASPECTRATIO IMAGE_COLOR IMAGE_COLOUR
+                        IMAGE_GRAYSCALE IMAGE_GREYSCALE IMAGE_SIZE MEDIA MIME_TYPE
+                        SOUND_DURATION SOUND_HQ TEXT_FULLTEXT VIDEO_DURATION
+                        VIDEO_HD).freeze
 
       ##
       # Start with general defaults from BL config. Need to use custom
@@ -103,7 +108,7 @@ module Europeana
       end
 
       def quote_facet_value(facet_field, value)
-        return value if Europeana::API::Search::Fields::MEDIA.include?(facet_field)
+        return value if MEDIA_FACETS.include?(facet_field)
         return value if value.include?('*')
         '"' + value.gsub('"', '\"') + '"'
       end

data/lib/europeana/blacklight/version.rb

@@ -1,5 +1,5 @@
 module Europeana
   module Blacklight
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.5.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: europeana-blacklight
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Richard Doe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Europeana REST API adapter for Blacklight