From ea72ee4a56aadbc09c818318ace4cd8e9ef3af88 Mon Sep 17 00:00:00 2001 From: Michal Date: Sun, 11 Dec 2016 14:37:53 +0100 Subject: [PATCH] =?UTF-8?q?Drobne=20poprawki=20do=20cz=C4=99=C5=9Bci=20rub?= =?UTF-8?q?y.=20Wyrzucona=20klasa.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruby_part/crane_class.rb | 29 ----------------------------- ruby_part/intelligence_test.rb | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 36 deletions(-) delete mode 100644 ruby_part/crane_class.rb diff --git a/ruby_part/crane_class.rb b/ruby_part/crane_class.rb deleted file mode 100644 index acf876e..0000000 --- a/ruby_part/crane_class.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'json' -class Crane - attr_accessor :name, :words - - def initialize(name) - @name = name - end - - def introduce - puts "Hello, sir. I'm #{name} the Crane." - end - - def get_words - file = File.read('test.json') - @words = JSON.parse(file) - #puts words - end - - def if_understand - return @words.length > 1 - end - - def response - file = File.read('past_forms.json') - past_formes = JSON.parse(file) - puts (if @words.values.any? { |e| @words.key(e).eql? "movement" } then "I #{past_formes[@words["movement"]] + ' ' + @words["directions"]}" else "Ooops" end) - end - -end diff --git a/ruby_part/intelligence_test.rb b/ruby_part/intelligence_test.rb index 023016c..2fd228c 100644 --- a/ruby_part/intelligence_test.rb +++ b/ruby_part/intelligence_test.rb @@ -1,8 +1,14 @@ -require_relative 'crane_class' +#require_relative 'crane_class' +require 'json' -c = Crane.new("Roman") -c.introduce -c.get_words -puts c.words -puts h = c.if_understand -c.response +def introduce + puts "Hello, sir. I'm Roman the Crane." +end + +file = File.read('test.json') +words = JSON.parse(file) + +file2 = File.read('past_forms.json') +past_formes = JSON.parse(file2) +puts (if words.values.any? { |e| words.key(e).eql? "movement" } && words.length > 1 then "I #{past_formes[words["movement"]] + ' ' + words["directions"]}" else "Ooops" end) +puts words["directions"]