infod 0.0.3.0 → 0.0.3.1

data/infod/groonga.rb

@@ -80,7 +80,7 @@ class E
   
   # index resource 
   def roonga graph="global", m = self.graph
-    puts "text #{graph} < #{uri} #{m.keys.join ' '}"
+#    puts "text #{graph} < #{uri} #{m.keys.join ' '}"
     g = E.groonga          # db
     m.map{|u,i|
       r = g[u] || g.add(u) # create or load entry

data/infod/html.rb

@@ -64,11 +64,11 @@ class String
 end
 
 class Fixnum
-  def html e=nil; H({_: :input, type: :number, value: to_s}) end
+  def html e=nil; to_s end
 end
 
 class Float
-  def html e=nil; H({_: :input, type: :number, value: to_s}) end
+  def html e=nil; to_s end
 end
 
 class TrueClass

data/infod/mail.rb

@@ -32,9 +32,7 @@ class E
       yield creator, SIOC+'creator_of', E[posts]
       yield posts, Type, E[LDP+'Container']
       yield posts, LDP+'firstPage', E['/index/sioc:has_creator/'+CGI.escape(creator)]
-
-      m.header['x-original-to'].do{|f|
-        yield e, SIOC+'reply_to', E[URI.escape "mailto:#{f}?References=<#{e}>&In-Reply-To=<#{e}>&Subject=#{m.subject.to_utf8}"] }
+      yield e, SIOC+'reply_to', E[URI.escape "mailto:#{m.header['x-original-to']||from}?References=<#{e}>&In-Reply-To=<#{e}>&Subject=#{m.subject.to_utf8}"]
 
       %w{to cc bcc}.map{|to|
         m.send(to).do{|to| to.map{|to|

data/infod/page.rb

@@ -5,7 +5,7 @@ class E
     u = d['#']
     [u[Prev].do{|p|{_: :a, rel: :prev, style: 'background-color:white;color:black;font-size:2.3em;float: left;clear:both;margin-right:.3em',href: p.uri, c: '←'}},
      u[Next].do{|n|{_: :a, rel: :next, style: 'background-color:black;color:white;font-size:2.3em;float:right;clear:both;border-radius:0',href: n.uri, c: '→'}},
-     {_: :a, href: e['REQUEST_URI']+'?view=data', # data browser
+     {_: :a, href: e['REQUEST_PATH'] + e.q.merge({'view'=>'data'}).qs, # data browser
        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')) # next/prev key mapping
     ]}

data/infod/search.rb

@@ -6,13 +6,11 @@ class E
 
   F['/search.n3/GET'] = F['/search/GET']
 
-  fn 'view/'+Search,-> q=nil,e { q||={}
+  fn 'view/'+Search,-> d,e {
     [H.css('/css/search'),H.js('/js/search'),
      {:class => :form,
-      c: {_: :form, action: e['REQUEST_PATH'],
-        c: [{_: :input, name: :q, value: q['q']}, # search box
-            q.except('q','start'). # new query & offset for this search
-            map{|a,s|
-              {_: :input, name:  a, value: s, :type => :hidden}}]}}]}
+      c: {_: :form, action: '/search',
+         c: {_: :input, name: :q}, # search box
+       }}]}
 
 end

data/infod/threads.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#watch __FILE__
+watch __FILE__
 class E
   
   fn 'protograph/thread',->d,e,g{
@@ -13,58 +13,32 @@ class E
     F['docsID'][g,e]}
   
   fn 'view/threads',->d,env{
+    posts = d.values.select{|r| # we want SIOC posts
+      r[Type].do{|t| [*t].map{|t| t.respond_to?(:uri) && t.uri}.member? SIOC+'Post'}}
+    threads = posts.group_by{|r| # group by thread-name
+       [*r[Title]][0].do{|t|t.sub(/^[rR][eE][^A-Za-z]./,'')}}
 
-    # CSS
-    [(H.css '/css/threads'),{_: :style, c: "body {background-color: ##{rand(2).even? ? 'fff' : '000'}}"},
-
-     # predicate tafting & search
-     (p = env.q['p']
-      o = env['uri'].E
-      [(H.js '/js/search'),
-       {_: :a, class: :rangeP, href: '/@'+p+'?set=indexP&&c=12', c: {'sioc:addressed_to' => 'to', 'sioc:has_creator' => 'From'}[p] || p}, ' ',
-       {_: :a, class: :rangePO, href: o.url+'?set=indexPO&c=12&p='+p, c: env['uri']},
-       {_: :form, action: (URI.escape (p.expand.E.poIndex o).uri),
-         c: [{_: :input, name: :set, value: :grep, type: :hidden},
-             {_: :input, name: :q}
-            ]},
-      ] if env.q['set']=='indexPO'),
-
+    [F['view/'+HTTP+'Response'][{'#' => d['#']},env],
+     (H.css '/css/threads'),{_: :style, c: "body {background-color: ##{rand(2).even? ? 'fff' : '000'}}"},
      '<table>',
-
-     # group posts by thread name
-     d.values.select{|r| r[Type].do{|t| [*t].map{|t| t.respond_to?(:uri) && t.uri}.member? SIOC+'Post'}
-     }.group_by{|r|
-       [*r[Title]][0].do{|t|t.sub(/^[rR][eE][^A-Za-z]./,'')}}.
-
-     # group by recipient
-     group_by{|r,k| k[0].do{|k|
-         k[To].do{|o|o.head.uri}}}.map{|e|
-
-       # group
-       c = E.cs
-       ['<tr><td class=subject>', e[1].map{|t|
-
-          # thread
-          [{_: :a, property: Title, :class => 'thread', style: "border-color:#{c}", href: t[1][0].url+'?graph=thread',
-             c: t[0].to_s.gsub(/[<>]/,'_').gsub(/\[([a-z\-A-Z0-9]+)\]/,'<span class=g>\1</span>')},
-
-
-           # post
-           (t[1].size > 1 &&
-            ['<br>', t[1].map{|s|
-               
-               # author name and RDFa
-               {_: :a, property: Creator, href: s.url+'?graph=thread#'+s.uri, :class => 'sender', style: 'background-color:'+c,
-                 c: (s[SIOC+'name']||s[Creator]).do{|n|n[0]}
-               }}]),'<br>']},'</td>',
-
-        {_: :td, class: :group, property: To,
-          c: {_: :a, :class => :to, style: 'background-color:'+c, c: e[0] && e[0].split(/@/)[0],
-            href: e[0] && e[0].E.url+'?set=indexPO&p=sioc:addressed_to'}},
-
-        '</tr>']},'</table>',
-
-     # drill down to full-content of this set
-     {_: :a, id: :down, href: env['REQUEST_PATH'].t, c: '↓'}]}
+     threads.group_by{|r,k| # group by recipient
+       k[0].do{|k| # we're only going to show one, use first message
+         k[To].do{|o|o.head.uri}}}.
+     map{|group,threads| c = E.cs
+       ['<tr><td class=subject>',
+        threads.map{|title,msgs| # thread
+          [{_: :a, property: Title, :class => 'thread', style: "border-color:#{c}", href: msgs[0].url+'?graph=thread',
+             c: title.to_s.gsub(/[<>]/,'_').gsub(/\[([a-z\-A-Z0-9]+)\]/,'<span class=g>\1</span>')},
+
+           (msgs.size > 1 && # more than one author?
+            ['<br>', msgs.map{|s| # show
+                {_: :a, property: Creator, href: s.url+'?graph=thread#'+s.uri, :class => 'sender', style: 'background-color:'+c,
+                 c: s[Creator]}}]),'<br>']},'</td>',
+
+        ({_: :td, class: :group, property: To,
+          c: {_: :a, :class => :to, style: 'background-color:'+c, c: group.label,
+            href: '/index/sioc:addressed_to/'+CGI.escape(group)+'?view=threads&c=24'}} if group),
+
+        '</tr>']},'</table>']}
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infod
 version: !ruby/object:Gem::Version
-  version: 0.0.3.0
+  version: 0.0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack