infod 0.0.3.3 → 0.0.3.4

data/infod/groonga.rb

@@ -33,7 +33,6 @@ class R
 
     rescue Groonga::SyntaxError => x
       m['#'] = {Type => R[COGS+'Exception'], Title => "invalid expr", Content => CGI.escapeHTML(x.message)}
-      e['nocache']=true
     end
 
     F['docsID'][m,e]}}
@@ -66,14 +65,14 @@ class R
   
   # add
   def roonga graph="global", m = self.graph
-   R.groonga.do{|g|
-    m.map{|u,i|
-      r = g[u] || g.add(u) # create or load entry
-      r.uri = u            # update data
-      r.graph = graph.to_s
-      r.content = i.to_s
-      r.time = i[R::Date].do{|t|t[0].to_time}
-    }}
+    R.groonga.do{|g|
+      m.map{|u,i|
+        r = g[u] || g.add(u) # create or load entry
+        r.uri = u            # update data
+        r.graph = graph.to_s
+        r.content = i.to_s
+        r.time = i[R::Date].do{|t|t[0].to_time}
+      }}
     self
   end
   

data/infod/html.rb

@@ -40,7 +40,7 @@ end
 class Array
   def cr; intersperse "\n" end
   def head; self[0] end
-  def html v=nil,g=nil; map{|e|e.html v,g}.join ' ' end
+  def html v=nil; map{|e|e.html v}.join ' ' end
   def h; join.h end
   def intersperse i
     inject([]){|a,b|a << b << i}[0..-2]
@@ -63,53 +63,41 @@ class String
   def abbrURI
     sub /(?<scheme>[a-z]+:\/\/)?(?<abbr>.*?)(?<frag>[^#\/]+)\/?$/,'<span class="abbr"><span class="scheme">\k<scheme></span>\k<abbr></span><span class="frag">\k<frag></span>'
   end
-  def html e=nil,g=nil
+  def html e=nil
     self
   end
 end
 
 class Fixnum
-  def html e=nil,g=nil; to_s end
+  def html e=nil; to_s end
   def max i; i > self ? self : i end
   def min i; i < self ? self : i end
 end
 
 class Float
-  def html e=nil,g=nil; to_s end
+  def html e=nil; to_s end
   def max i; i > self ? self : i end
   def min i; i < self ? self : i end
 end
 
 class TrueClass
-  def html e=nil,g=nil; H({_: :input, type: :checkbox, title: :True, checked: :checked}) end
+  def html e=nil; H({_: :input, type: :checkbox, title: :True, checked: :checked}) end
 end
 
 class FalseClass
-  def html e=nil,g=nil; H({_: :input, type: :checkbox, title: :False}) end
+  def html e=nil; H({_: :input, type: :checkbox, title: :False}) end
 end
 
-IsBnode = /^_:/
-
 class Hash
-  def html e={'SERVER_NAME'=>'localhost'}, g={}, key=true
+  def html e={'SERVER_NAME'=>'localhost'}
     if keys.size == 1 && has_key?('uri')
-      if uri.match IsBnode
-        g[uri].do{|r|
-          r.html e,g,key } || uri.href
-      else
-        uri.href
-      end
+      uri.href
     else
       H({_: :table, class: :html, c: map{|k,v|
-            unless k == 'uri' && (v.match IsBnode)
-              {_: :tr, property: k, c:
-                [k == R::Content ? {_: :td, class: :val, colspan: 2, c: v} :
-                 [
-                  ({_: :td, c: [{_: :a, name: k, href: (k == 'uri' ? (v.R.docBase.localURL e)+'?graph=edit' : k), c: k.to_s.abbrURI}], class: :key} if key),
-                  {_: :td, c: k == 'uri' ? v.R.do{|u| {_: :a, id: u, href: u.url, c: v}} : v.html(e,g), class: :val},
-                 ]]}
-            end
-          }})
+            {_: :tr, property: k, c:
+              [k == R::Content ? {_: :td, class: :val, colspan: 2, c: v} :
+               [{_: :td, c: [{_: :a, name: k, href: (k == 'uri' ? (v.R.docBase.localURL e)+'?graph=edit&mono' : k), c: k.to_s.abbrURI}], class: :key},
+                {_: :td, c: k == 'uri' ? v.R.do{|u| {_: :a, id: u, href: u.url, c: v}} : v.html(e), class: :val}]]}}})
     end
   end
 end
@@ -121,36 +109,26 @@ class R
   end
 
   F['view']=->d,e{
-    d.values.select{|r|
-      !r.has_key?('uri') || # URI field missing
-      !r.uri.match(IsBnode) # blank node
-      true
-    }.
-    sort_by{|r| r[Date].do{|d| d[0].to_s} || ''}.reverse.
-    map{|r| F['view/select'][r,e,d]}}
-
-  F['view/base']=->d,e,k=true,graph=nil{
-    [H.once(e,'base',H.css('/css/html')),
-     d.values.map{|v|v.html e,graph,k}]}
-
-  F['view/select']=->r,e,d=nil{
-    graph = {r.uri => r}
-    view = nil
-    if r.class == Hash
-      (r[Type].class==Array ? r[Type] : [r[Type]]).do{|types|
-        views = types.map(&:maybeURI).compact.map{|t|
-          subtype = t
-          type = subtype.split(/\//)[-2]
-          [F['view/' + subtype],
-          (F['view/' + type] if type)]}.
-        flatten.compact
-        view = views[0] unless views.empty?}
-    end
-    if !view # default view
-      F['view/base'][graph,e,true,d]
-    else
-      view[graph,e]
-    end}
+    d.values.map{|r|
+      graph = {r.uri => r}
+      view = nil
+      if r.class == Hash
+        r[Type].justArray.do{|types|
+          views = types.map(&:maybeURI).compact.map{|t|
+            subtype = t
+            type = subtype.split(/\//)[-2]
+            [F['view/' + subtype],
+             (F['view/' + type] if type)]}.
+          flatten.compact
+          view = views[0] unless views.empty?}
+      end
+      if !view
+        F['view/base'][graph,e]
+      else
+        view[graph,e]
+      end}}
+  
+  F['view/base']=->d,e{[H.once(e,'base',H.css('/css/html')),d.values.map{|v|v.html e}]}
 
   def triplrBlob
     glob.select(&:f).do{|f|f.map{|r|
@@ -158,10 +136,10 @@ class R
         yield r.uri,Content,r.r}} end
 
   def triplrHref enc=nil
-    yield uri,Content,(f && read).do{|r|enc ? r.force_encoding(enc).to_utf8 : r}.hrefs
+    yield uri,Content,open(d).read.do{|r|enc ? r.force_encoding(enc).to_utf8 : r}.hrefs if f
   end
 
-  def nokogiri;  Nokogiri::HTML.parse read end
+  def nokogiri;  Nokogiri::HTML.parse (open uri).read end
 
   F['HTMLbody'] = -> b {
     b.to_s.split(/<body[^>]*>/)[-1].to_s.split(/<\/body>/)[0] }
@@ -182,17 +160,6 @@ class R
          c: {_: :img, src: '/css/misc/cube.png', style: 'height:2em;background-color:white;padding:.54em;border-radius:1em;margin:.2em'}},
        (H.js '/js/pager'),(H.once e,:mu,(H.js '/js/mu'))]}} # (n)ext (p)rev key binding
 
-  def contentURIresolve *f
-    send(*f){|s,p,o|
-      yield s, p, p == Content ?
-      (Nokogiri::HTML.fragment o).do{|o|
-        o.css('a').map{|a|
-          if a.has_attribute? 'href'
-            (a.set_attribute 'href', (URI.join s, (a.attr 'href'))) rescue nil
-          end}
-        o.to_s} : o}
-  end
-
   fn Render+'text/html',->d,e{ u = d['#']||{}
     titles = d.map{|u,r| r[Title] if r.class==Hash }.flatten.compact
     view = F['view/'+e.q['view'].to_s] || F['view']

data/infod/image.rb

@@ -21,14 +21,14 @@ class R
           `gm convert #{i.sh} -thumbnail "#{size}x#{size}" #{path.sh}`
         end
       end
-      path.e ? (path.env r).getFile : F[E404][e,r]
+      path.e ? (path.env r).fileGET : F[E404][e,r]
     else
       F[E404][e,r]
     end}
 
   fn 'view/img',->i,_{
     [i.values.select{|v|v.class==Hash}.map{|i|
-       i[Type] && (i[Type].class==Array ? i[Type] : [i[Type]]).map(&:maybeURI).include?(DC+'Image') &&
+       i[Type] && i[Type].justArray.map(&:maybeURI).include?(DC+'Image') &&
        [{_: :a, href: i.url, c: {_: :img, style:'float:left;max-width:61.8%', src: i.url}},
         i.html]},
      (H.css '/css/img')]}

data/infod/infod.rb

@@ -15,7 +15,7 @@ shellwords}.map{|r|require r}
 %w{
 constants
 lambda
-mime
+MIME
 404
 500
 grep
@@ -45,6 +45,7 @@ names
 POST
 rdf
 schema
+SPARQL
 text
 threads
 time

data/infod/lambda.rb

@@ -4,7 +4,7 @@ end
 
 class NilClass
   def do; nil end
-  def html e=nil,g=nil; "" end
+  def html e=nil; "" end
   def R; "".R end
 end
 
@@ -21,10 +21,6 @@ def watch f
 
 class R
 
-  def initialize uri
-    @uri = uri.to_s
-  end
-
   def R uri = nil
     uri ? R.new(uri) : self
   end
@@ -49,7 +45,7 @@ class R
       i = i.split /:/
     yield uri, (f + (i[0].match(g)||[0,i[0]])[1].       # s
      gsub(/\s/,'_').gsub(/\//,'-').gsub(/[\(\)]+/,'')), # p
-      i.tail.join(':').strip.do{|v|v.match(/^[0-9\.]+$/) ? v.to_f : v.hrefs}} # o
+      i.tail.join(':').strip.do{|v|v.match(/^[0-9\.]+$/) ? v.to_f : v}} # o
   rescue
   end
 

data/infod/mail.rb

@@ -1,18 +1,33 @@
 #watch __FILE__
 class R
+=begin usage
 
-  MessagePath = ->id{'/msg/' + id.h[0..2] + '/' + id}
+  messages matching an address
+  msgs = R['/m/semantic-web@w3.org'].take
+
+  mirror message-files backing a resource-set
+  src = R::DC+'source'
+  files = msgs.map{|g| '.' + g.graph.values.find{|r|r.has_key? src}[src].head.R.path}
+  `rsync -avRz #{files.join ' '} h:/www/`
+
+  summary view on directories
+  F['/mail/GET'] = -> e,r {
+   r.q['view'] ||= 'threads' if e.uri[-1] == '/'
+   nil }
+
+=end
 
-  GREP_DIRS.push /^\/m\/[^\/]+\// # allow grep within a single address
+  MessagePath = ->id{'/msg/' + id.h[0..2] + '/' + id}
+  GREP_DIRS.push /^\/m\/[^\/]+\// # allow on a single address
 
   F['/m/GET'] = -> e,r{
-    # set overview(summary) view and start a depth-first view of message tree of this address
+    # use summary view and start a newest-first tree-range at address
     if m = e.pathSegment.uri.match(/^\/m\/([^\/]+)$/)
-      r.q['set'] ||= 'depth'
+      r.q['set']  ||= 'depth'
       r.q['view'] ||= 'threads'
-       e.response
+      e.response
     else
-      false      
+      false
     end}
 
   IndexMail = ->doc, graph, host {
@@ -48,12 +63,16 @@ class R
         creator = '/m/'+f+'#'+f                        # author URI
         yield e, Creator, R[creator]                   # message -> author
         yield creator, DC+'identifier', R['mailto:'+f] # author ID
+                                                       # reply to
+        r2 = m['List-Post'].do{|lp|lp.decoded[8..-2]} || # List-Post
+             m.reply_to.do{|t|t[0]} ||                   # Reply-To
+             f                                           # From
         yield e, SIOC+'reply_to',                      # reply URI
-        R[URI.escape("mailto:#{m.reply_to.do{|t|t[0]}||f}?References=<#{id}>&In-Reply-To=<#{id}>&Subject=#{m.subject}&")+'#reply']}}
+        R[URI.escape("mailto:#{r2}?References=<#{id}>&In-Reply-To=<#{id}>&Subject=#{m.subject}&")+'#reply']}}
 
     yield e, Date, m.date.iso8601 if m.date          # date
 
-    m.subject.do{|s|yield e, Title, s.to_utf8}       # subject
+    m.subject.do{|s|yield e, Title, s.to_utf8.hrefs} # subject
 
     yield e, SIOC+'has_discussion',                  # thread
     R[e+'?graph=thread&view=timegraph#discussion'] if m.in_reply_to || m.references
@@ -83,7 +102,7 @@ class R
            c: p.decoded.to_utf8.hrefs.gsub(/^\s*(&gt;)(&gt;|\s)*\n/,"").lines.to_a.map{|l| # skip quoted*empty lines
              l.match(/(^\s*(&gt;|On[^\n]+(said|wrote))[^\n]*)\n/) ?        # quoted?
              {_: :span, class: :q, depth: l.scan(/(&gt;)/).size, c: l} : l # wrap quotes
-           }},(H.css '/css/mail',true)])}
+           }},(H.css '/css/mail')])}
 
     attache = -> { e.R.a('.attache').mk }   # filesystem container for attachments & parts
 
@@ -106,20 +125,6 @@ class R
   end
 
   F['view/'+MIMEtype+'message/rfc822'] = NullView # hide container-resource in default view
-=begin
-  USAGE(context)
-
-  admin (irb) move messages among filesystems
-  p = R['/m/semantic-web@w3.org'].take.map{|g|'.' + g.graph.values.find{|r|r.has_key?(R::DC+'source')}[R::DC+'source'][0].R.path}
-  `rsync -avRz #{p.join ' '} h:/www/`
+  F['view/'+MIMEtype+'text/n3'] = NullView
 
-  view (rb) default to overview of directory
-  F['/mail/GET'] = -> e,r {
-   r.q['view'] ||= 'threads' if e.uri[-1] == '/'
-    false }
-
-  home (sh) current day-dir in Markdown  
-  echo "[today](/?y=day&view=threads)" > TODAY.md 
-
-=end
 end

data/infod/man.rb

@@ -92,7 +92,7 @@ class R
         end
         
         # response
-        html.env(r).getFile
+        html.env(r).fileGET
       end
     end
   }

data/infod/microblog.rb

@@ -26,9 +26,18 @@ class R
 
   def tw g
     node.readlines.shuffle.each_slice(22){|s|
-      R['https://twitter.com/search/realtime?q='+s.map{|u|'from:'+u.chomp}.intersperse('+OR+').join].addDocs :triplrTweets, g, nil, FeedArchiver}
+      R['https://twitter.com/search/realtime?q='+s.map{|u|'from:'+u.chomp}.intersperse('+OR+').join].addDocs :triplrTweets, g, nil, FeedArchiverJSON}
   end
 
+  FeedArchiverJSON = -> doc, graph, host {
+    doc.roonga host
+    graph.map{|u,r|
+      r[Date].do{|t| # link doc to date-index
+        t = t[0].gsub(/[-T]/,'/').sub /(.00.00|Z)$/, '' # trim normalized timezones and non-unique symbols
+        b = (u.sub(/http:\/\//,'.').gsub(/\W/,'..').gsub(FeedStop,'').sub(/\d{12,}/,'')+'.').gsub /\.+/,'.'
+        doc.ln R["http://#{host}/news/#{t}#{b}e"]}}
+  doc}
+
   def triplrTweets
     base = 'http://twitter.com'
     nokogiri.css('div.tweet').map{|t|

data/infod/names.rb

@@ -1,4 +1,8 @@
 class R
+=begin
+  name-manipulating functions
+  a RDF::URI-identified-resource has an associated filesystem node when using our subclass..
+=end
 
   def appendURI u; R uri + u.to_s end
   def appendSlashURI u; R uri.t + u.to_s end
@@ -8,33 +12,22 @@ class R
   def children; node.c.map &:R end
   def container; @u ||= R[f ? dirname + '/.' + (File.basename path) : path] end
   def d;        node.to_s end
-  def delete;   node.deleteNode if e; self end
   def dirname;  node.dirname.do{|d| d.to_s.size <= BaseLen ? '/' : d }.R end
   def docBase;  uri.split(/#/)[0].R.do{|d| d.dirname.as d.bare } end
   def d?;       node.directory? end
-  def env r=nil;r ? (@r = r; self) : @r end
-  def exist?;   node.exist? end
   def expand;   uri.expand.R end
   def ext;      File.extname(uri).tail||'' end
-  def file?;    node.file? end
   def frag;     uri.frag end
-  def get;      open(uri).read end
   def glob p=""; (Pathname.glob d + p).map &:R end
   def hostURL e; host='http://'+e['SERVER_NAME']; (uri.index('/') == 0 ? host : '') + uri end
   def inside;   node.expand_path.to_s.index(FSbase) == 0 end
   def label;    uri.label end
-  def mk;       e || FileUtils.mkdir_p(d); self end
-  def mtime;    node.stat.mtime if e end
   def node;     Pathname.new FSbase + path end
   def parent;   R Pathname.new(uri).parent end
   def parents;  parent.do{|p|p.uri.match(/^[.\/]+$/) ? [p] : [p].concat(p.parents)} end
   def path;     uri.match(/^\//) ? uri : ('/'+uri) end
   def pathSegment; uri.match(/^([a-z]+:\/\/[^\/]+)?(\/.*)/).do{|p|p[2]&&p[2].R}||nil end
-  def predicatePath p,s=true; container.as s ? p.R.shorten : p end
-  def predicates; container.c.map{|c|c.base.expand.R} end
   def prependURI u; R u.to_s + uri end
-  def read;     f ? readFile : get end
-  def readFile; File.open(d).read end
   def realpath; node.realpath rescue Errno::ENOENT end
   def shorten;  uri.shorten.R end
   def siblings; parent.c end
@@ -42,11 +35,9 @@ class R
   def == u;     to_s == u.to_s end
   def <=> c;    to_s <=> c.to_s end
   def sh;       d.force_encoding('UTF-8').sh end
-  def to_s;     uri end
-  def to_h;    {'uri' => uri} end
-  def touch;    FileUtils.touch node; self end
-  def writeFile c; File.open(d,'w'){|f|f << c} end
 
+  # shortcuts
+  
   alias_method :+, :appendURI
   alias_method :a, :appendURI
   alias_method :as, :appendSlashURI
@@ -54,11 +45,9 @@ class R
   alias_method :bare, :barename
   alias_method :c, :children
   alias_method :dir, :dirname
-  alias_method :e, :exist?
-  alias_method :f, :file?
-  alias_method :m, :mtime
-  alias_method :maybeURI, :uri
-  alias_method :url, :uri
+  alias_method :maybeURI, :to_s
+  alias_method :url, :to_s
+  alias_method :uri, :to_s
 
   def localURL e
     if uri.index('/') == 0

data/infod/rdf.rb

@@ -1,9 +1,9 @@
 #watch __FILE__
 class R
 
-  def nt;  @nt ||= docBase.a('.nt') end
-  def n3;  @n3 ||= docBase.a('.n3') end
-  def ttl; @ttl||= docBase.a('.ttl') end
+  def nt; docBase.a '.nt' end
+  def n3; docBase.a '.n3' end
+  def ttl; docBase.a '.ttl' end
 
   def self.renderRDF d,f,e
     (RDF::Writer.for f).buffer{|w|
@@ -23,7 +23,8 @@ class R
     uri = (local && f) ? d : uri
     RDF::Reader.open(uri, :format => format){|r|
       r.each_triple{|s,p,o|
-        yield s.to_s, p.to_s, [RDF::Node, RDF::URI].member?(o.class) ? R(o) : o.value.do{|v|v.class == String ? v.to_utf8 : v}}}
+        yield s.to_s, p.to_s,
+        [RDF::Node, RDF::URI].member?(o.class) ? R(o) : o.value.do{|v|v.class == String ? v.to_utf8 : v}}}
   end
 
   [['application/ld+json',:jsonld],