active-fedora 5.6.3 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36cbadd6320acedd29786e7fc1205da8de33af9d
-  data.tar.gz: 4660a096abd53d763e734c5b8c2ea992437de9ac
+  metadata.gz: d203bb23166b8052663ce948c2abf70dff30c060
+  data.tar.gz: f2c73e2fc4d6fc6ce52686864c3f07d7c1cd951e
 SHA512:
-  metadata.gz: aa335c3d8a5a78c9a75fab436c489ff93c1bb584140e16d660698ec390a16463acf540959e9d408142cffac4179e9c13eba4443bf070e80fd845fb73ecb4ecfb
-  data.tar.gz: 45d345c38cc5b411aea4df64292b5af9a991e0c178d031ee730f45af90fee534e4c0c980270b9bbf51294ed185f3b311db2d84dc962e3e40442a547cf016d0da
+  metadata.gz: 9ad8ede6c8e065cccfa12c8b3e6675bb5c9cff1c3f766c7f2cf60d871069df7087be41857df4556751a13f9e93871fbb6e23626b9364929593d260bf6e1f99ea
+  data.tar.gz: e30d9a768d58a756dfee0bf8cfa431a00aaca87a70f561b84c36cff1c700ef874ac7db68d482400cb389615ca30582f46366f72a2188e69dc3823d1c6ae46bf3

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gemspec
 group :development, :test do
-  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov', :platform => [:mri_19, :mri_20]
   gem 'simplecov-rcov', :platform => :mri_19
 end
 

data/active-fedora.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.3')
+  s.add_dependency("rubydora", '~>1.6')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>0.3.8')
   s.add_dependency("deprecation")

data/lib/active_fedora/nokogiri_datastream.rb

@@ -63,6 +63,9 @@ module ActiveFedora
     end
     
     def ng_xml=(new_xml)
+      # before we set ng_xml, we load the datastream so we know if the new value differs.
+      local_or_remote_content(true)
+
       case new_xml 
       when Nokogiri::XML::Document
         self.content=new_xml.to_xml
@@ -95,22 +98,39 @@ module ActiveFedora
     def metadata?
       true
     end
+    
+    def local_or_remote_content(ensure_fetch = true)
+      @content = to_xml if ng_xml_changed? || autocreate?
+      super
+    end
 
-    def content
-      to_xml
+    def autocreate?
+      changed_attributes.has_key? :profile
     end
 
     def datastream_content
       @datastream_content ||= Nokogiri::XML(super).to_xml  {|config| config.no_declaration}.strip
     end
     
-    def content=(content)
-      @ng_xml = Nokogiri::XML::Document.parse(content)
-      super(@ng_xml.to_s)
+    def content=(new_content)
+      if inline?
+        # inline datastreams may be transformed by fedora 3, so we test for equivalence instead of equality
+        if !EquivalentXml.equivalent?(datastream_content, new_content)
+          ng_xml_will_change! 
+          @ng_xml = Nokogiri::XML::Document.parse(new_content)
+          super(@ng_xml.to_s)
+        end
+      else
+        if datastream_content != new_content
+          ng_xml_will_change! 
+          @ng_xml = Nokogiri::XML::Document.parse(new_content)
+          super(@ng_xml.to_s)
+        end
+      end
     end
 
     def content_changed?
-      return false if new? and !xml_loaded
+      return false if !xml_loaded
       super
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.6.3"
+  VERSION = "5.7.0"
 end

data/solr/conf/schema.xml

@@ -168,20 +168,13 @@
              enablePositionIncrements=true ensures that a 'gap' is left to
              allow for accurate phrase queries.
         -->
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-                enablePositionIncrements="true"
-                />
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.SnowballPorterFilterFactory" language="English"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
       <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>      
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.SnowballPorterFilterFactory" language="English"/>
@@ -195,8 +188,6 @@
     <fieldType name="textTight" class="solr.TextField" positionIncrementGap="100" >
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.SnowballPorterFilterFactory" language="English"/>

data/spec/spec_helper.rb

@@ -2,9 +2,6 @@ ENV["environment"] ||= 'test'
 require "bundler/setup"
 
 require 'simplecov'
-require 'simplecov-rcov'
-
-SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
 SimpleCov.start
 
 require 'active-fedora'

data/spec/unit/om_datastream_spec.rb

@@ -21,7 +21,7 @@ describe ActiveFedora::OmDatastream do
   before(:each) do
     @mock_inner = mock('inner object')
     @mock_repo = mock('repository')
-    @mock_repo.stub(:datastream_dissemination=>'My Content', :config=>{})
+    @mock_repo.stub(:datastream_dissemination=>'My Content', :config=>{}, :datastream=>'')
     @mock_inner.stub(:repository).and_return(@mock_repo)
     @mock_inner.stub(:pid)
     @mock_inner.stub(:new? => false)
@@ -173,6 +173,7 @@ describe ActiveFedora::OmDatastream do
     it "should persist the product of .to_xml in fedora" do
       @mock_repo.stub(:datastream).and_return('')
       @test_ds.stub(:new? => true)
+      @test_ds.stub(:ng_xml_changed? => true)
       @test_ds.stub(:to_xml => "fake xml")
       @mock_repo.should_receive(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'X', :dsState => 'A', :mimeType=>'text/xml')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 5.6.3
+  version: 5.7.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -9,30 +9,8 @@ authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVjaHJp
-  czEVMBMGCgmSJomT8ixkARkWBWNiZWVyMRQwEgYKCZImiZPyLGQBGRYEaW5mbzAe
-  Fw0xMzAzMDcwNDI1MzRaFw0xNDAzMDcwNDI1MzRaMD0xDjAMBgNVBAMMBWNocmlz
-  MRUwEwYKCZImiZPyLGQBGRYFY2JlZXIxFDASBgoJkiaJk/IsZAEZFgRpbmZvMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UC2Jw9BQ7bNTyVHaxGKbCqV
-  H+BggkU9CWOBB8YA7j2ebcAjRlj6AemKWHB0fPEi9qmGaE1bMbus8IJbFcjkZNqG
-  6yHVdOq9tacSH4iiEdH3QioWSte0zY7vwD9u92QLaNzUAm9yjIYF6ZDNM/dl25Hb
-  UYDURJXfLOKe3AivodRujsHRxDLFpS6FjdmwB9m8N2JBs/uOrUULB48aaa36pWWE
-  w4rhqT9kOpZl8BRdE/pTrePlQGDZ8Oe74gVWJth4lavtMaPP+UqHigmlnFvWO9+D
-  a+9q1qwvQ3ySYRJIACIsYaY6rlhZ6i+PGKhbCnG6at6bC9TVu2JfKbC/LBP9mwID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU61dLp5FY
-  qfqrGhr0V8WPGwAIEKQwGwYDVR0RBBQwEoEQY2hyaXNAY2JlZXIuaW5mbzAbBgNV
-  HRIEFDASgRBjaHJpc0BjYmVlci5pbmZvMA0GCSqGSIb3DQEBBQUAA4IBAQBuQW5N
-  6NaEla5fJftOPCecLSB5z8oS+fAO8LbfcUqHSo+y/1ZkN8kF8Y1SaoqPpqxuOZ4g
-  zX+X6k0gJHLKHTNufTaLhORd66Tp1raoW2qqKEcoshOcoQyw/mh9KYLVaQEX8US8
-  0yZ9dRMWFtRjwvkvueNMzLZidH+GsaDq/bxR9/9PAv+4RxQRYw+nrAglf2DxINSI
-  o8CdBnIKvzS1JRgM172NHIwScyJdDFWxfBh1CTG9VRXTwQfyQmM0h1GThWYcdNw7
-  W4KPvarE4dgxT4TXIIKkh/K/Z9yaYt73biInVukEI9H2HHWkuAyblxg1jcR/zy+w
-  K27NJ2vhSpx2PPhb
-  -----END CERTIFICATE-----
-date: 2013-04-11 00:00:00.000000000 Z
+cert_chain: []
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -152,14 +130,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -552,7 +530,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubyfedora
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.

checksums.yaml.gz.sig

@@ -1,3 +0,0 @@
-���HQ�Pq߰���������}��ϰ�#��n
-FA�ˮ)iS����kP�j�(�ZʻIj�xגh���h6�&���$)�LAfG�
7��YE��w9���F����Ħ���ۘ��y��4DdE�@8����⫐�^�#?�iU��@Mu�F���@+LTk��7z��7TP����
-I~x�W