active_fedora_relsint 0.1.1 → 0.2.0

data/lib/active_fedora_relsint/datastream.rb

@@ -1,7 +1,11 @@
 module ActiveFedora
   module RelsInt
     class Datastream < ActiveFedora::Datastream
+      class_attribute :profile_solr_name
       attr_accessor :relationships_loaded
+      
+      self.profile_solr_name = ActiveFedora::SolrService.solr_name("rels_int_profile", :string, :displayable)
+      
       def serialize!
         self.content = to_rels_int() if changed_attributes.include? 'relationships'
         changed_attributes.delete 'relationships'
@@ -111,6 +115,30 @@ module ActiveFedora
       def self.xml_template
         "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"></rdf:RDF>"
       end
+      
+      def to_solr(solr_doc=Hash.new)
+        result = super(solr_doc)
+        result = solrize_relationships(result)
+        result
+      end
+      
+      def from_solr(solr_doc)
+        @solr_hash = JSON.parse(solr_doc[self.class.profile_solr_name][0])
+      end
+      
+      def solrize_relationships(solr_doc=Hash.new)
+        rel_hash = {} # the rels_int_profile is a hash of hashes in json
+        graph.each_statement do |statement|
+          predicate = ActiveFedora::RelsExtDatastream.short_predicate(statement.predicate)
+          literal = statement.object.kind_of?(RDF::Literal)
+          val = literal ? statement.object.value : statement.object.to_str
+          rel_hash[statement.subject] ||= {}
+          rel_hash[statement.subject][predicate] ||= []
+          rel_hash[statement.subject][predicate] << val
+        end
+        solr_doc[self.class.profile_solr_name] = rel_hash.to_json unless rel_hash.blank?
+        solr_doc
+      end
     end
   end
 end

data/lib/active_fedora_relsint/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module RelsInt
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/lib/tasks/active_fedora_relsint_dev.rake

@@ -0,0 +1,46 @@
+APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
+
+namespace :active_fedora_relsint do
+  require 'active-fedora'
+
+  # Use yard to build docs
+  begin
+    require 'yard'
+    require 'yard/rake/yardoc_task'
+    project_root = APP_ROOT
+    doc_destination = File.join(project_root, 'doc')
+
+    YARD::Rake::YardocTask.new(:doc) do |yt|
+      yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
+                   [ File.join(project_root, 'README.textile')]
+      yt.options = ['--output-dir', doc_destination, '--readme', 'README.textile']
+    end
+  rescue LoadError
+    desc "Generate YARD Documentation"
+    task :doc do
+      abort "Please install the YARD gem to generate rdoc."
+    end
+  end
+
+require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.pattern += FileList['spec/*_spec.rb']
+  end
+
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.pattern += FileList['spec/*_spec.rb']
+    spec.rcov = true
+  end
+
+desc "Execute specs with coverage"
+task :coverage do 
+  # Put spec opts in a file named .rspec in root
+  ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+  ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
+
+  Rake::Task["active_fedora_relsint:rspec"].invoke
+end
+
+end

data/spec/unit/relsint_spec.rb

@@ -23,66 +23,83 @@ describe ActiveFedora::RelsInt do
     Foo.ds_specs['RELS-INT'][:type].should == ActiveFedora::RelsInt::Datastream
   end
 
-  it "should serialize to appropriate RDF-XML" do
+  it "should serialize to appropriate RDF-XML on a new object" do
     blank_relsint = fixture('rels_int_blank.xml').read
     inner = mock("DigitalObject")
+    inner.stubs(:new?).returns(true)
     inner.stubs(:pid).returns("test:relsint")
     repo = mock("Repository")
-    #repo.expects(:datastream_dissemination).with(:dsid=>"RELS-INT", :pid=>"test:relsint").returns("")
-    #inner.stubs(:repository).returns(repo)
+    inner.stubs(:repository).returns(repo)
     test_obj = ActiveFedora::RelsInt::Datastream.new(inner,"RELS-INT")
     Nokogiri::XML.parse(test_obj.content).should 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 = mock("DigitalObject")
+    inner.stubs(:new?).returns(false)
+    inner.stubs(:pid).returns("test:relsint")
+    repo = mock("Repository")
+    # new datastream, no profile
+    repo.expects(:datastream).with(:pid=>inner.pid,:dsid=>"RELS-INT").returns(nil)
+    repo.expects(:config).returns({})
+    inner.stubs(:repository).returns(repo)
+    test_obj = ActiveFedora::RelsInt::Datastream.new(inner,"RELS-INT")
+    Nokogiri::XML.parse(test_obj.content).should be_equivalent_to Nokogiri::XML.parse(blank_relsint)
+  end
+
   describe ActiveFedora::RelsInt::Datastream do
-    it "should load relationships from foxml into the appropriate graphs" do
-      test_relsint = fixture('rels_int_test.xml').read
-      inner = mock("DigitalObject")
-      inner.stubs(:pid).returns("test:relsint")
-      inner.stubs(:internal_uri).returns("info:fedora/test:relsint")
+    before :each do
+      @test_relsint = fixture('rels_int_test.xml').read
+      @inner = mock("DigitalObject")
+      @inner.stubs(:new?).returns(false)
+      @inner.stubs(:pid).returns("test:relsint")
+      @inner.stubs(:internal_uri).returns("info:fedora/test:relsint")
       repo = mock("Repository")
       profile_xml = fixture('rels_int_profile.xml').read
-      repo.expects(:datastream).with(:pid=>inner.pid,:dsid=>"RELS-INT").returns(profile_xml)
-      repo.expects(:datastream_dissemination).with(:pid=>inner.pid,:dsid=>"RELS-INT").returns(test_relsint)
+      repo.expects(:datastream).with(:pid=>@inner.pid,:dsid=>"RELS-INT").returns(profile_xml)
+      repo.stubs(:datastream_dissemination).with(:pid=>@inner.pid,:dsid=>"RELS-INT").returns(@test_relsint)
       repo.stubs(:config).returns({})
-      inner.stubs(:repository).returns(repo)
-      test_obj = ActiveFedora::RelsInt::Datastream.new(inner,"RELS-INT")
+      @inner.stubs(:repository).returns(repo)
+    end
+    it "should load relationships from foxml into the appropriate graphs" do
+      test_obj = ActiveFedora::RelsInt::Datastream.new(@inner,"RELS-INT")
       test_obj.changed?.should be_false
-      dc = ActiveFedora::Datastream.new(inner,"DC")
+      dc = ActiveFedora::Datastream.new(@inner,"DC")
       triples = test_obj.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)}
       triples.should == [RDF::Statement.new(*e)]
     end
     it "should load relationships into appropriate graphs when assigned content" do
-      test_relsint = fixture('rels_int_test.xml').read
-      inner = mock("DigitalObject")
-      inner.stubs(:pid).returns("test:relsint")
-      inner.stubs(:internal_uri).returns("info:fedora/test:relsint")
-      test_obj = ActiveFedora::RelsInt::Datastream.new(inner,"RELS-INT")
-      test_obj.content=test_relsint
+      #test_relsint = fixture('rels_int_test.xml').read
+      #inner = mock("DigitalObject")
+      #inner.stubs(:pid).returns("test:relsint")
+      #inner.stubs(:internal_uri).returns("info:fedora/test:relsint")
+      test_obj = ActiveFedora::RelsInt::Datastream.new(@inner,"RELS-INT")
+      test_obj.content=@test_relsint
       test_obj.changed?.should be_true
-      dc = ActiveFedora::Datastream.new(inner,"DC")
+      dc = ActiveFedora::Datastream.new(@inner,"DC")
       triples = test_obj.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)}
       triples.should == [RDF::Statement.new(*e)]
     end    
     it "should propagate relationship changes to the appropriate graph in RELS-INT" do
-      test_relsint = fixture('rels_int_test.xml').read
-      inner = mock("DigitalObject")
-      inner.stubs(:pid).returns("test:relsint")
-      inner.stubs(:internal_uri).returns("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")
+      #test_relsint = fixture('rels_int_test.xml').read
+      #inner = mock("DigitalObject")
+      #inner.stubs(:pid).returns("test:relsint")
+      #inner.stubs(:internal_uri).returns("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")
       test_obj.add_relationship(dc,:is_metadata_for, test_obj)
       test_obj.add_relationship(rels_ext,:asserts, "FOO", true)
       test_obj.add_relationship(test_obj,:asserts, "BAR", true)
       test_obj.serialize!
       test_obj.changed?.should be_true
       puts test_obj.content
-      Nokogiri::XML.parse(test_obj.content).should be_equivalent_to Nokogiri::XML.parse(test_relsint)
+      Nokogiri::XML.parse(test_obj.content).should be_equivalent_to Nokogiri::XML.parse(@test_relsint)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora_relsint
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.11
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.11
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.5
+- !ruby/object:Gem::Dependency
+  name: loggable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveFedora library to allow use of RELS-INT to track RDF assertions
   about datastreams via a similar api to the ActiveFedora RELS-EXT implementation
 email:
@@ -153,16 +169,35 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.textile
+- Rakefile
 - active_fedora_relsint.gemspec
 - config/fedora.yml
 - config/predicate_mappings.yml
 - config/solr.yml
+- doc/ActiveFedora.html
+- doc/ActiveFedora/RelsInt.html
+- doc/ActiveFedora/RelsInt/Datastream.html
+- doc/_index.html
+- doc/class_list.html
+- doc/css/common.css
+- doc/css/full_list.css
+- doc/css/style.css
+- doc/file.README.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/js/app.js
+- doc/js/full_list.js
+- doc/js/jquery.js
+- doc/method_list.html
+- doc/top-level-namespace.html
 - fixtures/rels_int_blank.xml
 - fixtures/rels_int_profile.xml
 - fixtures/rels_int_test.xml
 - lib/active_fedora_relsint.rb
 - lib/active_fedora_relsint/datastream.rb
 - lib/active_fedora_relsint/version.rb
+- lib/tasks/active_fedora_relsint_dev.rake
 - spec/spec_helper.rb
 - spec/unit/relsint_spec.rb
 homepage: https://github.com/cul/active_fedora_rels_int
@@ -192,3 +227,4 @@ summary: ActiveFedora library supporting RELS-INT datastreams
 test_files:
 - spec/spec_helper.rb
 - spec/unit/relsint_spec.rb
+has_rdoc: