dynarex-tags 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9a02652ffdc0ecdfef3d1e2885570b8df50946
-  data.tar.gz: 0500d4db38b820ecb5b9e30562b315d78a4e224a
+  metadata.gz: 4c0419f44178d4fbf8048806ca43effaa6ed29b9
+  data.tar.gz: 901f30272f59276470a16fa937d20d13ca9d8e34
 SHA512:
-  metadata.gz: 8cbcd78581a5361b9a54265d307224e2500d4af3ee59ac2fb75876b04ffc1378d69cc92286d41ae49ef7d01b5695c878f1e8039d2f9cd565b7ec5297cba7c207
-  data.tar.gz: 0e3570edcdf73fc8f7c24f5e3a9866029b37218779e0317986f9d3160b56b7d3f3dafb9450374251ffe01e094b713488e76e3251e547fefeca2fa84527cac941
+  metadata.gz: d7e3d7d8266558b0087061f3d27b5b343198c3bd99e15f0efaa93630b9e712bb7a038b828ba138f72e73792995464dc99cd3fd65aa2a59b450cd664a7af1b501
+  data.tar.gz: e98ee49dd11a1445f74e82c6bab5c54fdeda769aeeeb3149574fe3e44fa77858203743ab37ba6cd5a92499d7cff1d1dee18a5125dc8df900ead492949fc96cfa

data/lib/dynarex-tags.rb

@@ -11,13 +11,17 @@ class DynarexTags
 
     @tags_path = File.join(tags_parent_path, 'tags')
     FileUtils.mkdir_p @tags_path
-    @index_filename = File.join(tags_parent_path, 'dxtags.xml')
+    @index_filename = File.join(tags_parent_path, 'dxtags.xml')        
     
   end
 
   def generate(category_url, &blk)
-
-    h = {}
+       
+    s = File.exists?(@index_filename) ? \
+                                @index_filename : 'tags/tag(keyword,count)'
+    dxindex = Dynarex.new s    
+    h = dxindex.all.inject({}) {|r,x|  r.merge(x.keyword => x.count) }
+    
     dx = Dynarex.new category_url
 
     dx.all.each do |x|
@@ -29,32 +33,25 @@ class DynarexTags
                         .map{|tag| [tag, x.title, x.url]}
       end
 
-      a.each {|tag, title, url| save_tag(h, tag, title, url)}
+      a.each {|tag, title, url| save_tag(h, tag.downcase, title, url)}
     end
+    
+    h.each {|tag,count| dxindex.create keyword: tag, count: count.to_s}    
 
-    save_dynarex_index(h)
+    dxindex.save @index_filename    
   end
 
 
   private
 
-  def save_dynarex_index(h)
-    
-    s = File.exists?(@index_filename) ? \
-                                @index_filename : 'tags/tag(keyword,count)'
-    dx = Dynarex.new s
-    h.each {|tag,count| dx.create keyword: tag, count: count.to_s}
-    
-    dx.save @index_filename
-  end
 
   def save_tag(h, tag, title, url)
 
-    tagfile = tag + '.xml'    
+    tagfile = File.join(@tags_path, tag + '.xml')
     buffer, h[tag] = h[tag] ? [tagfile, h[tag].succ] \
-                                                : ['items/item(title,url)', '1']
-    Dynarex.new(buffer).create(url: url, title: title)\
-                                         .save File.join(@tags_path, tagfile)
+                                             : ['items/item(title,url)', '1']
+
+    Dynarex.new(buffer).create(url: url, title: title).save tagfile
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex-tags
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Robertson