infod 0.0.3.1 → 0.0.3.2

data/infod.rb

@@ -4,13 +4,12 @@ lambda
 mime
 404
 500
+grep
 audio
 blog
 cal
 code
-css
 csv
-du
 edit
 facets
 feed
@@ -20,7 +19,6 @@ fs
 GET
 glob
 graph
-grep
 groonga
 HEAD
 histogram
@@ -28,7 +26,6 @@ html
 HTTP
 image
 index
-json
 kv
 ls
 mail
@@ -36,13 +33,11 @@ man
 microblog
 names
 page
-PATCH
 POST
 postscript
 rdf
 ruby
 schema
-search
 sh
 text
 threads

data/infod/404.rb

@@ -16,7 +16,7 @@ r.map{|k,v| s[Header + k] = k == 'uri' ? v : [v] }
                   s[Type] = [E[HTTP+'Response']]
 s[HTTP+'statusCodeValue'] = [404]
     s[Header+'HTTP_HOST'] = [E['http://' + s[Header+'HTTP_HOST'][0]]] if s[Header+'HTTP_HOST']
-                  s[Edit] = [E[r['REQUEST_PATH']+'?graph=edit']]
+                  s[Edit] = [E[r['REQUEST_PATH']+'?graph=create']]
               s['#query'] = [r.q]
             s['#seeAlso'] = [e.parent,*e.a('*').glob]
               r.q['view'] = '404'
@@ -27,9 +27,8 @@ s[HTTP+'statusCodeValue'] = [404]
     [H.css('/css/404'),{_: :style, c: "a {background-color:#{E.cs}}"},
      d.html]}
 
-  # a placeholder graph
-  # useful for initializing an editor on an empty resource
-  fn 'protograph/_',->d,_,m{
+  # a resource-placeholder graph
+  fn 'protograph/blank',->d,_,m{
     m[d.uri] = {}
     rand.to_s.h}
 

data/infod/500.rb

@@ -25,8 +25,9 @@ class E
                                   {_: :td, class: :index, c: p[1]},
                                   {_: :td, class: :context, c: (p[2]||'').hrefs}].cr}}.cr]}]}]}]]]}
 
-  F['/500/GET'] = ->e,r{H([Errors.sort_by{|u,r|r[:time]}.reverse.html,H.css('/css/500')]).hR}
-  F['/500/test/GET'] = ->e,r{1/0}
+  F['/500/GET'] = ->e,r{
+    body = H [Errors.sort_by{|u,r|r[:time]}.reverse.html, H.css('/css/500')]
+    [200, {'Content-Type'=>'text/html; charset=utf-8'}, [body]]}
 
   F['view/'+COGS+'Exception']=->e,r{
     e.values.map{|e|

data/infod/GET.rb

@@ -10,7 +10,7 @@ class E
 
     elsif file = [self,pathSegment].compact.find(&:f)
 
-      # file exists, but client might not accept its MIME, or want it transformed to another MIME
+      # file exists. check if client or server want it transformed to another MIME
       a = @r.accept.values.flatten
       accepted = a.empty? || (a.member? file.mimeP) || (a.member? '*/*')
       (!accepted || MIMEcook[file.mimeP] || @r.q.has_key?('view')) ?
@@ -23,7 +23,7 @@ class E
 
   def getFile
     @r['ETag'] = [m,size].h
-    maybeSend mimeP,->{self},:link
+    maybeSend mimeP,->{self}
   end
 
   def resource
@@ -42,13 +42,13 @@ class E
 
     m = {}
 
-    # graph identity (model)
+    # graph-identity (model)
     g = @r.q['graph']
     graphID = (g && F['protograph/' + g] || F['protograph/'])[self,@r.q,m]
 
     return F[E404][self,@r] if m.empty?
 
-    # response identity (view)
+    # response-identity (view)
     @r['ETag'] ||= [@r.q['view'].do{|v|F['view/' + v] && v}, graphID, @r.format, Watch].h
 
     maybeSend @r.format, ->{
@@ -78,18 +78,13 @@ class E
     !((m=@r['HTTP_IF_NONE_MATCH']) && m.strip.split(/\s*,\s*/).include?(@r['ETag']))
   end
   
-  def maybeSend m, b, iR = false; c = 200
-    send? ?            # does agent have this version?
-    b[].do{|b|         # continue with response
-
-      h = {'Content-Type'=> m,
-           'ETag'=> @r['ETag']}
-
+  def maybeSend m, b; c = 200
+    send? ?
+    b[].do{|b| # continue
+      h = {'Content-Type'=> m, 'ETag'=> @r['ETag']}
       h.update({'Cache-Control' => 'no-transform'}) if m.match /^(audio|image|video)/ # already compresed
-      h.update({'Link' => '<' + @r['uri'] + '?view>; rel=meta'}) if iR     # link to description
-#      h.update({'MS-Author-Via' => 'SPARQL'})  # authoring preference
 
-      # frontend-specific response handlers
+      # frontend-specific handlers
       b.class == E ? (Nginx ?                                                   # nginx chosen?
                       [c,h.update({'X-Accel-Redirect' => '/fs' + b.path}),[]] : # Nginx handler
                       Apache ?                                                  # Apache chosen?
@@ -101,4 +96,18 @@ class E
       [304,{},[]]  # client has response
   end
 
+  # user-patchable default handler - use index.html or defer to internal default-handler #response
+  fn '/GET',->e,r{
+    x = 'index.html'
+    i = [e,e.pathSegment].compact.map{|e|e.as x}.find &:e
+    if i && !r['REQUEST_URI'].match(/\?/)
+      if e.uri[-1] == '/' # inside dir?
+        i.env(r).getFile  # show index
+      else                # descend into dir
+        [301, {Location: e.uri.t}, []]
+      end
+    else
+      e.response
+    end}
+
 end

data/infod/HEAD.rb

@@ -10,7 +10,7 @@ class E
 
   # HEAD response-codes on a (.u) list of URIs
   def checkURIs
-    r = uris.select{|u|u.to_s.match /^http/}.map{|u|
+    r = uris.map{|u|
       c = [`curl -IsA 404? "#{u}"`.lines.to_a[0].match(/\d{3}/)[0].to_i,u] # HEAD
       puts c.join ' ' 
       c } # status, uri tuple

data/infod/HTTP.rb

@@ -4,15 +4,18 @@ require 'rack'
 class E
 
   def E.call e
-    dev
-    e.extend Th
+    e.extend Th # add HTTP utility functions to environment table
+    dev # see if watched files were changed
     e['HTTP_X_FORWARDED_HOST'].do{|h| e['SERVER_NAME'] = h }
-    p = e['REQUEST_PATH'].force_encoding 'UTF-8'
+    path = CGI.unescape e['REQUEST_PATH'].force_encoding('UTF-8').gsub '+','%2B'
+    resource = E['http://'+e['SERVER_NAME']+path]
 
-    uri = CGI.unescape((p.index(URIURL) == 0) ? p[URIURL.size..-1] : ('http://'+e['SERVER_NAME']+(p.gsub '+','%2B'))).E.env e
-
-    uri.inside ? ( e['uri'] = uri.uri
-                   uri.send e.verb ) : [403,{},[]]
+    if resource.inside
+      e['uri'] = resource.uri
+      (resource.env e).send e['REQUEST_METHOD']
+    else
+      [403,{},[]]
+    end
 
   rescue Exception => x
     F['E500'][x,e]
@@ -20,37 +23,22 @@ class E
 
 end
 
-class String
-
-  # querystring parse
-  def qp
-    d={}
-    split(/&/).map{|e|
-      k,v=e.split(/=/,2).map{|x|
-         CGI.unescape x}
-      d[k]=v}
-    d
-  end
-
-  def hR
-    [200, {'Content-Type'=>'text/html; charset=utf-8'}, [self]]
-  end
-
-end
-
 module Th
 
-  # query-string
-  def qs
-    (['GET','HEAD'].member? verb) ? self['QUERY_STRING'] : self['rack.input'].read
-  end
-
-  # parsed query-string
+  # Query-String -> Hash
   def q
-    @q ||= (qs||'').qp
+    @q ||=
+      (if q = self['QUERY_STRING']
+         h = {}
+         q.split(/&/).map{|e| k,v = e.split(/=/,2).map{|x| CGI.unescape x }
+                              h[k] = v }
+         h
+       else
+         {}
+       end)
   end
 
-  # Accept header -> Hash
+  # Accept -> Hash
   def accept_ k=''
     d={}
     self['HTTP_ACCEPT'+k].do{|k|
@@ -66,7 +54,7 @@ module Th
   end
 
   def conneg
-    #  extension
+    # specific format-variant URI
     { '.html' => 'text/html',
       '.jsonld' => 'application/ld+json',
       '.nt' => 'text/ntriples',
@@ -75,7 +63,7 @@ module Th
     }[File.extname self['uri']].do{|mime|
       return mime}
 
-    # Accept header
+    # Accept formats
     accept.sort.reverse.map{|q,mimes|
       mimes.map{|mime|
         return mime if E::F[E::Render+mime]}}
@@ -84,15 +72,11 @@ module Th
 
   def accept; @accept ||= accept_ end
 
-  def verb
-    self['REQUEST_METHOD']
-  end
-
 end
 
 class Hash
 
-  # unparse querystring
+  # Hash -> Query-String
   def qs
    '?'+map{|k,v|k.to_s+'='+(v ? (CGI.escape [*v][0].to_s) : '')}.intersperse("&").join('')
   end

data/infod/POST.rb

@@ -1,34 +1,36 @@
-#watch __FILE__
+watch __FILE__
 class E
 
   def POST
     type = @r['CONTENT_TYPE']
     case type
     when /^application\/sparql-update/
-
+      puts "SPARQL"
     when /^application\/x-www-form-urlencoded/
-      ch = nil
+      changed = false
       (Rack::Request.new @r).params.map{|k,v|
-        s, p, o = (CGI.unescape k).split S
+        s, p, o = (CGI.unescape k).split /\/\._/
         if s && p && o 
-          oP = o
           s, p, o = [s, p, o].map &:unpath
-          s = s.uri[0..-2].E if s.uri[-1] == '/'
-          p = p.uri[0..-2].E if p.uri[-1] == '/'
-          if oP.E == (E.literal v) && s.uri.match(/^http/) && p.uri.match(/^http/)
-            puts "POST <#{s}> <#{p}> <#{o}>"
-            s[p,o,v]
-            ch = true
+          if s.uri.match(/^http/) && p.uri.match(/^http/)
+            oO = v.match(/\A(\/|http)[\S]+\Z/) ? v.E : F['cleanHTML'][v]
+            if o != oO
+              changed = true
+              s[p,o,oO]
+            end
           end
         end}
-      if ch # state changed
+      if changed
         g = {}
-        fromStream g, :triplrFsStore
-        ef.w g, true
+        fromStream g, :triplrDoc
+        if g.empty?
+          ef.deleteNode
+        else
+          ef.w g, true
+        end
       end
     end
-
-    [303,{'Location'=>uri},[]]    
+    [303,{'Location'=>uri+'?graph=edit'},[]]
   end
 
 end

data/infod/audio.rb

@@ -3,12 +3,20 @@ class E
   VideoFile = /(avi|flv|mkv|mpg|mp4|wmv)$/i
   AudioFile = /(aif|wav|flac|mp3|m4a|aac|ogg)$/i
 
-  fn 'set/audio',->d,e,m{d.take.select{|e|e.ext.match AudioFile}}
-  fn 'set/video',->d,e,m{d.take.select{|e|e.ext.match VideoFile}}
+  fn 'set/audio',->d,e,m{
+    e['view'] = 'audio'
+    d.take.select{|e|e.ext.match AudioFile}}
 
+  fn 'set/video',->d,e,m{
+    e['view'] = 'audio'
+    e['video'] = true
+    d.take.select{|e|e.ext.match VideoFile}}
+
+  # table of audio-resource properties
   AudioK = {}
-  %w{Album-Movie-Show_title Lead_performers-Soloists Title-songname-content_description}.
-    map{|a|Audio + a}.concat(['uri', Stat+'mtime', Stat+'size']).map{|p|AudioK[p] = true}
+  %w{Album-Movie-Show_title Lead_performers-Soloists Title-songname-content_description}.map{|a|Audio + a}.
+    concat(['uri', Stat+'mtime', Stat+'size']).
+    map{|p|AudioK[p] = true}
 
   fn 'view/audio',->d,e{ d = d.dup
 

data/infod/blog.rb

@@ -21,7 +21,7 @@ class E
       when /reddit/ # minimal view
         F['view/'+SIOCt+'BoardPost'][{u => r},e]
       when /universalhub/  # logo + trim spacehogging tagjunk
-        c = Nokogiri::HTML.parse r[Content][0]
+        c = Nokogiri::HTML.fragment r[Content][0]
         c.css('section').map{|x|x.remove}
         {c: [{_: :a, href: r['http://purl.org/rss/1.0/link'][0].E.uri,
                c: [{_: :img, src: '/logos/uhub.png',style: 'position:absolute;top:-93px'},

data/infod/code.rb

@@ -27,8 +27,8 @@ class E
     # triplr/view mappings
     [ma,mt].map{|m|
       MIMEsource[m] ||= [:triplrSourceCode]
+      fn 'view/'+m, F['view/code']}}
 
-      fn 'view/'+m, F['view/code']
-  }}
+  MIMEsource['text/css'] ||= [:triplrSourceCode] # i hear CSS is Turing complete now, http://inamidst.com/whits/2014/formats
 
 end

data/infod/constants.rb

@@ -1,7 +1,6 @@
 class E
 
   FSbase = `pwd`.chomp ;  BaseLen = FSbase.size
-  URIURL = '/@'  # non-HTTP URI path resolution-prefix
   S      = /\._/ # data path-separator
 
   W3    = 'http://www.w3.org/'
@@ -15,23 +14,24 @@ class E
   DC       = Purl + 'dc/terms/'
   Date     = DC   + 'date'
   Title    = DC   + 'title'
-  Name     = FOAF + 'name'
+  Name     = SIOC + 'name'
   To       = SIOC + 'addressed_to'
   Creator  = SIOC + 'has_creator'
   Content  = SIOC + 'content'
   XHV      = W3   + '1999/xhtml/vocab#'
   RDFns    = W3   + "1999/02/22-rdf-syntax-ns#"
+  RDFs     = W3   + '2000/01/rdf-schema#'
+# RDFns    = W3   + 'ns/rdf#'
+# RDFs     = W3   + 'ns/rdfs#'
   EXIF     = W3   + '2003/12/exif/ns#'
   WF       = W3   + '2005/01/wf/flow#'
   HTTP     = W3   + '2011/http#'
   Header   = W3   + '2011/http-headers#'
   LDP      = W3   + 'ns/ldp#'
-  Next     = LDP+'nextPage'
-  Prev     = LDP+'prevPage'
+  Next     = LDP  + 'nextPage'
+  Prev     = LDP  + 'prevPage'
   Posix    = W3   + 'ns/posix/'
   Type     = RDFns+ "type"
-#  Type     = W3   + "ns/rdf#type"
-  RDFs     = W3   + 'ns/rdfs#'
   PAC      = DIG  + '2008/PAC/ontology/pac#'
   COGS     = Deri + 'cogs#'
   CSV      = Deri + 'scsv#'

data/infod/csv.rb

@@ -1,13 +1,36 @@
+#watch __FILE__
 class E
 
   # CSV -> tripleStream
   def triplrCSV d
     d = @r.q['delim']||d
-    open(node).readlines.map{|l|l.chomp.split(d) rescue []}.do{|t|
-      t[0].do{|x|
-        t[1..-1].each_with_index{|r,ow|r.each_with_index{|v,i|
-            yield uri+'#r'+ow.to_s,x[i],v
+    open(node).readlines.map{|l|l.chomp.split(d) rescue []}.do{|lines|
+      lines[0].do{|fields| # ok, we have at least one line..
+        yield uri+'#', Type, E[CSV+'Table']
+        yield uri+'#', CSV+'rowCount', lines.size
+        yield uri+'#', COGS+'View', E[uri+'?view=csv']
+        lines[1..-1].each_with_index{|row,line|
+          row.each_with_index{|field,i|
+            id = uri + '#row:' + line.to_s
+            yield id, fields[i], field
+            yield id, Type, E[CSV+'Row']
           }}}}
   end
 
+  F['view/csv'] = -> d,e {
+    # ignore non-rows
+    d.delete_if{|s,r|
+      !(r.class==Hash &&
+        r[Type].do{|t|
+          t.class == Array &&
+          t.map(&:maybeURI).member?(CSV+'Row')})}
+    # done w/ the type-tag
+    d.values.map{|r|r.delete Type}
+
+    [F['view/p'][d,e],
+     {_: :style, c: 'table.tab .abbr, table.tab .scheme {display: inline}'}
+    ]}
+
+  F['view/'+CSV+'Row'] = NullView
+
 end