dynarex-blog 0.7.2 → 0.7.3

data/lib/dynarex-blog.rb

@@ -30,6 +30,15 @@ class DynarexBlog
   end
 
   def create_entry(record={})
+
+    if record.has_key? :title then
+      lookup = '_entry_lookup.xml'
+      doc = Rexle.new File.open(@file_path + lookup,'r').read
+      if doc.element("records/entry[uri='#{format_uri(record[:title])}']") then
+      raise "err: create_entry: Duplicate title found"
+      end
+    end
+
     @hc_result.reset
     @id += 1
     # create a new record
@@ -65,7 +74,11 @@ class DynarexBlog
   
   def update(id, h)
 
+    puts '@current_looup ' + @current_lookup
+    puts 'id : ' + id.to_s
+   
     lookup = Dynarex.new @file_path + @current_lookup
+    puts 'records : ' + lookup.records.inspect
     lookup_id = lookup.records[id][:id]
     file = lookup.records[id][:body][:file]
 
@@ -73,11 +86,10 @@ class DynarexBlog
     
     dynarex = Dynarex.new(@file_path + file) 
     prev_tags = dynarex.record(id).tags
-    cur_tags = h[:tags]
     
-    if cur_tags.length > 0 then
+    if h[:tags] and h[:tags].length > 0 then
       
-      a = cur_tags.split(/\s/)
+      a = h[:tags].split(/\s/)
     
       if prev_tags and prev_tags.length > 0 then
 	
@@ -94,6 +106,8 @@ class DynarexBlog
       
       new_list.each {|tag| create_record(h, id, name=tag, type='tags') }
       dynarex.update(id, h)
+      puts 'dynarex : ' + dynarex.to_xml
+      puts 'saving: ' + @file_path + file
       dynarex.save
     end
     
@@ -101,7 +115,7 @@ class DynarexBlog
 
     @hc_lookup.write(@current_lookup) { Rexle.new File.open(@file_path + @current_lookup,'r').read }                
 
-    refresh_index if index_include? id
+    (puts "rebuilding index #@file_path} ... "; refresh_index) if index_include? id
 
   end
 
@@ -155,6 +169,15 @@ class DynarexBlog
     @entities.create.section({name: 'tags'}, id='tags')
     @entities.save @file_path + ENTITIES
     @lookup = new_lookup_file '_entry_lookup.xml'
+
+    # add the _404.xml
+    dynarex = Dynarex.new('entries/entry(id,file,year,month,uri)')
+    year, month = [:year, :month].map{|x| "%02d" % Time.now.method(x).call}
+    dynarex.create id: '1', file: '_4041.xml', year: year, month: month
+    dynarex.save '_404_lookup.xml'
+
+    Dynarex.new('entries/entry(title,body,tags,user)').save '_4041.xml'
+
   end
 
   def open(file_path='./')
@@ -252,7 +275,7 @@ class DynarexBlog
     lookup_id = lookup.records[id][:id]
     
     file = lookup.records[id][:body][:file]
-    lookup.update(lookup_id, uri: h[:title].gsub(/\s/,'-')).save    
+    lookup.update(lookup_id, uri: format_uri(h[:title])).save    
 
     Dynarex.new(@file_path + file).update(id, h).save        
     delete_cache_entry(lookup_filename, file)
@@ -271,6 +294,10 @@ class DynarexBlog
     @hc_lookup.delete(lookup_filename)    
   end
 
+  def format_uri(s)
+    s.gsub(/\s/,'-')
+  end
+
   def reset_cache_entry(lookup_filename, file)
     
     @hc_entry_file.delete(file)
@@ -285,14 +312,15 @@ class DynarexBlog
     x1 = (number - 1) * 10
     x2 = x1 + 9
 
-    lookup_a = doc.xpath('records/entry') do |entry| 
+    lookup_a = doc.xpath('records/entry').map do |entry| 
       %w(file id).map{|x| entry.text(x)}
     end
 
     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)\
+
+        Thread.current[:records] = Rexle.new(File.open(@file_path + filename,'r').read)\
           .xpath("records/entry[#{xpath}]")
       end
     end
@@ -378,6 +406,7 @@ class DynarexBlog
     @hc_lookup_a.delete(lookup + '1')    
 
     page = select_page(doc, 1)
+    puts 'page : ' + page.xml(pretty: true)
     @index.add page.element('records')
     @index.save
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dynarex-blog
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +00:00
+date: 2011-02-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency