words_and_idioms 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51c2cacea850658aafbd010cded38164bc130c3c
-  data.tar.gz: 2bf769f3ac117e134f294beae45df9de55f3be40
+  metadata.gz: b50c8506a0f4f7239350991ce789499f29696138
+  data.tar.gz: ff26ef4720389863d91baccd4fc8ef9fa49aaaab
 SHA512:
-  metadata.gz: e20165d0e7b51f88ea4673489f8a18feec57138069c56fb576bbade8a6ad91af79f1eb687758cdd47222c24b42cb6740e33229010c340e8a79a537075fd6df71
-  data.tar.gz: ac6fe26ce45223e192e875d0379a7eb74a48eb6bf1c5c32f585d07cbf1b33e706bc0ab00892686a10f5905efab5f813b9fa6437deda120334124550c5770ec0e
+  metadata.gz: b27f9a9faea62435172144da906e5015326ed523876931efe47cafc14f2affea0926bcc45baf82da1d9348c2d569de489422b3be7433b1d00958812eb8352e38
+  data.tar.gz: b804a90d0dfe8a4c899c1021bd76435a9f9e462db922411b58bc1517f9fa0f9c7a550fd8d1dfa04b33e2dd3fbe33b50c18c63a5d2b96625476888685a5e4cddb

data/bin/words_and_idioms

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 require 'bundler/setup'
-require './lib/words_and_idioms'
+require_relative '../lib/words_and_idioms'
 
 WordsAndIdioms::CLI.new.call

data/lib/words_and_idioms.rb

@@ -7,5 +7,6 @@ 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/idiom'
 require_relative './words_and_idioms/idiom_scraper'
 require_relative './words_and_idioms/user_input'

data/lib/words_and_idioms/cli.rb

@@ -18,6 +18,14 @@ class WordsAndIdioms::CLI
     menu
   end
 
+  def print_idiom_list
+    puts "Below is a list of newly created idioms from MacMillan's Open Dictionary Project"
+    Idiom.all.each.with_index(1) do |idiom, i|
+      puts "#{i}. #{idiom.name}"
+    end
+    IdiomExplorer.show_idiom
+  end
+
 def menu
   first_choice = (gets.chomp).to_i
     if first_choice == 1
@@ -25,7 +33,7 @@ def menu
       greet_user
     elsif first_choice == 2
       IdiomScraper.constructor
-      IdiomExplorer.print_list
+      print_idiom_list
       greet_user
     elsif first_choice != 1 && first_choice != 2 && first_choice != 3
       puts " "
@@ -37,6 +45,8 @@ def menu
     end
   end
 
+
+
   def goodbye
     puts "I hope you learned something today. See you again soon."
   end

data/lib/words_and_idioms/idiom.rb

@@ -0,0 +1,25 @@
+class Idiom
+  @@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 save
+    @@all << self
+  end
+
+  def self.all
+    @@all
+  end
+
+end

data/lib/words_and_idioms/idiom_explorer.rb

@@ -1,21 +1,15 @@
 class IdiomExplorer
 
-  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.name}"
-    end
-    show_idiom
-  end
 
   def self.show_idiom
     puts "Which idiom would you like me to define?"
     puts " "
     input = ((gets.chomp).to_i - 1)
+    idiom = Idiom.all[input]
     puts " "
     puts "Interesting choice. Here is the definition:".magenta
     puts " "
-    puts "#{IdiomScraper.all[input].name.upcase.yellow}: #{IdiomScraper.all[input].definition}"
+    puts idiom.name.upcase.yellow + ": " + idiom.definition
     puts " "
     puts "Would you like to see this word in context?".light_blue
     puts "Y/N"
@@ -23,7 +17,7 @@ class IdiomExplorer
     context = gets.chomp.downcase
     if context == "y"
       puts " "
-      puts IdiomScraper.all[input].usage.green
+      puts idiom.usage.green
       puts " "
     end
   end

data/lib/words_and_idioms/idiom_scraper.rb

@@ -3,17 +3,6 @@ class IdiomScraper
   @@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|
@@ -24,17 +13,10 @@ class IdiomScraper
         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)
+        Idiom.new(name, definition, usage)
       counter += 1
     end
   end
 
-  def save
-    @@all << self
-  end
-
-  def self.all
-    @@all
-  end
 
 end

data/lib/words_and_idioms/version.rb

@@ -1,3 +1,3 @@
 module WordsAndIdioms
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: words_and_idioms
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - skmcloughlin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,12 +117,14 @@ files:
 - lib/words_and_idioms.rb
 - lib/words_and_idioms/cli.rb
 - lib/words_and_idioms/dictionary_scraper.rb
+- lib/words_and_idioms/idiom.rb
 - lib/words_and_idioms/idiom_explorer.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-0.2.1.gem
 - words_and_idioms.gemspec
 homepage: https://github.com/skmcloughlin/WordsAndIdiomsGem
 licenses: