active_fedora_relsint 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 059d025a9c1151a15355876f60ff87e808520d33
-  data.tar.gz: 08de94e141d50b1c3e8dd3a827ed2acd67cb10e8
+  metadata.gz: 804d1e107e01115222d2c938924909f60dea4481
+  data.tar.gz: 441b7e2f98637ce3c5cba3db80739a20ac8f591a
 SHA512:
-  metadata.gz: 2b029a74aa68d006905dd9273b576e2d70e782d32a7425f1a4e6038a46030fa4b2ee582792950aad9c2c91fb1f7459d563fef788ecc4138e7b064f3a41138050
-  data.tar.gz: ae3de7a0bbdfae56084318a101e927e090854526ea540cd90cf18d658d0fea41513ecb567ffbc9343268c71354684736b32be032d5168b0b554e511142eb6709
+  metadata.gz: 03c43dde8f0d13d0ab3528aac58223d313eb5c91c379f3a6fe18b2d58442bcf0e0dac1d48715dea9134afb291c204d02024981427e8fa7da37d0c92b4cee4f4b
+  data.tar.gz: 6f685ed9e328162b071980cf078e32f89318ba949d39ded9c0ec4025e4e0356441394ba64bf10e6494144cd4668aa57fd715311200096a1f190e6681ab339a77

data/lib/active_fedora_relsint/datastream.rb

@@ -2,6 +2,7 @@
 module ActiveFedora
   module RelsInt
     class Datastream < ActiveFedora::Datastream
+      XSD_INT_BITLENGTH = 31
       class_attribute :profile_solr_name
       attr_accessor :relationships_loaded
       
@@ -38,7 +39,20 @@ module ActiveFedora
         elsif object.is_a? RDF::Resource
           object
         elsif literal
-          RDF::Literal.new(object)
+          result = RDF::Literal.new(object)
+          case # invalid datatypes for FCRepo 3
+          when result.datatype.eql?(RDF::XSD.integer)
+            result.datatype = (signed_bit_length(result.object) > XSD_INT_BITLENGTH ? RDF::XSD.long : RDF::XSD.int)
+          when result.datatype.eql?(RDF::XSD.decimal)
+            result.datatype = RDF::XSD.double
+          when result.datatype.eql?(RDF::XSD.boolean)
+            result.datatype = nil
+          when result.datatype.eql?(RDF::XSD.date)
+            result = RDF::Literal.new(object.to_datetime)
+          when result.datatype.eql?(RDF::XSD.time)
+            result = RDF::Literal.new(object.to_datetime)
+          end
+          result
         else
           RDF::URI.new(object.to_s)
         end
@@ -149,6 +163,14 @@ module ActiveFedora
           @resource = resource
         end
       end
+      private
+      def signed_bit_length(num)
+        if num.respond_to? :bit_length
+          num.bit_length
+        else # in MRI 1.9.x, we need to implement the two complement bitlength
+          Math.log2(num < 0 ? num.abs : num+1).ceil
+        end
+      end
     end
   end
 end

data/lib/active_fedora_relsint/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module RelsInt
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

data/spec/unit/relsint_spec.rb

@@ -1,126 +1,133 @@
 require 'spec_helper'
 
 describe ActiveFedora::RelsInt, type: :unit do
-  before :all do
-    class Foo < ActiveFedora::Base
-      include ActiveFedora::RelsInt
-    end
-  end
-  
-  after :all do
-    Object.send(:remove_const, :Foo) # cleanup
+  it do
+    is_expected.to be
+    expect(defined? ActiveFedora::RelsInt::Datastream).to be
   end
-  
-  describe "modules" do
-    it "should exist" do
-      expect(defined? ActiveFedora::RelsInt).to be_truthy
-      expect(defined? ActiveFedora::RelsInt::Datastream).to be_truthy
+  context "is included in a subclass of ActiveFedora::Base" do
+    let(:af_model) do
+      af_model = Class.new(ActiveFedora::Base)
+      af_model.class_eval do
+        include ActiveFedora::RelsInt
+      end
+      af_model
+    end
+    it "should add the appropriate ds_spec and accessor methods when mixed in" do
+      expect(af_model.ds_specs.keys).to include( 'RELS-INT')
+      expect(af_model.ds_specs['RELS-INT'][:type]).to be(ActiveFedora::RelsInt::Datastream)
     end
-  end
-
-  it "should add the appropriate ds_spec and accessor methods when mixed in" do
-    expect(Foo.ds_specs.keys).to include( 'RELS-INT')
-    expect(Foo.ds_specs['RELS-INT'][:type]).to be(ActiveFedora::RelsInt::Datastream)
-  end
-
-  it "should serialize to appropriate RDF-XML on a new object" do
-    blank_relsint = fixture('rels_int_blank.xml').read
-    inner = double("DigitalObject")
-    allow(inner).to receive(:new_record?).and_return(true)
-    allow(inner).to receive(:pid).and_return("test:relsint")
-    repo = double("Repository")
-    allow(inner).to receive(:repository).and_return(repo)
-    test_obj = ActiveFedora::RelsInt::Datastream.new(inner,"RELS-INT")
-    expect(Nokogiri::XML.parse(test_obj.content)).to be_equivalent_to Nokogiri::XML.parse(blank_relsint)
-  end
-  
-  it "should serialize to appropriate RDF-XML when added to an existing obect" do
-    blank_relsint = fixture('rels_int_blank.xml').read
-    inner = double("DigitalObject")
-    allow(inner).to receive(:new_record?).and_return(false)
-    allow(inner).to receive(:pid).and_return("test:relsint")
-    repo = double("Repository")
-    # new datastream, no profile
-    expect(repo).to receive(:datastream_profile).with(inner.pid,"RELS-INT",nil, nil).and_return('')
-    allow(inner).to receive(:repository).and_return(repo)
-    test_obj = ActiveFedora::RelsInt::Datastream.new(inner,"RELS-INT")
-    expect(Nokogiri::XML.parse(test_obj.content)).to be_equivalent_to Nokogiri::XML.parse(blank_relsint)
   end
 
   describe ActiveFedora::RelsInt::Datastream do
-    before :each do
-      @test_relsint = fixture('rels_int_test.xml').read
-      @inner = double("DigitalObject")
-      allow(@inner).to receive(:new_record?).and_return(false)
-      allow(@inner).to receive(:pid).and_return("test:relsint")
-      allow(@inner).to receive(:internal_uri).and_return("info:fedora/test:relsint")
+    let(:pid) { "test:relsint" }
+    let(:inner) do
+      inner = double("DigitalObject")
+      allow(inner).to receive(:pid).and_return(pid)
+      allow(inner).to receive(:internal_uri).and_return("info:fedora/test:relsint")
+      allow(inner).to receive(:repository).and_return(repo)
+      inner
+    end
+    let(:repo) do
       repo = double("Repository")
+      allow(repo).to receive(:datastream_dissemination).with(:pid=>pid,:dsid=>"RELS-INT").and_return(test_relsint)
+      repo
+    end
+    let(:test_relsint) { fixture('rels_int_test.xml').read }
+    let(:profile) do
       profile_xml = fixture('rels_int_profile.xml').read
       profile = Rubydora::ProfileParser.parse_datastream_profile(profile_xml)
-      expect(repo).to receive(:datastream_profile).with(@inner.pid,"RELS-INT",nil, nil).and_return(profile)
-      allow(repo).to receive(:datastream_dissemination).with(:pid=>@inner.pid,:dsid=>"RELS-INT").and_return(@test_relsint)
-      allow(@inner).to receive(:repository).and_return(repo)
+      profile
+    end
+    let(:datastream) do
+      ActiveFedora::RelsInt::Datastream.new(inner,"RELS-INT")
+    end
+    before do
+      allow(inner).to receive(:new_record?).and_return(false)
+      allow(repo).to receive(:datastream_profile).with(pid,"RELS-INT",nil, nil).and_return(profile)
+    end
+    context "on a new object" do
+      before do
+        allow(inner).to receive(:new_record?).and_return(true)
+      end
+      it "should serialize to appropriate RDF-XML" do
+        blank_relsint = fixture('rels_int_blank.xml').read
+        expect(Nokogiri::XML.parse(datastream.content)).to be_equivalent_to Nokogiri::XML.parse(blank_relsint)
+      end
     end
+    context "is a new datastream on an existing object" do
+      before do
+        # new datastream, no profile
+        allow(repo).to receive(:datastream_profile).with(pid,"RELS-INT",nil, nil).and_return('')
+      end
+      it "should serialize to appropriate RDF-XML" do
+        blank_relsint = fixture('rels_int_blank.xml').read
+        expect(Nokogiri::XML.parse(datastream.content)).to be_equivalent_to Nokogiri::XML.parse(blank_relsint)
+      end
+    end
+
     it "should load relationships from foxml into the appropriate graphs" do
-      test_obj = ActiveFedora::RelsInt::Datastream.new(@inner,"RELS-INT")
-      expect(test_obj.changed?).to be(false)
-      dc = ActiveFedora::Datastream.new(@inner,"DC")
-      triples = test_obj.relationships(dc,:is_metadata_for)
+      expect(datastream.changed?).to be(false)
+      dc = ActiveFedora::Datastream.new(inner,"DC")
+      triples = datastream.relationships(dc,:is_metadata_for)
       e = ['info:fedora/test:relsint/DC','info:fedora/fedora-system:def/relations-external#isMetadataFor','info:fedora/test:relsint/RELS-INT'].
         map {|x| RDF::URI.new(x)}
       f = ['info:fedora/test:relsint/DC','info:fedora/fedora-system:def/relations-external#isMetadataFor','info:fedora/test:relsint/RELS-EXT']
         .map {|x| RDF::URI.new(x)}
       expect(triples).to eq([RDF::Statement.new(*e),RDF::Statement.new(*f)])
-      expect(Nokogiri::XML.parse(test_obj.content)).to be_equivalent_to Nokogiri::XML.parse(@test_relsint)
+      expect(Nokogiri::XML.parse(datastream.content)).to be_equivalent_to Nokogiri::XML.parse(test_relsint)
     end
     it "should load relationships into appropriate graphs when assigned content" do
-      #test_relsint = fixture('rels_int_test.xml').read
-      #inner = double("DigitalObject")
-      #inner.stub(:pid).and_return("test:relsint")
-      #inner.stub(:internal_uri).and_return("info:fedora/test:relsint")
-      test_obj = ActiveFedora::RelsInt::Datastream.new(@inner,"RELS-INT")
-      test_obj.content=@test_relsint
-      expect(test_obj.changed?).to be(true)
-      dc = ActiveFedora::Datastream.new(@inner,"DC")
-      triples = test_obj.relationships(dc,:is_metadata_for)
+      datastream.content=test_relsint
+      expect(datastream.changed?).to be(true)
+      dc = ActiveFedora::Datastream.new(inner,"DC")
+      triples = datastream.relationships(dc,:is_metadata_for)
       e = ['info:fedora/test:relsint/DC','info:fedora/fedora-system:def/relations-external#isMetadataFor','info:fedora/test:relsint/RELS-INT']
         .map {|x| RDF::URI.new(x)}
       f = ['info:fedora/test:relsint/DC','info:fedora/fedora-system:def/relations-external#isMetadataFor','info:fedora/test:relsint/RELS-EXT']
         .map {|x| RDF::URI.new(x)}
       expect(triples).to eq([RDF::Statement.new(*e),RDF::Statement.new(*f)])
-    end    
+    end
     it "should propagate relationship changes to the appropriate graph in RELS-INT" do
-      #test_relsint = fixture('rels_int_test.xml').read
-      #inner = double("DigitalObject")
-      #inner.stub(:pid).and_return("test:relsint")
-      #inner.stub(:internal_uri).and_return("info:fedora/test:relsint")
-      test_obj = ActiveFedora::RelsInt::Datastream.new(@inner,"RELS-INT")
-      dc = ActiveFedora::Datastream.new(@inner,"DC")
-      rels_ext = ActiveFedora::Datastream.new(@inner,"RELS-EXT")
-      expect(test_obj.to_resource(test_obj)).to eql(RDF::URI.new("info:fedora/#{@inner.pid}/#{test_obj.dsid}"))
-      test_obj.add_relationship(dc,:is_metadata_for, test_obj)
-      test_obj.add_relationship(dc,:is_metadata_for, rels_ext)
-      test_obj.add_relationship(rels_ext,:asserts, "FOO", true)
-      test_obj.add_relationship(test_obj,:asserts, "BAR", true)
-      test_obj.serialize!
-      expect(Nokogiri::XML.parse(test_obj.content)).to be_equivalent_to Nokogiri::XML.parse(@test_relsint)
+      dc = ActiveFedora::Datastream.new(inner,"DC")
+      rels_ext = ActiveFedora::Datastream.new(inner,"RELS-EXT")
+      expect(datastream.to_resource(datastream)).to eql(RDF::URI.new("info:fedora/#{inner.pid}/#{datastream.dsid}"))
+      datastream.add_relationship(dc,:is_metadata_for, datastream)
+      datastream.add_relationship(dc,:is_metadata_for, rels_ext)
+      datastream.add_relationship(rels_ext,:asserts, "FOO", true)
+      datastream.add_relationship(datastream,:asserts, "BAR", true)
+      datastream.serialize!
+      expect(Nokogiri::XML.parse(datastream.content)).to be_equivalent_to Nokogiri::XML.parse(test_relsint)
     end
     it "should clear matching relationships selectively" do
-      test_obj = ActiveFedora::RelsInt::Datastream.new(@inner,"RELS-INT")
-      test_obj.content=@test_relsint
-      rels_ext = ActiveFedora::Datastream.new(@inner,"RELS-EXT")
+      datastream.content=test_relsint
+      rels_ext = ActiveFedora::Datastream.new(inner,"RELS-EXT")
       test_pred = 'http://projecthydra.org/ns/relations#asserts'
-      expect(test_obj.relationships(rels_ext,:asserts)).to_not be_empty
-      test_obj.clear_relationship('info:fedora/test:relsint/RELS-EXT',:asserts)
-      expect(test_obj.relationships(rels_ext,:asserts)).to be_empty
-      expect(test_obj.relationships(test_obj,:asserts)).to_not be_empty
+      expect(datastream.relationships(rels_ext,:asserts)).to_not be_empty
+      datastream.clear_relationship('info:fedora/test:relsint/RELS-EXT',:asserts)
+      expect(datastream.relationships(rels_ext,:asserts)).to be_empty
+      expect(datastream.relationships(datastream,:asserts)).to_not be_empty
     end
     it "should run to_solr" do
-      test_obj = ActiveFedora::RelsInt::Datastream.new(@inner,"RELS-INT")
-      test_obj.content=@test_relsint
-      expect(test_obj.changed?).to be(true)
-      expect{test_obj.to_solr}.to_not raise_error
+      datastream.content=test_relsint
+      expect(datastream.changed?).to be(true)
+      expect{datastream.to_solr}.to_not raise_error
+    end
+    describe "#to_resource" do
+      # FCRepo 3.x only supports RDF::XSD.int, RDF::XSD.long, RDF::XSD.float, RDF::XSD.double,
+      # and RDF::XSD.date_time but RDF uses RDF::XSD.integer, RDF::XSD.boolean
+      {
+        0 => RDF::XSD.int, 32767 => RDF::XSD.int, -32768 => RDF::XSD.int,
+        2147483647 => RDF::XSD.int, -2147483648 => RDF::XSD.int,
+        2147483648 => RDF::XSD.long, -2147483649 => RDF::XSD.long,
+        true => nil, false => nil,
+        BigDecimal('2.5') => RDF::XSD.double, 2.5.to_f => RDF::XSD.double,
+        Time.new => RDF::XSD.date_time, Date.new => RDF::XSD.date_time, DateTime.new => RDF::XSD.date_time
+      }.each do |value, datatype|
+        it "should assign implicit datatypes to #{value.class.name} literals such as #{value} valid for FCRepo 3" do
+          expect(datastream.to_resource(value,true).datatype).to eql(datatype)
+        end
+      end
     end
   end
-  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora_relsint
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Benjamin Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveFedora library supporting RELS-INT datastreams