dtcterm 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b69f76d2f3f2366574fc3e4006a0dcabdd8505c8
-  data.tar.gz: c6908cde29359c58dca917f10ae2035a44e4959b
+  metadata.gz: b4a76cc51d330926c09ba4ac7f3b32422b0ca8fe
+  data.tar.gz: 0b23e8ab55df6680686119241fa0ff94d08e9236
 SHA512:
-  metadata.gz: 69fb41bef5e5c81f5c56229248ff37db426b769b9a4f1ef64331bcdbd2eae31f1964b033e6d4bf921e37d98001f52cd055f6f758d19e7f4b51aab7f4b44e1ac8
-  data.tar.gz: d2cafb6ddba4ad747c2db47a65b918acf8e313dad2795cc22f1514705c2ff386625e6fbda03fe5ebecc1e443c6a49ccb4a887b98f744ea67a7e329efb1887855
+  metadata.gz: b96debf0283ca81441a305b2f90abf3292bb68edabf2444a432c6cc7841d9960c8b2ae665330d477e8549a220649cadc201bff0166dd072546ab1d425e4372a0
+  data.tar.gz: 0f63ee7c4cf359de67da1adfa286d0c89037e5b3b3891461a0748ed339e97b56cc46bc737128fef6f684029ec833158d0599243bc2c733e5d09809256c7d196f

data/lib/dtcterm.rb

@@ -5,11 +5,13 @@ module Dtcterm
         raise 'win32console is needed to use color on Windows. Try `gem install win32console`'
     end
 
+    require 'htmlentities'
     require 'optparse'
-    require 'nokogiri'
     require 'open-uri'
+    require 'nokogiri'
     require 'rubygems'
 
+
     class << self
 
         $using_color = true
@@ -24,7 +26,7 @@ module Dtcterm
         DTC_TOP_URL             = "http://danstonchat.com/top50.html"
 
         def version
-            '0.1.0'
+            '0.2.0'
         end
 
 
@@ -72,25 +74,30 @@ module Dtcterm
                 quote.id = item["class"].gsub(/[^\d]/, '')
                 quote.link = BASE_QUOTE_LINK.gsub("id", quote.id)
 
-                quote_item = item.children()[0].children()[0].children()[0]
+                quote_item = item.children()[0].children()[0]
+
+                quote_item.children().each do |i|
+                    if i["class"] == "decoration"
+                        i.content = "|newline|" + i.content + "|decorationclass|"
+                    end
+                end
+
                 while quote_item
-                    # A quote is always like : <span class="decoration">text</span> text
-                    # The "decoration" class means the username
+                    str = HTMLEntities.new.decode quote_item.content.gsub(/\|newline\|/, "\n")
 
-                    # Getting the span text.
-                    first = quote_item.text.sub(/\<br>/, '').strip()
+                    str.each_line do |line|
+                        unless line =~ /^[[:space:]]+$/
+                            first, second = line.split(/\|decorationclass\|/)
+                            quote.quote << [first.strip(), second ? second.strip() : second]
+                        end
+                    end
 
-                    # Getting the rest of text
-                    quote_item = quote_item.next()
+                    quote_list << quote
                     if (quote_item != nil)
-                        second = quote_item.text.sub(/'\<br>/, '').strip()
                         quote_item = quote_item.next()
                     end
-
-                    quote.quote << [first, second]
                 end
 
-                quote_list << quote
             end
 
             quote_list
@@ -117,7 +124,7 @@ module Dtcterm
 
                 opts.banner = "Usage: dtcterm one_quote_option [color_option]"
 
-                opts.version = VERSION
+                opts.version = version
 
                 opts.on("-c", "--no-color", "Enlève la couleur.") do
                     $using_color = false

data/test/test_dtcterm.rb

@@ -37,7 +37,7 @@ class DtctermTest < Test::Unit::TestCase
         eos
 
         html = html.gsub(/\n/, '').strip.gsub(/[[:space:]]{2,}/, '')
-        quote_list = Dtcterm::get_quote_list(Nokogiri::XML(html))
+        quote_list = Dtcterm::get_quote_list(Nokogiri::HTML(html))
 
         quote = quote_list[0]
         assert_equal quote.id, "1234"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtcterm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Loïc Runarvot
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.6
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement