fedora_lens 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1851950ca061fabd4b2a32c699778accbcbfbce2
-  data.tar.gz: d45a09d0ee487eb21fd118acc97a97b9df4d0299
+  metadata.gz: cc2ee8880920469db171ffad4c5039137a46e796
+  data.tar.gz: 0d3790c53ea006a2180a78916173dfe84e9ea96a
 SHA512:
-  metadata.gz: ee264c445d33e8a9637e24c826081525719cc37208159d57d26c70c43994783167fa962eae0485681732eedb583976409ab4bf7c00c0856b68df85454cda4bb3
-  data.tar.gz: 14c1c41dbba783f45030c2e0f22f9d12af28596acfd31768deb8dff02953dd69d9dd913de0214b0d05da5d5f0dc3d84185baeb4d73cca63418721ea5d3a3591d
+  metadata.gz: a33e640c5822d859f7bf466c9a62b9d42433f699ab8965e29f7da2e673ff9aa805f2bc035b068126aa43a0bb32ba0cffcb211c6eac66d492b771477e932010eb
+  data.tar.gz: 4b89d671befc602a69c7769e308c0503026bd55413db50f27c55a4a5d3c4f94b7ad340996a11e58975a802f3eed4afa254a33c0140c9899cddd78e061c8b7035

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'ldp', github: 'cbeer/ldp'
 gem 'jettywrapper'
 
 group :development, :test do

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-4a4.zip"
+ZIP_URL = "https://github.com/projecthydra/hydra-jetty/archive/fedora-4a5.zip"
 require 'jettywrapper'
 
 task default: :ci

data/fedora_lens.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   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.3'
+  spec.add_dependency 'ldp', '0.0.4'
 end

data/lib/fedora_lens.rb

@@ -1,6 +1,5 @@
 require 'rdf'
 require 'ldp'
-require 'ldp_monkeypatch'
 require 'rdf/turtle'
 require 'nokogiri'
 require 'active_model'
@@ -26,9 +25,8 @@ module FedoraLens
     end
   end
 
-  HOST = "http://localhost:8983/fedora"
+  HOST = "http://localhost:8983/fedora/rest"
   #HOST = "http://localhost:8080"
-  PATH = '/rest'
 
   def self.connection
     @@connection ||= Ldp::Client.new(HOST)
@@ -78,7 +76,7 @@ module FedoraLens
   end
 
   def new_record?
-    @new_record
+    @orm.resource.new?
   end
 
   def uri
@@ -92,40 +90,32 @@ module FedoraLens
   protected
     # This allows you to overide the initializer, but still use this behavior
     def init_core(subject_or_data = {}, data = nil)
-      @new_record = true
       case subject_or_data
-        when Ldp::Resource
+        when Ldp::Resource::RdfSource
           @orm = Ldp::Orm.new(subject_or_data)
           @attributes = get_attributes_from_orm(@orm)
         when NilClass, Hash
           data = subject_or_data || {}
-          @orm = Ldp::Orm.new(Ldp::Resource.new(FedoraLens.connection, nil, RDF::Graph.new))
+          @orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, nil, RDF::Graph.new))
           @attributes = data.with_indifferent_access
         when String
           data ||= {}
-          @orm = Ldp::Orm.new(Ldp::Resource.new(FedoraLens.connection, subject_or_data, RDF::Graph.new))
+          @orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, subject_or_data, RDF::Graph.new))
           @attributes = data.with_indifferent_access
         else
-          raise ArgumentError, "#{data.class} is not acceptable"
+          raise ArgumentError, "#{subject_or_data.class} is not acceptable"
         end
     end
 
     def create_record
       push_attributes_to_orm
-      orm.resource.create
-      @new_record = false
+      @orm = orm.create
       true
     end
 
     def update_record
       push_attributes_to_orm
-      # Fedora errors out when you try to set the rdf:type
-      # see https://github.com/cbeer/ldp/issues/2
-      orm.graph.delete([@orm.resource.subject_uri,
-                         RDF::URI.new("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
-                         nil])
-      orm.save
-      orm.last_response.success?
+      orm.save!
     end
 
 
@@ -141,16 +131,17 @@ module FedoraLens
 
   module ClassMethods
     def find(id)
-      resource = Ldp::Resource.new(FedoraLens.connection, id_to_uri(id))
+      resource = Ldp::Resource::RdfSource.new(FedoraLens.connection, id_to_uri(id))
+      raise Ldp::NotFound if resource.new?
       self.new(resource)
     end
 
     def id_to_uri(id)
-      "#{HOST}#{PATH}" + (id.start_with?('/') ? id : '/' + id)
+      HOST + (id.start_with?('/') ? id : '/' + id)
     end
 
     def uri_to_id(uri)
-      uri.to_s.sub(HOST + PATH, '')
+      uri.to_s.sub(HOST, '')
     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 + PATH, '') }
+            source.map { |uri| URI.parse(uri).to_s.sub(HOST, '') }
           end,
           put: lambda do |sources, values|
             Array(values).compact.map do |value|
-              RDF::URI.new(HOST + PATH + value)
+              RDF::URI.new(HOST + value)
             end
           end
         ]
@@ -139,7 +139,7 @@ module FedoraLens
             orm
           end,
           create: lambda do |values|
-            orm = Ldp::Orm.new(Ldp::Resource.new(nil, '', RDF::Graph.new))
+            orm = Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, '', RDF::Graph.new))
             values.each do |value|
               orm.graph.insert([orm.resource.subject_uri, predicate, value])
             end
@@ -164,9 +164,9 @@ module FedoraLens
         Lens[
           get: lambda do |uri|
             if uri.present?
-              Ldp::Orm.new(Ldp::Resource.new(FedoraLens.connection, uri.to_s))
+              Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, uri.to_s))
             else
-              Ldp::Orm.new(Ldp::Resource.new(FedoraLens.connection, nil, RDF::Graph.new))
+              Ldp::Orm.new(Ldp::Resource::RdfSource.new(FedoraLens.connection, nil, RDF::Graph.new))
             end
           end,
           put: lambda do |uri, orm|

data/lib/fedora_lens/version.rb

@@ -1,3 +1,3 @@
 module FedoraLens
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 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+PATH+'/id/123'), RDF::URI.new(HOST+PATH+'/id/321')] }
+      let(:original) { [RDF::URI.new(HOST + '/id/123'), RDF::URI.new(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+PATH+'/id/777'), RDF::URI.new(HOST+PATH+'/id/888')]
+            expect(subject).to eq [RDF::URI.new(HOST + '/id/777'), RDF::URI.new(HOST + '/id/888')]
           end
         end
 
@@ -136,33 +136,48 @@ module FedoraLens
 
     describe ".get_predicate" do
       let(:orm) do
-        graph = RDF::Graph.new
-        orm = Ldp::Orm.new(Ldp::Resource.new(nil, '', graph))
-        orm.graph.insert([orm.resource.subject_uri, RDF::DC11.title, "title"])
-        orm
+        Ldp::Orm.new(resource).tap do |orm|
+          orm.graph.insert([orm.resource.subject_uri, RDF::DC11.title, "new title"])
+        end
       end
+
+      let(:resource) { Ldp::Resource::RdfSource.new(mock_conn, '', RDF::Graph.new) } 
+      let(:mock_conn) { double }
+      before { resource.stub(new?: true) }
+      subject { Lenses.get_predicate(RDF::DC11.title) }
+
+      let(:value) { [RDF::Literal.new("new title")] }
+
       it "converts an Ldp::Orm to the value of the specified predicate" do
-        Lenses.get_predicate(RDF::DC11.title).get(orm).first.should eq RDF::Literal.new("title")
+        subject.get(orm).first.should eq value.first 
       end
+
       it "gets an empty set" do
         Lenses.get_predicate(RDF::DC11.description).get(orm).should eq []
       end
+
+      it "is well-behaved (PutGet: get(put(source, value)) == value)" do
+        converted = subject.get(subject.put(orm, value))
+        expect(converted).to eq value
+      end
+
       it "sets the value of an Ldp::Orm for the specified predicate" do
-        Lenses.get_predicate(RDF::DC11.title).put(orm, [RDF::Literal.new("new")]).value(RDF::DC11.title).first.should eq RDF::Literal.new("new")
+        subject.put(orm, [RDF::Literal.new("new")]).value(RDF::DC11.title).first.should eq RDF::Literal.new("new")
+      end
+
+      it "is well-behaved (GetPut: put(source, get(source)) == source)" do
+        converted = subject.put(orm, subject.get(orm))
+        expect(converted).to eq orm
       end
+
       it "creates a new Ldp::Orm with the value for a specified predicate" do
-        converted = Lenses.get_predicate(RDF::DC11.title).create([RDF::Literal.new("title")])
-        converted.graph.dump(:ttl).should eq orm.graph.dump(:ttl)
-      end
-      graph = RDF::Graph.new
-      orm = Ldp::Orm.new(Ldp::Resource.new(nil, '', graph))
-      orm.graph.insert([orm.resource.subject_uri, RDF::DC11.title, "title"])
-      test_lens(Lenses.get_predicate(RDF::DC11.title), orm, [RDF::Literal.new("new title")]) do |v|
-        if v.is_a? Ldp::Orm
-          v.value(RDF::DC11.title)
-        else
-          v
-        end
+        converted = subject.create(value)
+        converted.graph.should eq orm.graph
+      end
+
+      it "is well-behaved (CreateGet: get(create(value)) == value)" do
+        created = subject.get(subject.create(value))
+        expect(created).to eq value
       end
     end
   end

data/spec/fedora_lens_spec.rb

@@ -75,7 +75,7 @@ describe FedoraLens do
 
     describe "#id" do
       it "should not have 'fedora' in the id" do
-        m = TestClass.new('http://localhost:8983/fedora/rest/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
@@ -92,13 +92,15 @@ describe FedoraLens do
         m = TestClass.create(title: "created resource")
         m.reload
         m.title = "changed title"
-        m.save
+        m.save!
         TestClass.find(m.id).title.should eq "changed title"
       end
 
       context "with a supplied id" do
         subject { TestClass.new(TestClass.id_to_uri('foobar')) }
 
+        after { subject.delete }
+
         it "saves with that id" do
           expect(subject.new_record?).to be_true
           expect(subject.save).to be_true
@@ -112,11 +114,11 @@ describe FedoraLens do
       subject { TestClass.id_to_uri(id) }
       context "without a leading slash" do
         let(:id) { 'test' }
-        it { should eq 'http://localhost:8983/fedora/rest/test' }
+        it { should eq FedoraLens::HOST + '/test' }
       end
       context "with a leading slash" do
         let(:id) { '/test' }
-        it { should eq 'http://localhost:8983/fedora/rest/test' }
+        it { should eq FedoraLens::HOST + '/test' }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fedora_lens
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 description: ''
 email:
 - justin@curationexperts.com
@@ -157,7 +157,6 @@ files:
 - lib/fedora_lens/lens_tests.rb
 - lib/fedora_lens/lenses.rb
 - lib/fedora_lens/version.rb
-- lib/ldp_monkeypatch.rb
 - lib/test_class.rb
 - spec/fedora_lens/lenses_spec.rb
 - spec/fedora_lens_spec.rb

data/lib/ldp_monkeypatch.rb

@@ -1,22 +0,0 @@
-require 'ldp'
-module Ldp
-
-  class Resource
-    def create
-      # create seems to not be working in ldp, but it's not entirely clear how it should work
-      # for example, :new? calls :get, which will raise an error when an object doesn't exist,
-      # this means it is impossible to create anything.
-      # raise "" if new?
-      # puts "MONKEY patch create #{client.inspect}"
-      # puts "Graph #{graph.dump(:ttl)}"
-      resp = client.post '/fedora/rest', graph.dump(:ttl) do |req|
-        # req.headers['Slug'] = subject
-      end
-
-      # puts "Heards #{resp.headers.inspect}"
-      @subject = resp.headers['Location']
-      # puts "Loc #{@subject.inspect}"
-      @subject_uri = nil
-    end
-  end
-end