Merge pull request #205 from launchdarkly/eb/sc-159609/no-rubocop-rails

disable rubocop Rails rules and fix some remaining syntax offenses

Author: eli-darkly

.circleci/config.yml

@@ -11,7 +11,6 @@ workflows:
       - rubocop/rubocop:
           after-install-rubocop:
             - run: gem install rubocop-performance
-            - run: gem install rubocop-rails
       - build-test-windows
       - build-test-linux:
           name: Ruby 2.6

.rubocop.yml

@@ -1,5 +1,4 @@
 require:
-  - rubocop-rails
   - rubocop-performance
 
 AllCops:
@@ -113,10 +112,6 @@ Metrics/CyclomaticComplexity:
                  of test cases needed to validate a method.
   Enabled: false
 
-Rails/Delegate:
-  Description: 'Prefer delegate method for delegations.'
-  Enabled: false
-
 Style/PreferredHashMethods:
   Description: 'Checks for use of deprecated Hash methods.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-key'
@@ -586,54 +581,6 @@ Performance/StringReplacement:
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#stringgsub-vs-stringtr-code'
   Enabled: false
 
-# Rails
-
-Rails/ActionFilter:
-  Description: 'Enforces consistent use of action filter methods.'
-  Enabled: false
-
-Rails/Date:
-  Description: >-
-                  Checks the correct usage of date aware methods,
-                  such as Date.today, Date.current etc.
-  Enabled: false
-
-Rails/FindBy:
-  Description: 'Prefer find_by over where.first.'
-  Enabled: false
-
-Rails/FindEach:
-  Description: 'Prefer all.find_each over all.find.'
-  Enabled: false
-
-Rails/HasAndBelongsToMany:
-  Description: 'Prefer has_many :through to has_and_belongs_to_many.'
-  Enabled: false
-
-Rails/Output:
-  Description: 'Checks for calls to puts, print, etc.'
-  Enabled: false
-
-Rails/ReadWriteAttribute:
-  Description: >-
-                 Checks for read_attribute(:attr) and
-                 write_attribute(:attr, val).
-  Enabled: false
-
-Rails/ScopeArgs:
-  Description: 'Checks the arguments of ActiveRecord scopes.'
-  Enabled: false
-
-Rails/TimeZone:
-  Description: 'Checks the correct usage of time zone aware methods.'
-  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
-  Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
-  Enabled: false
-
-Rails/Validation:
-  Description: 'Use validates :attribute, hash of validations.'
-  Enabled: false
-
 # Disabled temporarily while we bring code base inline
 Layout/ArgumentAlignment:
   Enabled: false
@@ -794,9 +741,6 @@ Naming/RescuedExceptionsVariableName:
 Naming/VariableNumber:
   Enabled: false
 
-Rails/SkipsModelValidations:
-  Enabled: false
-
 Style/AccessorGrouping:
   Enabled: false
 

contract-tests/service.rb

@@ -30,7 +30,7 @@
       'all-flags-client-side-only',
       'all-flags-details-only-for-tracked-flags',
       'tags',
-    ]
+    ],
   }.to_json
 end
 

lib/ldclient-rb/impl/event_sender.rb

@@ -33,7 +33,7 @@ def send_event_data(event_data, description, is_diagnostic)
         begin
           http_client = @http_client_pool.acquire()
           response = nil
-          (0..1).each do |attempt|
+          2.times do |attempt|
             if attempt > 0
               @logger.warn { "[LDClient] Will retry posting events after #{@retry_interval} second" }
               sleep(@retry_interval)

lib/ldclient-rb/impl/util.rb

@@ -56,7 +56,7 @@ def self.validate_application_value(value, name, logger)
           return ""
         end
 
-        if value.match(/[^a-zA-Z0-9._-]/)
+        if /[^a-zA-Z0-9._-]/.match?(value)
           logger.warn { "Value of application[#{name}] contained invalid characters and was discarded" }
           return ""
         end

spec/config_spec.rb

@@ -76,7 +76,7 @@
     end
 
     it "will drop invalid values" do
-      [" ", "@", ":", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._-a"]. each do |value|
+      [" ", "@", ":", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._-a"].each do |value|
         expect(subject.new(logger: $null_log, application: { id: value, version: value }).application).to eq ({ id: "", version: "" })
       end
     end
@@ -86,7 +86,7 @@
         { :id => "id", :version => "version", :expected => "application-id/id application-version/version" },
         { :id => "id", :version => "", :expected => "application-id/id" },
         { :id => "", :version => "version", :expected => "application-version/version" },
-        { :id => "", :version => "", :expected => "" }
+        { :id => "", :version => "", :expected => "" },
       ].each do |test_case|
         config = subject.new(application: { id: test_case[:id], version: test_case[:version] })
         expect(LaunchDarkly::Impl::Util.application_header_value(config.application)).to eq test_case[:expected]

spec/event_sender_spec.rb

@@ -45,7 +45,7 @@ def with_sender_and_server
             "user-agent" => [ "RubyClient/" + LaunchDarkly::VERSION ],
             "x-launchdarkly-event-schema" => [ "3" ],
             "x-launchdarkly-tags" => [ "application-id/id application-version/version" ],
-            "connection" => [ "Keep-Alive" ]
+            "connection" => [ "Keep-Alive" ],
           })
           expect(req.header['x-launchdarkly-payload-id']).not_to eq []
         end