roadforest 0.5 → 0.7

data/spec/affordances-flow.rb

@@ -19,7 +19,10 @@ describe "The full affordances flow" do
   Aff = RoadForest::Graph::Af
 
   let :service_host do
-    RoadForest::Application::ServicesHost.new
+    RoadForest::Application::ServicesHost.new.tap do |services|
+      services.root_url = "http://example.com/a"
+      services.authz.cleartext_grants!
+    end
   end
 
   let :content_engine do
@@ -38,10 +41,7 @@ describe "The full affordances flow" do
   end
 
   let :augmenter do
-    RoadForest::Augment::Augmenter.new.tap do |augmenter|
-      augmenter.router = router
-      augmenter.canonical_uri = Addressable::URI.parse("http://example.com/a")
-    end
+    RoadForest::Augment::Augmenter.new(service_host)
   end
 
   let :rdfa do
@@ -138,7 +138,7 @@ describe "The full affordances flow" do
     end
 
     let :put_uri do
-      EX.a.join("put").to_s
+      (EX.a / "put").to_s
     end
 
     it "should parse RDFa back to base_graph" do
@@ -206,11 +206,9 @@ describe "The full affordances flow" do
     class TestInterface < RoadForest::Interface::RDF
     end
 
-    let :router do
-      RoadForest::Dispatcher.new(application).tap do |router|
-        router.add :test, ["a"], :parent, TestInterface
-        router.add :target, ["z"], :parent, TestInterface
-      end
+    before :each do
+      service_host.router.add :test, ["a"], :parent, TestInterface
+      service_host.router.add :target, ["z"], :parent, TestInterface
     end
 
     let :base_graph do
@@ -229,14 +227,19 @@ describe "The full affordances flow" do
       RDF::Repository.new.tap do |graph|
         graph << [caff, ::RDF.type, Aff.Update]
         graph << [caff, Aff.target, EX.a]
+        graph << [caff, Aff.authorizedBy, "admin"]
         graph << [uaff, ::RDF.type, Aff.Create]
         graph << [uaff, Aff.target, EX.a]
+        graph << [uaff, Aff.authorizedBy, "admin"]
         graph << [daff, ::RDF.type, Aff.Remove]
         graph << [daff, Aff.target, EX.a]
+        graph << [daff, Aff.authorizedBy, "admin"]
         graph << [naff, ::RDF.type, Aff.Navigate]
         graph << [naff, Aff.target, EX.a]
+        graph << [naff, Aff.authorizedBy, "admin"]
         graph << [onaff, ::RDF.type, Aff.Navigate]
         graph << [onaff, Aff.target, EX.z]
+        graph << [onaff, Aff.authorizedBy, "admin"]
       end
     end
 
@@ -249,10 +252,8 @@ describe "The full affordances flow" do
     class TestInterface < RoadForest::Interface::RDF
     end
 
-    let :router do
-      RoadForest::Dispatcher.new(application).tap do |router|
-        router.add :test, ["a"], :parent, TestInterface
-      end
+    before :each do
+      service_host.router.add :test, ["a"], :parent, TestInterface
     end
 
     let :base_graph do
@@ -266,17 +267,20 @@ describe "The full affordances flow" do
       uaff = ::RDF::Node.new(:uaff)
       naff = ::RDF::Node.new(:naff)
       daff = ::RDF::Node.new(:daff)
-      zaff = ::RDF::Node.new(:zaff)
 
       RDF::Repository.new.tap do |graph|
         graph << [caff, ::RDF.type, Aff.Update]
         graph << [caff, Aff.target, EX.a]
+        graph << [caff, Aff.authorizedBy, "admin"]
         graph << [uaff, ::RDF.type, Aff.Create]
         graph << [uaff, Aff.target, EX.a]
+        graph << [uaff, Aff.authorizedBy, "admin"]
         graph << [daff, ::RDF.type, Aff.Remove]
         graph << [daff, Aff.target, EX.a]
+        graph << [daff, Aff.authorizedBy, "admin"]
         graph << [naff, ::RDF.type, Aff.Navigate]
         graph << [naff, Aff.target, EX.a]
+        graph << [naff, Aff.authorizedBy, "admin"]
       end
     end
 
@@ -289,10 +293,8 @@ describe "The full affordances flow" do
     class TestInterface < RoadForest::Interface::RDF
     end
 
-    let :router do
-      RoadForest::Dispatcher.new(application).tap do |router|
-        router.add :test, ["a"], :parent, TestInterface
-      end
+    before :each do
+      service_host.router.add :test, ["a"], :parent, TestInterface
     end
 
     let :base_graph do
@@ -311,12 +313,20 @@ describe "The full affordances flow" do
       RDF::Repository.new.tap do |graph|
         graph << [caff, ::RDF.type, Aff.Update]
         graph << [caff, Aff.target, EX.a]
+        graph << [caff, Aff.authorizedBy, "admin"]
+
         graph << [uaff, ::RDF.type, Aff.Create]
         graph << [uaff, Aff.target, EX.a]
+        graph << [uaff, Aff.authorizedBy, "admin"]
+
         graph << [daff, ::RDF.type, Aff.Remove]
         graph << [daff, Aff.target, EX.a]
+        graph << [daff, Aff.authorizedBy, "admin"]
+
         graph << [naff, ::RDF.type, Aff.Navigate]
         graph << [naff, Aff.target, EX.a]
+        graph << [naff, Aff.authorizedBy, "admin"]
+
         graph << [zaff, ::RDF.type, Aff.Null]
         graph << [zaff, Aff.target, EX.z]
       end
@@ -334,12 +344,10 @@ describe "The full affordances flow" do
     class Blobby < RoadForest::Interface::Blob
     end
 
-    let :router do
-      RoadForest::Dispatcher.new(application).tap do |router|
-        router.add :test, ["a"], :parent, TestInterface
-        router.add :blob, ["z"], :leaf, RoadForest::Interface::Blob do |route|
-          route.content_engine = RoadForest::ContentHandling.images_engine
-        end
+    before :each do
+      service_host.router.add :test, ["a"], :parent, TestInterface
+      service_host.router.add :blob, ["z"], :leaf, RoadForest::Interface::Blob do |route|
+        route.content_engine = RoadForest::ContentHandling.images_engine
       end
     end
 
@@ -359,14 +367,19 @@ describe "The full affordances flow" do
       RDF::Repository.new.tap do |graph|
         graph << [caff, ::RDF.type, Aff.Update]
         graph << [caff, Aff.target, EX.a]
+        graph << [caff, Aff.authorizedBy, "admin"]
         graph << [uaff, ::RDF.type, Aff.Create]
         graph << [uaff, Aff.target, EX.a]
+        graph << [uaff, Aff.authorizedBy, "admin"]
         graph << [daff, ::RDF.type, Aff.Remove]
         graph << [daff, Aff.target, EX.a]
+        graph << [daff, Aff.authorizedBy, "admin"]
         graph << [naff, ::RDF.type, Aff.Navigate]
         graph << [naff, Aff.target, EX.a]
+        graph << [naff, Aff.authorizedBy, "admin"]
         graph << [eaff, ::RDF.type, Aff.Embed]
         graph << [eaff, Aff.target, EX.z]
+        graph << [eaff, Aff.authorizedBy, "admin"]
       end
     end
 
@@ -379,10 +392,8 @@ describe "The full affordances flow" do
     class TestInterface < RoadForest::Interface::RDF
     end
 
-    let :router do
-      RoadForest::Dispatcher.new(application).tap do |router|
-        router.add :test, ["a"], :parent, TestInterface
-      end
+    before :each do
+      service_host.router.add :test, ["a"], :parent, TestInterface
     end
 
     let :base_graph do
@@ -406,6 +417,11 @@ describe "The full affordances flow" do
         graph << [daff, Aff.target, EX.a]
         graph << [naff, ::RDF.type, Aff.Navigate]
         graph << [naff, Aff.target, EX.a]
+
+        graph << [caff, Aff.authorizedBy, "admin"]
+        graph << [uaff, Aff.authorizedBy, "admin"]
+        graph << [daff, Aff.authorizedBy, "admin"]
+        graph << [naff, Aff.authorizedBy, "admin"]
       end
     end
 

data/spec/authorization.rb

@@ -7,6 +7,19 @@ describe RoadForest::Authorization do
     end
   end
 
+  def req_with_header(header)
+    req = double("Webmachine::Request")
+    req.stub(:headers).and_return({"Authorization" => header})
+    req
+  end
+
+  def req_with_cert(file)
+    cert = OpenSSL::X509::Certificate.new(File.read(file))
+    req = double("Webmachine::Request")
+    req.stub(:headers).and_return({})
+    req.stub(:client_cert).and_return(cert)
+  end
+
   describe "default setup" do
     let :requires_admin do
       manager.build_grants do |grants|
@@ -15,20 +28,19 @@ describe RoadForest::Authorization do
     end
 
     it "should refuse an unauthenticated user" do
-      manager.authorization(nil, requires_admin).should == :refused
+      manager.authorization(req_with_header(nil), requires_admin).should == :refused
     end
 
     it "should grant an authenticated user" do
-      manager.authorization("Basic #{Base64.encode64("user:secret")}", requires_admin).should == :granted
+      manager.authorization(req_with_header("Basic #{Base64.encode64("user:secret")}"), requires_admin).should == :granted
     end
 
     it "should refuse a garbage authentication header" do
-      manager.authorization("some garbage here", requires_admin).should == :refused
+      manager.authorization(req_with_header("some garbage here"), requires_admin).should == :refused
     end
 
     it "should construct a valid challenge header" do
       manager.challenge(:realm => "This test here").should == 'Basic realm="This test here"'
-
     end
   end
 end

data/spec/client.rb

@@ -12,21 +12,39 @@ describe RoadForest::RemoteHost do
 
   let :services do
     require 'logger'
+    require 'roadforest/type-handlers/jsonld'
+    require 'roadforest/type-handlers/rdfa'
     FileManagementExample::ServicesHost.new.tap do |host|
+      host.root_url = "http://localhost:8778/" # +/- a '/' at the end is finicky.
       host.file_records = [
         FileManagementExample::FileRecord.new("one", false),
         FileManagementExample::FileRecord.new("two", false),
         FileManagementExample::FileRecord.new("three", false)
       ]
+
+      rdfa = RoadForest::TypeHandlers::RDFa.new
+      rdfa.haml_options = {:ugly => false}
+      jsonld = RoadForest::TypeHandlers::JSONLD.new
+
+      host.default_content_engine = RoadForest::ContentHandling::Engine.new.tap do |engine|
+        engine.add rdfa, "text/html;q=1;rdfa=1"
+        engine.add rdfa, "application/xhtml+xml;q=1;rdfa=1"
+        engine.add jsonld, "application/ld+json"
+        engine.add rdfa, "text/html;q=0.5"
+        engine.add rdfa, "application/xhtml+xml;q=0.5"
+      end
+
       host.destination_dir = destination_dir
       host.authz.authenticator.add_account("user", "secret", "token")
+      host.authz.cleartext_grants!
     end
   end
 
   let :base_server do
-    RoadForest::TestSupport::RemoteHost.new(FileManagementExample::Application.new("http://localhost:8778", services)).tap do |server|
+    RoadForest::TestSupport::RemoteHost.new(services).tap do |server|
       server.add_credentials("user", "secret")
-     # server.trace = true
+      #server.http_trace = true
+      #server.graph_trace = true
     end
   end
 
@@ -102,7 +120,7 @@ describe RoadForest::RemoteHost do
             end
           end
         ensure
-          dump_trace
+          #dump_trace
         end
       end
 
@@ -170,7 +188,7 @@ describe RoadForest::RemoteHost do
 
       it "should return correct content-type" do
         server.http_exchanges.each do |exchange|
-          exchange.response.headers["Content-Type"].should == content_type
+          [content_type, nil].should include(exchange.response.headers["Content-Type"])
         end
       end
     end

data/spec/focus-list.rb

@@ -21,6 +21,30 @@ describe RoadForest::Graph::FocusList do
     focus.as_list
   end
 
+  it "should render correctly empty" do
+    focus.add_list(:rdf, :value)
+
+    graph.should match_query { |query|
+      query.pattern(:object => RDF.nil)
+    }
+  end
+
+  it "should raise error if trying to append to an empty list" do
+    list = focus.add_list(:rdf, :value)
+
+    expect{ list.append_node("#1") }.to raise_error
+  end
+
+  it "should append nodes in an added list" do
+    focus.add_list(:rdf, :value) do |list|
+      list.append_node("#1")
+    end
+
+    graph.should match_query { |query|
+      query.pattern(:object => RDF::URI.new("urn:root#1"))
+    }
+  end
+
   it "should add an item to graph" do
     list.append_node("#test")
 

data/spec/full-integration.rb

@@ -31,8 +31,8 @@ describe "RoadForest integration", :integration => true do
       require 'logger'
 
       RoadForest.serve(
-        FileManagementExample::Application.new("http://localhost:#{@server_port}"),
         FileManagementExample::ServicesHost.new.tap do |host|
+          host.root_url = "https://localhost:#{@server_port}"
           host.file_records = [
             FileManagementExample::FileRecord.new("one", false),
             FileManagementExample::FileRecord.new("two", false),
@@ -42,9 +42,13 @@ describe "RoadForest integration", :integration => true do
           host.logger = Logger.new("integration-test.log")
           host.logger.level = Logger::DEBUG
           host.authz.authenticator.add_account("admin", "passwerd", "toktok")
+          host.authz.authenticator.add_account("admin@test.com", nil, nil) #nil password cannot authn
         end
       ) do |config|
         config.port = @server_port
+        RoadForest::SSL.enable(config, "spec_support/fixtures/server-key.pem", "spec_support/fixtures/server.cert")
+        RoadForest::SSL.add_ca_cert(config, "spec_support/fixtures/ca.cert")
+        RoadForest::SSL.add_client_verify(config)
       end
     end
 
@@ -82,12 +86,13 @@ describe "RoadForest integration", :integration => true do
   end
 
   let :server_url do
-    "http://localhost:#{@server_port}"
+    "https://localhost:#{@server_port}"
   end
 
   let :server do
     server = RoadForest::RemoteHost.new(server_url)
-    server.add_credentials("admin","passwerd")
+    server.use_ca_cert("spec_support/fixtures/ca.cert")
+    server.use_client_tls("spec_support/fixtures/client-key.pem", "spec_support/fixtures/client.cert")
     #server.trace = true
     server
   end

data/spec/graph-store.rb

@@ -152,5 +152,13 @@ describe RoadForest::Graph do
         query.pattern [:subject, RDF::DC.dateCopyrighted, :value]
       end.execute(graph_store).should_not be_empty
     end
+
+    it "should be able insert statement-ish items" do
+      node = ::RDF::Node.new
+      step << [ node, ::RDF.type, [:dc, :dateCopyrighted]]
+      graph_store.should match_query{
+        pattern [ :node, ::RDF.type, ::RDF::DC.dateCopyrighted ]
+      }
+    end
   end
 end

data/spec/keychain.rb

@@ -40,12 +40,21 @@ describe RoadForest::HTTP::Keychain do
   end
 
   describe "#preemptive_response" do
+    subject :source do
+      RoadForest::HTTP::PreparedCredentialSource.new.tap do |source|
+        source.add("http://example.com/test/", username, password)
+      end
+    end
     subject :keychain do
       RoadForest::HTTP::Keychain.new.tap do |chain|
-        chain.add("http://example.com/test/", username, password)
+        chain.add_source(source)
       end
     end
 
+    before :each do
+      keychain.challenge_response("http://example.com/test/", "Basic Realm='testing'")
+    end
+
     it "should return matching creds" do
       creds = keychain.preemptive_response("http://example.com/test/under/here/")
       creds.should == expected_header
@@ -58,25 +67,20 @@ describe RoadForest::HTTP::Keychain do
   end
 
   describe "#challenge_response" do
+    subject :source do
+      RoadForest::HTTP::PreparedCredentialSource.new.tap do |source|
+        source.add("http://example.com/test/", username, password)
+      end
+    end
     subject :keychain do
       RoadForest::HTTP::Keychain.new.tap do |chain|
-        chain.add("http://example.com/test/", username, password, "test")
+        chain.add_source(source)
       end
     end
 
-    it "should return matching creds" do
-      creds = keychain.challenge_response("http://example.com/", "Basic realm='test'")
-      creds.should == expected_header
-    end
-
-    it "should not return covering creds" do
+    it "should prepared creds" do
       creds = keychain.challenge_response("http://example.com/test/under/here/", "Basic realm='other'")
-      creds.should be_nil
-    end
-
-    it "should not return non-matching creds" do
-      creds = keychain.challenge_response("http://example.com/", "Basic realm='other'")
-      creds.should be_nil
+      creds.should == expected_header
     end
   end
 end

data/spec/rdf-normalization.rb

@@ -3,15 +3,41 @@ require 'roadforest/graph/normalization'
 describe RoadForest::Graph::Normalization do
   include described_class
 
-  it "should match http://test.com and http://test.com/" do
-    normalize_resource("http://test.com").to_s.should == normalize_resource("http://test.com/").to_s
+  describe "#normalize_term" do
+    it "should resolve a curie" do
+      normalize_term([:rf, "Impulse"]).to_s.should == "http://lrdesign.com/graph/roadforest#Impulse"
+    end
   end
 
-  it "should match http://test.com:8888 and http://test.com:8888/" do
-    normalize_resource("http://test.com:8888").to_s.should == "http://test.com:8888/"
+  describe "#normalize_resource" do
+    it "should match http://test.com and http://test.com/" do
+      normalize_resource("http://test.com").to_s.should == normalize_resource("http://test.com/").to_s
+    end
+
+    it "should match http://test.com:8888 and http://test.com:8888/" do
+      normalize_resource("http://test.com:8888").to_s.should == "http://test.com:8888/"
+    end
+
+    it "should match http://localhost:8778 and http://localhost:8778/" do
+      normalize_resource("http://localhost:8778").to_s.should == "http://localhost:8778/"
+    end
   end
 
-  it "should match http://localhost:8778 and http://localhost:8778/" do
-    normalize_resource("http://localhost:8778").to_s.should == "http://localhost:8778/"
+  describe "normalize_context" do
+    it "should remove fragment part" do
+      normalize_context("http://localhost:8778/place#fragment").to_s.should == "http://localhost:8778/place"
+    end
+
+    it "should remove the fragment from a frozen URL" do
+      uri = ::RDF::URI.new("http://localhost:8778/place#fragment").freeze
+
+      normalize_context(uri).to_s.should == "http://localhost:8778/place"
+    end
+
+    it "should remove the fragment from an array-wrapped frozen URL" do
+      uri = ::RDF::URI.new("http://localhost:8778/place#fragment").freeze
+
+      normalize_context([uri]).to_s.should == "http://localhost:8778/place"
+    end
   end
 end