Skip to content

Commit f135620

Browse files
authored
Merge pull request #330 from Dynamoid/minor-refactoring-and-cleanup
Minor refactoring and cleanup
2 parents 5675129 + 6b30216 commit f135620

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1231
-948
lines changed

.rubocop.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,28 @@ AllCops:
88
# It's a matter of taste
99
Layout/AlignParameters:
1010
EnforcedStyle: with_fixed_indentation
11+
Layout/AlignHash:
12+
Enabled: false
1113
Style/GuardClause:
1214
Enabled: false
1315
Style/FormatStringToken:
1416
Enabled: false
1517
Style/DoubleNegation:
1618
Enabled: false
19+
Style/IfUnlessModifier:
20+
Enabled: false
21+
Style/EachWithObject:
22+
Enabled: false
23+
Style/SafeNavigation:
24+
Enabled: false
25+
Style/BlockDelimiters:
26+
Enabled: false
27+
Layout/MultilineMethodCallIndentation:
28+
EnforcedStyle: indented
29+
Naming/VariableNumber:
30+
Enabled: false
31+
Style/MultilineBlockChain:
32+
Enabled: false
1733

1834
# We aren't so brave to tackle all these issues right now
1935
Metrics/LineLength:
@@ -50,4 +66,6 @@ Style/MissingRespondToMissing:
5066
Enabled: false
5167
Naming/PredicateName:
5268
Enabled: false
69+
Security/YAMLLoad:
70+
Enabled: false
5371

gemfiles/rails_4_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
source 'https://rubygems.org'
66

7+
gem 'activemodel', '~> 4.2.0'
78
gem 'nokogiri', '~> 1.6.8'
89
gem 'pry-byebug', platforms: :ruby
9-
gem 'activemodel', '~> 4.2.0'
1010

1111
gemspec path: '../'

gemfiles/rails_5_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
source 'https://rubygems.org'
66

7-
gem 'pry-byebug', platforms: :ruby
87
gem 'activemodel', '~> 5.0.0'
8+
gem 'pry-byebug', platforms: :ruby
99

1010
gemspec path: '../'

gemfiles/rails_5_1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
source 'https://rubygems.org'
66

7-
gem 'pry-byebug', platforms: :ruby
87
gem 'activemodel', '~> 5.1.0'
8+
gem 'pry-byebug', platforms: :ruby
99

1010
gemspec path: '../'

gemfiles/rails_5_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
source 'https://rubygems.org'
66

7-
gem 'pry-byebug', platforms: :ruby
87
gem 'activemodel', '~> 5.2.0'
8+
gem 'pry-byebug', platforms: :ruby
99

1010
gemspec path: '../'

lib/dynamoid/adapter.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ def delete_table(table_name, options = {})
155155
# @since 0.2.0
156156
def method_missing(method, *args, &block)
157157
return benchmark(method, *args) { adapter.send(method, *args, &block) } if adapter.respond_to?(method)
158+
158159
super
159160
end
160161

0 commit comments

Comments
 (0)