RubyGems - noticesys - Versions diffs - 0.2.1 → 0.3.0 - Mend

noticesys 0.2.1 → 0.3.0

Files changed (7) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d288e2ea5fd9a6be99076b447767fd120adcc2a0be9b7ebd1bdd92ced1296d0b
-  data.tar.gz: de32569b9420ebae7f040b9ff636b96806deee430497e0e40aec5c32fdf428af
+  metadata.gz: 4079e24a9946239aea1bfbd9f32d590d3c61d4fe1d0708533bfaf389fa188fe4
+  data.tar.gz: b0cfe6648e0d8df499a850f51a7bcddd10e1c338bbbf61472a253f56d848b9f2
 SHA512:
-  metadata.gz: 3e05af4fe17385335f3181c0c53034e39f0f8b676a7f0b4ff49ca517015edc490a3dd551b8226a9a9323a1c640b30088cbc20df04ad4b6e618e43ca1190b5a27
-  data.tar.gz: 4f6eb36fb6a83b68fde2aff90edbb91ce8622e357fa2a1c6ac10bece8a3e4dd299a26199ba0abd3aaf7245a9af391d3372737b7e2e49d77c93efd8756e47d036
+  metadata.gz: 8a4a83f020a327d8eab7c5bf8213d624e0b3fa01569dacee4f728bcb20a74461cc94c98c842d4f7e39ad040d5db17a7fccaf8b410ee86e886f69df627c3d02e0
+  data.tar.gz: 2b7a7b81dc1d029f84a357e2f004ab00c380aa6b88f3b8c58b6961043f818b295ac6331517b4a35e7b11a5b29b605500f38083b8992769e8eb6889b7adb61129

checksums.yaml.gz.sig CHANGED Viewed

Binary file

data.tar.gz.sig CHANGED Viewed

Binary file

data/data/microblog.txt CHANGED Viewed

@@ -47,6 +47,34 @@
         <meta property="og:url" content="#{h[:url]}"/>
         <meta name="noticesys:card" content="notice"/>
+%notice
+        <div class='notice'>
+          <div id='avatar' class='profile'>
+            <a href="/#{rx.topic}"><img src='#{dx.image}'/></a>
+            <div id='ucard'>
+              <div>
+                <img src='#{dx.image}'/>
+              </div>
+              <a href="/#{rx.topic}"><span class='title'>#{dx.title}</span></a>
+              <span class='username'>@#{username}</span>
+              <p>#{dx.bio}</p>
+            </div>
+          </div>
+          <div class='ncol2'>
+            <div class='user'><a href="#{rx.topic}"><span>#{dx.title}</span></a> @#{rx.topic} &middot; <a href="#{rx.link}" title="#{d}">#{relative_time
+            }</a><:svg/ellipsis>
+            </div>
+            #{description}
+            #{card2}
+            <div id='actions'>
+              <:svg/reply>
+            </div>
+          </div>
+        </div>
 %status
     <html>
@@ -68,6 +96,68 @@
       </body>
     </html>
+%user
+        <html>
+          <head>
+            <title>#{dx.title} (@#{username}) | Microblog</title>
+            <meta charset='UTF-8'/>
+            <meta name='viewport' content='width=device-width, initial-scale=1'>
+            <link rel='stylesheet' type='text/css' href='#{@css_url}'/>
+          </head>
+          <body>
+          <div id='wrap' class='main'>
+          <header>
+          <div id='banner'>
+          </div>
+          <div id='search'>
+            <form action='/search'>
+              <input type='text' name='q' id='q' placeholder='Search microblogs'/>
+            </form>
+          </div>
+          </header>
+          <div style='clear: both'/>
+          <div class='row'>
+            <div class='column'>
+            </div>
+            <div class='column'>
+            #{s}
+            </div>
+            <div class='column'>
+              <h2>Currently</h2>
+            </div>
+          </div>
+          <div id='footer'>
+            <h2>Links</h2>
+            <ul>
+              <li><a href='about:blank'>blank</a></li>
+            </ul>
+          </div>
+          </div>
+          </body>
+      </html>
+  %ptop
+      <div id='ptop'>
+      <img src='#{dx.image}'/>
+      <span id='title'>#{dx.title}</span>
+      <span id='user'>@#{username}</span>
+      <p>#{dx.bio}</p>
+      </div>
+      <hr/>
+  %rsslink
+      <hr/>
+      <a href="//#{@static_urlbase}/microblog/u/#{username}/rss.xml">rss</a>
 %svg
   %article
@@ -77,8 +167,16 @@
 <svg viewBox="0 0 24 24" class="backarrow"><g><path d="M20 11H7.414l4.293-4.293c.39-.39.39-1.023 0-1.414s-1.023-.39-1.414 0l-6 6c-.39.39-.39 1.023 0 1.414l6 6c.195.195.45.293.707.293s.512-.098.707-.293c.39-.39.39-1.023 0-1.414L7.414 13H20c.553 0 1-.447 1-1s-.447-1-1-1z"></path></g></svg>
+  %ellipsis
+<svg viewBox="0 0 24 24" class="ellipsis"><g><circle cx="5" cy="12" r="2"></circle><circle cx="12" cy="12" r="2"></circle><circle cx="19" cy="12" r="2"></circle></g></svg>
   %link
 <svg viewBox="0 0 24 24"><g><path d="M11.96 14.945c-.067 0-.136-.01-.203-.027-1.13-.318-2.097-.986-2.795-1.932-.832-1.125-1.176-2.508-.968-3.893s.942-2.605 2.068-3.438l3.53-2.608c2.322-1.716 5.61-1.224 7.33 1.1.83 1.127 1.175 2.51.967 3.895s-.943 2.605-2.07 3.438l-1.48 1.094c-.333.246-.804.175-1.05-.158-.246-.334-.176-.804.158-1.05l1.48-1.095c.803-.592 1.327-1.463 1.476-2.45.148-.988-.098-1.975-.69-2.778-1.225-1.656-3.572-2.01-5.23-.784l-3.53 2.608c-.802.593-1.326 1.464-1.475 2.45-.15.99.097 1.975.69 2.778.498.675 1.187 1.15 1.992 1.377.4.114.633.528.52.928-.092.33-.394.547-.722.547z"></path><path d="M7.27 22.054c-1.61 0-3.197-.735-4.225-2.125-.832-1.127-1.176-2.51-.968-3.894s.943-2.605 2.07-3.438l1.478-1.094c.334-.245.805-.175 1.05.158s.177.804-.157 1.05l-1.48 1.095c-.803.593-1.326 1.464-1.475 2.45-.148.99.097 1.975.69 2.778 1.225 1.657 3.57 2.01 5.23.785l3.528-2.608c1.658-1.225 2.01-3.57.785-5.23-.498-.674-1.187-1.15-1.992-1.376-.4-.113-.633-.527-.52-.927.112-.4.528-.63.926-.522 1.13.318 2.096.986 2.794 1.932 1.717 2.324 1.224 5.612-1.1 7.33l-3.53 2.608c-.933.693-2.023 1.026-3.105 1.026z"></path></g></svg>
+  %reply
+<svg viewBox="0 0 24 24" <g><path d="M14.046 2.242l-4.148-.01h-.002c-4.374 0-7.8 3.427-7.8 7.802 0 4.098 3.186 7.206 7.465 7.37v3.828c0 .108.044.286.12.403.142.225.384.347.632.347.138 0 .277-.038.402-.118.264-.168 6.473-4.14 8.088-5.506 1.902-1.61 3.04-3.97 3.043-6.312v-.017c-.006-4.367-3.43-7.787-7.8-7.788zm3.787 12.972c-1.134.96-4.862 3.405-6.772 4.643V16.67c0-.414-.335-.75-.75-.75h-.396c-3.66 0-6.318-2.476-6.318-5.886 0-3.534 2.768-6.302 6.3-6.302l4.147.01h.002c3.532 0 6.3 2.766 6.302 6.296-.003 1.91-.942 3.844-2.514 5.176z"></path></g></svg>

data/lib/noticesys.rb CHANGED Viewed

@@ -5,10 +5,10 @@
 require 'down'        # file downloader
 require 'weblet'      # HTML retrieval
 require 'dynarex'     # flat file storage system
+require 'unichron'    # universal chron tool (i.e. time calculation)
 require 'ogextractor' # extract metadata
 module NoticeSys
   class Client
@@ -127,14 +127,74 @@ module NoticeSys
   end
+  class CardView
+    def initialize(weblet)
+      @w = weblet
+    end
+    def render(dx, rx, card)
+      card2 = case card.keys.first
+      when :images
+        card[:images].map.with_index do |img, i|
+          href = [dx.link.sub(/\/$/,''), rx.topic, 'status', rx.id,
+                  'photo', (i+1).to_s ].join('/')
+          url, align = img[:url], img[:align]
+          "<a href='%s'><div class='top-crop %s'><img class='img1' src='%s'/></div></a>" % [href, align, url]
+        end.join
+      when :summary_large_image
+        h2 = card[:summary_large_image]
+        rawdesc = h2[:desc]
+        desc = rawdesc.length > 147 ? rawdesc[0..147] + '...' : rawdesc
+        site = h2[:url][/https?:\/\/([^\/]+)/,1].sub(/^www\./,'')
+        title = h2[:title]
+        img = h2[:img]
+        url = h2[:url]
+        @w.render('card', binding)
+      when :summary
+        h2 = card[:summary]
+        rawdesc = h2[:desc]
+        desc = rawdesc.length > 95 ? rawdesc[0..95] + '...' : rawdesc
+        site = h2[:url][/https?:\/\/([^\/]+)/,1].sub(/^www\./,'')
+        title = h2[:title].length > 46 ? h2[:title][0..46] + '...' :  h2[:title]
+        img = h2[:img]
+        url = h2[:url]
+        img_element = if img then
+          "<img src='#{img}'>"
+        else
+          @w.render('svg/article')
+        end
+        @w.render('card2', binding)
+      end
+    end
+  end
   class StatusView
-    def initialize(basepath, xslfile, css_url, weblet_file=nil)
+    def initialize(basepath, xslfile, css_url, weblet_file)
       @basepath, @xslfile, @css_url = basepath, xslfile, css_url
-      weblet_file ||= File.join(File.dirname(__FILE__), '..',
-                                'data', 'microblog.txt')
       @w = Weblet.new(weblet_file, binding)
+      @card = CardView.new(@w)
     end
@@ -190,7 +250,7 @@ module NoticeSys
           #img = h[:img].sub(/small(?=\.\w+$)/,'large')
           img = h[:img]
           metadata = @w.render(:meta, binding)
-          [render_card(dx, rx, card), metadata]
+          [@card.render(dx, rx, card), metadata]
         end
       else
@@ -215,58 +275,66 @@ module NoticeSys
     end
-    private
+  end
+  class StatusListView
-    def render_card(dx, rx, card)
+    def initialize(basepath, css_url, weblet_file, static_urlbase)
-      card2 = case card.keys.first
-      when :images
+      @basepath, @css_url, @static_urlbase = basepath,  css_url, static_urlbase
+      @w = Weblet.new(weblet_file, binding)
+      @card = CardView.new(@w)
-        card[:images].map.with_index do |img, i|
+    end
+    def render(username)
+      s = ''
+      dx = Dynarex.new(File.join(@basepath, username, 'feed.xml'))
+      s += @w.render 'user/ptop', binding
+      notices = dx.all.map do |rx|
+        card2 = ''
+        rawcard = rx.to_h[:card]
-          href = [dx.link.sub(/\/$/,''), rx.topic, 'status', rx.id,
-                  'photo', (i+1).to_s ].join('/')
-          url, align = img[:url], img[:align]
-          "<a href='%s'><div class='top-crop %s'><img class='img1' src='%s'/></div></a>" % [href, align, url]
+        card2 = if rawcard and rawcard.length > 10 then
+          card = JSON.parse(rawcard, symbolize_names: true)
-        end.join
+          if card.is_a? Hash then
+            @card.render(dx, rx, card)
+          end
+        else
+          ''
+        end
+        t2 = Time.at rx.id.to_s[0..9].to_i
+        relative_time = Unichron.new(t2).elapsed
-      when :summary_large_image
-        h2 = card[:summary_large_image]
-        rawdesc = h2[:desc]
-        desc = rawdesc.length > 147 ? rawdesc[0..147] + '...' : rawdesc
-        site = h2[:url][/https?:\/\/([^\/]+)/,1].sub(/^www\./,'')
-        title = h2[:title]
-        img = h2[:img]
-        url = h2[:url]
-        @w.render('card', binding)
-      when :summary
-        h2 = card[:summary]
-        rawdesc = h2[:desc]
-        desc = rawdesc.length > 95 ? rawdesc[0..95] + '...' : rawdesc
-        site = h2[:url][/https?:\/\/([^\/]+)/,1].sub(/^www\./,'')
-        title = h2[:title].length > 46 ? h2[:title][0..46] + '...' :  h2[:title]
-        img = h2[:img]
-        url = h2[:url]
+        d = t2.strftime("%I:%M%p %b %d %Y")
-        img_element = if img then
-          "<img src='#{img}'>"
+        description = if rx.description.length > 1 then
+          doc = Rexle.new "<node>%s</node>" % rx.description.gsub(/<\/?p>/,'')
+          doc.root.xpath('img|div').each(&:delete)
+          "<p>%s</p>" % doc.root.xml
         else
-          @w.render('svg/article')
+          ''
         end
-        @w.render('card2', binding)
+        @w.render :notice, binding
       end
-    end
+      s += notices.join
+      s += @w.render 'user/rsslink', binding
+      @w.render :user, binding
+    end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noticesys
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -97,6 +97,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.27
+- !ruby/object:Gem::Dependency
+  name: unichron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: ogextractor
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig CHANGED Viewed

Binary file