active-fedora 7.1.2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e987a2602b885c9099690f3f89c4be1ff0a67e6
-  data.tar.gz: a9e588cd24f3ab37ab1c62517e8394cac99c3e9d
+  metadata.gz: e049566d6809c6928e2d4ea760f815d963c72a6b
+  data.tar.gz: 4f254fc331fc5ea3bdee7318e26eaab5b4a7b234
 SHA512:
-  metadata.gz: c6092042dc750aa62ef37094969243999464537013a6ed8b9c49013ea17f98e630875d7cc56208445ac75421f99de5f5b3ae63f532496d00dc5d3c2d583e0511
-  data.tar.gz: e320241e372b1a891440c719979dd0e81fff3025f425f710d673966e99cd49701b669e21fd2a19053458442cfd12fd035a3beef4713b09c25331c4e8366ee887
+  metadata.gz: 381da47c98e120c5ac1cc0901eeb00e4dbb1d2f8086ee190bd144d161385b0ef037f169a823776804cdcfc5b596231f2b77d896ad889507172b8299553f8a406
+  data.tar.gz: 85f7a9a3e29b002df812600a9049dbc663001f014089c5ef2e1fed5e257c9c9b1fb2113274282854264ebb99303eeac347e810ea5639b37696e2d5b4a4d9b783

data/.travis.yml

@@ -1,22 +1,14 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.3.1
 
-gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
-  - gemfiles/rails4.1.gemfile
 
-    
 matrix:
   include:
-    - rvm: 2.1.0
-      gemfile: gemfiles/rails4.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails4.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails4.gemfile
-      
+    - rvm: 2.2.5
+      env: RAILS_VERSION=4.2.7.1
+    - rvm: 2.1.10
+      env: RAILS_VERSION=4.2.7.1
 
 notifications:
   irc: "irc.freenode.org#projecthydra"
@@ -24,3 +16,5 @@ notifications:
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+jdk: oraclejdk8

data/Gemfile

@@ -9,3 +9,5 @@ group :test do
 end
 
 gem 'jruby-openssl', :platform=> :jruby
+gem 'activemodel', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+gem 'linkeddata', '~> 1.99'

data/active-fedora.gemspec

@@ -14,13 +14,13 @@ Gem::Specification.new do |s|
   s.license = "APACHE2"
   s.required_ruby_version     = '>= 1.9.3'
 
-  s.add_dependency 'rsolr', "~> 1.0.10"
+  s.add_dependency 'rsolr', ">= 1.0.10", '< 3'
   s.add_dependency 'om', '~> 3.1'
   s.add_dependency 'nom-xml', '>= 0.5.1'
   s.add_dependency "activesupport", '>= 3.0.0'
   s.add_dependency "rubydora", '~> 1.8'
   s.add_dependency "active-triples", '~> 0.2.2'
-  s.add_dependency "rdf-rdfxml", '~> 1.1.0'
+  s.add_dependency "rdf-rdfxml", '~> 1.1'
   s.add_dependency "deprecation"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"

data/lib/active_fedora/associations/belongs_to_association.rb

@@ -10,22 +10,25 @@ module ActiveFedora
       end
 
       def id_reader
-        @full_result ||= begin
+        begin
           # need to find the id with the correct class
           ids = @owner.ids_for_outbound(@reflection.options[:property])
 
-          return if ids.empty? 
+          return if ids.empty?
+
           # This incurs a lot of overhead, but it's necessary if the users use one property for more than one association.
           # e.g.
           #   belongs_to :author, property: :has_member, class_name: 'Person'
           #   belongs_to :publisher, property: :has_member
-
-          results = SolrService.query(construct_query(ids))
-          if results.present?
-            results.first
+          
+          if @owner.reflections.one? { |k, v| v.options[:property] == @reflection.options[:property] }
+            @full_results = nil
+            ids.first
+          else
+            @full_results = SolrService.query(construct_query(ids))
+            @full_results.first['id'] if @full_results.present?
           end
         end
-        @full_result['id'] if @full_result
       end
 
       def replace(record)
@@ -55,7 +58,13 @@ module ActiveFedora
 
       private
         def find_target
-          ActiveFedora::SolrService.reify_solr_results([@full_result]).first if id_reader
+          return unless id_reader
+
+          if @full_result # side-effect from #id_reader
+            ActiveFedora::SolrService.reify_solr_results([@full_result]).first
+          else
+            ActiveFedora::Base.find(id_reader, cast: true)
+          end
         end
 
         # Constructs a query that checks solr for the correct id & class_name combination

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "7.1.2"
+  VERSION = "7.2.0"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -1,7 +1,7 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
 require 'jettywrapper'
-JETTY_ZIP_BASENAME = 'master'
+JETTY_ZIP_BASENAME = 'v7.3.0'
 Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
 
 namespace :active_fedora do

data/spec/integration/om_datastream_spec.rb

@@ -30,11 +30,11 @@ describe ActiveFedora::OmDatastream do
     end
 
     it "should not be changed when no fields have been set" do
-      @obj.descMetadata.should_not be_content_changed
+      @obj.descMetadata.should_not be_changed
     end
     it "should be changed when a field has been set" do
       @obj.descMetadata.title = 'Foobar'
-      @obj.descMetadata.should be_content_changed
+      @obj.descMetadata.should be_changed
     end
     describe "#changed?" do
       it "should not be changed if the new xml matches the old xml" do

data/spec/support/an_active_model.rb

@@ -3,6 +3,10 @@ shared_examples_for "An ActiveModel" do
     expect(test).to eq(true)
   end
 
+  def assert_equal(test, obj)
+    expect(test).to eq(obj)
+  end
+
   def assert_kind_of(klass, inspected_object)
     expect(inspected_object).to be_kind_of(klass)
   end

data/spec/unit/active_fedora_spec.rb

@@ -123,7 +123,7 @@ describe ActiveFedora do
     it "should raise a NameError if the class isn't found" do
       expect {
         ActiveFedora.class_from_string("FooClass", ParentClass::OtherSiblingClass)
-      }.to raise_error NameError, "uninitialized constant FooClass"
+      }.to raise_error NameError, /uninitialized constant FooClass/
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.2.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +108,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -294,9 +300,6 @@ files:
 - config/solr.yml
 - config/solr_mappings_af_0.1.yml
 - config/solr_mappings_bl_2.4.yml
-- gemfiles/rails3.gemfile
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.gemfile
 - lib/active-fedora.rb
 - lib/active_fedora.rb
 - lib/active_fedora/association_relation.rb
@@ -551,9 +554,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+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: 

data/gemfiles/rails3.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../"
-
-gem 'activemodel', '~> 3.2.13'

data/gemfiles/rails4.1.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../"
-
-gem 'activemodel', '4.1.0.rc1'

data/gemfiles/rails4.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../"
-
-gem 'activemodel', '~> 4.0.0'