blacklight-gallery 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffbe838ae6acb0682381c6675b8f83d379241cba
-  data.tar.gz: ae99ff328fbc8528374b32533c0763893c499fa9
+  metadata.gz: a53aff88a47da1ba281d332cd1daea53020e37b4
+  data.tar.gz: 1f81070bc809fe402b42db61a4a54bfe88c866b9
 SHA512:
-  metadata.gz: 3fc0b5dc2b4816f8157f3d8024863ed83bff0ddcffffd71933e76f7cac88db4d7b7f54c38be4ea3f6809eda16ff66ddd3dfe1a35361c22784f01cd16387eba4b
-  data.tar.gz: ce17f6276395d0cb397f958a9b2799b719c3ca42912559d37daa899778b38210d0636d93e26efc9ac710738640bbb2ef872fe2514b024e7511b631793f59ad39
+  metadata.gz: cd5380372da4752fe3233febf9477e6308a53caf432a14b3ed954675fbfb9f69377bd08582cfeaaea94006e334e709d5de71d81cd29f659ddf730ee086d4606c
+  data.tar.gz: 058d3d596e076e0713ce7ed9c4c74e26f1db0e8dad0ad49078d9c2dfa41d73a1ffa4a276568964db1597f8b06436d4c11f7f3b848bfb2dc8c265ce90c9421f01

data/.gitignore

@@ -16,4 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 jetty
-spec/internal
+spec/internal
+.internal_test_app

data/Gemfile

@@ -5,19 +5,30 @@ gemspec
 
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
-if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 0.8.0
+# engine_cart stanza: 0.8.0
+# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+if File.exist?(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
 else
-  gem 'rails', ENV['RAILS_VERSION']
+  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
+
+  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
-  # explicitly include sass-rails to get compatible sprocket dependencies
-  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'sass-rails', ">= 5.0.0"
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'bootstrap-sass', '>= 3.3.5.1'
     gem 'responders', "~> 2.0"
+    gem 'sass-rails', ">= 5.0"
   else
-    gem 'sass-rails', '< 5.0'
-    gem 'coffee-rails', "~> 4.0.0"
+    gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
+    gem 'sass-rails', "< 5.0"
   end
-end
+end
+# END ENGINE_CART BLOCK

data/app/models/concerns/blacklight/gallery/openseadragon_solr_document.rb

@@ -1,7 +1,7 @@
 module Blacklight::Gallery::OpenseadragonSolrDocument
-  def to_openseadragon view_config = nil
-    if view_config and view_config.tile_source_field
-      Array(fetch(view_config.tile_source_field))
-    end
+  def to_openseadragon(view_config = nil)
+    return unless view_config.try(:tile_source_field) &&
+                  fetch(view_config.tile_source_field, nil)
+    Array(fetch(view_config.tile_source_field))
   end
 end

data/blacklight-gallery.gemspec

@@ -18,18 +18,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails"
-  spec.add_dependency "blacklight", "~> 5.12"
+  spec.add_dependency 'blacklight', '>= 5.12', '< 7'
   spec.add_dependency "bootstrap-sass", "~> 3.0"
   spec.add_dependency "openseadragon", ">= 0.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency "rspec-rails", "~> 3.1"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-activemodel-mocks"
   spec.add_development_dependency "rspec-collection_matchers"
   spec.add_development_dependency "jettywrapper"
-  spec.add_development_dependency "engine_cart", "~> 0.6"
+  spec.add_development_dependency "engine_cart", "~> 0.8"
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "poltergeist", ">= 1.5.0"
 end

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/spec/models/concerns/openseadragon_solr_document_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Blacklight::Gallery::OpenseadragonSolrDocument do
+  subject { SolrDocument.new(fields).to_openseadragon(view_config) }
+
+  context 'when configured for the view' do
+    let(:fields) { { some_field: 'data' } }
+    let(:view_config) { double('ViewConfig', tile_source_field: :some_field) }
+    it 'returns the data from the document as an array' do
+      expect(subject).to eq ['data']
+    end
+  end
+
+  context 'when not configured for the view' do
+    let(:fields) { { some_field: 'data' } }
+    let(:view_config) { double('ViewConfig') }
+    it 'returns nil' do
+      expect(subject).to be_nil
+    end
+  end
+
+  context 'when the document has the field' do
+    let(:fields) { { some_field: 'data' } }
+    let(:view_config) { double('ViewConfig', tile_source_field: :some_field) }
+    it 'returns the data from the document as an array' do
+      expect(subject).to eq ['data']
+    end
+  end
+
+  context 'when the document does not have the field' do
+    let(:fields) { { some_other_field: 'data' } }
+    let(:view_config) { double('ViewConfig', tile_source_field: :some_field) }
+    it 'returns the data from the document as an array' do
+      expect(subject).to be_nil
+    end
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,8 +1,6 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
-
   def remove_index 
     remove_file "public/index.html"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,22 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +278,7 @@ files:
 - spec/features/masonry_spec.rb
 - spec/features/slideshow_spec.rb
 - spec/helpers/blacklight/gallery_helper_spec.rb
+- spec/models/concerns/openseadragon_solr_document_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_document_slideshow.html.erb_spec.rb
@@ -286,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Gallery display for Blacklight
@@ -295,6 +316,7 @@ test_files:
 - spec/features/masonry_spec.rb
 - spec/features/slideshow_spec.rb
 - spec/helpers/blacklight/gallery_helper_spec.rb
+- spec/models/concerns/openseadragon_solr_document_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_document_slideshow.html.erb_spec.rb