roadforest 0.0.1 → 0.0.2

data/lib/roadforest/remote-host.rb

@@ -9,8 +9,12 @@ module RoadForest
     include RDF::Normalization
 
     def initialize(well_known_url)
-      @url = normalize_resource(well_known_url)
-      @graph = build_graph_store
+      self.url = well_known_url
+    end
+    attr_reader :url
+
+    def url=(string)
+      @url = normalize_resource(string)
     end
 
     def build_graph_store
@@ -19,7 +23,7 @@ module RoadForest
 
     attr_writer :http_client
     def http_client
-      @http_client ||= HTTP::ExconAdapter.new(@url)
+      @http_client ||= HTTP::ExconAdapter.new(url)
     end
 
     def graph_transfer
@@ -42,7 +46,8 @@ module RoadForest
     end
 
     def anneal(focus)
-      annealer = RDF::SourceRigor::CredenceAnnealer.new(@graph)
+      graph = build_graph_store
+      annealer = RDF::SourceRigor::CredenceAnnealer.new(graph)
       annealer.resolve do
         yield focus
       end
@@ -50,12 +55,16 @@ module RoadForest
 
     def putting(&block)
       require 'roadforest/rdf/update-focus'
-      target_graph = ::RDF::Repository.new
-      updater = RDF::UpdateFocus.new(@url, @graph, source_rigor)
-      updater.target_graph = target_graph
+      graph = build_graph_store
+      updater = RDF::UpdateFocus.new(url, graph, source_rigor)
+      annealer = RDF::SourceRigor::CredenceAnnealer.new(graph)
 
-      anneal(updater, &block)
+      annealer.resolve do
+        updater.target_graph = ::RDF::Repository.new
+        yield updater
+      end
 
+      target_graph = updater.target_graph
       target_graph.each_context do |context|
         graph = ::RDF::Graph.new(context, :data => target_graph)
         graph_transfer.put(context, graph)
@@ -64,7 +73,8 @@ module RoadForest
 
     def posting(&block)
       require 'roadforest/rdf/post-focus'
-      poster = RDF::PostFocus.new(@url, @graph, source_rigor)
+      graph = build_graph_store
+      poster = RDF::PostFocus.new(url, graph, source_rigor)
 
       anneal(poster, &block)
 
@@ -72,7 +82,8 @@ module RoadForest
     end
 
     def getting(&block)
-      reader = RDF::GraphReading.new(@url, @graph, source_rigor)
+      graph = build_graph_store
+      reader = RDF::GraphReading.new(url, graph, source_rigor)
 
       anneal(reader, &block)
     end

data/lib/roadforest/resource/rdf/read-only.rb

@@ -24,6 +24,10 @@ module RoadForest
           end
         end
 
+        def request_uri
+          request.uri.to_s.sub(/[?]\Z/, '')
+        end
+
         def request_accept_header
           request.headers["Accept"] || "*/*"
         end

data/lib/roadforest/server.rb

@@ -1,3 +1,25 @@
 #This file is intended as the single entry point for RoadForest server code
 require 'roadforest/application'
 require 'roadforest/models'
+
+module RoadForest
+  def self.serve(application, services)
+    require 'webrick/accesslog'
+    application.services = services
+
+    logfile = services.logger
+    logfile.info("#{Time.now.to_s}: Starting Roadforest server")
+
+    application.configure do |config|
+      config.adapter_options = {
+        :Logger => WEBrick::Log.new(logfile),
+        :AccessLog => [
+          [logfile, WEBrick::AccessLog::COMMON_LOG_FORMAT ],
+          [logfile, WEBrick::AccessLog::REFERER_LOG_FORMAT ]
+      ]
+      }
+      yield config if block_given?
+    end
+    application.run
+  end
+end

data/lib/roadforest/test-support/dispatcher-facade.rb

@@ -18,7 +18,7 @@ module RoadForest
         if resource = @dispatcher.find_resource(request, response)
           FSM.new(resource, request, response).run
         else
-          Webmachine.render_error(404, request, response)
+          ::Webmachine.render_error(404, request, response)
         end
       end
     end

data/lib/roadforest/test-support/http-client.rb

@@ -47,10 +47,18 @@ module RoadForest
         response.status = exchange.response.code
         response.body_string = exchange.response.body
 
+        enrich_with_server_stuff(response)
+
         #puts; puts "#{__FILE__}:#{__LINE__} => #{(response).inspect}"
         return response
       end
 
+      def enrich_with_server_stuff(response)
+        response.headers["Server"]="RoadForest Test Server"
+        response.headers["Date"]=Time.now.httpdate
+        response.headers["Connection"] = "Keep-Alive"
+      end
+
       class Exchange
         def initialize
           @uri = nil

data/spec/client.rb

@@ -13,6 +13,7 @@ describe RoadForest::RemoteHost do
   end
 
   let :services do
+    require 'logger'
     FileManagementExample::ServicesHost.new.tap do |host|
       host.file_records = [
         FileManagementExample::FileRecord.new("one", false),
@@ -24,7 +25,7 @@ describe RoadForest::RemoteHost do
   end
 
   let :server do
-    RoadForest::TestSupport::RemoteHost.new(FileManagementExample::Application.new("http://roadforest.test-domain.com/", services))
+    RoadForest::TestSupport::RemoteHost.new(FileManagementExample::Application.new("http://localhost:8778", services))
   end
 
   def dump_trace
@@ -72,7 +73,7 @@ describe RoadForest::RemoteHost do
     end
 
     it "should set destination" do
-      @destination.to_context.to_s.should == "http://roadforest.test-domain.com/files/one"
+      @destination.to_context.to_s.should == "http://localhost:8778/files/one"
     end
 
     it "should deliver file to destination path" do
@@ -134,6 +135,23 @@ describe RoadForest::RemoteHost do
       end
     end
 
+    it "should change the server's responses" do
+      server.getting do |graph|
+        @correct = 0
+        items = graph.all(:skos, "hasTopConcept")
+
+        unresolved = items.find do |nav_item|
+          nav_item[:skos, "label"] == "Unresolved"
+        end
+
+        unresolved.first(:foaf, "page").first(:lc, "needs").as_list.each do |need|
+          @correct += 1
+        end
+      end
+
+      @correct.should == 0
+    end
+
     it "should extract data from server responses" do
       server.should match_query do
         pattern(:subject, [:lc, "path"], nil)

data/spec/credence-annealer.rb

@@ -20,7 +20,7 @@ describe RoadForest::RDF::SourceRigor::CredenceAnnealer do
   end
 
   it "should re-run it's block until the GraphStore settles" do
-    graph.stub(:quiet_impulse?).and_return(false, false, true)
+    graph.stub(:quiet_impulse?).and_return(false, false, false, false, true) #called twice per resolution loop
 
     times_run = 0
     annealer.resolve do

data/spec/excon-adapater.rb

@@ -0,0 +1,30 @@
+require 'roadforest/http/adapters/excon'
+
+describe RoadForest::HTTP::ExconAdapter do
+  let :adapter do
+    RoadForest::HTTP::ExconAdapter.new("http://test-site.com").tap do |adapter|
+      adapter.connection_defaults[:mock] = true
+    end
+  end
+
+  before :each do
+    Excon.stub do
+      {
+        :body => "Hello!"
+      }
+    end
+  end
+
+  describe "responses to GET requests" do
+    let :request do
+      RoadForest::HTTP::Request.new("GET", "http://test-site.com/test")
+    end
+
+    subject :response do
+      adapter.do_request(request)
+    end
+
+    its(:status){ should == 200 }
+    its(:body_string){ should == "Hello!" }
+  end
+end

data/spec/focus-list.rb

@@ -0,0 +1,34 @@
+require 'rdf'
+require 'roadforest/rdf/focus-list'
+require 'roadforest/rdf/graph-focus'
+
+describe RoadForest::RDF::FocusList do
+  let :graph do
+    RDF::Graph.new
+  end
+
+  let :focus do
+    RoadForest::RDF::GraphFocus.new("urn:root", graph)
+  end
+
+  let :list do
+    focus.as_list
+  end
+
+  it "should add an item to graph" do
+    list.append_node("#test")
+
+    graph.should match_query do |query|
+      query.pattern(:subject => "urn:root#test")
+    end
+  end
+
+  it "should add several items to the graph" do
+    list.append_node("#1")
+    list.append_node("#2")
+    list.append_node("#3")
+
+    focus.as_list.to_a.should have(3).nodes
+
+  end
+end

data/spec/form-parsing.rb

@@ -0,0 +1 @@
+require 'roadforest/resource/http/form-parsing'

data/spec/full-integration.rb

@@ -0,0 +1,193 @@
+require 'socket'
+require 'rdf'
+
+describe "RoadForest integration", :integration => true do
+  class LC < ::RDF::Vocabulary("http://lrdesign.com/vocabularies/logical-construct#"); end
+  def kill_server(pid)
+    return if pid.nil?
+    Process.kill("KILL", pid) rescue nil
+    Process.wait(pid)
+  rescue Errno::ECHILD
+  end
+
+  before :each do
+    @server_port = 8778
+
+    begin
+      test_conn =  TCPSocket.new 'localhost', @server_port
+      raise "Something is still running on localhost:#{@server_port}"
+    rescue Errno::ECONNREFUSED
+      #That's what we're hoping for
+    ensure
+      #test_conn.close
+    end
+
+    @setup_time_limit = 3
+    @destination_dir = "spec_support/destination"
+    @server_logs = "integration-tests.log"
+
+    @server_pid = fork do
+      require 'roadforest/server'
+      require 'examples/file-management'
+      require 'logger'
+      RoadForest.serve(
+        FileManagementExample::Application.new("http://localhost:#{@server_port}"),
+        FileManagementExample::ServicesHost.new.tap do |host|
+          host.file_records = [
+            FileManagementExample::FileRecord.new("one", false),
+            FileManagementExample::FileRecord.new("two", false),
+            FileManagementExample::FileRecord.new("three", false)
+          ]
+          host.destination_dir = @destination_dir
+          host.logger = Logger.new("integration-test.log")
+          host.logger.level = Logger::DEBUG
+        end
+      ) do |config|
+        config.port = @server_port
+      end
+    end
+
+    require 'roadforest/remote-host'
+
+    %w{EXIT TERM}.each do |signal|
+      trap(signal) do
+        kill_server(@server_pid)
+      end
+    end
+
+    begin_time = Time.now
+    begin
+      test_conn =  TCPSocket.new 'localhost', @server_port
+    rescue Errno::ECONNREFUSED
+      if Time.now - begin_time > @setup_time_limit
+        raise "Couldn't connect to test server after #{@setup_time_limit} seconds - bailing out"
+      else
+        sleep 0.05
+        retry
+      end
+    ensure
+      test_conn.close rescue nil
+    end
+  end
+
+  after :each do
+    kill_server @server_pid
+  end
+
+  let :source_path do
+    "spec_support/test-file.txt"
+  end
+
+  let :server_url do
+    "http://localhost:#{@server_port}"
+  end
+
+  let :server do
+    server = RoadForest::RemoteHost.new(server_url)
+    #server.graph_transfer.trace = true
+    server
+  end
+
+  before :each do
+    require 'fileutils'
+    FileUtils.rm_f(@destination_dir)
+    FileUtils.mkdir_p(@destination_dir)
+  end
+
+  def unresolved_list(graph)
+    items = graph.all(:skos, "hasTopConcept")
+
+    unresolved = items.find do |nav_item|
+      nav_item[:skos, "label"] == "Unresolved"
+    end
+
+    return unresolved.first(:foaf, "page")
+  end
+
+
+  describe "raw put of file data" do
+    before :each do
+      @destination = nil
+      server.getting do |graph|
+        target = unresolved_list(graph)
+        @destination = target.first(:lc, "needs").as_list.first[:lc, "contents"]
+      end
+
+      unless @destination.nil?
+        File::open(source_path) do |file|
+          @response = server.put_file(@destination, "text/plain", file)
+        end
+      end
+    end
+
+    it "should respond with 204" do
+      @response.status.should == 204
+    end
+
+    it "should set destination" do
+      @destination.to_context.to_s.should == "#{server_url}/files/one"
+    end
+
+    it "should deliver file to destination path" do
+      File::read(File::join(@destination_dir, "one")).should == File::read(source_path)
+    end
+  end
+
+  describe "posting data to server" do
+    before :each do
+      server.posting do |graph|
+        target = unresolved_list(graph)
+
+        target.post_to do |new_need|
+          new_need[[:lc, "name"]] = "lawyers/guns/money"
+        end
+      end
+    end
+
+    it "should change the server state" do
+      server.getting do |graph|
+        @get_me_out_of_this = unresolved_list(graph).first(:lc, "needs").as_list.find do |need|
+          need[:lc, "name"] == "lawyers/guns/money"
+        end
+      end
+
+      @get_me_out_of_this.should_not be_nil
+    end
+  end
+
+  describe "getting data from the server" do
+    it "should get a correct count" do
+      server.getting do |graph|
+        @correct = 0
+        unresolved_list(graph).first(:lc, "needs").as_list.each do |need|
+          @correct += 1 unless need[:lc, "resolved"]
+        end
+      end
+
+      @correct.should == 3
+    end
+  end
+
+  describe "putting data to server" do
+    before :each do
+      server.putting do |graph|
+        target = unresolved_list(graph)
+
+        target.first(:lc, "needs").as_list.each do |need|
+          need[[:lc, "resolved"]] = true
+        end
+      end
+    end
+
+    it "should change the server state" do
+      server.getting do |graph|
+        @correct = 0
+        unresolved_list(graph).first(:lc, "needs").as_list.each do |need|
+          @correct += 1
+        end
+      end
+
+      @correct.should == 0
+    end
+  end
+end

data/spec/rdf-normalization.rb

@@ -0,0 +1,17 @@
+require 'roadforest/rdf/normalization'
+
+describe RoadForest::RDF::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
+  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

data/spec/update-focus.rb

@@ -71,6 +71,13 @@ describe RoadForest::RDF::UpdateFocus do
     end
   end
 
+  it "should make relevant prefixes available" do
+    updater[[:rdf, :type]] = [:voc, :Thing]
+    updater[[:voc, :a]] = 15
+
+    updater.relevant_prefixes.keys.sort.should == ["rdf", "voc"]
+  end
+
   it "should copy entire context when resource is written" do
     updater[Voc[:a]] = 17
 
@@ -114,4 +121,34 @@ describe RoadForest::RDF::UpdateFocus do
     updater[Voc[:a]].should == 7
     target_graph.should be_empty
   end
+
+  it "should add a list to the target graph" do
+    list_focus = updater.add_node(Voc[:list])
+    nodes = []
+    list_focus.as_list.append_node do |node|
+      nodes << node
+      node[Voc[:d]] = 107
+    end
+
+    list_focus.as_list.append_node do |node|
+      nodes << node
+      node[Voc[:d]] = 109
+    end
+
+    list_focus.as_list.append_node do |node|
+      nodes << node
+      node[Voc[:d]] = 113
+    end
+
+    resource_graph = ::RDF::Graph.new(context_node, :data => target_graph)
+
+    list = ::RDF::List.new(list_focus.subject, target_graph)
+
+    list[0].should == nodes[0].subject
+    list[1].should == nodes[1].subject
+    list[2].should == nodes[2].subject
+    resource_graph.query([nodes[0].subject, Voc[:d], 107]).should_not be_empty
+    resource_graph.query([nodes[1].subject, Voc[:d], 109]).should_not be_empty
+    resource_graph.query([nodes[2].subject, Voc[:d], 113]).should_not be_empty
+  end
 end

metadata

@@ -2,14 +2,14 @@
 name: roadforest
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -17,15 +17,15 @@ dependencies:
   name: rdf
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.6
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.6
     none: false
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -142,7 +142,7 @@ files:
 - lib/roadforest/rdf/context-fascade.rb
 - lib/roadforest/rdf/source-rigor.rb
 - lib/roadforest/rdf/graph-focus.rb
-- lib/roadforest/rdf/post-focus.rb
+- lib/roadforest/rdf/etagging.rb
 - lib/roadforest/rdf/source-rigor/null-investigator.rb
 - lib/roadforest/rdf/source-rigor/credence.rb
 - lib/roadforest/rdf/source-rigor/credence/any.rb
@@ -151,14 +151,14 @@ files:
 - lib/roadforest/rdf/source-rigor/http-investigator.rb
 - lib/roadforest/rdf/source-rigor/investigator.rb
 - lib/roadforest/rdf/source-rigor/credence-annealer.rb
+- lib/roadforest/rdf/post-focus.rb
+- lib/roadforest/rdf/investigation.rb
 - lib/roadforest/rdf/update-focus.rb
 - lib/roadforest/rdf/vocabulary.rb
 - lib/roadforest/rdf/document.rb
-- lib/roadforest/rdf/focus-wrapping.rb
 - lib/roadforest/rdf/resource-pattern.rb
 - lib/roadforest/rdf/parcel.rb
 - lib/roadforest/rdf/resource-query.rb
-- lib/roadforest/rdf/investigation.rb
 - lib/roadforest/http/message.rb
 - lib/roadforest/http/graph-response.rb
 - lib/roadforest/http/adapters/excon.rb
@@ -172,22 +172,22 @@ files:
 - lib/roadforest/resource/role/has-children.rb
 - lib/roadforest/resource/handlers.rb
 - lib/roadforest/resource/rdf.rb
-- lib/roadforest/test-support/matchers.rb
-- lib/roadforest/test-support/remote-host.rb
+- lib/roadforest/test-support/http-client.rb
 - lib/roadforest/test-support/trace-formatter.rb
+- lib/roadforest/test-support/matchers.rb
 - lib/roadforest/test-support/dispatcher-facade.rb
-- lib/roadforest/test-support/http-client.rb
+- lib/roadforest/test-support/remote-host.rb
 - lib/roadforest/server.rb
 - lib/roadforest/application/services-host.rb
 - lib/roadforest/application/path-provider.rb
 - lib/roadforest/application/parameters.rb
 - lib/roadforest/application/dispatcher.rb
 - lib/roadforest/application/route-adapter.rb
-- lib/roadforest/models.rb
 - lib/roadforest/model.rb
-- lib/roadforest/blob-model.rb
+- lib/roadforest/models.rb
 - lib/roadforest/test-support.rb
 - lib/roadforest/rdf.rb
+- lib/roadforest/blob-model.rb
 - lib/roadforest/utility/class-registry.rb
 - lib/roadforest/content-handling/type-handlers/jsonld.rb
 - lib/roadforest/content-handling/media-type.rb
@@ -195,14 +195,19 @@ files:
 - lib/roadforest/application.rb
 - lib/roadforest/remote-host.rb
 - lib/roadforest.rb
+- examples/file-management.rb
 - spec/graph-store.rb
+- spec/focus-list.rb
 - spec/graph-copier.rb
 - spec/rdf-parcel.rb
 - spec/media-types.rb
+- spec/rdf-normalization.rb
+- spec/excon-adapater.rb
 - spec/update-focus.rb
 - spec/client.rb
+- spec/form-parsing.rb
 - spec/credence-annealer.rb
-- examples/file-management.rb
+- spec/full-integration.rb
 - spec_support/gem_test_suite.rb
 homepage: http://nyarly.github.com/roadforest
 licenses:
@@ -213,7 +218,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- roadforest-0.0.1 Documentation
+- roadforest-0.0.2 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -222,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -247142993
+      hash: -203066605
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement

data/lib/roadforest/rdf/focus-wrapping.rb

@@ -1,30 +0,0 @@
-require 'rdf/model/node'
-
-module RoadForest::RDF
-  module FocusWrapping
-    def new_focus
-      dup
-    end
-
-    def wrap_node(value)
-      next_step = new_focus
-      if ::RDF::Node === value
-        next_step.root_url = self.root_url
-      else
-        next_step.root_url = normalize_context(value)
-      end
-      next_step.subject = value
-      next_step.graph = graph
-      next_step.source_rigor = source_rigor
-      next_step
-    end
-
-    def unwrap_value(value)
-      if value.respond_to? :object
-        value.object
-      else
-        wrap_node(value)
-      end
-    end
-  end
-end