dolarhoy 0.1.3 → 0.2.0

data/bin/dolarhoy

@@ -1,35 +1,40 @@
 #! /usr/bin/env ruby
-require 'iconv'
-require 'yaml'
+
+require "nokogiri"
 require "dolarhoy/currency"
-require 'hpricot'
 
 html = if ARGV.first
   File.read(ARGV.first)
 else
   require 'net/http'
   require 'uri'
-  
+
   response = Net::HTTP.start(URI.parse('http://www.dolarhoy.com').host) do |http|
     http.get('/indexx.php', 'Referer' => 'http://www.dolarhoy.com')
   end
-  
-  response.body
+
+  if RUBY_VERSION > "1.9"
+    response.body.force_encoding("ISO-8859-1").encode("UTF-8")
+  else
+    response.body
+  end
 end
 
-doc = Hpricot(Iconv.iconv('UTF-8', 'ISO-8859-1', html).first)
+doc = Nokogiri::HTML(html)
 
 currencies = []
 
-doc.search("body > div table[@bgcolor='#000000']") do |table|
-  values = table.search("font[@size='3']")
+doc.css("body > div table[@bgcolor='#000000']").each do |table|
+  values = table.css("font[@size='3']")
   next unless values.size > 1
 
-  currencies << Currency.new(
-    table.search("td:first").inner_text,
+  currency = Currency.new(
+    table.at_css("td:first").inner_text,
     values[0].inner_text,
     values[1].inner_text
   )
+
+  currencies << currency if currency.aliased?
 end
 
 puts currencies.sort.join("\n")

data/lib/dolarhoy/currency.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require "yaml"
+
 class Currency
   include Comparable
 
@@ -12,7 +14,7 @@ class Currency
   end
 
   def <=>(other)
-    name <=> other.name
+    self.alias <=> other.alias
   end
 
   def parse(text)
@@ -32,26 +34,33 @@ class Currency
     name.gsub!('Ú', 'U')
     name.gsub!("\r", " ")
     name.gsub!("\n", " ")
-    name = name[/^([\w\s\.\$]+)/, 1].strip.capitalize.squeeze(' ')
-    reverse_aliases[name] || name
+    name[/^([\w\s\.\$]+)/, 1].strip.capitalize.squeeze(' ')
   end
 
   def to_s
-    "#{name} #{format buy} #{format sell}"
+    "#{self.alias} #{format buy} #{format sell} #{format average}"
   end
 
   def aliases
-    @aliases ||= YAML.load_file(File.expand_path(File.join(File.dirname(__FILE__), '..', 'aliases.yml')))
+    @@aliases ||= YAML.load_file(File.expand_path(File.join(File.dirname(__FILE__), '..', 'aliases.yml')))
   end
   
   def reverse_aliases
-    unless @reverse_aliases
-      @reverse_aliases = {}
-      aliases.each do |code,names|
-        [*names].each {|name| @reverse_aliases[name] = code }
-      end
+    @@reverse_aliases ||= aliases.inject({}) do |reverse, (code, names)|
+      [*names].each { |name| reverse[name] = code }
+      reverse
     end
+  end
+
+  def aliased?
+    !! self.alias
+  end
+
+  def alias
+    reverse_aliases[name]
+  end
 
-    @reverse_aliases
+  def average
+    (buy + sell) / 2.0
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dolarhoy
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Damian Janowski
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -03:00
+date: 2009-01-09 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: nokogiri
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.6"
-    version: 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: damian.janowski@gmail.com
 executables: 
@@ -47,21 +59,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: A command-line tool for DolarHoy.com.