Skip to content

Commit

Permalink
Merge pull request #330 from Dynamoid/minor-refactoring-and-cleanup
Browse files Browse the repository at this point in the history
Minor refactoring and cleanup
  • Loading branch information
andrykonchin committed Apr 21, 2019
2 parents 5675129 + 6b30216 commit f135620
Show file tree
Hide file tree
Showing 44 changed files with 1,231 additions and 948 deletions.
18 changes: 18 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,28 @@ AllCops:
# It's a matter of taste
Layout/AlignParameters:
EnforcedStyle: with_fixed_indentation
Layout/AlignHash:
Enabled: false
Style/GuardClause:
Enabled: false
Style/FormatStringToken:
Enabled: false
Style/DoubleNegation:
Enabled: false
Style/IfUnlessModifier:
Enabled: false
Style/EachWithObject:
Enabled: false
Style/SafeNavigation:
Enabled: false
Style/BlockDelimiters:
Enabled: false
Layout/MultilineMethodCallIndentation:
EnforcedStyle: indented
Naming/VariableNumber:
Enabled: false
Style/MultilineBlockChain:
Enabled: false

# We aren't so brave to tackle all these issues right now
Metrics/LineLength:
Expand Down Expand Up @@ -50,4 +66,6 @@ Style/MissingRespondToMissing:
Enabled: false
Naming/PredicateName:
Enabled: false
Security/YAMLLoad:
Enabled: false

2 changes: 1 addition & 1 deletion gemfiles/rails_4_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

source 'https://rubygems.org'

gem 'activemodel', '~> 4.2.0'
gem 'nokogiri', '~> 1.6.8'
gem 'pry-byebug', platforms: :ruby
gem 'activemodel', '~> 4.2.0'

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_5_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'pry-byebug', platforms: :ruby
gem 'activemodel', '~> 5.0.0'
gem 'pry-byebug', platforms: :ruby

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_5_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'pry-byebug', platforms: :ruby
gem 'activemodel', '~> 5.1.0'
gem 'pry-byebug', platforms: :ruby

gemspec path: '../'
2 changes: 1 addition & 1 deletion gemfiles/rails_5_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

source 'https://rubygems.org'

gem 'pry-byebug', platforms: :ruby
gem 'activemodel', '~> 5.2.0'
gem 'pry-byebug', platforms: :ruby

gemspec path: '../'
1 change: 1 addition & 0 deletions lib/dynamoid/adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ def delete_table(table_name, options = {})
# @since 0.2.0
def method_missing(method, *args, &block)
return benchmark(method, *args) { adapter.send(method, *args, &block) } if adapter.respond_to?(method)

super
end

Expand Down

0 comments on commit f135620

Please sign in to comment.