astrological_forecast 1.3.5 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b1916031f1ada4f6d0dda98cfd63524f587060102e3e1615b1a6a715b4ce2f
-  data.tar.gz: 1fc22e725ee0bb125b2c44618240b53b299ab945d18476a5c665bba190c0248c
+  metadata.gz: d9caf93370cf8653834f4485454a9da5bd120b267527d20b5b860ed050cbf439
+  data.tar.gz: 4b508193efc0909795a49013311a2f6dd44b66c101f319c733efabb102fae859
 SHA512:
-  metadata.gz: c88416b4fe1dae0af0acfb4b05b6de117eb8e74611a212e9ee3923851bd3a4831a3ad5731eace163dc3c88a86de83c5056198bba487e236cf36d153f3355daf0
-  data.tar.gz: cf5a02b23438efee5324ee79166cb7ded4778eb836ad2810aef29fa74b4a02cde7fc520ed3aa03f401a805167616c327a540478bae55a433fc75547df964803d
+  metadata.gz: f56f2cbe98682cf443dd3b00c92e4022f555dfefd962728a7547faddec50e3c89ea077391be362a4829cfbd2c9550a5b98d1bda9851c0f3f22abf915ad27b951
+  data.tar.gz: dbaa4201c29343f548a8e39c8a8db66b5040cbace0e108f9ad1f7807ab7e7577edce6f3ef11a10f8df97f939b79896b997bf7d3b76c7714dabd6e3578021c6f2

data/Gemfile

@@ -18,5 +18,3 @@ group :test do
   gem 'vcr', '~> 6.1'
   gem 'webmock', '~> 3.1'
 end
-
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    astrological_forecast (1.3.5)
+    astrological_forecast (2.0.0)
       addressable
       nokogiri
       open-uri
@@ -17,25 +17,25 @@ GEM
       simplecov (>= 0.15, < 0.22)
     crack (0.4.5)
       rexml
-    date (3.2.2)
+    date (3.3.3)
     diff-lcs (1.5.0)
     docile (1.4.0)
     hashdiff (1.0.1)
-    json (2.6.2)
-    nokogiri (1.13.9-x86_64-linux)
+    json (2.6.3)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
-    open-uri (0.2.0)
+    open-uri (0.3.0)
       stringio
       time
       uri
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    public_suffix (5.0.0)
-    racc (1.6.0)
+    public_suffix (5.0.1)
+    racc (1.6.2)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -43,29 +43,29 @@ GEM
       rspec-mocks (~> 3.12.0)
     rspec-core (3.12.0)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.38.0)
+    rubocop (1.43.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.15.0)
+    rubocop-rspec (2.17.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -74,11 +74,11 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    stringio (3.0.2)
-    time (0.2.0)
+    stringio (3.0.4)
+    time (0.2.1)
       date
-    unicode-display_width (2.3.0)
-    uri (0.11.0)
+    unicode-display_width (2.4.2)
+    uri (0.12.0)
     vcr (6.1.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)

data/README.md

@@ -61,15 +61,15 @@ gem 'astrological_forecast'
 ``` rb
 require 'astrological_forecast'
 
-AstrologicalForecast.predict
+AstrologicalForecast.predict(true)
 
 # Или, если не хотите использовать консоль для ввода данных:
 
-AstrologicalForecast.predict('19.05', 'общий', 'на сегодня')
+AstrologicalForecast.predict(true, '19.05', 'общий', 'на сегодня')
 
 ```
 
-## Запуск (версия с вводом данных в консоли):
+## Запуск (версия с вводом прогноза в консоль):
 
 ``` rb
 ruby name_programm.rb
@@ -115,6 +115,17 @@ ruby name_programm.rb
 комфортной. Стоит подумать о том, чтобы выйти из нее раньше, чем это случится.
 ```
 
+## Запуск (версия БЕЗ вывода прогноза в консоль):
+
+``` rb
+require 'astrological_forecast'
+
+astro = AstrologicalForecast.predict(false, '19.05', 'общий', 'на сегодня')
+
+# astro.class -> Hash
+```
+
+
 ## Помочь в разработке:
 
 Шлите ваши пулреквесты в https://github.com/ProfessorNemo/astrological_forecast.

data/lib/astrological_forecast/definition_sign.rb

@@ -30,7 +30,7 @@ module AstrologicalForecast
     def definition_sign_hands
       raise IncorrectDate unless @date.match?(/\A(\d{2})\.(\d{2})\z/)
 
-      @date
+      AstrologicalForecast::Facts.sign_identification(sign, @date)
     end
   end
 end

data/lib/astrological_forecast/facts.rb

@@ -23,16 +23,18 @@ module AstrologicalForecast
 
     class << self
       def give_types
-        TYPES.keys.each(&:to_sym).each_with_index do |type, index|
-          puts "#{index + 1}. #{type}"
+
+        TYPES.each_with_index do |type, index|
+
+          puts "#{index + 1}. #{type[0]}"
         end
         puts
         print '> '
       end
 
       def give_period
-        PERIOD.keys.each(&:to_sym).each_with_index do |period, index|
-          puts "#{index + 1}. #{period}"
+        PERIOD.each_with_index do |period, index|
+          puts "#{index + 1}. #{period[0]}"
         end
         puts
         print '> '

data/lib/astrological_forecast/forecast.rb

@@ -7,6 +7,7 @@ module AstrologicalForecast
       @signs = params[:signs]
       @user_type = params[:user_type]
       @user_period = params[:user_period]
+      @console = params[:console]
     end
 
     # получение прогноза
@@ -18,8 +19,8 @@ module AstrologicalForecast
         { number: @definition['number'],
           name_ru: @definition['sign_ru'],
           name_en: @signs.keys[@definition['number'].to_i - 1],
-          type: AstrologicalForecast::Facts::TYPES[AstrologicalForecast::Facts::TYPES.keys.each(&:to_sym)[@user_type - 1]],
-          time: AstrologicalForecast::Facts::PERIOD[AstrologicalForecast::Facts::PERIOD.keys.each(&:to_sym)[@user_period - 1]] }
+          type: AstrologicalForecast::Facts::TYPES[AstrologicalForecast::Facts::TYPES.each_key(&:to_sym)[@user_type - 1]],
+          time: AstrologicalForecast::Facts::PERIOD[AstrologicalForecast::Facts::PERIOD.each_key(&:to_sym)[@user_period - 1]] }
 
       begin
         intro = AstrologicalForecast::Introduction.init(vars)
@@ -29,7 +30,9 @@ module AstrologicalForecast
         abort e.message
       end
 
-      forecast_results(intro, prediction)
+      return forecast_results(intro, prediction) if @console
+
+      intro.merge prediction
     end
 
     def forecast_results(intro, prediction)

data/lib/astrological_forecast/type.rb

@@ -63,7 +63,7 @@ module AstrologicalForecast
 
     # Проверка на корректность заданного типа прогноза и периода прогнозирования
     def manual_check(opt, const, error)
-      types = const.each_with_index.each_with_object({}) do |(var, i), result|
+      types = const.each_with_index.with_object({}) do |(var, i), result|
         result[var[0]] = i + 1
       end
 

data/lib/astrological_forecast/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AstrologicalForecast
-  VERSION = '1.3.5'
+  VERSION = '2.0.1'
 end

data/lib/astrological_forecast.rb

@@ -6,7 +6,7 @@ require_relative 'main'
 BASE_URL = 'https://orakul.com/'
 
 module AstrologicalForecast
-  def self.predict(date = nil, type = nil, period = nil)
+  def self.predict(console = false, date = nil, type = nil, period = nil)
     determinant = AstrologicalForecast::DefinitionSign.new(date: date)
 
     characteristic = AstrologicalForecast::Type.new(type: type, period: period)
@@ -15,7 +15,8 @@ module AstrologicalForecast
       definition: determinant.definition,
       signs: determinant.signs,
       user_type: characteristic.user_type,
-      user_period: characteristic.user_period
+      user_period: characteristic.user_period,
+      console: console
     }
 
     forecast = AstrologicalForecast::Forecast.new(params)
@@ -23,3 +24,6 @@ module AstrologicalForecast
     forecast.data_forecast
   end
 end
+
+# AstrologicalForecast.predict(true, '19.05', 'общий', 'на сегодня')
+# AstrologicalForecast.predict(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: astrological_forecast
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 2.0.1
 platform: ruby
 authors:
 - Gleb V. Zhegulin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable