nebrija 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ba2a021640531761d7918e7944af9fb8e516348
-  data.tar.gz: 6f44535cb1d28dc59a030e5432c846f9dd8f33f2
+  metadata.gz: 3468bc9fdc5a9179a3afdca07498df03222d5d82
+  data.tar.gz: b1fff36971dd0891331f7ae9ca13b5a557ec552c
 SHA512:
-  metadata.gz: 36651388f59296fd56e2a98a1df0a19c374842aecb82bf52446db3f4dd2b9e85b9cbe5e15dc1a9c92f613c5704438b081acf49a3ca0d6ff16a87955c4bd5b5e3
-  data.tar.gz: f47edca6879180db5cd77cecaf811e9774110911035810c29fcb09db7362fdd3de62d600d4afb142f116b32794d2cd05513b3ece6500f4586b32cc9945d81e32
+  metadata.gz: 4eeccc878c3b06ed6802f0c90f56c8f273b8f6ed189bacd523c5d7b27836d3db803c68430944e56add28e40778ebdfe505d0789fbbe7c6344e2428d2d115a73d
+  data.tar.gz: 32ca4f4a95be26aac62a2538e1e408a6d04dacca7ea5fcb290f77d503e2e0b38d3b0b0264db740b0b0f07471cb31cd2733061522e3c77501b2893de541c667ea

data/bin/nebrija

@@ -14,7 +14,7 @@ end
 puts 'Oh, hai!'
 puts
 
-response = HTTPRae.new.search(arg)
+response = Rae.new.search(arg)
 
 status = response[:status]
 
@@ -36,7 +36,7 @@ else
     data.each_with_index do |entry, i|
       puts "#{i+1}. #{entry[:word]}"
       entry[:meanings].each_with_index do |definitions, j|
-        puts "\t#{j+1}. #{definitions[:meaning]}"
+        puts "\t#{j+1}. #{definitions[:definition]}"
         puts "\t\tMeta: #{definitions[:meta]}" if !definitions[:meta].nil?
       end
     end 

data/lib/nebrija/parser.rb

@@ -1,27 +1,36 @@
 require 'nokogiri'
 
 class Parser
-  
+
   META_REGEX = /^([a-zA-Z]{1,4}+\.[ ]{1,2})+/
 
   def initialize(rae_data, word)
     @doc = Nokogiri::HTML(rae_data
-                      .gsub(/[\n]+/, '')
-                      .gsub(/[ ]{2,}+/, ' '))
-    @word = word
+                      .gsub(/\n+/, '')
+                      .gsub(/\s{2,}+/, ' '))
   end
 
   def parse
-
-    return {:status => 'error', :message => 'Word/id does not exist. Sorry.'} if !valid? 
-    perform
+    if valid?
+      {
+        :status => 'success',
+        :type => single? ? 'single' : 'multiple',
+        :response => single? ? parse_single : parse_multiple
+      }
+    else
+      {
+        :status => 'error',
+        :message => 'Word/id does not exist. Sorry.'
+      }
+    end
   end
 
+  private
+
   def single?
     @doc.css('body > ul').length.zero?
   end
 
-  private 
   def parse_single
     single_data = []
     state = :entry # TODO. Improve FSM syntax.
@@ -32,7 +41,7 @@ class Parser
         word = entry.css('span').inner_text
         word = '=>' if word == ''
         single_data << {
-          :word => word.strip.capitalize, # gsub(/~/, @word)
+          :word => word.strip.capitalize,
           :meanings => [],
           :etymology  => nil
         }
@@ -54,18 +63,17 @@ class Parser
       end
       state = :entry
     end 
+
     single_data
   end
 
   def parse_multiple
-    multiple_result = []
-    @doc.css('body > ul > li > a').each do |word|
-      multiple_result << {
+    @doc.css('body > ul > li > a').map do |word|
+      {
         :word => word.css('span').first.inner_text,
         :id => word['href'].gsub(/search\?id=/, '')
       }
-    end 
-    multiple_result
+    end
   end
 
   def valid?
@@ -75,20 +83,6 @@ class Parser
     valid_title && valid_body && delete_pending?
   end
 
-  def perform
-    response = nil
-    if single?
-      response = parse_single
-    else
-      response = parse_multiple
-    end
-    {
-      :status => 'success', 
-      :type => if single? then 'single' else 'multiple' end,
-      :response => response
-    }
-  end
-  
   def delete_pending?
     tb_deleted = true
     if !@doc.css('body > div > p').nil? && !@doc.css('body > div > p').first.nil?

data/lib/nebrija.rb

@@ -1,55 +1,28 @@
-require 'nebrija/parser'
 require 'typhoeus'
 require 'uri'
+require 'nebrija/parser'
 
 class Rae
+  SEARCH_URL = 'http://lema.rae.es/drae/srv/search'
 
   def search(word)
     Parser.new(query(word), word).parse
   end
 
   private
-  def query(word)
-    raise 'NotImplementedError'
-  end
-end
 
-
-class FileRae < Rae
-
-  private
-  def query(file)
-    IO.read(file)
-  end
-end
-
-
-class HTTPRae < Rae
-  USER_AGENT = 'Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36'
-  SEARCH_URL = 'http://lema.rae.es/drae/srv/search?'
-  ID_REGEX = /[0-9]/
-
-  private
   def query(word)
-    @word = word
-    
-    params = 'id=' 
-    params = 'val=' if val?
-    
+    params = (word.encode('utf-8') =~ /\d/) ? 'id=' : 'val='
+
     response = Typhoeus::Request.post(
-      URI.escape("#{SEARCH_URL}#{params}#{word}".encode('iso-8859-1')),
-      body: build_headers
+      URI.escape("#{SEARCH_URL}?#{params}#{word}".encode('iso-8859-1')),
+      :body => build_body
     )
-    
-    response.body
-
-  end
 
-  def val?
-    (@word.encode('utf-8') =~ ID_REGEX).nil?
+    response.body
   end
 
-  def build_headers
+  def build_body
     {
       'TS014dfc77_id' => 3,
       'TS014dfc77_cr' => '42612abd48551544c72ae36bc40f440a%3Akkmj%3AQG60Q2v4%3A1477350835',

data/test/test_rae.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+class TestRae < Minitest::Test
+
+  def test_error_basic
+    stub_request(:post, "#{Rae::SEARCH_URL}?val=wadus").
+      to_return(:status => 200, :body => mock('error'), :headers => {})
+
+    search = Rae.new.search('wadus')
+    assert_equal search[:status], 'error'
+  end
+
+  def test_single_basic
+    stub_request(:post, "#{Rae::SEARCH_URL}?val=amor").
+      to_return(:status => 200, :body => mock('single'), :headers => {})
+
+    search = Rae.new.search('amor')
+    assert_equal 'success', search[:status]
+    assert_equal 'single', search[:type]
+
+    first_word = search[:response].first
+    assert_equal 'Amor.', first_word[:word]
+  end
+
+  def test_multiple_basic
+    stub_request(:post, "#{Rae::SEARCH_URL}?val=banco").
+      to_return(:status => 200, :body => mock('multiple'), :headers => {})
+
+    search = Rae.new.search('banco')
+    assert_equal 'success', search[:status]
+    assert_equal 'multiple', search[:type]
+    assert_equal 2, search[:response].length
+    assert_equal 'bancar', search[:response][0][:word]
+    assert_equal 'banco', search[:response][1][:word]
+  end
+
+  private
+
+  def mock(mock_name)
+    File.read("#{File.expand_path(File.dirname(__FILE__))}/mocks/#{mock_name}.html")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nebrija
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - '@javierhonduco'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.18.0
 description: A gem to access the rae dictionary
 email: javierhonduco@gmail.com
 executables:
@@ -77,7 +91,7 @@ files:
 - lib/nebrija.rb
 - lib/nebrija/parser.rb
 - bin/nebrija
-- test/test_basic.rb
+- test/test_rae.rb
 homepage: http://rubygems.org/gems/nebrija
 licenses:
 - MIT
@@ -103,4 +117,4 @@ signing_key:
 specification_version: 4
 summary: This gem provides access to the rae webpage
 test_files:
-- test/test_basic.rb
+- test/test_rae.rb

data/test/test_basic.rb

@@ -1,63 +0,0 @@
-require 'minitest/autorun'
-require 'nebrija' 
-
-MOCKS_DIR = "#{File.expand_path(File.dirname(__FILE__))}/mocks"
-
-class TestMockedParserBasic < Minitest::Test
-
-  def test_error_basic
-    assert_equal FileRae.new.search("#{MOCKS_DIR}/error.html")[:status] 
-  end
-  
-  def test_single_basic
-    assert !FileRae.new.search("#{MOCKS_DIR}/single.html")[:response][:data].nil?
-  end
-
-  def test_multiple_basic
-    assert FileRae.new.search("#{MOCKS_DIR}/multiple.html")[:reponse].length == 2
-  end
-end
-
-class TestMockedParserContent < Minitest::Test
- 
-  def test_single_basic
-    assert FileRae.new.search("#{MOCKS_DIR}/single.html")[:response].length > 20
-  end
-
-  def test_multiple_basic
-    assert FileRae.new.search("#{MOCKS_DIR}/multiple.html")[:response][0][:word] == 'bancar' 
-    assert FileRae.new.search("#{MOCKS_DIR}/multiple.html")[:response][1][:word] == 'banco'  
-  end
-end
-
-
-class TestMockedParserBasic < Minitest::Test
-
-  def test_single_basic_id
-    assert !HTTPRae.new.search('MHpGWYJ6YDXX2bw9Ghwm')[:response].nil?
-  end
-
-  def test_error_basic
-    assert HTTPRae.new.search('jddhfgsd')[:status] == 'error'
-  end
-  
-  def test_single_basic
-    assert !HTTPRae.new.search('a')[:response].nil?
-  end
-
-  def test_multiple_basic
-    assert HTTPRae.new.search('banco')[:response].length == 2
-  end
-end
-
-class TestParserContent < Minitest::Test
-  
-  def test_single_basic
-    assert HTTPRae.new.search('a')[:response].length > 4
-  end
-
-  def test_multiple_basic
-    assert HTTPRae.new.search('banco')[:response][0][:word] == 'bancar' 
-    assert HTTPRae.new.search('banco')[:response][1][:word] == 'banco'  
-  end
-end