dynarex-blog 0.6.19 → 0.7.0

data/lib/dynarex-blog.rb

@@ -2,14 +2,14 @@
 
 # file: dynarex-blog.rb
 
-require 'rexml/document'
 require 'polyrex'
 require 'dynarex'
 require 'hashcache'
 
 class DynarexBlog
-  include REXML
-  
+
+
+  ENTITIES = 'entities.xml'  
   attr_accessor :id
 
   def initialize(file_path='./')
@@ -17,48 +17,53 @@ class DynarexBlog
     if File.exists? (@file_path + 'index.xml') then  open(@file_path) else fresh_start() end
     @current_lookup = '_entry_lookup.xml'
     @hc_lookup = HashCache.new(size: 15)
-    @hc_lookup.read(@current_lookup) { Document.new File.open(@file_path + @current_lookup,'r').read }
+
+    @hc_lookup.read(@current_lookup) { Rexle.new File.open(@file_path + @current_lookup,'r').read }
     
     @hc_result = HashCache.new(size: 10)
     @hc_entry_file = HashCache.new(size: 10)
     @hc_lookup_a = HashCache.new(size: 10)
     
-    raw_tags = @entities.xpath "records/section[summary/name='tags']/records"    
-    @tags = XPath.match(raw_tags, 'entity/summary').map{|tag| %w(name entry_count).map {|x| tag.text(x).to_s} }    
+    xpath = "records/section[summary/name='tags']/records/entity/summary"
+    @tags = @entities.xpath(xpath){|e| [e.text('name'), e.text('count')]}
     super()
   end
 
   def create_entry(record={})
-
     @hc_result.reset
     @id += 1
     # create a new record
     @index.create record, @id
-    
+
     # if there is more than 10 records shift the 1st record.
-    if @index.records.length > 10 then
+    if @index.flat_records.length > 10 then
       # '+++ deleting the 1st index record +++'
-      @index.delete @index.records.to_a[0][-1][:id]
+      @index.to_doc.delete('records/*[1]')
     end
-    @index.save @file_path + 'index.xml'
+
+    @index.save
 
     create_record(record, @id.to_s, name='_entry', type='main')
+
     if record[:tags] then
       record[:tags].split(/\s/).each do |tag|
         create_record(record, @id.to_s, name=tag, type='tags')
       end
     end    
-    
+
   end  
     
   def entry(id)
-    doc_lookup = @hc_lookup.read(@current_lookup) { Document.new File.open(@file_path + @current_lookup,'r').read }
-    file = XPath.first(doc_lookup.root, "records/entry[id='#{id}']/file/text()").to_s
-    doc_entries = Document.new(@hc_entry_file.read(file) { File.open(@file_path + file,'r').read })
-    XPath.first(doc_entries.root, "records/entry[@id='#{id}']")
+
+    doc_lookup = @hc_lookup.read(@current_lookup) { Rexle.new File.open(@file_path + @current_lookup,'r').read }
+    file = doc_lookup.text("records/entry[id='#{id}']/file")
+    doc_entries = Rexle.new(@hc_entry_file.read(file) { File.open(@file_path + file,'r').read })
+
+    doc_entries.element("records/entry[@id='#{id}']")
   end
   
   def update(id, h)
+
     lookup = Dynarex.new @file_path + @current_lookup
     lookup_id = lookup.records[id][:id]
     file = lookup.records[id][:body][:file]
@@ -75,25 +80,25 @@ class DynarexBlog
     
       if prev_tags and prev_tags.length > 0 then
 	
-	b = prev_tags.split(/\s/)
-	old_list = a - b # tags to be deleted
-	new_list = b - a # tags to be inserted
-	
-	old_list.each {|x| delete_entry(tag_name, id) }
-	common = a.to_set.intersection(b).to_a # tags to be updated     
-	common.each {|name|  update_entry(name, id, h) }
+        b = prev_tags.split(/\s/)
+        old_list = a - b # tags to be deleted
+        new_list = b - a # tags to be inserted
+
+        old_list.each {|x| delete_entry(tag_name, id) }
+        common = a.to_set.intersection(b).to_a # tags to be updated     
+        common.each {|name|  update_entry(name, id, h) }
       else
-	new_list = a
+        new_list = a
       end
       
       new_list.each {|tag| create_record(h, id, name=tag, type='tags') }
-      
       dynarex.update(id, h)
       dynarex.save
     end
     
     lookup.update(lookup_id, uri: h[:title].gsub(/\s/,'-')).save
-    @hc_lookup.write(@current_lookup) { Document.new File.open(@file_path + @current_lookup,'r').read }        
+
+    @hc_lookup.write(@current_lookup) { Rexle.new File.open(@file_path + @current_lookup,'r').read }                
 
     refresh_index if index_include? id
 
@@ -120,8 +125,18 @@ class DynarexBlog
     end
 
     # start of reindexing
-    refresh_index if index_include? id
-    
+
+    if index_include? id then
+
+      count = @index.xpath('count(records/entry)')
+
+      if count < 10 then
+        @index.delete(id)
+        @index.save
+      else
+        refresh_index     
+      end
+    end
   end
 
   def fresh_start()
@@ -131,11 +146,13 @@ class DynarexBlog
     @index = new_blog_file 'index.xml'
 
     @entities = Polyrex.new('entities/section[name]/entity[name,count,entry_count]')
-    @entities.create.section({name: 'main'}, id='main')
-    @entities.id('main').create.entity(name: '_entry', count: '1')
-    @entities.create.section({name: 'tags'}, id='tags')
-    @entities.save @file_path + 'entities.xml'
 
+    @entities.create.section({name: 'main'}, id='main') do |create|
+      create.entity(name: '_entry', count: '1')
+    end
+
+    @entities.create.section({name: 'tags'}, id='tags')
+    @entities.save @file_path + ENTITIES
     @lookup = new_lookup_file '_entry_lookup.xml'
   end
 
@@ -147,24 +164,26 @@ class DynarexBlog
       @index = Dynarex.new @file_path + 'index.xml'
       @id = @index.records ? @index.records.to_a[-1][-1][:id].to_i : 0
     }
-    threads << Thread.new{@entities = Polyrex.new @file_path + 'entities.xml'}
+    threads << Thread.new{@entities = Polyrex.new @file_path + ENTITIES}
     threads.each {|thread| thread.join}
 
   end
 
-  def page(number=0)
+  def page(number='1')
     lookup = @current_lookup
 
     result = nil
     
     result = @hc_result.read(lookup + number.to_s) do
 
-      if (number == 1) and (lookup == '_entry_lookup.xml') and (@index.records.length == 10) then 
+      if (number.to_s == '1') and (lookup == '_entry_lookup.xml') and (@index.records.length <= 10) then 
+
         doc = @hc_lookup.refresh(lookup)
-        r = Document.new(File.open(@file_path + 'index.xml','r').read)        
+        r = @index.to_doc
       else
-	doc = @hc_lookup.read(lookup) { Document.new File.open(@file_path + lookup,'r').read }        
-        r = select_page(doc, number)
+
+      	doc = @hc_lookup.read(lookup) { Rexle.new File.open(@file_path + lookup,'r').read }                
+        r = select_page(doc, number.to_i)
         @current_lookup = '_entry_lookup.xml'
         
         # refresh to maintain _entry_lookup in the cache
@@ -172,7 +191,9 @@ class DynarexBlog
         @hc_lookup_a.refresh(@current_lookup)
       end
       
-      total_records = XPath.first(doc.root, 'count(records/entry)')
+      total_records = doc.xpath('count(records/entry)')
+      return nil if total_records.nil?
+
       total_pages, remainder = %w(/ %).map {|x| total_records.send x, 10}
       total_pages += 1 if remainder > 0      
       
@@ -183,7 +204,7 @@ class DynarexBlog
       }
       
       summary.each do |name, text|
-        r.root.elements['summary'].add Element.new(name.to_s).add_text(text.to_s)  
+        r.element('summary').add Rexle::Element.new(name.to_s).add_text(text.to_s)    
       end    
       
       r
@@ -248,7 +269,7 @@ class DynarexBlog
     
     @hc_lookup.delete(lookup_filename)    
   end
-  
+
   def reset_cache_entry(lookup_filename, file)
     
     @hc_entry_file.delete(file)
@@ -260,30 +281,26 @@ class DynarexBlog
 
   def select_page(doc, number)
 
-    #doc = Document.new File.open(@file_path + lookup,'r').read    
-    
     x1 = (number - 1) * 10
     x2 = x1 + 9
 
-    lookup_a = @hc_lookup_a.read(@current_lookup + number.to_s) {XPath.match(doc.root,'records/entry')}
-    a = lookup_a.reverse[x1..x2]
-    
-
-    xpath_ids = "entry[%s]" % a.map{|x| x.text('id').to_s}.map{|x| "@id='%s'" % x}.join(' or ')
+    lookup_a = doc.xpath('records/entry') do |entry| 
+      %w(file id).map{|x| entry.text(x)}
+    end
 
-    temp_doc = Document.new '<root/>'
-    a.map{|x| x.text('file').to_s}.uniq.each do |file|
-      doc_entryx = Document.new( @hc_entry_file.read(file) {File.open(@file_path + file,'r').read})
-      XPath.each(doc_entryx.root,'records/entry') do |entry|
-        temp_doc.root.add entry
+    threads = lookup_a.reverse[x1..x2].group_by(&:first).map do |filename,raw_ids| 
+      Thread.new do
+        xpath = raw_ids.map{|x| "@id='%s'" % x[-1]}.join(' or ')
+        Thread.current[:records] = Rexle.new(File.open(filename,'r').read)\
+          .xpath("records/entry[#{xpath}]")
       end
     end
 
-    result = Document.new '<result><summary/><records/></result>'
-    records = XPath.first(result.root, 'records')
-    XPath.each(temp_doc.root, xpath_ids) do |record|
-      records.add record
-    end
+    records = threads.map{|x| x.join; x[:records]}.flatten(1)
+
+    result = Rexle.new(Dynarex.new('entries/entry(title,body,tags,user)').to_xml)
+    records_node = result.element('records')
+    records.each{|record| records_node.add_element record}
       
     result
 
@@ -302,18 +319,18 @@ class DynarexBlog
     lookup
   end
 
-  def create_record(record, id, name, type)
+  def create_record(record={}, id, name, type)
 
-    entry_count = @entities.xpath "records/section[summary/name='#{type}']/records/entity/summary[name='#{name}']/count"
+    xpath = "records/section[summary/name='#{type}']/records/entity/summary[name='#{name}']/count"
+    entry_count = @entities.element xpath
     lookup_file = "%s_lookup.xml" % name
 
     if entry_count.nil?
-      @entities.id('tags').create.entity(name: name, count: '1', entry_count: '1')
-      @entities.save @file_path + 'entities.xml'
-      @entities = Polyrex.new @file_path + 'entities.xml'
-      entry_count = @entities.xpath "records/section[summary/name='#{type}']/records/entity/summary[name='#{name}']/count"
 
+      @entities.id('tags').create.entity(name: name, count: '1', entry_count: '1')
+      entry_count = @entities.element "records/section[summary/name='#{type}']/records/entity/summary[name='#{name}']/count"
       dynarex = Dynarex.new('entries/entry(title,body,tags,user)')
+
       dynarex.summary[:format_mask].gsub!(/\s/,'; ')
       dynarex_path = @file_path + name + '1.xml'
       dynarex.save dynarex_path
@@ -325,48 +342,45 @@ class DynarexBlog
     entry_file = "%s%s.xml" % [name, entry_count.text]
     dynarex_path = "%s%s" % [@file_path, entry_file]
     dynarex = Dynarex.new dynarex_path
-    
+
     dynarex.create record, id
     dynarex.save dynarex_path
-
     delete_cache_entry(lookup_file, entry_file)
+
     # add the record to lookup
 
     lookup = Dynarex.new @file_path + lookup_file
-    lookup.create id: id, file: entry_file, year: Time.now.strftime("%Y"), month: Time.now.strftime("%m"), uri: record[:title].gsub(/\s/,'-')
-    lookup.save @file_path + lookup_file
-    @hc_lookup.write(lookup_file) { Document.new File.open(@file_path + lookup_file,'r').read }
-    
+    h = {id: id, file: entry_file, year: Time.now.strftime("%Y"), month: Time.now.strftime("%m"), uri: record[:title].gsub(/\s/,'-')}
+
+    lookup.create h
+    lookup.save
+    @hc_lookup.write(lookup_file) { Rexle.new File.open(@file_path + lookup_file,'r').read }
+
     # if there is 15 items create a new entries file
-    if dynarex.records.length >= 15 then
+    if dynarex.flat_records.length >= 15 then
 
       entry_count.text = (entry_count.text.to_i + 1).to_s
-      @entities.save @file_path + 'entities.xml'
-
+      @entities.save @file_path + ENTITIES
       dynarex = new_blog_file "%s%s.xml" % [name, entry_count.text]
-
     end
+
   end
   
   def refresh_index()
-    doc_index = Document.new File.open(@file_path + 'index.xml','r').read
 
-    node_records = XPath.first(doc_index.root, 'records')
-    node_records.parent.delete node_records
+    @index.delete('records')
 
     lookup = '_entry_lookup.xml'
-    doc = Document.new File.open(@file_path + lookup,'r').read
+    doc = Rexle.new File.open(@file_path + lookup,'r').read
     @hc_lookup_a.delete(lookup + '1')    
-    page = select_page(doc, 1)
-    doc_index.root.add XPath.first(page.root, 'records')
 
-    File.open(@file_path + 'index.xml', 'w'){|f| doc_index.write f}
-    @index = Dynarex.new @file_path + 'index.xml'    
+    page = select_page(doc, 1)
+    @index.add page.element('records')
+    @index.save
   end  
   
   def index_include?(id)
-    doc = Document.new File.open(@file_path + 'index.xml','r').read
-    XPath.first(doc.root, "records/entry[@id='#{id}']")
+    @index.element("records/entry[@id='#{id}']")
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dynarex-blog
 version: !ruby/object:Gem::Version 
-  version: 0.6.19
+  version: 0.7.0
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency