fedora_lens 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3222d73b43ce75e77c9fa65792200ecdd44c0f2b
-  data.tar.gz: 8b39418761c0dbbe02b3b281f526565411b67c1f
+  metadata.gz: f8a0a4bf460274072101c5095f365d6c6a409d7b
+  data.tar.gz: 6e0cbfde2267b95dd38fec8621871fd6a9625451
 SHA512:
-  metadata.gz: f67898563c473ff9e6d3de1d136dc83d0ca9c55da614d9b635895396c2440daea8b9ff1c4d22f2ce22d5f0249f03edd96e2b7043d8281f20c6b72cfacb9cc43d
-  data.tar.gz: 037b06ad821e55d3248d4d60ecc80b0cdfdf3b28ac984eeb4238adf09dffb2b316de472111e1f4ef611ca712e3ca45d855fedd3e266f39515a15db5a06a4554a
+  metadata.gz: ef00a7de221518a88b701bacc8fc0a9b32f63ae2b5dc5063c9bb83e51a82ecd80bcbd4bee65879355147b5f8374e456fd2587118ad1353391d9b5b4a367f0990
+  data.tar.gz: d8775ef12c0e7223111a6d6f5c1b08072eed19ca9883f9b2a119c48686fa6b2d358cd5491a93c7d8f5986f8e6c869aa5381a74cda220aba5dc70002166fed0ad

data/Rakefile

@@ -5,7 +5,7 @@ Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec)
 
-ZIP_URL = "https://github.com/projecthydra/hydra-jetty/archive/fedora-4a5.zip"
+ZIP_URL = "https://github.com/projecthydra/hydra-jetty/archive/fedora-4a6.zip"
 require 'jettywrapper'
 
 task default: :ci

data/fedora_lens.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", '~> 2.99'
   spec.add_development_dependency "childprocess"
 
   spec.add_dependency 'rdf-turtle', '~> 1.1.2'
   spec.add_dependency 'activemodel', '>= 4.0.2', "< 5.0"
   spec.add_dependency 'nokogiri', '~> 1.6.1'
-  spec.add_dependency 'ldp', '0.0.5'
+  spec.add_dependency 'ldp', '0.0.6'
 end

data/lib/fedora_lens.rb

@@ -26,10 +26,36 @@ module FedoraLens
   end
 
   HOST = "http://localhost:8983/fedora/rest"
-  #HOST = "http://localhost:8080"
 
-  def self.connection
-    @@connection ||= Ldp::Client.new(HOST)
+  class << self
+    def connection
+      @@connection ||= Ldp::Client.new(host)
+    end
+
+    def host
+      HOST
+    end
+
+    def base_path
+      @@base_path ||= ''
+    end
+
+    # Set a base path if you want to put all your objects below a certain path
+    # example:
+    #   FedoraLens.base_path = '/text
+    def base_path= path
+      @@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
 
   included do
@@ -96,7 +122,7 @@ module FedoraLens
           @attributes = get_attributes_from_orm(@orm)
         when NilClass, Hash
           data = subject_or_data || {}
-          @orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, nil, RDF::Graph.new))
+          @orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, nil, RDF::Graph.new, FedoraLens.host + FedoraLens.base_path))
           @attributes = data.with_indifferent_access
         when String
           data ||= {}
@@ -109,18 +135,45 @@ module FedoraLens
 
     def create_record
       push_attributes_to_orm
-      @orm = orm.create
+      create_and_fetch_attributes
       true
     end
 
     def update_record
       push_attributes_to_orm
-      orm.save!
+      update_and_fetch_attributes
     end
 
 
   private
 
+  def update_and_fetch_attributes
+    orm.save!.tap do
+      clear_cached_response
+      # This is slow, but it enables us to get attributes like http://fedora.info/definitions/v4/repository#lastModified
+      # TODO perhaps attributes could be lazily fetched
+      @attributes = get_attributes_from_orm(@orm)
+      clear_cached_response
+    end
+  end
+
+  def create_and_fetch_attributes
+      @orm = orm.create
+      # This is slow, but it enables us to get attributes like http://fedora.info/definitions/v4/repository#created
+      # TODO perhaps attributes could be lazily fetched
+      @attributes = get_attributes_from_orm(@orm)
+      clear_cached_response
+  end
+
+  # TODO this causes slowness because we're losing the cached GET response. However it prevents ETag exceptions caused when a
+  # subnode is added before an update.
+  def clear_cached_response
+    # This strips the current cached response (and ETag) from the current ORM to avoid ETag exceptions on the next update,
+    # since the etag will change if a child node is added.
+    @orm = Ldp::Orm.new @orm.resource.class.new @orm.resource.client, @orm.resource.subject
+  end
+
+
   def push_attributes_to_orm
     @orm = self.class.orm_to_hash.put(@orm, @attributes)
   end
@@ -137,11 +190,11 @@ module FedoraLens
     end
 
     def id_to_uri(id)
-      HOST + (id.start_with?('/') ? id : '/' + id)
+      FedoraLens.id_to_uri(id)
     end
 
     def uri_to_id(uri)
-      uri.to_s.sub(HOST, '')
+      FedoraLens.uri_to_id(uri)
     end
 
     def create(data)

data/lib/fedora_lens/lenses.rb

@@ -50,11 +50,11 @@ module FedoraLens
       def uris_to_ids
         Lens[
           get: lambda do |source|
-            source.map { |uri| URI.parse(uri).to_s.sub(HOST, '') }
+            source.map { |uri| FedoraLens.uri_to_id(URI.parse(uri).to_s) }
           end,
           put: lambda do |sources, values|
             Array(values).compact.map do |value|
-              RDF::URI.new(HOST + value)
+              RDF::URI.new(FedoraLens.id_to_uri(value))
             end
           end
         ]

data/lib/fedora_lens/version.rb

@@ -1,3 +1,3 @@
 module FedoraLens
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spec/fedora_lens/lenses_spec.rb

@@ -59,7 +59,7 @@ module FedoraLens
     describe ".uris_to_ids" do
       let(:lens) { Lenses.uris_to_ids }
 
-      let(:original) { [RDF::URI.new(HOST + '/id/123'), RDF::URI.new(HOST + '/id/321')] }
+      let(:original) { [RDF::URI.new(FedoraLens.host + '/id/123'), RDF::URI.new(FedoraLens.host + '/id/321')] }
 
       describe "#get" do
         subject { lens.get(input) }
@@ -85,7 +85,7 @@ module FedoraLens
         context "with new values " do
           let(:input) { ['/id/777', '/id/888'] }
           it "overwrites the items" do
-            expect(subject).to eq [RDF::URI.new(HOST + '/id/777'), RDF::URI.new(HOST + '/id/888')]
+            expect(subject).to eq [RDF::URI.new(FedoraLens.host + '/id/777'), RDF::URI.new(FedoraLens.host + '/id/888')]
           end
         end
 

data/spec/fedora_lens_spec.rb

@@ -8,20 +8,14 @@ describe FedoraLens do
     @model = TestClass.new
   end
 
-
-  # before do
-  #   require 'logger'
-  #   Ldp.logger = Logger.new(STDOUT).tap do |l|
-  #     l.level = Logger::DEBUG
-  #   end
-  # end
-
-
   context "with a simple class" do
     before do
       class TestClass
         include FedoraLens
         attribute :title, [RDF::DC11.title, Lenses.single, Lenses.literal_to_string]
+        attribute :create_date, [ RDF::URI.new("http://fedora.info/definitions/v4/repository#created"), FedoraLens::Lenses.single, FedoraLens::Lenses.literal_to_string ]
+        attribute :modified_date, [ RDF::URI.new("http://fedora.info/definitions/v4/repository#lastModified"), FedoraLens::Lenses.single, FedoraLens::Lenses.literal_to_string ]
+        
       end
     end
 
@@ -42,7 +36,10 @@ describe FedoraLens do
         let(:existing) { TestClass.create(title: "created resource") }
         subject { TestClass.find(existing.id) }
         it { should be_kind_of TestClass }
-        its(:id) { should eq existing.id }
+
+        it "should have the same id" do
+          expect(subject.id).to eq existing.id
+        end
       end
     end
 
@@ -75,7 +72,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')
+        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'
       end
     end
@@ -85,14 +82,15 @@ describe FedoraLens do
       it "saves a new resource" do
         m = TestClass.new(title: "created resource")
         m.save
+        expect(m.create_date).to_not be_nil
         TestClass.find(m.id).title.should eq "created resource"
       end
 
       it "saves an updated resource" do
         m = TestClass.create(title: "created resource")
-        m.reload
         m.title = "changed title"
-        m.save!
+        expect { sleep 1; m.save }.to change { m.modified_date }
+        expect(m.modified_date).to_not be_empty
         TestClass.find(m.id).title.should eq "changed title"
       end
 
@@ -102,9 +100,9 @@ describe FedoraLens do
         after { subject.delete }
 
         it "saves with that id" do
-          expect(subject.new_record?).to be_true
-          expect(subject.save).to be_true
-          expect(subject.new_record?).to be_false
+          expect(subject.new_record?).to be true
+          expect(subject.save).to be true
+          expect(subject.new_record?).to be false
         end
 
       end
@@ -112,16 +110,72 @@ describe FedoraLens do
 
     describe "id_to_uri" do
       subject { TestClass.id_to_uri(id) }
-      context "without a leading slash" do
-        let(:id) { 'test' }
-        it { should eq FedoraLens::HOST + '/test' }
+      context "no base_path set" do
+        context "without a leading slash" do
+          let(:id) { 'test' }
+          it { should eq FedoraLens.host + '/test' }
+        end
+        context "with a leading slash" do
+          let(:id) { '/test' }
+          it { should eq FedoraLens.host + '/test' }
+        end
       end
-      context "with a leading slash" do
-        let(:id) { '/test' }
-        it { should eq FedoraLens::HOST + '/test' }
+
+      context "with base_path set" do
+        before do
+          @original_base = FedoraLens.base_path
+          FedoraLens.base_path = '/test'
+        end
+
+        after { FedoraLens.base_path = @original_base }
+
+        context "without a leading slash" do
+          let(:id) { 'test-me' }
+          it { should eq FedoraLens.host + '/test/test-me' }
+        end
+        context "with a leading slash" do
+          let(:id) { '/test-me' }
+          it { should eq FedoraLens.host + '/test/test-me' }
+        end
+        context "within the base path" do
+          let(:id) { '/test/test-me' }
+          it { should eq FedoraLens.host + '/test/test-me' }
+        end
       end
     end
 
+    describe "uri_to_id" do
+      subject { TestClass.uri_to_id(uri) }
+      context "no base_path set" do
+
+        context "at the base level" do
+          let(:uri) { "#{FedoraLens.host}/test" }
+          it { should eq '/test' }
+        end
+        context "at the second level" do
+          let(:uri) { "#{FedoraLens.host}/test/foo" }
+          it { should eq '/test/foo' }
+        end
+      end
+
+      context "with base_path set" do
+        before do
+          @original_base = FedoraLens.base_path
+          FedoraLens.base_path = '/test'
+        end
+
+        after { FedoraLens.base_path = @original_base }
+
+        context "at the base level" do
+          let(:uri) { "#{FedoraLens.host}/test/foo" }
+          it { should eq '/foo' }
+        end
+        context "at the second level" do
+          let(:uri) { "#{FedoraLens.host}/test/foo/bar" }
+          it { should eq '/foo/bar' }
+        end
+      end
+    end
   end
 
   context "with a class that has many attributes" do

data/spec/spec_helper.rb

@@ -3,6 +3,10 @@ require "bundler/setup"
 require 'fedora_lens'
 require 'fedora_lens/lenses'
 
+# HttpLogger.logger = Logger.new(STDOUT)
+# HttpLogger.colorize = false
+# HttpLogger.ignore = [/localhost:8983\/solr/]
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedora_lens
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,110 +9,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 description: ''
 email:
 - justin@curationexperts.com
@@ -136,10 +136,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -171,17 +170,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A client for Fedora Commons Repository (fcrepo) version 4

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0-p353