active_fedora-crosswalks 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Q0OGFjNmNkNzU3NTJjODQ2NTc2ODljZmZjYWZlZTM1ZmQ4Mzk3Mw==
+    MTZjYjFiNmFjMjlhNTQxMWE0YmQ2ZWVmY2EzY2Y3NTRkYjY1MTNlOQ==
   data.tar.gz: !binary |-
-    NTEwMGFkMjExNzgyMDU2MWIxZWMwMzJhOWNlMjhkNWE3MjI2MjBmYw==
+    YTg3MzIzMzcyN2I4OTIwY2E1NWMzZDAyMjAxZTQ3MWI1OWY4Yjc5MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjU3OWZmOWE4OGYwNjc0ODM5ZTQ3NjQ1ZDVmZmY5NDk1YjdkY2ZhMWJhOWFm
-    ZTE3ZTVjYzk5MzU5Nzg0NjY0YjQ2ZjhlMjlkNjAzNDVjYTRiNmQ2MDk2MWY3
-    NDVhMTNjOGNhNmFkMmUzYzVmMDk2MWM0YzU0MjYyOWI1ZTA4NzM=
+    NDMxMDhkZDI4NWRkNDIzMDg2NWE1MTc3NTViNzM0OGVhZTkwY2ViYjY2YzY5
+    ZDE4NWNjM2VhM2I5OTYzMzAxZGZkNGYwMGQxYjU5OGIyYzkyM2RjNDI5ZmNl
+    ZDkxN2Y0MWVlODdhNDNjNTNmMTk1YTQyNmRiNzJkODIzZTJmOTY=
   data.tar.gz: !binary |-
-    MTcxZTkxODRhMzkzMzk5ODA5MDVhNGEwMjNhMTM5YmQ2ZDE4ZmJiN2YyOTIz
-    MWQ5YTBiZjk3ZTVlZDdiMzRhNGY0YTM2MGQ3YmFmNjNhMTEwN2U4YTUwYWVl
-    NjViYzA0YTA4Y2Q2NGU0YjYxZGMxMTVjOTAyYTVhYWY5N2NhYjk=
+    MzNiOGQ1Y2JiMzgwMWZiMmIyMTIwYzk3OGU3Y2E2NGEwZWFhYjc3OWQ5NjQ1
+    MGQyMzk4MzFkNWRjZmE1MjljNzRhMTc5YzZjNGYwM2UzODlmYjJkZGE3MzFm
+    NzkwNDhjNjE4OTRmNDkwNmNmN2RhODAxOGZlNGFkODQxZDE5YTE=

data/lib/active_fedora/crosswalks/accessors/generic_accessor.rb

@@ -6,9 +6,11 @@ module ActiveFedora
         def self.new(datastream, field)
           if self.to_s.include?("GenericAccessor")
             if datastream.kind_of?(ActiveFedora::RelsExtDatastream)
+              puts "Returning a rels accessor"
               return RelsExtAccessor.new(datastream, field)
             end
             if datastream.kind_of?(ActiveFedora::OmDatastream)
+              puts "Returning an OM Accessor"
               return OmAccessor.new(datastream, field)
             end
           end
@@ -27,10 +29,25 @@ module ActiveFedora
         def get_value
           FieldProxy.new(Array.wrap(datastream.send(field.to_s)), self, field)
         end
+        def original_get_value
+          if datastream.respond_to?("unstubbed_#{self.field}")
+            FieldProxy.new(Array.wrap(datastream.send("unstubbed_#{self.field}")), self, field)
+          else
+            get_value
+          end
+        end
         def set_value(*args)
           value = args.last
           datastream.send("#{field.to_s}=",value)
         end
+        def original_set_value(*args)
+          value = args.last
+          if datastream.respond_to?("unstubbed_#{self.field}=")
+            datastream.send("unstubbed_#{self.field}=",value)
+          else
+            set_value(value)
+          end
+        end
       end
     end
   end

data/lib/active_fedora/crosswalks/accessors/om_accessor.rb

@@ -15,6 +15,8 @@ module ActiveFedora
           value = Array.wrap(args.last)
           datastream.send(:update_indexed_attributes, {field => value})
         end
+        alias_method :original_get_value, :get_value
+        alias_method :original_set_value, :set_value
       end
     end
   end

data/lib/active_fedora/crosswalks/accessors/rels_ext_accessor.rb

@@ -18,6 +18,8 @@ module ActiveFedora
             datastream.model.add_relationship(field.to_sym, v)
           end
         end
+        alias_method :original_get_value, :get_value
+        alias_method :original_set_value, :set_value
       end
     end
   end

data/lib/active_fedora/crosswalks/crosswalker.rb

@@ -4,8 +4,13 @@ module ActiveFedora
       include ActiveModel::Validations
       validates :parent, :field, :to, :presence => true
       validate :parent_has_datastream
-      attr_accessor :parent, :datastream, :target_datastream, :field, :to
+      attr_accessor :parent, :datastream, :target_datastream, :field, :to, :transform, :reverse_transform
       def initialize(args)
+        @transform = args.delete(:transform)
+        @reverse_transform = args.delete(:reverse_transform)
+        unless transform && reverse_transform || (!transform && !reverse_transform)
+          raise "If a transform is provided, then a reverse transform must be as well."
+        end
         @datastream = args.delete(:datastream)
         @parent = @datastream.digital_object if @datastream
         @field = args.delete(:field)
@@ -26,6 +31,7 @@ module ActiveFedora
         datastream.crosswalk_fields << field
         create_reader
         create_writer
+        sync_values
       end
 
       def source_accessor
@@ -36,28 +42,49 @@ module ActiveFedora
         @target_accessor ||= Accessors::GenericAccessor.new(target_datastream, to)
       end
 
+      def sync_values(opts={})
+        current_source_values = Array.wrap(source_accessor.original_get_value)
+        current_target_values = perform_transform(Array.wrap(target_accessor.original_get_value))
+        combined = current_source_values | current_target_values
+        combined = current_source_values if opts[:force_target]
+        source_accessor.original_set_value(combined)
+        target_accessor.original_set_value(perform_reverse_transform(combined))
+      end
+
       protected
 
+      def perform_transform(values)
+        values.map!{|x| transform.call(x)} if transform
+        return values
+      end
+
+      def perform_reverse_transform(values)
+        values.map!{|x| reverse_transform.call(x)} if reverse_transform
+        return values
+      end
+
       def create_reader
         object, method, expected_args = source_accessor.get_reader
         crosswalker = self
+        object.singleton_class.class_eval do
+          alias_method "unstubbed_#{method}".to_sym, method.to_sym
+        end
         object.define_singleton_method(method) do |*args|
-          if !expected_args || args[0..-2] == expected_args || (args.last.kind_of?(Hash) && args.last.has_key?(expected_args))
-            crosswalker.source_accessor.set_value(crosswalker.target_accessor.get_value)
-          end
-          crosswalker.target_accessor.get_value
+          crosswalker.sync_values
+          FieldProxy.new(crosswalker.source_accessor.original_get_value, crosswalker.source_accessor, crosswalker.source_accessor.field)
         end
       end
 
       def create_writer
         object, method, expected_args = source_accessor.get_writer
         crosswalker = self
+        object.singleton_class.class_eval do
+          alias_method "unstubbed_#{method}".to_sym, method.to_sym
+        end
         object.define_singleton_method(method) do |*args|
-          if !expected_args || args[0..-2] == expected_args || (args.last.kind_of?(Hash) && args.last.has_key?(expected_args))
-            result = super(args.last)
-            crosswalker.target_accessor.set_value(result)
-            return result
-          end
+          super(*args)
+          crosswalker.sync_values(:force_target => true)
+          FieldProxy.new(crosswalker.source_accessor.get_value, crosswalker.source_accessor, crosswalker.source_accessor.field)
         end
       end
 

data/lib/active_fedora/crosswalks/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Crosswalks
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/lib/active_fedora/crosswalks/crosswalkable_spec.rb

@@ -9,7 +9,7 @@ describe ActiveFedora::Crosswalks::Crosswalkable do
   after(:each) do
     Object.send(:remove_const, :CrosswalkAsset)
   end
-  context "crosswalking RDF to RDF" do
+  describe "crosswalking RDF to RDF" do
     before(:each) do
       CrosswalkAsset.has_metadata :name => 'descMetadata', :type => ExampleRdfDatastream
       CrosswalkAsset.has_metadata :name => 'xwalkMetadata', :type => ExampleRdfDatastream do |ds|
@@ -71,7 +71,99 @@ describe ActiveFedora::Crosswalks::Crosswalkable do
       end
     end
   end
-  context "crosswalking RDF to RELS-EXT" do
+  describe "transforms" do
+    context "when you pass a transform" do
+      context "but you don't pass a reverse transform" do
+        before(:each) do
+          CrosswalkAsset.has_metadata :name => 'descMetadata', :type => ExampleRdfDatastream
+          CrosswalkAsset.has_metadata :name => 'xwalkMetadata', :type => ExampleRdfDatastream do |ds|
+            ds.crosswalk :field => :title, :to => :other_title, :in => :descMetadata, :transform => Proc.new{|x| "bla_#{x}"}
+          end
+        end
+        it "should raise an error when you try to initialize the object" do
+          expect{asset}.to raise_error
+        end
+      end
+      context "as well as a reverse transform (for RDF)" do
+        before(:each) do
+          CrosswalkAsset.has_metadata :name => 'descMetadata', :type => ExampleRdfDatastream
+          CrosswalkAsset.has_metadata :name => 'xwalkMetadata', :type => ExampleRdfDatastream do |ds|
+            ds.crosswalk :field => :title, :to => :other_title, :in => :descMetadata, :transform => Proc.new{|x| "bla_#{x}"},
+                         :reverse_transform => Proc.new{|x| x.split("bla_").last}
+          end
+        end
+        context "when a field is set" do
+          context "on the source datastream" do
+            before(:each) do
+              asset.descMetadata.other_title = "bla"
+            end
+            it "should transform the value" do
+              expect(asset.xwalkMetadata.title).to eq ["bla_bla"]
+            end
+            it "should leave the source datastream correct" do
+              expect(asset.descMetadata.other_title).to eq ["bla"]
+            end
+          end
+          context "on the crosswalked datastream" do
+            before(:each) do
+              asset.xwalkMetadata.title = "bla_bla"
+            end
+            it "should reverse transform the value for the source datastream" do
+              expect(asset.descMetadata.other_title).to eq ["bla"]
+            end
+            it "should leave the crosswalk datastream correct" do
+              expect(asset.xwalkMetadata.title).to eq ["bla_bla"]
+            end
+          end
+        end
+      end
+      context "as well as a reverse transform (for Rels)" do
+        before(:each) do
+          CrosswalkAsset.has_metadata :name => 'xwalkMetadata', :type => ExampleRdfDatastream do |ds|
+            ds.crosswalk :field => :title, :to => :is_member_of_collection, :in => "RELS-EXT", :transform => Proc.new{|x| x.split("info:fedora/").last},
+                         :reverse_transform => Proc.new{|x| "info:fedora/#{x}" }
+          end
+        end
+        context "when a field exists prior to crosswalking (previous data in graph)" do
+          before(:each) do
+            asset.xwalkMetadata.set_value(asset.xwalkMetadata.rdf_subject, :title, "test:testing")
+          end
+          it "should maintain that value" do
+            expect(asset.xwalkMetadata.title).to eq ["test:testing"]
+          end
+          it "should perform the transform to rels" do
+            asset.xwalkMetadata.title # Have to call this to perform the crosswalk right now. Calls sync_values.
+            expect(asset.relationships(:is_member_of_collection)).to eq ["info:fedora/test:testing"]
+          end
+        end
+        context "when a field is set" do
+          context "on the source datastream" do
+            before(:each) do
+              asset.add_relationship(:is_member_of_collection, "info:fedora/test:test")
+            end
+            it "should transform the value" do
+              expect(asset.xwalkMetadata.title).to eq ["test:test"]
+            end
+            it "should leave the source datastream correct" do
+              expect(asset.relationships(:is_member_of_collection)).to eq ["info:fedora/test:test"]
+            end
+          end
+          context "on the crosswalked datastream" do
+            before(:each) do
+              asset.xwalkMetadata.title = "test:test"
+            end
+            it "should reverse transform the value for the source datastream" do
+              expect(asset.relationships(:is_member_of_collection)).to eq ["info:fedora/test:test"]
+            end
+            it "should leave the crosswalk datastream correct" do
+              expect(asset.xwalkMetadata.title).to eq ["test:test"]
+            end
+          end
+        end
+      end
+    end
+  end
+  describe "crosswalking RDF to RELS-EXT" do
     before(:each) do
       CrosswalkAsset.has_metadata :name => 'xwalkMetadata', :type => ExampleRdfDatastream do |ds|
         ds.crosswalk :field => :title, :to => :is_member_of_collection, :in => "RELS-EXT"
@@ -122,7 +214,7 @@ describe ActiveFedora::Crosswalks::Crosswalkable do
       end
     end
   end
-  context "crosswalking RDF to OM" do
+  describe "crosswalking RDF to OM" do
     before(:each) do
       CrosswalkAsset.has_metadata :name => 'descMetadata', :type => DummyOmDatastream
       CrosswalkAsset.has_metadata :name => 'xwalkMetadata', :type => ExampleRdfDatastream do |ds|
@@ -162,12 +254,12 @@ describe ActiveFedora::Crosswalks::Crosswalkable do
           asset.xwalkMetadata.title << "test"
         end
         it "should add the metadata to the source field" do
-          expect(asset.descMetadata.name.family_name).to eq ["Horn", "test", "Caesar"]
+          expect(asset.descMetadata.name.family_name).to eq ["Horn", "Caesar", "test"]
         end
       end
     end
   end
-  context "crosswalking OM to RDF" do
+  describe "crosswalking OM to RDF" do
     before(:each) do
       CrosswalkAsset.has_metadata :name => 'descMetadata', :type => ExampleRdfDatastream
       CrosswalkAsset.has_metadata :name => 'xwalkMetadata', :type => DummyOmDatastream do |ds|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-crosswalks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Trey Terrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler