conjugate_french 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a599047dc59694461680f571faddb49c673a094167c1eeb7507b0f1e9281783b
-  data.tar.gz: b066a1ae51a0bdb666fc54addf6576c7813e89a369d6639de7bac9d2bad58370
+  metadata.gz: b7a75418e3191ca82ce1e4aa723e0d23b44d69934a7059ec4f3ec66a029b8786
+  data.tar.gz: 5c65f09fd4a7e504e76b211adb15836d368f1801e960a9f196bd648a1b7ff090
 SHA512:
-  metadata.gz: 0db8ab911024d2dd2862c6c431d8403bd1fe845a566bedcdc9c667e07c8e7c967f4c6843d5ae69ace6fddb1e39e50abea78db663410c9401575fc0b9e71bd67f
-  data.tar.gz: 482b090ae07641c4267d7da2e6442888cc31ee0a6145c79c0af502c57d0a5cdf5354db7825351d34bef8069446773c70650df12f56c6c2be1c57bd053019dc55
+  metadata.gz: 832b04e130dc3f9db126dc28bf55f838f8ac29f9a27095e5c8b2bebf8f69688c7177e2b67699aca27b3942c1521bacc39e7a72b2f41667a6c1659893ac3a6522
+  data.tar.gz: beabba716afb2ad5600482dccb98adaa865488e5378309423707e410f4a29902fd3361c30b0d437ee944b60e25f99bc301268e748b167a39f8977156691052fa

data/:courir

@@ -0,0 +1,2 @@
+{""=>"verbe="}
+The verb you entered was not found. There is probably a typo or the verb is not in the infinitive.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    conjugate_french (0.1.3)
+    conjugate_french (0.1.4)
       json
       terminal-table
       thor

data/bin/conjugate_french

@@ -2,8 +2,9 @@
 
 require 'conjugate_french'
 
-if ARGV.size == 1
-  puts 'please add a correct verb after the verbe method call'
+case ARGV.size
+when 1
+  raise ArgumentError, 'please add a correct verb after the conjugate method call'
 else
-  ConjugateFrench::ConjugateCLI.start(ARGV)
+  puts ConjugateFrench::ConjugateCLI.start(ARGV)
 end

data/courir

@@ -0,0 +1,2 @@
+{""=>"verbe="}
+The verb you entered was not found. There is probably a typo or the verb is not in the infinitive.

data/lib/conjugate/tense.rb

@@ -0,0 +1,63 @@
+require 'json'
+require 'terminal-table'
+
+module ConjugateFrench
+  class Tense
+    TENSES = %w[indicatif subjonctif conditionnel impératif participe].freeze
+    VERB_ERROR = "The verb you've entered can not be conjugated".freeze
+    TENSE_ERROR = "The verb can not be conjugated at the tense you've entered".freeze
+
+    def self.conjugate(verb, tense)
+      build_tables(get_verbe(verb), tense)
+    end
+
+    def self.build_tables(full_verb, specific_tense)
+      raise ArgumentError, VERB_ERROR if full_verb.nil?
+
+      if specific_tense.nil?
+        TENSES.map { |tense| table(tense, full_verb) }
+      else
+        table(specific_tense, full_verb)
+      end
+    end
+
+    def self.get_verbe(verb)
+      file = File.read('lib/verbs.json')
+      parsed_file = JSON.parse(file)
+      @get_verbe ||= parsed_file.select do |verb_list|
+        verb_list['infinitif']['présent'][0] == verb
+      end[0]
+    end
+
+    def self.headings(tense, full_verb)
+      raise ArgumentError, TENSE_ERROR unless TENSES.include?(tense)
+
+      [nil, full_verb[tense].keys]
+    end
+
+    def self.table(tense, full_verb)
+      tense_rows = persons(tense)
+      verb = full_verb['infinitif']['présent'].first
+
+      tense_rows.each_with_index do |person, index|
+        full_verb[tense].each { |row| person << row[1][index] }
+      end
+
+      tense = Terminal::Table.new(
+        title: "Verbe #{verb.capitalize} #{tense.capitalize}",
+        rows: tense_rows,
+        headings: headings(tense, full_verb).flatten
+      )
+    end
+
+    def self.persons(tense)
+      if tense == 'impératif'
+        [[nil], [nil], [nil]]
+      elsif tense == 'participe'
+        [[nil], [nil]]
+      else
+        [['Je'], ['Tu'], ['Il'], ['Nous'], ['Vous'], ['Ils']]
+      end
+    end
+  end
+end

data/lib/conjugate_french.rb

@@ -1,64 +1,14 @@
 require 'conjugate_french/version'
 require 'thor'
-require 'json'
-require 'terminal-table'
+require_relative './conjugate/tense'
 
 module ConjugateFrench
   class ConjugateCLI < Thor
     desc 'verbe VERB', 'finally know how to write french VERBS'
-    TENSES = %w[indicatif subjonctif conditionnel impératif participe].freeze
+    argument :opts, optional: true, type: :hash
 
-    def verbe(verb)
-      file = File.read('lib/verbs.json')
-      parsed_file = JSON.parse(file)
-
-      full_verb = parsed_file.select do |verb_list|
-        verb_list['infinitif']['présent'][0] == verb
-      end
-
-      final_output = output(full_verb, verb)
-      puts final_output
-      final_output
-    end
-
-    private
-
-    def table(tense, full_verb, verb)
-      tense_rows = persons(tense)
-
-      tense_headings = headings(tense, full_verb)
-
-      tense_rows.each_with_index do |person, index|
-        full_verb[0][tense].each { |row| person << row[1][index] }
-      end
-
-      tense = Terminal::Table.new(
-        title: "Verbe #{verb.capitalize} #{tense.capitalize}",
-        rows: tense_rows,
-        headings: tense_headings.flatten
-      )
-    end
-
-    def persons(tense)
-      if tense == 'impératif'
-        [[nil], [nil], [nil]]
-      elsif tense == 'participe'
-        [[nil], [nil]]
-      else
-        [['Je'], ['Tu'], ['Il'], ['Nous'], ['Vous'], ['Ils']]
-      end
-    end
-
-    def headings(tense, full_verb)
-      [nil, full_verb[0][tense].keys]
-    end
-
-    def output(full_verb, verb)
-      if full_verb.empty?
-        'The verb you entered was not found. There is probably a typo or the verb is not in the infinitive.'
-      else
-        TENSES.map { |tense| table(tense, full_verb, verb) }
-      end
+    def conjugate
+      ConjugateFrench::Tense.conjugate(opts['verb'], opts['tense'])
     end
   end
 end

data/lib/conjugate_french/version.rb

@@ -1,3 +1,3 @@
 module ConjugateFrench
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjugate_french
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Martfed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-31 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -79,6 +79,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ":courir"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -88,8 +89,9 @@ files:
 - bin/conjugate_french
 - bin/console
 - bin/setup
-- conjugate_french-0.1.2.gem
 - conjugate_french.gemspec
+- courir
+- lib/conjugate/tense.rb
 - lib/conjugate_french.rb
 - lib/conjugate_french/version.rb
 - lib/verbs.json