words_and_idioms 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cda497bcc77f6b57044188c08363b3bd9215677
-  data.tar.gz: cabf7a700a9686c2a184afa1ad2a639e29119afb
+  metadata.gz: dcbf9e27a70c940bf2100fb99ea950dee1c7127e
+  data.tar.gz: a3d27ed5c1674d8d5a1f962b1d61995c7008502c
 SHA512:
-  metadata.gz: 672352b070859b154429c11ae68ee4fbfff01a0d06f1523ebe3544e55a0270b1903499694558c519f604921918aff58f1c9990ec9cd3ccb2ecde99614ab22df2
-  data.tar.gz: 992f3b4e65debd11c1a072f8592c83fc30316d1c398bd9f2e10e7fceadc7559c804766354cb6bb559fb49dea20838a1eb0b656fcf951dda61c8606c719ca2d7d
+  metadata.gz: 627df717b3550526f722f8857d84d7712c6efae6261878577cd30265707c9988aa1cfb19e7e9804f4b57df009f2cdc65d27934ebd97951d3d710562bc0397f51
+  data.tar.gz: 7b35f32f607aa22aa9bcf8f987ecf875685b132a26258d9542e8537ebddbda879f5d317a3d1d48caa2c638146c47f2c57ef68b67e1b09fc18286bcda8c4c450f

data/lib/words_and_idioms/cli.rb

@@ -1,5 +1,3 @@
-require 'colorize'
-
 class WordsAndIdioms::CLI
 
   def call
@@ -26,7 +24,8 @@ def menu
       DictionaryScraper.new
       greet_user
     elsif first_choice == 2
-      IdiomExplorer.idiom_routine
+      IdiomScraper.constructor
+      IdiomExplorer.print_list
       greet_user
     elsif first_choice != 1 && first_choice != 2 && first_choice != 3
       puts " "

data/lib/words_and_idioms/dictionary_scraper.rb

@@ -1,66 +1,54 @@
-require 'open-uri'
-require 'nokogiri'
-require 'colorize'
 class DictionaryScraper
 
   attr_accessor :user_input
 
   @@word = ""
   @@definition = ""
+  @@correct_spelling = nil
 
   def initialize
     begin
-      @@word = UserInput.get_word
+      @@word = @@correct_spelling || UserInput.get_word
       word_url = "http://www.dictionary.com/browse/#{@@word}"
       html = open(word_url)
-      doc = Nokogiri::HTML(html)
-
+      @@doc = Nokogiri::HTML(html)
     rescue OpenURI::HTTPError
-      DictionaryScraper.check_spelling
-
+      check_spelling
     else
-      definition_xml = doc.css(".def-content")[0].text
-      definition_init_parse = definition_xml.split("\r\n")
-      @@definition = definition_init_parse[1].delete("\n").strip
-      puts " "
-      puts " "
-      puts "According to dictionary.com #{@@word} means:".green
-      puts "#{@@definition}"
-      puts " "
-      puts " "
+      print_definition
     end
   end
 
-  def self.check_spelling
+  def print_definition
+    definition_xml = @@doc.css(".def-content")[0].text
+    definition_init_parse = definition_xml.split("\r\n")
+    @@definition = definition_init_parse[1].delete("\n").strip
+    puts " "
+    puts "According to dictionary.com #{@@word} means:".green
+    puts "#{@@definition}"
+    puts " "
+    @@correct_spelling = nil
+  end
+
+  def check_spelling
     begin
       check_url = "http://www.macmillandictionary.com/spellcheck/british/?q=#{@@word}"
       check_html = open(check_url)
       check_doc = Nokogiri::HTML(check_html)
-      @correct_spelling = check_doc.css("#search-results")[1].children.children[1].children.children.text
-      rescue NoMethodError
-        puts "Hmmm... That's a tough one. I can't find that one anywhere. Maybe you can add it to the open dictionary!".red
-        puts " "
-        puts " "
-      else
-      puts "Hmmm... I can't find that one in the dictionary. Did you mean #{@correct_spelling.upcase}?".yellow
+      @@correct_spelling = check_doc.css("#search-results")[1].children.children[1].children.children.text
+    rescue NoMethodError
+      puts "Hmmm... That's a tough one. I can't find that one anywhere. Maybe you can add it to the open dictionary!".red
+      puts " "
+    else
+      puts "Hmmm... I can't find that one in the dictionary. Did you mean #{@@correct_spelling.upcase}?".yellow
       puts "Y/N?:"
-      if gets.chomp == "Y"
-        @correct_word = @correct_spelling
-        corrected_url = "http://www.dictionary.com/browse/#{@correct_word}"
-        corrected_html = open(corrected_url)
-        corrected_doc = Nokogiri::HTML(corrected_html)
-        corrected_definition_xml = corrected_doc.css(".def-content")[0].text
-        corrected_definition_init_parse = corrected_definition_xml.split("\r\n")
-        @corrected_definition = corrected_definition_init_parse[1].delete("\n").strip
-        puts "According to dictionary.com #{@correct_word} means:".green
-        puts "#{@corrected_definition}"
-      else
-        puts " "
-        puts " "
-        puts "Well, then. Perhaps we can try again.".green
-        puts " "
-        puts " "
-      end
+        if gets.chomp.downcase == "y"
+          DictionaryScraper.new
+        else
+          puts " "
+          puts "Well, then. Perhaps we can try again.".green
+          puts " "
+        end
     end
   end
 

data/lib/words_and_idioms/idiom_explorer.rb

@@ -1,63 +1,31 @@
-require 'open-uri'
-require 'nokogiri'
-require 'colorize'
-
 class IdiomExplorer
-  @@word_url = "http://www.macmillandictionary.com/us/open-dictionary/latestEntries.html"
-  @@html = open(@@word_url)
-  @@doc = Nokogiri::HTML(@@html)
-  @@all = []
-
 
-    def self.usage
-      @usage_array = []
-      counter = 0
-      @@doc.css(" #openEntries .openEntry .openSense").each do |entry|
-          if @@doc.css(" #openEntries .openEntry .openSense")[counter].children[2] != nil
-            @usage_array << @@doc.css(" #openEntries .openEntry .openSense")[counter].children[1].text
-          else
-            @usage_array << "Looks like nobody's put an example sentence up yet. Maybe you could submit one!"
-          end
-          counter +=1
-        end
-      @usage_array
+  def self.print_list
+    puts "Below is a list of newly created idioms from MacMillan's Open Dictionary Project"
+    IdiomScraper.all.each.with_index(1) do |idiom, i|
+      puts "#{i}. #{idiom}"
     end
+    show_idiom
+  end
 
-  def self.idiom_routine
-    IdiomList.new
-    counter = 1
-    IdiomList.all.each do |hash|
-      hash.each do |k,v|
-        puts "#{counter}. #{k}"
-        counter += 1
-      end
-    end
-    puts " "
+  def show_idiom
     puts "Which idiom would you like me to define?"
     puts " "
-    input = (gets.chomp).to_i
+    input = ((gets.chomp).to_i - 1)
     puts " "
     puts "Interesting choice. Here is the definition:".magenta
     puts " "
-    hash_value = IdiomList.all[input - 1]
-    hash_idiom = hash_value.keys[0]
-    hash_def = hash_value[hash_idiom]
-    puts "#{hash_idiom.upcase.yellow}: #{hash_def}"
-    puts " "
+    puts IdiomScraper.all[input].name.upcase.yellow": " IdiomScraper.all[input].definition
     puts " "
     puts "Would you like to see this word in context?".light_blue
     puts "Y/N"
 
     context = gets.chomp.downcase
     if context == "y"
-      self.usage
-      puts " "
-      puts " "
-      puts @usage_array[input - 1].green
       puts " "
+      puts IdiomScraper.all[input].usage].green
       puts " "
     end
   end
 
-
 end

data/lib/words_and_idioms/idiom_scraper.rb

@@ -0,0 +1,40 @@
+class IdiomScraper
+  @@url = "http://www.macmillandictionary.com/us/open-dictionary/latestEntries.html"
+  @@html = open(@@url)
+  @@doc = Nokogiri::HTML(@@html)
+
+  @@all = []
+
+  attr_accessor :name, :definition, :usage
+
+  def initialize(name, definition, usage)
+    @name = name
+    @definition = definition
+    @usage = usage
+    self.save
+  end
+
+  def self.constructor
+    counter = 0
+    @@doc.search(".openEntry").each do |node|
+      name = @@doc.search(".openEntry")[counter].css("a").text
+      definition = @@doc.search(".openEntry")[counter].css(".openDef").text
+        if @@doc.search(".openEntry")[counter].css(".openEx").text != ""
+          usage = @@doc.search(".openEntry")[counter].css(".openEx").text
+        elsif @@doc.search(".openEntry")[counter].css(".openEx").text == ""
+          usage = "It looks like nobody has submitted a sentence yet. Maybe you could write one!"
+        end
+        IdiomScraper.new(name, definition, usage)
+      counter += 1
+    end
+  end
+
+  def save
+    @@all << self
+  end
+
+  def all
+    @@all
+  end
+
+end

data/lib/words_and_idioms/version.rb

@@ -1,3 +1,3 @@
 module WordsAndIdioms
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/words_and_idioms/zz - idiom_explorer_old.rb

@@ -0,0 +1,43 @@
+class IdiomExplorer
+
+  def initialize
+
+  end
+  def self.idiom_routine
+    IdiomList.new
+    counter = 1
+    IdiomList.all.each do |hash|
+      hash.each do |k,v|
+        puts "#{counter}. #{k}"
+        counter += 1
+      end
+    end
+    puts " "
+    puts "Which idiom would you like me to define?"
+    puts " "
+    input = (gets.chomp).to_i
+    puts " "
+    puts "Interesting choice. Here is the definition:".magenta
+    puts " "
+    hash_value = IdiomList.all[input - 1]
+    hash_idiom = hash_value.keys[0]
+    hash_def = hash_value[hash_idiom]
+    puts "#{hash_idiom.upcase.yellow}: #{hash_def}"
+    puts " "
+    puts " "
+    puts "Would you like to see this word in context?".light_blue
+    puts "Y/N"
+
+    context = gets.chomp.downcase
+    if context == "y"
+      self.usage
+      puts " "
+      puts " "
+      puts @usage_array[input - 1].green
+      puts " "
+      puts " "
+    end
+  end
+
+
+end

data/lib/words_and_idioms/{idioms.rb → zz - idioms.rb }

@@ -1,6 +1,3 @@
-require 'open-uri'
-require 'nokogiri'
-
 class IdiomList
 
   @@word_url = "http://www.macmillandictionary.com/us/open-dictionary/latestEntries.html"

data/lib/words_and_idioms.rb

@@ -1,6 +1,11 @@
+require 'colorize'
+require 'nokogiri'
+require 'pry'
+require 'open-uri'
+
 require_relative "./words_and_idioms/version"
 require_relative './words_and_idioms/cli'
 require_relative './words_and_idioms/dictionary_scraper'
 require_relative './words_and_idioms/idiom_explorer'
-require_relative './words_and_idioms/idioms'
+require_relative './words_and_idioms/idiom_scraper'
 require_relative './words_and_idioms/user_input'

data/words_and_idioms.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "colorize"
 
-  spec.add_dependency "colorize"
-  spec.add_dependency 'nokogiri'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: words_and_idioms
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - skmcloughlin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,13 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -113,14 +113,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- bin/words_and_idioms.rb
+- bin/words_and_idioms
 - lib/words_and_idioms.rb
 - lib/words_and_idioms/cli.rb
 - lib/words_and_idioms/dictionary_scraper.rb
 - lib/words_and_idioms/idiom_explorer.rb
-- lib/words_and_idioms/idioms.rb
+- lib/words_and_idioms/idiom_scraper.rb
 - lib/words_and_idioms/user_input.rb
 - lib/words_and_idioms/version.rb
+- lib/words_and_idioms/zz - idiom_explorer_old.rb
+- lib/words_and_idioms/zz - idioms.rb
 - words_and_idioms.gemspec
 homepage: https://github.com/skmcloughlin/WordsAndIdiomsGem
 licenses: