roadforest 0.0.2 → 0.0.3

data/spec/update-focus.rb

@@ -1,10 +1,9 @@
 require 'roadforest/rdf/source-rigor'
-require 'roadforest/rdf/update-focus'
 require 'roadforest/rdf/graph-store'
 require 'roadforest/rdf/document'
 require 'rdf/rdfa'
 
-describe RoadForest::RDF::UpdateFocus do
+describe RoadForest::RDF::GraphFocus, "with UpdateManager" do
   class Voc < ::RDF::Vocabulary("http:/pred.org/"); end
 
   let :context_node do
@@ -62,15 +61,18 @@ describe RoadForest::RDF::UpdateFocus do
     end
   end
 
-  subject :updater do
-    RoadForest::RDF::UpdateFocus.new.tap do |updater|
-      updater.source_graph = source_graph
-      updater.target_graph = target_graph
-      updater.subject = context_node
-      updater.source_rigor = source_rigor
+  let :access do
+    RoadForest::RDF::UpdateManager.new.tap do |access|
+      access.source_graph = source_graph
+      access.target_graph = target_graph
+      access.rigor = source_rigor
     end
   end
 
+  subject :updater do
+    RoadForest::RDF::GraphFocus.new(access, context_node)
+  end
+
   it "should make relevant prefixes available" do
     updater[[:rdf, :type]] = [:voc, :Thing]
     updater[[:voc, :a]] = 15

metadata

@@ -2,14 +2,14 @@
 name: roadforest
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -17,14 +17,22 @@ dependencies:
   name: rdf
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
+        segments:
+        - 1
+        - 0
+        - 6
         version: 1.0.6
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
+        segments:
+        - 1
+        - 0
+        - 6
         version: 1.0.6
     none: false
 - !ruby/object:Gem::Dependency
@@ -35,13 +43,21 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        segments:
+        - 1
+        - 0
+        - 8
+        version: 1.0.8
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        segments:
+        - 1
+        - 0
+        - 8
+        version: 1.0.8
     none: false
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -51,12 +67,20 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 1
+        - 1
+        - 0
         version: 1.1.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 1
+        - 1
+        - 0
         version: 1.1.0
     none: false
 - !ruby/object:Gem::Dependency
@@ -67,12 +91,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
+        segments:
+        - 2
+        - 2
+        - 8
         version: 2.2.8
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
+        segments:
+        - 2
+        - 2
+        - 8
         version: 2.2.8
     none: false
 - !ruby/object:Gem::Dependency
@@ -83,12 +115,18 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 25
         version: '0.25'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 25
         version: '0.25'
     none: false
 - !ruby/object:Gem::Dependency
@@ -99,12 +137,20 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 1
+        - 3
+        - 6
         version: 1.3.6
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 1
+        - 3
+        - 6
         version: 1.3.6
     none: false
 - !ruby/object:Gem::Dependency
@@ -115,12 +161,20 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 9
+        - 1
         version: 0.9.1
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 9
+        - 1
         version: 0.9.1
     none: false
 description: ! "  RoaD FoReST is a web framework designed to use the Resource Description\n
@@ -137,9 +191,8 @@ files:
 - lib/roadforest/rdf/graph-store.rb
 - lib/roadforest/rdf/normalization.rb
 - lib/roadforest/rdf/focus-list.rb
-- lib/roadforest/rdf/graph-reading.rb
 - lib/roadforest/rdf/graph-copier.rb
-- lib/roadforest/rdf/context-fascade.rb
+- lib/roadforest/rdf/access-manager.rb
 - lib/roadforest/rdf/source-rigor.rb
 - lib/roadforest/rdf/graph-focus.rb
 - lib/roadforest/rdf/etagging.rb
@@ -153,7 +206,6 @@ files:
 - 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/resource-pattern.rb
@@ -170,7 +222,6 @@ files:
 - lib/roadforest/resource/http/form-parsing.rb
 - lib/roadforest/resource/role/writable.rb
 - lib/roadforest/resource/role/has-children.rb
-- lib/roadforest/resource/handlers.rb
 - lib/roadforest/resource/rdf.rb
 - lib/roadforest/test-support/http-client.rb
 - lib/roadforest/test-support/trace-formatter.rb
@@ -218,7 +269,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- roadforest-0.0.2 Documentation
+- roadforest-0.0.3 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -227,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -203066605
+      hash: -124333677
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement

data/lib/roadforest/rdf/graph-reading.rb

@@ -1,200 +0,0 @@
-require 'roadforest/rdf/focus-list'
-require 'roadforest/rdf/normalization'
-require 'roadforest/rdf/resource-query'
-require 'rdf/model/node'
-require 'roadforest/rdf'
-
-
-module RoadForest::RDF
-  class GraphReading
-    #XXX Any changes to this class heirarchy or to ContextFascade should start
-    #with a refactor like:
-    #  Reduce this to the single-node API ([] []=)
-    #  Change the ContextFascade into a family of classes (RO, RW, Update)
-    include Normalization
-
-    #attr_accessor :source_graph, :target_graph, :subject, :root_url,
-    #:source_rigor
-
-    attr_accessor :subject, :access_manager
-
-    alias rdf subject
-
-    def initialize(subject = nil, graph = nil, rigor = nil)
-      @access_manager = ContextFascade.new
-      @access_manager.rigor = rigor
-      self.target_graph = graph
-      self.source_graph = graph
-
-      self.subject = subject unless subject.nil?
-    end
-
-    def source_graph
-      @access_manager.source_graph
-    end
-
-    def source_graph=(graph)
-      @access_manager.source_graph = graph
-    end
-
-    def target_graph
-      nil
-    end
-
-    def target_graph=(graph)
-      @access_manager.target_graph = nil
-    end
-
-    def source_rigor
-      @access_manager.rigor
-    end
-
-    def source_rigor=(rigor)
-      @access_manager.rigor = rigor
-    end
-
-    def root_url
-      @access_manager.resource
-    end
-
-    def subject=(*value)
-      @subject = normalize_resource(value)
-      case @subject
-      when ::RDF::URI
-        @access_manager.resource = @subject
-      end
-    end
-
-    def inspect
-      "#<#{self.class.name}:0x#{"%x" % object_id} (#{subject.to_s}) #{forward_properties.inspect}>"
-    end
-    alias to_s inspect
-
-    def dup
-      other = self.class.new
-      other.access_manager = access_manager.dup
-      other.subject = subject
-      other
-    end
-
-    def wrap_node(value)
-      next_step = dup
-      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
-    end
-
-    def unwrap_value(value)
-      return nil if value.nil?
-      if value.respond_to? :object
-        value.object
-      else
-        wrap_node(value)
-      end
-    end
-
-    def to_context
-      normalize_context(subject)
-    end
-
-    def root_url=(*value) #XXX curies?
-      @root_url = normalize_resource(value)
-    end
-
-    #XXX This probably wants to be handled completely in the MediaType handler
-    def relevant_prefixes
-      relevant_prefixes_for_graph(source_graph)
-    end
-
-    def get(prefix, property = nil)
-      return single_or_enum(forward_query_value( prefix, property))
-    end
-    alias_method :[], :get
-
-    def first(prefix, property = nil)
-      return forward_query_value( prefix, property ).first
-    end
-
-    def all(prefix, property = nil)
-      return forward_query_value( prefix, property )
-    end
-
-    #XXX Maybe rev should return a decorator, so it looks like:
-    #focus.rev.get(...) or focus.rev.all(...)
-    def rev(prefix, property = nil)
-      return single_or_enum(reverse_query_value( prefix, property))
-    end
-
-    def rev_first(prefix, property = nil)
-      return reverse_query_value(prefix, property).first
-    end
-
-    def rev_all(prefix, property = nil)
-      return reverse_query_value(prefix, property)
-    end
-
-    def as_list
-      list = FocusList.new(subject, access_manager)
-      list.base_node = self
-      list
-    end
-
-    def forward_properties
-      query_properties( build_query{|q| q.pattern([ normalize_resource(subject), :property, :value ])} )
-    end
-
-    def reverse_properties
-      query_properties( build_query{|q| q.pattern([ :value, :property, normalize_resource(subject)])} )
-    end
-
-    protected
-
-    def single_or_enum(values)
-      case values.length
-      when 0
-        return nil
-      when 1
-        return values.first
-      else
-        return values.enum_for(:each)
-      end
-    end
-
-    def reverse_query_value(prefix, property=nil)
-      query_value(build_query{|q|
-        q.pattern([ :value, normalize_property(prefix, property), normalize_resource(subject)])
-      })
-    end
-
-    def forward_query_value(prefix, property=nil)
-      query_value(build_query{|q|
-        q.pattern([ normalize_resource(subject), normalize_property(prefix, property), :value])
-      })
-    end
-
-    def build_query(&block)
-      access_manager.build_query(&block)
-    end
-
-    def query_value(query)
-      solutions = query.execute(access_manager)
-      solutions.map do |solution|
-        unwrap_value(solution.value)
-      end
-    end
-
-    def query_properties(query)
-      Hash[query.execute(access_manager).map do |solution|
-        prop = solution.property
-        if qname = prop.qname
-          prop = qname
-        end
-        [prop, solution.value]
-      end]
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-require 'roadforest/rdf/graph-focus'
-require 'roadforest/rdf/parcel'
-
-module RoadForest::RDF
-  class UpdateFocus < GraphWriting
-    def target_graph
-      @access_manager.target_graph
-    end
-
-    def target_graph=(graph)
-      @access_manager.target_graph = graph
-    end
-
-    def relevant_prefixes
-      super.merge(relevant_prefixes_for_graph(target_graph))
-    end
-  end
-end