infod 0.0.3.2 → 0.0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 06750f111d49bb2b62f28cd18bc35dd5212dc0ac
+  data.tar.gz: 7ee2db920696465b43201741aa28e6ecaf64af41
+SHA512:
+  metadata.gz: 03d0d7ae6b88af73a4d5054e2736764d46d5e3247284bcbda919c811182ab0bdbf4e2ef37ccd5fdd8228f4435f3bc6f23311f6f6ac41a9f70016338e4bc6a01c
+  data.tar.gz: ff95efae2b1690cd8f244360e903d1f9a7ea287a2450cdcb85e418b1f444eed54d9601819f4a266897ba0409711ad5af572f984f65a9b076395c2cf690a26cdb

data/bin/infod

@@ -28,7 +28,7 @@ module Rack
     def self.load _
       Rack::Builder.new {
         use Rack::Deflater
-        run E
+        run R
       }.to_app
     end
   end

data/infod.rb

@@ -1,3 +1,17 @@
+%w{
+cgi
+date
+digest/sha1
+fileutils
+json
+linkeddata
+mail
+nokogiri
+open-uri
+pathname
+rack
+shellwords}.map{|r|require r}
+
 %w{
 constants
 lambda
@@ -13,34 +27,25 @@ csv
 edit
 facets
 feed
-find
 forum
 fs
 GET
-glob
 graph
 groonga
-HEAD
 histogram
 html
 HTTP
 image
 index
-kv
 ls
 mail
 man
 microblog
 names
-page
 POST
-postscript
 rdf
-ruby
 schema
-sh
 text
 threads
 time
-wiki
 }.map{|e|require_relative e}

data/infod/404.rb

@@ -1,4 +1,4 @@
-class E
+class R
 
   E404 = 'req/'+HTTP+'404'
 
@@ -13,18 +13,20 @@ r.map{|k,v| s[Header + k] = k == 'uri' ? v : [v] }
   %w{CHARSET LANGUAGE ENCODING}.map{|a|
     s[Header+'ACCEPT_'+a] = [r.accept_('_' + a)]}
        s[Header+'ACCEPT'] = [r.accept]
-                  s[Type] = [E[HTTP+'Response']]
+                  s[Type] = [R[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=create']]
+    s[Header+'HTTP_HOST'] = [R['http://' + s[Header+'HTTP_HOST'][0]]] if s[Header+'HTTP_HOST']
+                  s[Edit] = [R[r['REQUEST_PATH']+'?graph=create']]
               s['#query'] = [r.q]
             s['#seeAlso'] = [e.parent,*e.a('*').glob]
               r.q['view'] = '404'
 
     [404,{'Content-Type'=> r.format},[e.render(r.format,g,r)]]}
-  
+
+  F['/cache/GET'] = F[E404]
+
   fn 'view/404',->d,e{
-    [H.css('/css/404'),{_: :style, c: "a {background-color:#{E.cs}}"},
+    [H.css('/css/404'),{_: :style, c: "a {background-color:#{R.cs}}"},
      d.html]}
 
   # a resource-placeholder graph
@@ -32,4 +34,15 @@ s[HTTP+'statusCodeValue'] = [404]
     m[d.uri] = {}
     rand.to_s.h}
 
+  def checkURIs
+    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
+    puts "\n\n"
+    r.map{|c|
+      # show anomalies
+      puts c.join(' ') unless c[0] == 200 }
+  end
+
 end

data/infod/500.rb

@@ -1,5 +1,5 @@
 #watch __FILE__
-class E
+class R
   
   Errors ||= {}
 
@@ -44,7 +44,7 @@ h1 {padding:.2em; background-color:#f00; color:#fff; margin:0}
 div {display:inline}
 table {border-spacing:0;margin:0}
 b {background-color:#eee;color:#500;padding:.1em .3em .1em .3em}
-.frag {font-weight:bold; color:#000; background-color:#{E.cs}}
+.frag {font-weight:bold; color:#000; background-color:#{R.cs}}
 td.space {background-color:#ddd}
 td.message {background-color:#009;color:#fff}
 td.path {text-align:right}

data/infod/GET.rb

@@ -1,4 +1,4 @@
-class E
+class R
   
   Apache = ENV['apache']
   Nginx  = ENV['nginx']
@@ -21,6 +21,14 @@ class E
     end
   end
 
+  def HEAD
+    self.GET.do{|s,h,b|[s,h,[]]}
+  end
+
+  def OPTIONS
+    [200,{},[]]
+  end
+
   def getFile
     @r['ETag'] = [m,size].h
     maybeSend mimeP,->{self}
@@ -52,25 +60,19 @@ class E
     @r['ETag'] ||= [@r.q['view'].do{|v|F['view/' + v] && v}, graphID, @r.format, Watch].h
 
     maybeSend @r.format, ->{
-      
-      # response
-      r = E'/E/req/' + @r['ETag'].dive
-      if r.e # exists
+
+      r = R '/cache/view/' + @r['ETag'].dive
+      if r.e # exists?
         r
       else
-        
-        # graph
-        c = E '/E/graph/' + graphID.dive
-        if c.e # exists
+        c = R '/cache/model/' + graphID.dive
+        if c.e # exists?
           m = c.r true
         else
-          # construct
-          (g && F['graph/' + g] || F['graph/'])[self, @r.q,m]
-          # cache
-          c.w m,true
+          (g && F['graph/' + g] || F['graph/'])[self, @r.q,m] # construct
+          c.w m,true # cache
         end
-                # cache < construct
-        r.w render @r.format, m, @r
+        r.w render @r.format, m, @r # construct -> cache
       end }
   end
 
@@ -85,7 +87,7 @@ class E
       h.update({'Cache-Control' => 'no-transform'}) if m.match /^(audio|image|video)/ # already compresed
 
       # frontend-specific handlers
-      b.class == E ? (Nginx ?                                                   # nginx chosen?
+      b.class == R ? (Nginx ?                                                   # nginx chosen?
                       [c,h.update({'X-Accel-Redirect' => '/fs' + b.path}),[]] : # Nginx handler
                       Apache ?                                                  # Apache chosen?
                       [c,h.update({'X-Sendfile' => b.d}),[]] : # Apache handler

data/infod/HTTP.rb

@@ -1,14 +1,12 @@
 #watch __FILE__
-require 'rack'
+class R
 
-class E
-
-  def E.call e
-    e.extend Th # add HTTP utility functions to environment table
+  def R.call e
+    e.extend Th # HTTP utility functions
     dev # see if watched files were changed
     e['HTTP_X_FORWARDED_HOST'].do{|h| e['SERVER_NAME'] = h }
     path = CGI.unescape e['REQUEST_PATH'].force_encoding('UTF-8').gsub '+','%2B'
-    resource = E['http://'+e['SERVER_NAME']+path]
+    resource = R['http://'+e['SERVER_NAME']+path]
 
     if resource.inside
       e['uri'] = resource.uri
@@ -66,7 +64,7 @@ module Th
     # Accept formats
     accept.sort.reverse.map{|q,mimes|
       mimes.map{|mime|
-        return mime if E::F[E::Render+mime]}}
+        return mime if R::F[R::Render+mime]}}
     'text/html'
   end
 

data/infod/POST.rb

@@ -1,31 +1,38 @@
-watch __FILE__
-class E
+#watch __FILE__
+class R
 
   def POST
-    type = @r['CONTENT_TYPE']
-    case type
-    when /^application\/sparql-update/
-      puts "SPARQL"
+    # custom handler lookup cascade
+    pathSegment.do{|path|
+      lambdas = path.cascade.map{|p| p.uri.t + 'POST' }
+      ['http://'+@r['SERVER_NAME'],""].map{|h| lambdas.map{|p|
+          F[h + p].do{|fn| fn[self,@r].do{|r|
+              $stdout.puts [r[0],'http://'+@r['SERVER_NAME']+@r['REQUEST_URI'],@r['HTTP_USER_AGENT'],@r['HTTP_REFERER'],@r.format].join ' '
+              return r
+            }}}}}
+    basicPOST
+  end
+  def basicPOST
+    return [303,{'Location'=>uri},[]]
+    case @r['CONTENT_TYPE']
     when /^application\/x-www-form-urlencoded/
       changed = false
-      (Rack::Request.new @r).params.map{|k,v|
-        s, p, o = (CGI.unescape k).split /\/\._/
-        if s && p && o 
-          s, p, o = [s, p, o].map &:unpath
-          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
+      (Rack::Request.new @r).params.map{|k,v| s, p, tripleA = JSON.parse CGI.unescape k
+        s = s.R
+       pp = s.predicatePath p
+        o = v.match(/\A(\/|http)[\S]+\Z/) ? v.R : F['cleanHTML'][v]
+        tripleB = pp.objectPath(o)[0]
+        if tripleA.to_s != tripleB.to_s
+          tripleA && tripleA.R.do{|t| t.delete if t.e }
+          s[p] = o unless o.class==String && o.empty?
+          changed = true
         end}
       if changed
         g = {}
         fromStream g, :triplrDoc
-        if g.empty?
-          ef.deleteNode
-        else
+        if g.empty? # no triples left
+          ef.delete
+        else        # snapshot to graph-doc
           ef.w g, true
         end
       end

data/infod/audio.rb

@@ -1,4 +1,4 @@
-class E
+class R
 
   VideoFile = /(avi|flv|mkv|mpg|mp4|wmv)$/i
   AudioFile = /(aif|wav|flac|mp3|m4a|aac|ogg)$/i

data/infod/blog.rb

@@ -1,29 +1,46 @@
 #watch __FILE__
-class E
+class R
 
-  F['view/'+SIOCt+'BlogPost']=->g,e{
+  F['/blog/post/POST'] = -> d,e {
+    name = URI.escape (Rack::Request.new d.env).params['name'].gsub /[?#\s\/]/,'_'
+    doc = 'http://'+e['SERVER_NAME']+Time.now.strftime('/%Y/%m/')+name
+    post = doc.R.a '#'
+    post[Type] = R[SIOCt+'BlogPost']
+    post[Title] = name
+    edit = "?prototype=sioct:BlogPost&graph=edit"
+    [303,{'Location' => doc + edit},[]]}
 
-    F['example/blogview'][g,e]
+  F['/blog/post/GET'] = -> d,e {
+    [200,{'Content-Type'=>'text/html'},
+     [H(['name',
+         {_: :form, method: :POST,
+           c: [{_: :input, name: :name, style: "font-size:1.6em;width:48ex"},
+               {_: :input, type: :submit, value: ' go '}
+              ]}])]]}
 
-  }
+  F['view/'+SIOCt+'BlogPost']=->g,e{F['example/blogview'][g,e]}
 
   F['example/blogview']=->g,e{
     g.map{|u,r|
-      case u
+      case u # match against URIs for customized view
       when /artery.wbur/ # compact whitespace a bit
         r[Content] = {class: :WBUR, c: [{_: :style, c: ".WBUR p {margin:0}"},r[Content]]}
         F['view/base'][{u => r},e,false]        
+
       when /boston\.com/ # crop sharebuttons
        (Nokogiri::HTML.parse r[Content][0]).css('p')[0].do{|p|r[Content]=p.inner_html}
         F['view/base'][{u => r},e,false]
+
       when /flickr/
         r[Content]
+
       when /reddit/ # minimal view
         F['view/'+SIOCt+'BoardPost'][{u => r},e]
+
       when /universalhub/  # logo + trim spacehogging tagjunk
         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: [{_: :a, href: r['http://purl.org/rss/1.0/link'][0].R.uri,
                c: [{_: :img, src: '/logos/uhub.png',style: 'position:absolute;top:-93px'},
                    {_: :h2, style: 'color:#000;margin:0',c: r[Title]}]},c.to_s],
           style: 'float:left;max-width:40em;position:relative;background-color:#fff;border-color:#eee;margin-top:93px;margin-right:.3em;padding-top:0;border-style:dotted;border-width:.3em;border-radius:0 .8em .8em .8em'}

data/infod/cal.rb

@@ -1,5 +1,5 @@
 #watch __FILE__
-class E
+class R
   
   fn 'req/day',->e,r{
     [303, {'Location'=> e.day.uri + r.q.except('y').qs}, []]}
@@ -51,7 +51,7 @@ class E
 
   fn 'view/month',->d,e{
     [(d.delete :time).do{|month|
-       {_: :b, c: month.strftime('%B'),style: "color: #{E.cs}"}},
+       {_: :b, c: month.strftime('%B'),style: "color: #{R.cs}"}},
      F['view/t'][d,e,'day','day-terminate']]}
 
     fn 'view/day-terminate',->d,e{

data/infod/code.rb

@@ -1,4 +1,4 @@
-class E
+class R
   
   def triplrSourceCode
     m = mime.split(/\//)[-1].sub(/^x-/,'')
@@ -10,7 +10,7 @@ class E
  end
 
   fn 'view/code',->d,e{[{_: :style, c: 'body{background-color:white;color:black}'},
-    d.values.map{|r|[r.E.do{|e|[{_: :a,name: e.uri},e.html(e.base,true)]},'<br>',
+    d.values.map{|r|[r.R.do{|e|[{_: :a,name: e.uri},e.html(e.base,true)]},'<br>',
                       r[Content]]}]}
 
   # ls /usr/share/source-highlight/*.lang | xargs -i basename {} .lang | tr "\n" " "

data/infod/constants.rb

@@ -1,7 +1,6 @@
-class E
+class R
 
   FSbase = `pwd`.chomp ;  BaseLen = FSbase.size
-  S      = /\._/ # data path-separator
 
   W3    = 'http://www.w3.org/'
   Purl  = 'http://purl.org/'
@@ -46,10 +45,13 @@ class E
   Prefix={
     "dc" => DC,
     "foaf" => FOAF,
-    "rdf" => W3 + "ns/rdf#" ,
+    "rdf" => RDFns,
     "rdfs" => RDFs,
     "sioc" => SIOC,
+    "sioct" => SIOCt,
     "stat" => Stat,
   }
 
+  attr_reader :uri
+
 end

data/infod/csv.rb

@@ -1,19 +1,19 @@
 #watch __FILE__
-class E
+class R
 
   # CSV -> tripleStream
   def triplrCSV d
     d = @r.q['delim']||d
     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+'#', Type, R[CSV+'Table']
         yield uri+'#', CSV+'rowCount', lines.size
-        yield uri+'#', COGS+'View', E[uri+'?view=csv']
+        yield uri+'#', COGS+'View', R[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']
+            yield id, Type, R[CSV+'Row']
           }}}}
   end
 
@@ -24,7 +24,7 @@ class E
         r[Type].do{|t|
           t.class == Array &&
           t.map(&:maybeURI).member?(CSV+'Row')})}
-    # done w/ the type-tag
+    # eat the type-tag
     d.values.map{|r|r.delete Type}
 
     [F['view/p'][d,e],

data/infod/edit.rb

@@ -1,5 +1,5 @@
-watch __FILE__
-class E
+#watch __FILE__
+class R
 
   Prototypes = {
     SIOCt+'MicroblogPost' => [Content],
@@ -16,7 +16,7 @@ class E
   fn 'view/create',->g,e{
     [{_: :style, c: 'a {display:block;font-size:2em}'},{_: :b, c: :type},
      Prototypes.map{|t,ps|
-       {_: :a, href:  e['REQUEST_PATH']+'?graph=edit&prototype='+(CGI.escape t), c: t.label}}]}
+       {_: :a, href:  e['REQUEST_PATH']+'?graph=edit&prototype='+(URI.escape t.shorten), c: t.label}}]}
 
   # editable triples
   F['protograph/edit'] = -> e,env,g {
@@ -25,6 +25,7 @@ class E
     rand.to_s.h}
     
   fn 'graph/edit',->e,env,g{
+    puts "graph.edit #{e}"
     e.fromStream g, :triplrDoc} # add fs-sourced triples
     
 =begin HTML <form> RDF editor
@@ -35,47 +36,42 @@ class E
   fn 'view/edit',->g,e{
 
     # render a triple
-    triple = ->s,p,o{
-      if s && p && o
-        s = s.E
-        p = p.E
-        oE = p.literal o                 # cast literal to URI
-        id = s.concatURI(p).concatURI oE # triple identifier
-        [(case p.uri                     # more to support here.. http://dev.w3.org/html5/markup/input.html#input
-          when Content
-            [{_: :textarea, name: id, c: o, rows: 16, cols: 80},
-            '<br>',o]
-          when Date
-            {_: :input, name: id, type: :datetime, value: o.empty? ? Time.now.iso8601 : o}
-          else
-            {_: :input, name: id, value: o, size: 54}
-          end
-          ),"<br>\n"]
-      end}
-   
+    triple = ->s,p,o{ # http://dev.w3.org/html5/markup/input.html#input
+      spo = o && s.R.predicatePath(p).objectPath(o)[0].uri
+      t = CGI.escape [s,p,spo].to_json
+      [(case p.R.uri
+        when Content
+          [{_: :textarea, name: t, c: o, rows: 16, cols: 80},
+           '<br>',o]
+        when Date
+          {_: :input, name: t, type: :datetime, value: !o || o.empty? && Time.now.iso8601 || o}
+        else
+          {_: :input, name: t, value: o, size: 54}
+        end
+        ),"<br>\n"]}
+    
     ps = [] # predicates to go editable on
-    e.q['prototype'].do{|pr|
+    e.q['prototype'].do{|pr| pr = pr.expand
       Prototypes[pr].do{|v|ps.concat v }} # prototype imports
     e.q['predicate'].do{|p|ps.push p }    # explicit predicate
 
-    [{_: :style, c: ".abbr {display: none}\ntd {vertical-align:top}"},
+    [H.css('/css/html'),
      {_: :form, name: :editor, method: :POST, action: e['REQUEST_PATH'],
 
        c: [{_: :a, class: :edit, c: '+add field',
              href: e['uri']+'?graph=blank&view=addP', style: 'background-color:#0f0;border-radius:5em;color:#000;padding:.5em'},
            g.map{|s,r| # subject
-             uri = s.E.localURL e
-             {_: :table, style: 'background-color:#eee',
+             uri = s.R.localURL e
+             {_: :table, class: :html,
                c: [{_: :tr, c: {_: :td, colspan: 2, c: {_: :a, class: :uri, id: s, c: s, href: uri}}},
-                   {_: :input, type: :hidden, name: s.E.concatURI(Edit.E).concatURI(E['/']), value: e['uri']+'?graph=edit'},
                    r.keys.-([Edit]).concat(ps).uniq.map{|p| # resource + prototype/initialize predicates
                      {_: :tr,
-                       c: [{_: :td, c: {_: :a, title: p, href: p, c: p.abbrURI}}, # property
+                       c: [{_: :td, class: :key, c: {_: :a, title: p, href: p, c: p.abbrURI}}, # property
                            {_: :td,
                              c: [r[p].do{|o|                            # objects
                                    (o.class == Array ? o : [o]).map{|o| # each object
                                      triple[s,p,o]}},                   # existing triples
-                                 triple[s,p,'']]}]}}]}},                # new triple
+                                 triple[s,p,nil]]}]}}]}},                # new triple
            {_: :input, type: :submit, value: 'save'}]}]}
 
   # select a property to edit