rae 1.1.2 → 1.5.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Koldo Oteo
+Copyright (c) 2009 David A. Cuadrado
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -9,9 +9,10 @@ Description goes here.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+  (if you want to have your own version, that is fine but
+   bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright
 
-Copyright (c) 2010 Koldo Oteo. See LICENSE for details.
+Copyright (c) 2009 David A. Cuadrado. See LICENSE for details.

data/Rakefile

@@ -5,15 +5,12 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rae"
-    gem.summary = %Q{CLI to access the rae.es}
-    gem.description = %Q{CLI to access the rae.es}
-    gem.email = "koldo.oteo1@gmail.com"
-    gem.homepage = "http://github.com/koteo/rae"
-    gem.authors = ["Koldo Oteo"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-
-    gem.add_dependency('mechanize', '>= 0.9.3')
-    gem.add_dependency('nokogiri', '>= 1.3.3')
+    gem.summary = %Q{library to access the rae.es}
+    gem.description = %Q{library to access the rae.es}
+    gem.email = "krawek@gmail.com"
+    gem.homepage = "http://github.com/dcu/rae"
+    gem.authors = ["David A. Cuadrado", "Koldo Oteo"]
+    gem.add_dependency "mechanize", ">= 1.0.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -0,0 +1 @@
+1.5.0

data/bin/rae

@@ -1,81 +1,10 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
-#
-#=======================================================================================
-#
-# FILE: rae.rb
-#
-#
-# DESCRIPTION: Libreríde acceso a la drae (diccionario de la real academia españ)
-# desde ruby
-#
-# OPTIONS: [palabra]
-# REQUIREMENTS: nokogiri, mechanize
-# AUTHOR: Koldo Oteo (), koldo.oteo1@gmail.com
-# WEB: http://koteo.lacoctelera.net
-# VERSION: 1.1.2
-# CREATED: 10/03/2010
-# AGRADECIMIENTOS: A krawek de freenode.
-#=======================================================================================
-require 'rubygems'
-require 'nokogiri'
-require 'mechanize'
 
+$:.unshift File.dirname(__FILE__)+"/../lib"
+require 'rae'
 
-class Rae
+definitions = Rae.new.search(ARGV.first)
 
-  def pide_pal
-    @pal = ARGV.first
-    if !@pal
-      puts "Programa para acceder al diccionario de la rae desde ruby."
-      puts
-      puts "Uso: rae [palabra]"
-      puts "La palabra se debe escribir con acentos y con exactitud, para buscar en la rae sin problemas."
-      puts
-      puts "Reportar bugs a <koldo.oteo1@gmail.com>."
-      puts
-      exit
-    end
-  end
-
-  def asig_proxy
-    if ENV['http_proxy'] != nil then
-      #ENV['http_proxy'].scan(/(^http|https) \:\/\/ (\d+.\d+.\d+.\d+|\w+.|\w+.\.\w+) \: (\d.+)/xi)
-      @host, @port = ENV['http_proxy'].to_s.sub(%r{^\w+://}, "").split(":", 2)
-    end
-  end
-
-  def accede_form
-    @agent = Mechanize.new
-
-    asig_proxy
-    if @host != nil
-      @agent.set_proxy("#{@host}", "#{@port}")
-    end
-
-    @agent.user_agent_alias = 'Mac Safari'
-    @page = @agent.get 'http://buscon.rae.es/draeI/html/cabecera.htm'
-
-    @form = @page.forms.first
-    @form['TIPO_BUS'] = '3'
-    @form['LEMA'] = @pal
-
-    @page = @agent.submit(@form, @form.buttons.first)
-
-  end
-
-  def format
-    @read_doc = Nokogiri::HTML(@page.body)
-    @read_doc.css('p').each do |l|
-      puts l.content.to_s.strip
-    end
-  end
+definitions.each_with_index do |definition, index|
+  puts "#{index+1}. #{definition}"
 end
-
-
-ra = Rae.new
-
-ra.pide_pal
-ra.accede_form
-ra.format
-

data/lib/rae.rb

@@ -0,0 +1,63 @@
+require 'mechanize'
+
+if RUBY_VERSION < '1.9'
+  $KCODE = 'u'
+end
+
+class Rae
+  def initialize
+  end
+
+  def search(word, bus = 3)
+    agent = Mechanize.new
+    agent.user_agent_alias = 'Mac Safari'
+    page = agent.get 'http://buscon.rae.es/draeI/html/cabecera.htm'
+
+    form = page.forms.first
+
+    form['TIPO_BUS'] = bus
+    form['LEMA'] = word
+
+    page = agent.submit(form, form.buttons.first)
+
+    parse_page(page, word)
+  end
+
+  protected
+  def parse_page(page, word)
+    definitions = []
+    subdefinition = nil
+    page.parser.css('p').each_with_index do |l, index|
+      if l.content.to_s.strip =~ /La palabra #{Regexp.escape(word)} no/
+        links = page.links_with(:href => /\?LEMA\=/)
+        if link = links.first
+          word = link.text.strip
+          page = link.click
+          return parse_page(page, word)
+        end
+      else
+        definition, subdefinition = parse_definition(l, subdefinition, word)
+        definitions << definition if definition
+      end
+    end
+
+    definitions
+  end
+
+  def parse_definition(l, subdefinition, word)
+    definition = l.content.to_s.strip
+    if definition =~ /\d+\.\s+(.+)/
+      definition = $1
+      if subdefinition
+        definition = "#{subdefinition} -> #{definition}"
+      end
+    elsif definition =~ /\~/
+      subdefinition = definition.sub("~", word).strip
+      definition = nil
+    else
+      definition = nil
+    end
+
+    [definition, subdefinition]
+  end
+end

data/rae.gemspec

@@ -0,0 +1,51 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rae}
+  s.version = "1.5.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["David A. Cuadrado", "Koldo Oteo"]
+  s.date = %q{2010-08-21}
+  s.default_executable = %q{rae}
+  s.description = %q{library to access the rae.es}
+  s.email = %q{krawek@gmail.com}
+  s.executables = ["rae"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/rae",
+     "lib/rae.rb",
+     "rae.gemspec"
+  ]
+  s.homepage = %q{http://github.com/dcu/rae}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{library to access the rae.es}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
+    else
+      s.add_dependency(%q<mechanize>, [">= 1.0.0"])
+    end
+  else
+    s.add_dependency(%q<mechanize>, [">= 1.0.0"])
+  end
+end
+

metadata

@@ -1,64 +1,42 @@
 --- !ruby/object:Gem::Specification 
 name: rae
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 2
-  version: 1.1.2
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
+- David A. Cuadrado
 - Koldo Oteo
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 +01:00
+date: 2010-08-21 00:00:00 -05:00
 default_executable: rae
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: mechanize
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
+        - 1
         - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mechanize
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
         - 0
-        - 9
-        - 3
-        version: 0.9.3
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  type: :runtime
-  version_requirements: *id003
-description: CLI to access the rae.es
-email: koldo.oteo1@gmail.com
+  version_requirements: *id001
+description: library to access the rae.es
+email: krawek@gmail.com
 executables: 
 - rae
 extensions: []
@@ -72,11 +50,12 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- VERSION
+- bin/rae
 - lib/rae.rb
-- test/helper.rb
-- test/test_rae.rb
+- rae.gemspec
 has_rdoc: true
-homepage: http://github.com/koteo/rae
+homepage: http://github.com/dcu/rae
 licenses: []
 
 post_install_message: 
@@ -85,26 +64,29 @@ 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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: CLI to access the rae.es
-test_files: 
-- test/helper.rb
-- test/test_rae.rb
+summary: library to access the rae.es
+test_files: []
+

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rae'
-
-class Test::Unit::TestCase
-end

data/test/test_rae.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestRae < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end