fedora_lens 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ddccef7b4b1d4c0bf21e0afe5596f375b79ae40
-  data.tar.gz: f979c71a8daa29d9e291e6c2c06d4c3abd7c9223
+  metadata.gz: e6671569000710d40972edffeba71ed8d9630ffb
+  data.tar.gz: cc5fc8ac334267db1c39cc7163bf7bd61d658084
 SHA512:
-  metadata.gz: 8fef1c7a9b0b4bc6739d003278978791705661bec3dd8722cdbfa1e8c34f8f0b01700fa1bc39da55dc71258a3d82b2ddc74ee1c030b197651809af67b619cd79
-  data.tar.gz: 117fcc9c8a4236d629d2517a77c6b61ee84f004064d4d0c6abd1df77160faa2eb51ad8902c7d2a19c02ddc8f85bfd9cdcafb9d446ddb9b6bc70c4055363063d7
+  metadata.gz: 2ef1d42b975f4120a5bef5966e68e8ea2a5c47daf44fe5b472c002a24e7004a3ba83162d2d0ba73ee9cb2fcfeb39254c39c60f107cb8fd8f028b34d8cc88b27a
+  data.tar.gz: 55ed68f8a5cf38a928c88c7b8aee56b18485d5fa895031904471eca64bd52ab4c0cabcd0c875d07fc5982e1823a7bd2f3d1c3b489f6e7b7cd549d4764206ee6c

data/lib/fedora_lens/core.rb

@@ -43,15 +43,6 @@ module FedoraLens
       @@base_path =  path
     end
 
-    def id_to_uri(id)
-      id = "/#{id}" unless id.start_with? '/'
-      id = FedoraLens.base_path + id unless id.start_with? "#{FedoraLens.base_path}/"
-      FedoraLens.host + id
-    end
-
-    def uri_to_id(uri)
-      uri.to_s.sub(FedoraLens.host + FedoraLens.base_path, '')
-    end
   end
 
   module Core
@@ -185,11 +176,14 @@ module FedoraLens
       end
 
       def id_to_uri(id)
-        FedoraLens.id_to_uri(id)
+        id = "/#{id}" unless id.start_with? '/'
+        id = FedoraLens.base_path + id unless id.start_with? "#{FedoraLens.base_path}/"
+        FedoraLens.host + id
       end
 
       def uri_to_id(uri)
-        FedoraLens.uri_to_id(uri)
+        id = uri.to_s.sub(FedoraLens.host + FedoraLens.base_path, '')
+        id.start_with?('/') ? id[1..-1] : id
       end
 
       def create(data)

data/lib/fedora_lens/lenses.rb

@@ -47,14 +47,15 @@ module FedoraLens
         ]
       end
 
-      def uris_to_ids
+      # @param class_lambda [Proc] returns an object which implements uri_to_id and id_to_uri 
+      def uris_to_ids(&block)
         Lens[
           get: lambda do |source|
-            source.map { |uri| FedoraLens.uri_to_id(URI.parse(uri).to_s) }
+            source.map { |uri| yield.uri_to_id(URI.parse(uri).to_s) }
           end,
           put: lambda do |sources, values|
             Array(values).compact.map do |value|
-              RDF::URI.new(FedoraLens.id_to_uri(value))
+              RDF::URI.new(yield.id_to_uri(value))
             end
           end
         ]

data/lib/fedora_lens/version.rb

@@ -1,3 +1,3 @@
 module FedoraLens
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/spec/fedora_lens/lenses_spec.rb

@@ -57,17 +57,26 @@ module FedoraLens
     end
 
     describe ".uris_to_ids" do
-      let(:lens) { Lenses.uris_to_ids }
+      let(:mapper) { double('mapper') }
+      let(:lens) { Lenses.uris_to_ids { mapper } }
 
-      let(:original) { [RDF::URI.new(FedoraLens.host + '/id/123'), RDF::URI.new(FedoraLens.host + '/id/321')] }
+      let(:id1) { '/id/123' }
+      let(:id2) { '/id/321' }
+      let(:uri1) { RDF::URI.new(FedoraLens.host + id1) }
+      let(:uri2) { RDF::URI.new(FedoraLens.host + id2) }
+
+      let(:ids) { [id1, id2] }
+      let(:uris) { [uri1, uri2] }
 
       describe "#get" do
         subject { lens.get(input) }
 
         context "with exiting content" do
-          let(:input) { original  }
+          let(:input) { uris }
           it "casts them to string" do
-            expect(subject).to eq ['/id/123', '/id/321']
+            expect(mapper).to receive(:uri_to_id).with(uri1).and_return(id1)
+            expect(mapper).to receive(:uri_to_id).with(uri2).and_return(id2)
+            expect(subject).to eq ids
           end
         end
 
@@ -80,12 +89,17 @@ module FedoraLens
       end
 
       describe "#put" do
+        let(:original) { [RDF::URI.new(FedoraLens.host + '/foo/1'), RDF::URI.new(FedoraLens.host + '/foo/2')] }
         subject { lens.put(original, input) }
 
         context "with new values " do
-          let(:input) { ['/id/777', '/id/888'] }
+          let(:id1) { '/id/777' }
+          let(:id2) { '/id/888' }
+          let(:input) { ids }
           it "overwrites the items" do
-            expect(subject).to eq [RDF::URI.new(FedoraLens.host + '/id/777'), RDF::URI.new(FedoraLens.host + '/id/888')]
+            expect(mapper).to receive(:id_to_uri).with(id1).and_return(uri1)
+            expect(mapper).to receive(:id_to_uri).with(id2).and_return(uri2)
+            expect(subject).to eq uris
           end
         end
 

data/spec/fedora_lens_spec.rb

@@ -73,7 +73,7 @@ describe FedoraLens do
     describe "#id" do
       it "should not have 'fedora' in the id" do
         m = TestClass.new(FedoraLens.host + '/41/0d/6b/47/410d6b47-ce9c-4fa0-91e2-d62765667c52')
-        expect(m.id).to eq '/41/0d/6b/47/410d6b47-ce9c-4fa0-91e2-d62765667c52'
+        expect(m.id).to eq '41/0d/6b/47/410d6b47-ce9c-4fa0-91e2-d62765667c52'
       end
     end
 
@@ -150,11 +150,11 @@ describe FedoraLens do
 
         context "at the base level" do
           let(:uri) { "#{FedoraLens.host}/test" }
-          it { should eq '/test' }
+          it { should eq 'test' }
         end
         context "at the second level" do
           let(:uri) { "#{FedoraLens.host}/test/foo" }
-          it { should eq '/test/foo' }
+          it { should eq 'test/foo' }
         end
       end
 
@@ -168,11 +168,11 @@ describe FedoraLens do
 
         context "at the base level" do
           let(:uri) { "#{FedoraLens.host}/test/foo" }
-          it { should eq '/foo' }
+          it { should eq 'foo' }
         end
         context "at the second level" do
           let(:uri) { "#{FedoraLens.host}/test/foo/bar" }
-          it { should eq '/foo/bar' }
+          it { should eq 'foo/bar' }
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedora_lens
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Justin Coyne