roadforest 0.0.3 → 0.1

data/spec/client.rb

@@ -21,11 +21,15 @@ describe RoadForest::RemoteHost do
         FileManagementExample::FileRecord.new("three", false)
       ]
       host.destination_dir = destination_dir
+      host.authz.authenticator.add_account("user", "secret", "token")
     end
   end
 
-  let :server do
-    RoadForest::TestSupport::RemoteHost.new(FileManagementExample::Application.new("http://localhost:8778", services))
+  let :base_server do
+    RoadForest::TestSupport::RemoteHost.new(FileManagementExample::Application.new("http://localhost:8778", services)).tap do |server|
+      server.add_credentials("user", "secret")
+      #server.trace = true
+    end
   end
 
   def dump_trace
@@ -46,125 +50,163 @@ describe RoadForest::RemoteHost do
     FileUtils.mkdir_p(destination_dir)
   end
 
-  describe "raw put of file data" do
-    before :each do
-      @destination = nil
-      server.getting do |graph|
-        items = graph.all(:skos, "hasTopConcept")
+  shared_examples_for "client-server interaction" do
+    describe "raw put of file data" do
+      before :each do
+        @destination = nil
+        server.getting do |graph|
+          items = graph.all(:skos, "hasTopConcept")
+
+          unresolved = items.find do |nav_item|
+            nav_item[:skos, "prefLabel"] == "Unresolved"
+          end
+
+          target = unresolved.first(:foaf, "page")
 
-        unresolved = items.find do |nav_item|
-          nav_item[:skos, "label"] == "Unresolved"
+          @destination = target.first(:lc, "needs").as_list.first[:lc, "contents"]
         end
 
-        target = unresolved.first(:foaf, "page")
+        unless @destination.nil?
+          File::open(source_path) do |file|
+            server.put_file(@destination, "text/plain", file)
+          end
+        end
+      end
 
-        @destination = target.first(:lc, "needs").as_list.first[:lc, "contents"]
+      it "should be able to format traces correctly" do
+        RoadForest::TestSupport::FSM.trace_dump.should =~ /Decision/
       end
 
-      unless @destination.nil?
-        File::open(source_path) do |file|
-          server.put_file(@destination, "text/plain", file)
-        end
+      it "should set destination" do
+        @destination.to_context.to_s.should == "http://localhost:8778/files/one"
       end
-    end
 
-    it "should be able to format traces correctly" do
-      RoadForest::TestSupport::FSM.trace_dump.should =~ /Decision/
+      it "should deliver file to destination path" do
+        File::read(File::join(destination_dir, "one")).should ==
+          File::read(source_path)
+      end
     end
 
-    it "should set destination" do
-      @destination.to_context.to_s.should == "http://localhost:8778/files/one"
-    end
+    describe "posting data to server" do
+      before :each do
+        begin
+          server.posting do |graph|
+            items = graph.all(:skos, "hasTopConcept")
+
+            unresolved = items.find do |nav_item|
+              nav_item[:skos, "prefLabel"] == "Unresolved"
+            end
+
+            target = unresolved.first(:foaf, "page")
+
+            target.post_to do |new_need|
+              new_need[[:lc, "name"]] = "lawyers/guns/money"
+            end
+          end
+        ensure
+          dump_trace
+        end
+      end
 
-    it "should deliver file to destination path" do
-      File::read(File::join(destination_dir, "one")).should ==
-        File::read(source_path)
+      it "should change the server state" do
+        services.file_records.find do |record|
+          record.name == "lawyers/guns/money"
+        end.should be_an_instance_of FileManagementExample::FileRecord
+      end
     end
-  end
 
-  describe "posting data to server" do
-    before :each do
-      begin
-        server.posting do |graph|
+    describe "putting data to server" do
+      before :each do
+        server.putting do |graph|
+          require 'rdf/turtle'
           items = graph.all(:skos, "hasTopConcept")
 
           unresolved = items.find do |nav_item|
-            nav_item[:skos, "label"] == "Unresolved"
+            nav_item[:skos, "prefLabel"] == "Unresolved"
           end
 
           target = unresolved.first(:foaf, "page")
 
-          target.post_to do |new_need|
-            new_need[[:lc, "name"]] = "lawyers/guns/money"
+          needs = target.first(:lc, "needs")
+          needs = needs.as_list
+
+          needs.each do |need|
+            need[[:lc, "resolved"]] = true
           end
         end
-      ensure
-        dump_trace
       end
-    end
 
-    it "should change the server state" do
-      services.file_records.find do |record|
-        record.name == "lawyers/guns/money"
-      end.should be_an_instance_of FileManagementExample::FileRecord
-    end
-  end
-
-  describe "putting data to server" do
-    before :each do
-      server.putting do |graph|
-        items = graph.all(:skos, "hasTopConcept")
-
-        unresolved = items.find do |nav_item|
-          nav_item[:skos, "label"] == "Unresolved"
+      it "should change the server state" do
+        services.file_records.each do |record|
+          record.resolved.should == true
         end
+      end
 
-        target = unresolved.first(:foaf, "page")
+      it "should change the server's responses" do
+        server.getting do |graph|
+          @correct = 0
+          items = graph.all(:skos, "hasTopConcept")
 
-        needs = target.first(:lc, "needs").as_list
+          unresolved = items.find do |nav_item|
+            nav_item[:skos, "prefLabel"] == "Unresolved"
+          end
 
-        needs.each do |need|
-          need[[:lc, "resolved"]] = true
+          unresolved.first(:foaf, "page").first(:lc, "needs").as_list.each do |need|
+            @correct += 1
+          end
         end
+
+        @correct.should == 0
       end
-    end
 
-    it "should change the server state" do
-      services.file_records.each do |record|
-        record.resolved.should == true
+      it "should extract data from server responses" do
+        server.should match_query do
+          pattern(:subject, [:lc, "path"], nil)
+          pattern(:subject, [:lc, "file"], nil)
+        end
       end
-    end
 
-    it "should change the server's responses" do
-      server.getting do |graph|
-        @correct = 0
-        items = graph.all(:skos, "hasTopConcept")
+      it "should have transmitted data" do
+        server.http_exchanges.should_not be_empty
+      end
 
-        unresolved = items.find do |nav_item|
-          nav_item[:skos, "label"] == "Unresolved"
+      it "should return correct content-type" do
+        server.http_exchanges.each do |exchange|
+          exchange.response.headers["Content-Type"].should == content_type
         end
+      end
+    end
+  end
 
-        unresolved.first(:foaf, "page").first(:lc, "needs").as_list.each do |need|
-          @correct += 1
+  describe "using JSON-LD" do
+    let :server do
+      base_server.tap do |server|
+        server.graph_transfer.type_handling = RoadForest::ContentHandling::Engine.new.tap do |engine|
+          engine.add RoadForest::MediaType::Handlers::JSONLD.new, "application/ld+json"
         end
       end
+    end
 
-      @correct.should == 0
+    let :content_type do
+      "application/ld+json"
     end
 
-    it "should extract data from server responses" do
-      server.should match_query do
-        pattern(:subject, [:lc, "path"], nil)
-        pattern(:subject, [:lc, "file"], nil)
+    include_examples "client-server interaction"
+  end
+
+  describe "using RDFa" do
+    let :server do
+      base_server.tap do |server|
+        server.graph_transfer.type_handling = RoadForest::ContentHandling::Engine.new.tap do |engine|
+          engine.add RoadForest::MediaType::Handlers::RDFa.new, "text/html;q=1;rdfa=1"
+        end
       end
     end
 
-    it "should return correct content-type" do
-      #test_server.http_exchanges.each{|ex| puts ex.response.body}
-      server.http_exchanges.should_not be_empty
-      server.http_exchanges.each do |exchange|
-        exchange.response.headers["Content-Type"].should == "application/ld+json"
-      end
+    let :content_type do
+      "text/html;rdfa=1"
     end
+
+    include_examples "client-server interaction"
   end
 end

data/spec/{excon-adapater.rb → excon-adapter.rb}

@@ -15,6 +15,10 @@ describe RoadForest::HTTP::ExconAdapter do
     end
   end
 
+  after :each do
+    Excon.stubs.clear
+  end
+
   describe "responses to GET requests" do
     let :request do
       RoadForest::HTTP::Request.new("GET", "http://test-site.com/test")

data/spec/full-integration.rb

@@ -41,6 +41,7 @@ describe "RoadForest integration", :integration => true do
           host.destination_dir = @destination_dir
           host.logger = Logger.new("integration-test.log")
           host.logger.level = Logger::DEBUG
+          host.authz.authenticator.add_account("admin", "passwerd", "toktok")
         end
       ) do |config|
         config.port = @server_port
@@ -55,6 +56,8 @@ describe "RoadForest integration", :integration => true do
       end
     end
 
+    Excon.defaults[:mock] = false
+
     begin_time = Time.now
     begin
       test_conn =  TCPSocket.new 'localhost', @server_port
@@ -84,7 +87,8 @@ describe "RoadForest integration", :integration => true do
 
   let :server do
     server = RoadForest::RemoteHost.new(server_url)
-    #server.graph_transfer.trace = true
+    server.add_credentials("admin","passwerd")
+    #server.trace = true
     server
   end
 
@@ -98,7 +102,7 @@ describe "RoadForest integration", :integration => true do
     items = graph.all(:skos, "hasTopConcept")
 
     unresolved = items.find do |nav_item|
-      nav_item[:skos, "label"] == "Unresolved"
+      nav_item[:skos, "prefLabel"] == "Unresolved"
     end
 
     return unresolved.first(:foaf, "page")

data/spec/graph-store.rb

@@ -29,7 +29,7 @@ describe RoadForest::RDF do
 
       step[[:foaf, :givenname]] = "Lester"
       step[[:dc, :date]] = Time.now
-      step = step.node_at([:dc, :related], "http://lrdesign.com/test-rdf/sub")
+      step = step.node_at([:dc, :relation], "http://lrdesign.com/test-rdf/sub")
       step[[:dc, :date]] = Time.now
 
       store.graph_dump(:rdfa)

data/spec/media-types.rb

@@ -1,11 +1,38 @@
 require 'roadforest/content-handling/media-type'
+
 describe RoadForest::ContentHandling::MediaType do
+  let :type_string do
+    "text/html;q=0.42;rdfa;sublevel=3"
+  end
+
+  let :type do
+    RoadForest::ContentHandling::MediaType.parse(type_string)
+  end
+
+  it "should parse accept_params" do
+    type.params.should_not have_key(:q)
+    type.quality.should == 0.42
+    type.params.should have_key("rdfa")
+    type.params.should have_key("sublevel")
+    type.params["sublevel"].should == "3"
+  end
+
+  it "should produce a matching accept header" do
+    type.accept_header.should == type_string
+  end
+
+  it "should produce a correct content-type header" do
+    type.content_type_header.should == "text/html;rdfa;sublevel=3"
+  end
+end
+
+describe RoadForest::ContentHandling::MediaTypeList do
   let :accepted_list do
-    RoadForest::ContentHandling::MediaTypeList.build("text/*;q=0.3, text/html;q=0.7, text/html;level=1, text/html;level=2;q=0.4, */*;q=0.5")
+    RoadForest::ContentHandling::MediaTypeList.build("text/*;q=0.3, text/html;q=0.7, text/html;level=1, text/html;q=0.4;level=2, */*;q=0.5")
   end
 
   let :provided_list do
-    RoadForest::ContentHandling::MediaTypeList.build("text/html;q=0.9;rdfa=true, application/json+ld;q=0.4")
+    RoadForest::ContentHandling::MediaTypeList.build("text/html;q=0.9;rdfa, application/json+ld;q=0.4")
   end
 
   it "should find best match" do