code-snippets 0.2.13 → 0.3.0

data/lib/code-snippets.rb

@@ -49,12 +49,12 @@ class CodeSnippets
   
   def show(id, current_user='guest')
     
-    doc = Document.new('<result><summary/><records/></result>')            
+    doc = Rexle.new('<result><summary/><records/></result>')                        
     entry = @blog.entry(id).dup
-    doc.root.elements['records'].add entry
+    doc.root.element('records').add entry
 
     (tags = " [%s]" % entry.text('tags').split(/\s/).join('] [')) if entry.text('tags')
-    doc.root.elements['summary'].add Element.new('title').add_text(entry.text('title').to_s + tags)    
+    doc.root.element('summary').add Rexle::Element.new('title').add_text(entry.text('title').to_s + tags)        
     prepare_doc doc
     
     render_html(doc, @xsl_doc_single, current_user).to_s
@@ -69,7 +69,7 @@ class CodeSnippets
     # fetch the user
     user = h[:user]
     h.delete :user
-    @blog.update_user(user, id, h)
+    @blog.update_entry(user, id, h)
   end
   
   # -- xml interface ------------
@@ -122,15 +122,19 @@ class CodeSnippets
 
   def html_cached(context, summary, current_user='guest', &b)
     c = context.join
-    @page_cache.read(c + current_user) do 
+
+    out = @page_cache.read(c + current_user) do 
       view_html(@doc_cache.read(c + current_user){b.call}, c, summary, current_user).to_s
     end
+
+    out
   end
 
   def view_html(raw_doc, context, summary, current_user='guest')
-    
+
     blk = lambda do
-      page_doc = Document.new(raw_doc.to_s)  
+
+      page_doc = Rexle.new(raw_doc.to_s)    
 
       prepare_doc(page_doc)  
       total_records, total_pages, page_number = %w(total_records total_pages page_number)\
@@ -147,24 +151,31 @@ class CodeSnippets
       summary[:rss_url] = (@args.unshift '/rss').join('/')
       
       summary.each do |name, text|
-        page_doc.root.elements['summary'].add Element.new(name.to_s).add_text(text.to_s)  
+        page_doc.root.element('summary').add Rexle::Element.new(name.to_s).add_text(text.to_s)    
       end
       
-      summary_node = XPath.first(page_doc.root, 'summary')
-      tags = Document.new(@tags.to_s).root.elements['records']
-      tags.name = 'tags'
-      summary_node.add tags
-      latest_posts = Document.new(@latest_posts.to_s).root.elements['records']
-      latest_posts.name = 'latest_posts'
-      summary_node.add latest_posts
+      summary_node = page_doc.element('summary')
+
+      if @tags and @tags.length >= 1 then
+        tags = Rexle.new(@tags.to_s).root.element('records')
+        tags.name = 'tags'
+        summary_node.add_element tags
+      end
+
+      if @latest_posts then
+        latest_posts = Rexle.new(@latest_posts.to_s).root.element('records')
+        latest_posts.name = 'latest_posts'
+        summary_node.add latest_posts
+      end
+
       bottom_summary = summary_node.dup
       bottom_summary.name = 'bottom_summary'
       page_doc.root.add bottom_summary
-      page_doc
+      page_doc.xml
     end
-    
+
     xml_doc =  context != '1' ? @hc_xml.read(context+current_user, &blk) : blk.call
-    
+
     render_html(xml_doc, @xsl_doc, current_user)
 
   end
@@ -174,43 +185,49 @@ class CodeSnippets
     page_doc.root.name = 'snippets'
     convertor = Syntax::Convertors::HTML.for_syntax "ruby"
 
-    XPath.each(page_doc.root,'records/entry') do |entry|
+    page_doc.xpath('records/entry').each do |entry|
 
-      line = entry.elements['body/text()'].to_s.gsub('&amp;','&#38;')
+      line = entry.element('body/text()').gsub('&amp;','&#38;')
       buffer = line.gsub(/&lt;(\/?)(code|pre|span|br|a\s|\/a)(\/?[^&]+)?&gt;/,'<\1\2\3>').gsub('&#38;','&amp;')
 
-      doc_body = Document.new("<div class='post-body'>%s</div>" % buffer)
+      doc_body = Rexle.new("<div class='post-body'>%s</div>" % buffer)
 
-      XPath.each(doc_body.root, 'code') do |code| 
-        styled_code = code.text.to_s[/<span>/] ? code.text.to_s : convertor.convert(REXML::Text::unnormalize(code.text.to_s))
-        code.add Document.new("%s" % styled_code).root
+      doc_body.xpath('code').each do |code| 
+        styled_code = code.text[/<span>/] ? code.text : convertor.convert(code.text.unescape)
+        code.add Rexle.new("%s" % styled_code).root
         code.text = ''
         code.name = '_code'
       end
 
-      body = entry.elements['body']
-      body.parent.delete body
-      entry.add Document.new(doc_body.to_s.gsub(/<\/?_code>/,'')).root
+      entry.delete('body')
+
+      entry.add Rexle.new(doc_body.to_s.gsub(/<\/?_code>/,'')).root
 
-      tags = entry.elements['tags']
-      tags.text.to_s.split(/\s/).map {|x| tags.add Element.new('tag').add_text(x)}
+      tags = entry.element('tags')
+      tags.text.to_s.split(/\s/).map {|x| tags.add Rexle::Element.new('tag').add_text(x)}
       tags.text = ''
 
-      entry.add_attribute('created',Time.parse(entry.attribute('created').value).strftime("%b %d, %Y"))
+      entry.add_attribute(created: Time.parse(entry.attributes[:created]).strftime("%b %d, %Y"))
 
     end
 
   end
 
   def load()
-    @blog = DynarexUsersBlog.new(@h[:filepath], @h[:default_user])            
-    @tags = sidetags(@blog.tags)
-    @latest_posts = latest_posts(@blog)
+
+    @blog = DynarexUsersBlog.new(filepath: @h[:filepath], user: @h[:default_user])            
+
+    if @blog.tags.length > 0 then
+      @tags = sidetags(@blog.tags) 
+      @latest_posts = latest_posts(@blog)
+    end
+
     @page_cache = HashCache.new
     @doc_cache = HashCache.new
     @hc_xml = HashCache.new(file_cache: true)
     @rss_cache = HashCache.new
     @args = []
+    
     load_renderer()
   end
 
@@ -225,7 +242,7 @@ class CodeSnippets
       weight = 100 / (biggest_tag / word_size.to_i)
       gauge = (weight / 10).to_i
       gauge = 8 if gauge > 8
-      dynarex.create name: word, gauge: gauge, count: word_size
+      dynarex.create name: word, gauge: gauge.to_s, count: word_size
     end
 
     dynarex.to_xml
@@ -236,8 +253,8 @@ class CodeSnippets
 
     %w(ruby javascript html xml array shell linux bash).each do |x|
       posts.create.posts(title: x) do |create|
-        XPath.each(blog.tag(x).page(1).root, "records/entry[position() < 4]") do |entry|
-          create.entry title: entry.text('title').to_s, id: entry.attribute('id').value.to_s
+        blog.tag(x).page(1).xpath("records/entry[position() < 4]").each do |entry|
+          create.entry title: entry.text('title').to_s, id: entry.attribute(:id)
         end
       end
     end
@@ -257,14 +274,15 @@ class CodeSnippets
     @xsl_doc = Document.new(main.to_s)
     XPath.each(snippets.root, 'xsl:template') {|template|  @xsl_doc.root.add template }
 
+
     @xsl_doc_single = Document.new(main.to_s)
     XPath.each(snippets_entry.root, 'xsl:template') {|template|  @xsl_doc_single.root.add template }
 
   end
   
-  def render_html(xml_doc, xsl_doc, current_user='guest')
-    xsl_params = ['current_user', current_user]
-    Nokogiri::XSLT(xsl_doc.to_s).transform(Nokogiri::XML(xml_doc.to_s), Nokogiri::XSLT.quote_params(xsl_params))     
+  def render_html(xml, xsl_doc, current_user='guest')
+    xsl_params = ['current_user', current_user]    
+    Nokogiri::XSLT(xsl_doc.to_s).transform(Nokogiri::XML(xml.to_s), Nokogiri::XSLT.quote_params(xsl_params))          
   end
   
   alias render_rss render_html  
@@ -276,13 +294,15 @@ class CodeSnippets
   end
 
   def view_rss(doc)
-    page_doc = Document.new(doc.to_s)
-    rss_doc = Document.new(render_rss(page_doc,@xsl_rssdoc).to_s)
-    
-    XPath.each(rss_doc.root,'channel/item/description') do |desc|
-      desc.text = desc.text.to_s.gsub(/\n/,'\0<br />')
+
+    page_doc = Rexle.new(doc.xml)
+    rss_doc = Rexle.new(render_rss(page_doc,@xsl_rssdoc).to_s)
+
+    rss_doc.xpath('channel/item/description').each do |desc|
+      desc.text = desc.text.gsub(/\n/,'\0<br />')
     end
-    rss_doc.to_s
+
+    rss_doc.xml
   end
   
   def cache_reset()
@@ -291,4 +311,4 @@ class CodeSnippets
     @hc_xml.reset
   end
         
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: code-snippets
 version: !ruby/object:Gem::Version 
-  version: 0.2.13
+  version: 0.3.0
 platform: ruby
 authors: []
 
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: dynarex-usersblog
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: 
 executables: []