nebrija 0.0.1 → 0.0.2

data/bin/nebrija

@@ -3,7 +3,42 @@
 require 'json'
 require 'nebrija'
 
+
+arg = ARGV.first
+
+if arg.nil?
+  puts 'Type smthg!'
+  return
+end
+
 puts 'Oh, hai!'
-puts 'In future versions this will print something more human readable.'
 puts
-puts JSON.pretty_generate(HTTPRae.new.search(ARGV[0]))
+
+response = HTTPRae.new.search(arg)
+
+status = response[:status]
+
+if status == 'error'
+  puts 'Word does not exist. :(.'
+else 
+  type = response[:type]
+  data = response[:response]
+
+  if type == 'multiple'
+    puts 'We found multiple words matching your search criteria:'
+    puts 'Search by id to find their meaning.'
+    puts 
+    data.each_with_index do |entry, i|
+      puts "#{i+1}. #{entry[:word]} ~> #{entry[:id]}"
+    end
+  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[:word]}"
+        puts "\t\tMeta: #{definitions[:meta]}" if !definitions[:meta].nil?
+      end
+    end 
+  end
+end

data/lib/nebrija/parser.rb

@@ -24,8 +24,7 @@ class Parser
 
   private 
   def parse_single
-    data = []
-    result = {:id => @doc.css('body > div > a').first['name'].to_i, :data => data}
+    single_data = []
     state = :entry # TODO. Improve FSM syntax.
     index = -1 # HACK(javierhonduco)
 
@@ -33,7 +32,7 @@ class Parser
       if entry['class'] == 'p' and state == :entry
         word = entry.css('span').inner_text
         word = '=>' if word == ''
-        data << {
+        single_data << {
           :word => word.gsub(/~/, @word).strip.capitalize, 
           :meanings => []
         }
@@ -43,7 +42,7 @@ class Parser
         next if text[0] == '(' # Del latín, Nil.    
         unparsed_meta = text.scan META_REGEX
         text = text.gsub(META_REGEX, '')
-        data[index][:meanings] << {
+        single_data[index][:meanings] << {
           :word => text, 
           :meta => (unparsed_meta.join.strip if unparsed_meta.join.strip != ''),
         } if !text.nil? and text != ''
@@ -51,7 +50,7 @@ class Parser
       end
       state = :entry
     end 
-    result
+    single_data
   end
 
   def parse_multiple

data/test/test_basic.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'nebrija' 
 
-MOCKS_DIR = "#{Dir.pwd}/test/mocks"
+MOCKS_DIR = "#{File.expand_path(File.dirname(__FILE__))}/mocks"
 
 class TestMockedParserBasic < Test::Unit::TestCase
 
@@ -21,7 +21,7 @@ end
 class TestMockedParserContent < Test::Unit::TestCase
   
   def test_single_basic
-    assert FileRae.new.search("#{MOCKS_DIR}/single.html")[:response][:data].length > 20
+    assert FileRae.new.search("#{MOCKS_DIR}/single.html")[:response].length > 20
   end
 
   def test_multiple_basic
@@ -34,7 +34,7 @@ end
 class TestMockedParserBasic < Test::Unit::TestCase
 
   def test_single_basic_id
-    assert_not_nil HTTPRae.new.search('MHpGWYJ6YDXX2bw9Ghwm')[:response][:data]
+    assert_not_nil HTTPRae.new.search('MHpGWYJ6YDXX2bw9Ghwm')[:response]
   end
 
   def test_error_basic
@@ -42,7 +42,7 @@ class TestMockedParserBasic < Test::Unit::TestCase
   end
   
   def test_single_basic
-    assert_not_nil HTTPRae.new.search('a')[:response][:data]
+    assert_not_nil HTTPRae.new.search('a')[:response]
   end
 
   def test_multiple_basic
@@ -53,7 +53,7 @@ end
 class TestParserContent < Test::Unit::TestCase
   
   def test_single_basic
-    assert HTTPRae.new.search('a')[:response][:data].length > 4
+    assert HTTPRae.new.search('a')[:response].length > 4
   end
 
   def test_multiple_basic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nebrija
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: