active-fedora 9.11.0 → 9.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bce277ca040d2e5d2b6f20ad12ded43a0d09a81e
-  data.tar.gz: 41626c552b9571d1993bc95f3719a0b12a24eb5b
+  metadata.gz: 02fb3ee9bf393052113ffdd4082e741bc155266c
+  data.tar.gz: 674c9e4a7a00220c1bb2011414dfdaf841b76100
 SHA512:
-  metadata.gz: b48ed0579be52f0683f6293adc4ff4908706d125f924119cabc2e01076bfcf2501e7732ef9b057948f6aeffd0f10679626d033aab52313523839020005d543ac
-  data.tar.gz: 2dfa7a8abb57bc8dc376da0767fd5d70ecf13bc9bbcb6f0542faaad5b8d70973367c1f81776aa8e4e704655029676b9ec124836f3736d1940c36a7e470b3092d
+  metadata.gz: 8e8c4e554a899aa3109de27b30dfb1a64b0c3954cf2ad4c2e7c255413ed27bf8242ed8bd951f8364c18a92d49f346f800ffed9e52abc7af507143eff1e5631e2
+  data.tar.gz: e5d93de8c674af3aa2f27dc18a52c06bf35afd3a0e9ab0b4ad01522664015e86e8e83faa4938ec5dda2ee16df5f76bec22229f9c3c8557e6f89fcf7f41b87a58

data/.rubocop.yml

@@ -88,6 +88,7 @@ Metrics/ClassLength:
     - 'lib/active_fedora/associations/collection_association.rb'
     - 'lib/active_fedora/reflection.rb'
     - 'lib/active_fedora/orders/ordered_list.rb'
+    - 'lib/active_fedora/solr_service.rb'
 
 Metrics/MethodLength:
   Enabled: false

data/lib/active_fedora.rb

@@ -122,6 +122,7 @@ module ActiveFedora #:nodoc:
       autoload :FinderMethods
     end
 
+    autoload :RuntimeRegistry
     autoload :Schema
     autoload :Scoping
     autoload :Serialization
@@ -170,6 +171,8 @@ module ActiveFedora #:nodoc:
     end
   end
 
+  extend Deprecation
+
   class << self
     attr_reader :fedora_config, :solr_config, :config_options
     attr_accessor :configurator
@@ -231,11 +234,12 @@ module ActiveFedora #:nodoc:
     end
 
     def reset_fedora!
-      @fedora = nil
+      Deprecation.warn(ActiveFedora, 'ActiveFedora.reset_fedora! is deprecated; use ActiveFedora::Fedora.reset! instead. This will be removed in active-fedora 10.0')
+      ActiveFedora::Fedora.reset!
     end
 
     def fedora
-      @fedora ||= Fedora.new(fedora_config.credentials)
+      ActiveFedora::Fedora.instance
     end
 
     delegate :predicate_config, to: :configurator

data/lib/active_fedora/associations/collection_association.rb

@@ -103,11 +103,11 @@ module ActiveFedora
         other_array.each { |val| raise_on_type_mismatch!(val) }
 
         load_target
-        other   = other_array.size < 100 ? other_array : other_array.to_set
-        current = @target.size < 100 ? @target : @target.to_set
+        deletions = @target - other_array
+        additions = other_array - @target
 
-        delete(@target.select { |v| !other.include?(v) })
-        concat(other_array.select { |v| !current.include?(v) })
+        delete(deletions)
+        concat(additions)
       end
 
       def include?(record)
@@ -254,7 +254,7 @@ module ActiveFedora
       end
 
       def add_to_target(record, skip_callbacks = false)
-        #  transaction do
+        # Start transaction
         callback(:before_add, record) unless skip_callbacks
         yield(record) if block_given?
 
@@ -266,7 +266,7 @@ module ActiveFedora
 
         callback(:after_add, record) unless skip_callbacks
         set_inverse_instance(record)
-        # end
+        # End transaction
 
         record
       end

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -14,7 +14,6 @@ module ActiveFedora
             return false unless record.save(validate: validate)
           end
         end
-
         owner[reflection.foreign_key] ||= []
         owner[reflection.foreign_key] += [record.id]
 

data/lib/active_fedora/associations/rdf.rb

@@ -4,11 +4,12 @@ module ActiveFedora
       def replace(values)
         ids = Array(values).reject(&:blank?)
         raise "can't modify frozen #{owner.class}" if owner.frozen?
-        destroy
-        ids.each do |id|
-          uri = ::RDF::URI(ActiveFedora::Base.id_to_uri(id))
-          owner.resource.insert [owner.rdf_subject, reflection.predicate, uri]
-        end
+        current_objects = filtered_results
+        incoming_objects = ids.map { |id| ::RDF::URI(ActiveFedora::Base.id_to_uri(id)) }
+        deletions = current_objects - incoming_objects
+        additions = incoming_objects - current_objects
+        deletions.each { |object| owner.resource.delete([owner.rdf_subject, reflection.predicate, object]) }
+        additions.each { |object| owner.resource.insert([owner.rdf_subject, reflection.predicate, object]) }
         owner.send(:attribute_will_change!, reflection.name)
       end
 

data/lib/active_fedora/cleaner.rb

@@ -44,7 +44,7 @@ module ActiveFedora
     end
 
     def self.reinitialize_repo
-      ActiveFedora.reset_fedora!
+      ActiveFedora::Fedora.reset!
     end
 
     def self.log(message)

data/lib/active_fedora/fedora.rb

@@ -1,5 +1,21 @@
 module ActiveFedora
   class Fedora
+    class << self
+      def register(options = {})
+        ActiveFedora::RuntimeRegistry.fedora_connection = Fedora.new(ActiveFedora.fedora_config.credentials.merge(options))
+      end
+
+      def instance
+        register unless ActiveFedora::RuntimeRegistry.fedora_connection
+
+        ActiveFedora::RuntimeRegistry.fedora_connection
+      end
+
+      def reset!
+        ActiveFedora::RuntimeRegistry.fedora_connection = nil
+      end
+    end
+
     def initialize(config)
       @config = config
     end

data/lib/active_fedora/file/streaming.rb

@@ -24,7 +24,7 @@ module ActiveFedora::File::Streaming
 
     def each(no_of_requests_limit = 3, &block)
       raise ArgumentError, 'HTTP redirect too deep' if no_of_requests_limit == 0
-      Net::HTTP.start(uri.host, uri.port) do |http|
+      Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == 'https')) do |http|
         request = Net::HTTP::Get.new uri, headers
         http.request request do |response|
           case response

data/lib/active_fedora/runtime_registry.rb

@@ -0,0 +1,9 @@
+require 'active_support/per_thread_registry'
+
+module ActiveFedora
+  class RuntimeRegistry
+    extend ActiveSupport::PerThreadRegistry
+
+    attr_accessor :solr_service, :fedora_connection
+  end
+end

data/lib/active_fedora/solr_hit.rb

@@ -21,6 +21,7 @@ module ActiveFedora
     attr_reader :document
 
     def initialize(document)
+      document = document.with_indifferent_access
       super
       @document = document
     end

data/lib/active_fedora/solr_service.rb

@@ -5,22 +5,34 @@ module ActiveFedora
   class SolrService
     extend Deprecation
 
-    attr_reader :conn
+    attr_writer :conn
 
-    def initialize(host, args)
-      host = 'http://localhost:8080/solr' unless host
-      args = { read_timeout: 120, open_timeout: 120 }.merge(args.dup)
-      args[:url] = host
-      @conn = RSolr.connect args
+    def initialize(options = {})
+      @options = { read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr' }.merge(options)
+    end
+
+    def conn
+      @conn ||= RSolr.connect @options
     end
 
     class << self
-      def register(host = nil, args = {})
-        Thread.current[:solr_service] = new(host, args)
+      def register(*args)
+        options = args.extract_options!
+
+        if args.length == 1
+          Deprecation.warn(SolrService, "SolrService.register with a host argument is deprecated. Use `SolrService.register(url: host)` instead. This will be removed in active-fedora 10.0")
+
+          host = args.first
+          options[:url] = host if host
+        elsif args.length > 1
+          raise ArgumentError, "wrong number of arguments (#{args.length} for 0..2)"
+        end
+
+        ActiveFedora::RuntimeRegistry.solr_service = new(options)
       end
 
       def reset!
-        Thread.current[:solr_service] = nil
+        ActiveFedora::RuntimeRegistry.solr_service = nil
       end
 
       def select_path
@@ -30,12 +42,11 @@ module ActiveFedora
       def instance
         # Register Solr
 
-        unless Thread.current[:solr_service]
-          register(ActiveFedora.solr_config[:url], ActiveFedora.solr_config)
+        unless ActiveFedora::RuntimeRegistry.solr_service
+          register(ActiveFedora.solr_config)
         end
 
-        raise SolrNotInitialized unless Thread.current[:solr_service]
-        Thread.current[:solr_service]
+        ActiveFedora::RuntimeRegistry.solr_service
       end
 
       def lazy_reify_solr_results(solr_results, opts = {})
@@ -150,5 +161,4 @@ module ActiveFedora
       end
     end
   end # SolrService
-  class SolrNotInitialized < StandardError; end
 end # ActiveFedora

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.11.0".freeze
+  VERSION = "9.12.0".freeze
 end

data/spec/integration/solr_hit_spec.rb

@@ -24,8 +24,7 @@ describe ActiveFedora::SolrHit do
     title: 'My Title'
   ) }
 
-  let(:profile) { { "foo" => ["baz"], "bar" => "quix", "title" => "My Title" }.to_json }
-  let(:doc) { { 'id' => 'test-123', 'has_model_ssim' => ['Foo'], 'object_profile_ssm' => profile } }
+  let(:doc) { obj.to_solr }
   let(:solr_hit) { described_class.new(doc) }
 
   after do
@@ -44,6 +43,8 @@ describe ActiveFedora::SolrHit do
   describe "#instantiate_with_json" do
     subject { solr_hit.instantiate_with_json }
 
+    it { is_expected.to be_persisted }
+
     it "finds the document in solr" do
       expect(subject).to be_instance_of Foo
       expect(subject.title).to eq 'My Title'

data/spec/unit/file/streaming_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ActiveFedora::File::Streaming do
+  let(:test_class) do
+    tc = Class.new
+    tc.send(:include, described_class)
+    tc
+  end
+  let(:streamer) do
+    streamer = test_class.new
+    allow(streamer).to receive(:uri).and_return(uri)
+    allow(streamer).to receive(:authorization_key).and_return("authorization_key")
+    streamer
+  end
+
+  context "without ssl" do
+    let(:uri) { "http://localhost/file/1" }
+
+    it do
+      expect(Net::HTTP).to receive(:start).with('localhost', 80, use_ssl: false).and_return(nil)
+      streamer.stream.each
+    end
+  end
+
+  context "with ssl" do
+    let(:uri) { "https://localhost/file/1" }
+
+    it do
+      expect(Net::HTTP).to receive(:start).with('localhost', 443, use_ssl: true).and_return(nil)
+      streamer.stream.each
+    end
+  end
+end

data/spec/unit/solr_service_spec.rb

@@ -2,43 +2,50 @@ require 'spec_helper'
 
 describe ActiveFedora::SolrService do
   before do
-    Thread.current[:solr_service] = nil
+    described_class.reset!
   end
 
-  after(:all) do
-    described_class.register(ActiveFedora.solr_config[:url])
+  after do
+    described_class.reset!
   end
 
-  it "takes a n-arg constructor and configure for localhost" do
-    expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr')
-    described_class.register
-  end
-  it "accepts host arg into constructor" do
-    expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://fubar')
-    described_class.register('http://fubar')
-  end
-  it "clobbers options" do
-    expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr', autocommit: :off, foo: :bar)
-    described_class.register(nil, autocommit: :off, foo: :bar)
+  describe '#conn' do
+    it "takes a n-arg constructor and configure for localhost" do
+      expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr')
+      described_class.register.conn
+    end
+    it "accepts host arg into constructor" do
+      expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://fubar')
+      Deprecation.silence(described_class) do
+        described_class.register('http://fubar').conn
+      end
+    end
+    it "clobbers options" do
+      expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr', autocommit: :off, foo: :bar)
+      described_class.register(autocommit: :off, foo: :bar).conn
+    end
   end
 
-  it "sets the threadlocal solr service" do
-    expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr', autocommit: :off, foo: :bar)
-    ss = described_class.register(nil, autocommit: :off, foo: :bar)
-    expect(Thread.current[:solr_service]).to eq ss
-    expect(described_class.instance).to eq ss
-  end
-  it "tries to initialize if the service not initialized, and fail if it does not succeed" do
-    expect(Thread.current[:solr_service]).to be_nil
-    expect(described_class).to receive(:register)
-    expect(proc { described_class.instance }).to raise_error(ActiveFedora::SolrNotInitialized)
+  describe '#conn=' do
+    let(:new_connection) { double }
+    it 'is settable' do
+      described_class.instance.conn = new_connection
+      expect(described_class.instance.conn).to eq new_connection
+    end
   end
-  it "passes on solr_config when initializing the service" do
-    allow(RSolr).to receive(:connect)
-    expect(Thread.current[:solr_service]).to be_nil
-    allow(ActiveFedora).to receive(:solr_config).and_return(url: 'http://fubar', update_path: 'update_test')
-    expect(described_class).to receive(:register).with('http://fubar', hash_including(update_path: 'update_test')).and_call_original
-    described_class.instance
+
+  describe '.instance' do
+    it "sets the threadlocal solr service" do
+      ss = described_class.register(autocommit: :off, foo: :bar)
+      expect(ActiveFedora::RuntimeRegistry.solr_service).to eq ss
+      expect(described_class.instance).to eq ss
+    end
+    it "passes on solr_config when initializing the service" do
+      allow(RSolr).to receive(:connect)
+      allow(ActiveFedora).to receive(:solr_config).and_return(url: 'http://fubar', update_path: 'update_test')
+      expect(described_class).to receive(:register).with(hash_including(url: 'http://fubar', update_path: 'update_test')).and_call_original
+      described_class.instance
+    end
   end
 
   describe '#construct_query_for_pids' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.11.0
+  version: 9.12.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -522,6 +522,7 @@ files:
 - lib/active_fedora/rspec_matchers/belong_to_associated_active_fedora_object_matcher.rb
 - lib/active_fedora/rspec_matchers/have_many_associated_active_fedora_objects_matcher.rb
 - lib/active_fedora/rspec_matchers/have_predicate_matcher.rb
+- lib/active_fedora/runtime_registry.rb
 - lib/active_fedora/schema.rb
 - lib/active_fedora/schema_indexing_strategy.rb
 - lib/active_fedora/scoping.rb
@@ -688,6 +689,7 @@ files:
 - spec/unit/core_spec.rb
 - spec/unit/default_model_mapper_spec.rb
 - spec/unit/fedora_spec.rb
+- spec/unit/file/streaming_spec.rb
 - spec/unit/file_configurator_spec.rb
 - spec/unit/file_path_builder_spec.rb
 - spec/unit/file_spec.rb
@@ -763,9 +765,8 @@ 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: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []
-has_rdoc: