Merge pull request #45 from ifad/chore/use-empty-instead-of-comparing…

…-size Use empty and present instead of checking size
ifad · Jan 22, 2024 · 14ff4b9 · 14ff4b9
2 parents 6775b27 + 516bdd1
commit 14ff4b9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
diff --git a/lib/hawk/http/instrumentation.rb b/lib/hawk/http/instrumentation.rb
@@ -30,7 +30,7 @@ def instrument(type, payload)
             elapsed = (Time.now.to_f - start) * 1000
 
             url = payload[:url].to_s
-            if payload[:params] && payload[:params].size > 0
+            if payload[:params].present?
               url << '?' << payload[:params].inject('') { |s, (k, v)| s << [k, '=', v, '&'].join }.chomp('&')
             end
 

diff --git a/lib/hawk/model/association.rb b/lib/hawk/model/association.rb
@@ -13,7 +13,7 @@ def self.included(base)
       #
       def initialize(attributes = {}, params = {})
         super
-        if attributes.size > 0 && self.class.associations?
+        if attributes.present? && self.class.associations?
           preload_associations(attributes, params, self.class)
         end
       end
@@ -136,7 +136,7 @@ def associations
         # Check whether associations are defined
         #
         def associations?
-          @_associations && @_associations.size > 0
+          @_associations.present?
         end
 
         # Check whether the given attribute is an association

diff --git a/lib/hawk/model/schema.rb b/lib/hawk/model/schema.rb
@@ -51,7 +51,7 @@ def cast!(attributes)
       end
 
       def schema(attributes = nil)
-        if attributes && attributes.size > 0 && self.class.schema.nil?
+        if attributes.present? && self.class.schema.nil?
           self.class.define_schema_from(attributes)
         end
         self.class.schema || {}