hydra-core 9.3.0 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e23e594007d826f8bad840f355b3665e69f0f7e0
-  data.tar.gz: 6aadfdfd537b2dc78a82590bef7d1081bcfb8551
+  metadata.gz: 3aafc89dec95ca89ab2ff03a21972eacad393681
+  data.tar.gz: ac8fe4bd904f9d1e481321dce1407c483628d2c4
 SHA512:
-  metadata.gz: 249ab501d9712ea5e3a3b2bc4e7e8531651a1a7cbae89f3083996a505db3a4b47fed46bf7c4887c69c6f6a79c1ac6af81b35a61d6571a0a80c8e2c5afde6565a
-  data.tar.gz: e1fe9b5671e08dbf820c6b5f6aa20aa9da234d9dab3a53c850341fb6429b8df7fdc6f00a2d896eef72c6a9d8ab379b0f8032b900e78eb213e0eaf70443b50c06
+  metadata.gz: 2a7fb894e9c174171668650660144c5c3ad572ad406fbd883902e3be58193e14d74a84b69b776d5e14c4c173919e65a0a23a86372c22eb02cbdbf67f278317c4
+  data.tar.gz: be273f18331a7bf62ec8a79aa79fef0226cd0f57fc5b79ae8a8b0b2a0bc08c47ad5dddd0a92c691031702823780f322053ff78911f4b365a74698f6c86426b4b

data/app/controllers/concerns/hydra/controller/controller_behavior.rb

@@ -1,8 +1,5 @@
 # Include this module into any of your Controller classes to add Hydra functionality
 #
-# The primary function of this module is to mix in a number of other Hydra Modules, including
-#   Hydra::AccessControlsEnforcement
-#
 # @example
 #  class CustomHydraController < ApplicationController
 #    include Hydra::Controller::ControllerBehavior

data/app/controllers/concerns/hydra/controller/download_behavior.rb

@@ -135,7 +135,7 @@ module Hydra
       def prepare_file_headers
         send_file_headers! content_options
         response.headers['Content-Type'] = file.mime_type
-        response.headers['Content-Length'] ||= file.size
+        response.headers['Content-Length'] ||= file.size.to_s
         # Prevent Rack::ETag from calculating a digest over body
         response.headers['Last-Modified'] = asset.modified_date.utc.strftime("%a, %d %b %Y %T GMT")
         self.content_type = file.mime_type

data/app/controllers/concerns/hydra/controller/ip_based_ability.rb

@@ -0,0 +1,9 @@
+module Hydra::Controller
+  module IpBasedAbility
+    # Overriding the default method provided by cancan
+    # This passes the remote_ip to the Ability instance
+    def current_ability
+      @current_ability ||= ::Ability.new(current_user, remote_ip: request.remote_ip)
+    end
+  end
+end

data/app/controllers/concerns/hydra/controller/search_builder.rb

@@ -1,7 +1,7 @@
 module Hydra::Controller::SearchBuilder
   extend ActiveSupport::Concern
 
-  # Override blacklight to produce a search_builder that has the current collection in context
+  # Override blacklight to produce a search_builder that has the current ability in context
   def search_builder processor_chain = search_params_logic
     super.tap { |builder| builder.current_ability = current_ability }
   end

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.3.0"
+  VERSION = "9.4.0"
 end

data/spec/controllers/ip_based_ability_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'IpBasedAbilitySpec' do
+  controller do
+    include Hydra::Controller::IpBasedAbility
+  end
+
+  describe '#ability' do
+    let(:user) { double }
+    let(:ip) { '123.456.789.111' }
+
+    before do
+      allow(controller).to receive(:current_user).and_return(user)
+      allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip) { ip }
+    end
+
+    it 'passes ip to ability' do
+      expect(Ability).to receive(:new).with(user, remote_ip: ip)
+      controller.current_ability
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.4.0
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.3.0
+        version: 9.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.3.0
+        version: 9.4.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,7 @@ files:
 - app/controllers/concerns/hydra/controller.rb
 - app/controllers/concerns/hydra/controller/controller_behavior.rb
 - app/controllers/concerns/hydra/controller/download_behavior.rb
+- app/controllers/concerns/hydra/controller/ip_based_ability.rb
 - app/controllers/concerns/hydra/controller/search_builder.rb
 - app/helpers/blacklight_helper.rb
 - app/helpers/hydra/blacklight_helper_behavior.rb
@@ -171,6 +172,7 @@ files:
 - spec/.gitignore
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
+- spec/controllers/ip_based_ability_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/lib/model_methods_spec.rb
@@ -221,6 +223,7 @@ test_files:
 - spec/.gitignore
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/downloads_controller_spec.rb
+- spec/controllers/ip_based_ability_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/lib/model_methods_spec.rb