Skip to content

Commit

Permalink
Address some Code Climate suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlduran
jlduran committed Jan 21, 2019
1 parent 0fd7ab1 commit 4105864
Show file tree
Hide file tree
Showing 23 changed files with 124 additions and 259 deletions.
12 changes: 4 additions & 8 deletions lib/numbers_and_words/strategies/figures_converter/languages/es.rb
View file
Expand Up @@ -20,14 +20,10 @@ def ones
end

def tens_with_ones
if @figures.tens == 2
@translations
.twenties_with_ones(@figures, gender: gender,
is_apocopated: one_apocopated?)
else
super({ gender: gender,
is_apocopated: one_apocopated? })
end
options = { gender: gender, is_apocopated: one_apocopated? }
return @translations.twenties_with_ones(@figures, options) if @figures.tens == 2

super(options)
end

def hundreds
Expand Down
5 changes: 4 additions & 1 deletion lib/numbers_and_words/strategies/figures_converter/languages/pt-BR.rb
View file
Expand Up @@ -78,7 +78,10 @@ def opaque?
end

def one_thousand?
current_capacity == 1 && figures[0] == 1 && figures.hundreds.nil? && figures.tens.nil?
current_capacity == 1 &&
figures.ones == 1 &&
figures.tens.nil? &&
figures.hundreds.nil?
end

def without_connector?
Expand Down
1 change: 1 addition & 0 deletions lib/numbers_and_words/strategies/figures_converter/options.rb
View file
@@ -1,5 +1,6 @@
# frozen_string_literal: true

require 'numbers_and_words/strategies/figures_converter/options/base'
require 'numbers_and_words/strategies/figures_converter/options/en'
require 'numbers_and_words/strategies/figures_converter/options/en-GB'
require 'numbers_and_words/strategies/figures_converter/options/es'
Expand Down
5 changes: 5 additions & 0 deletions lib/numbers_and_words/strategies/figures_converter/options/base.rb
View file
@@ -0,0 +1,5 @@
# frozen_string_literal: true

require 'numbers_and_words/strategies/figures_converter/options/base/gender'
require 'numbers_and_words/strategies/figures_converter/options/base/ordinal'
require 'numbers_and_words/strategies/figures_converter/options/base/remove_zero'
30 changes: 30 additions & 0 deletions lib/numbers_and_words/strategies/figures_converter/options/base/gender.rb
View file
@@ -0,0 +1,30 @@
# frozen_string_literal: true

module NumbersAndWords
module Strategies
module FiguresConverter
module Options
module Base
class Gender
attr_accessor :strategy, :options

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
active? ? @options[:gender].to_sym : :male
end

private

def active?
@options[:gender]
end
end
end
end
end
end
end
28 changes: 28 additions & 0 deletions lib/numbers_and_words/strategies/figures_converter/options/base/ordinal.rb
View file
@@ -0,0 +1,28 @@
# frozen_string_literal: true

module NumbersAndWords
module Strategies
module FiguresConverter
module Options
module Base
class Ordinal
def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
return :ordinal if active?
end

private

def active?
@options[:ordinal]
end
end
end
end
end
end
end
30 changes: 30 additions & 0 deletions lib/numbers_and_words/strategies/figures_converter/options/base/remove_zero.rb
View file
@@ -0,0 +1,30 @@
# frozen_string_literal: true

module NumbersAndWords
module Strategies
module FiguresConverter
module Options
module Base
class RemoveZero
attr_accessor :strategy, :options

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
active?
end

private

def active?
@options[:remove_zero]
end
end
end
end
end
end
end
15 changes: 1 addition & 14 deletions lib/numbers_and_words/strategies/figures_converter/options/cs/gender.rb
View file
Expand Up @@ -5,23 +5,10 @@ module Strategies
module FiguresConverter
module Options
module Cs
class Gender
attr_accessor :strategy, :options

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

class Gender < Base::Gender
def result
active? ? @options[:gender].to_sym : :female
end

private

def active?
@options[:gender]
end
end
end
end
Expand Down
16 changes: 1 addition & 15 deletions lib/numbers_and_words/strategies/figures_converter/options/cs/ordinal.rb
View file
Expand Up @@ -5,21 +5,7 @@ module Strategies
module FiguresConverter
module Options
module Cs
class Ordinal
def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
return :ordinal if active?
end

private

def active?
@options[:ordinal]
end
class Ordinal < Base::Ordinal
end
end
end
Expand Down
18 changes: 1 addition & 17 deletions lib/numbers_and_words/strategies/figures_converter/options/cs/remove_zero.rb
View file
Expand Up @@ -5,23 +5,7 @@ module Strategies
module FiguresConverter
module Options
module Cs
class RemoveZero
attr_accessor :strategy, :options

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
active?
end

private

def active?
@options[:remove_zero]
end
class RemoveZero < Base::RemoveZero
end
end
end
Expand Down
11 changes: 1 addition & 10 deletions lib/numbers_and_words/strategies/figures_converter/options/en/ordinal.rb
View file
Expand Up @@ -5,27 +5,18 @@ module Strategies
module FiguresConverter
module Options
module En
class Ordinal
class Ordinal < Base::Ordinal
ZERO_TYPE = :zero
HUNDRED_TYPE = :hundreds
MEGS_TYPE = :megs

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result(type)
@type = type
MEGS_TYPE != type ? check_simple_numbers : check_megs_numbers
end

private

def active?
@options[:ordinal]
end

def check_simple_numbers
:ordinal if simple_numbers_condition && active?
end
Expand Down
18 changes: 1 addition & 17 deletions lib/numbers_and_words/strategies/figures_converter/options/en/remove_zero.rb
View file
Expand Up @@ -5,23 +5,7 @@ module Strategies
module FiguresConverter
module Options
module En
class RemoveZero
attr_accessor :strategy, :options

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
active?
end

private

def active?
@options[:remove_zero]
end
class RemoveZero < Base::RemoveZero
end
end
end
Expand Down
18 changes: 1 addition & 17 deletions lib/numbers_and_words/strategies/figures_converter/options/es/gender.rb
View file
Expand Up @@ -5,23 +5,7 @@ module Strategies
module FiguresConverter
module Options
module Es
class Gender
attr_accessor :strategy, :options

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
active? ? @options[:gender].to_sym : :male
end

private

def active?
@options[:gender]
end
class Gender < Base::Gender
end
end
end
Expand Down
18 changes: 1 addition & 17 deletions lib/numbers_and_words/strategies/figures_converter/options/es/remove_zero.rb
View file
Expand Up @@ -5,23 +5,7 @@ module Strategies
module FiguresConverter
module Options
module Es
class RemoveZero
attr_accessor :strategy, :options

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
active?
end

private

def active?
@options[:remove_zero]
end
class RemoveZero < Base::RemoveZero
end
end
end
Expand Down
51 changes: 1 addition & 50 deletions lib/numbers_and_words/strategies/figures_converter/options/hu/ordinal.rb
View file
Expand Up @@ -5,56 +5,7 @@ module Strategies
module FiguresConverter
module Options
module Hu
class Ordinal
ZERO_TYPE = :zero
HUNDRED_TYPE = :hundreds
MEGS_TYPE = :megs

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result(type)
@type = type
MEGS_TYPE != type ? check_simple_numbers : check_megs_numbers
end

private

def active?
@options[:ordinal]
end

def check_simple_numbers
:ordinal if simple_numbers_condition && active?
end

def check_megs_numbers
:ordinal if megs_numbers_condition && active?
end

def simple_numbers_condition
current_capacity.nil? &&
(HUNDRED_TYPE != @type ||
HUNDRED_TYPE == @type && simple_number_to_words.empty?)
end

def megs_numbers_condition
current_capacity == language_figures.ordinal_capacity
end

def simple_number_to_words
@strategy.language.simple_number_to_words
end

def current_capacity
@strategy.language.current_capacity
end

def language_figures
@strategy.language.parent_figures
end
class Ordinal < En::Ordinal
end
end
end
Expand Down
19 changes: 1 addition & 18 deletions lib/numbers_and_words/strategies/figures_converter/options/pt-BR/gender.rb
View file
Expand Up @@ -5,24 +5,7 @@ module Strategies
module FiguresConverter
module Options
module PtBr
class Gender
attr_accessor :strategy, :options

def initialize(proxy, *_args)
@strategy = proxy.strategy
@options = proxy.options
end

def result
gender = active? ? @options[:gender].to_sym : :male
%i[male female].include?(gender) ? gender : :male
end

private

def active?
@options[:gender]
end
class Gender < Base::Gender
end
end
end
Expand Down

0 comments on commit 4105864

Please sign in to comment.