From 54a0b5eae7d22fc34db63503391b32d3b27f0f01 Mon Sep 17 00:00:00 2001 From: Pedro Carbajal Date: Fri, 5 Jan 2024 17:25:15 +0900 Subject: [PATCH] Fix formatting of assignment if statements --- fmrest.gemspec | 13 ++++++------ lib/fmrest.rb | 13 ++++++------ lib/fmrest/spyke/model/orm.rb | 11 +++++----- lib/fmrest/v1/dates.rb | 8 ++++---- lib/fmrest/v1/token_session.rb | 13 ++++++------ spec/spyke/model/attributes_spec.rb | 32 +++++++++++++++-------------- 6 files changed, 48 insertions(+), 42 deletions(-) diff --git a/fmrest.gemspec b/fmrest.gemspec index a091cfa..d152874 100644 --- a/fmrest.gemspec +++ b/fmrest.gemspec @@ -32,12 +32,13 @@ Gem::Specification.new do |spec| spec.add_development_dependency "yard" spec.add_development_dependency "yard-activesupport-concern" - ar_version = ENV["ACTIVE_RECORD_VERSION"] || "~> 7.0" - sqlite3_version = if (4.2..5.2).include?(ar_version.to_s.gsub(/[^\d.]/, "").to_f) - "~> 1.3.0" - else - "~> 1.4.0" - end + ar_version = ENV["ACTIVE_RECORD_VERSION"] || "~> 7.0" + sqlite3_version = + if (4.2..5.2).include?(ar_version.to_s.gsub(/[^\d.]/, "").to_f) + "~> 1.3.0" + else + "~> 1.4.0" + end spec.add_development_dependency "activerecord", ar_version spec.add_development_dependency "sqlite3", sqlite3_version diff --git a/lib/fmrest.rb b/lib/fmrest.rb index 64a7479..4479261 100644 --- a/lib/fmrest.rb +++ b/lib/fmrest.rb @@ -40,12 +40,13 @@ def config end def logger - @logger ||= if defined?(Rails) - Rails.logger - else - require "logger" - Logger.new($stdout) - end + @logger ||= + if defined?(Rails) + Rails.logger + else + require "logger" + Logger.new($stdout) + end end # Shortcut for `FmRest::V1.escape_find_operators` diff --git a/lib/fmrest/spyke/model/orm.rb b/lib/fmrest/spyke/model/orm.rb index 4b0681e..0a8b5b8 100644 --- a/lib/fmrest/spyke/model/orm.rb +++ b/lib/fmrest/spyke/model/orm.rb @@ -168,11 +168,12 @@ def destroy(options = {}) # For whatever reason the Data API wants the script params as query # string params for DELETE requests, making this more complicated # than it should be - script_query_string = if options.has_key?(:script) - "?" + Faraday::Utils.build_query(FmRest::V1.convert_script_params(options[:script])) - else - "" - end + script_query_string = + if options.has_key?(:script) + "?" + Faraday::Utils.build_query(FmRest::V1.convert_script_params(options[:script])) + else + "" + end self.attributes = delete(uri.to_s + script_query_string) end diff --git a/lib/fmrest/v1/dates.rb b/lib/fmrest/v1/dates.rb index 0e2e44e..f0b79e7 100644 --- a/lib/fmrest/v1/dates.rb +++ b/lib/fmrest/v1/dates.rb @@ -71,10 +71,10 @@ def local_offset_for_datetime(dt, zone = nil) # Do we have ActiveSupport's TimeZone? time = if time.respond_to?(:in_time_zone) - time.in_time_zone(zone || ::Time.zone) - else - time.localtime - end + time.in_time_zone(zone || ::Time.zone) + else + time.localtime + end Rational(time.utc_offset, 86400) # seconds in one day (24*60*60) end diff --git a/lib/fmrest/v1/token_session.rb b/lib/fmrest/v1/token_session.rb index 1bb10a6..6612fc1 100644 --- a/lib/fmrest/v1/token_session.rb +++ b/lib/fmrest/v1/token_session.rb @@ -101,12 +101,13 @@ def token_store_key # Strip the host part to just the hostname (i.e. no scheme or port) host = @settings.host! host = URI(host).hostname if host =~ /\Ahttps?:\/\// - identity_segment = if fmid_token = @settings.fmid_token - require "digest" - Digest::SHA256.hexdigest(fmid_token) - else - @settings.username! - end + identity_segment = + if fmid_token = @settings.fmid_token + require "digest" + Digest::SHA256.hexdigest(fmid_token) + else + @settings.username! + end "#{host}:#{@settings.database!}:#{identity_segment}" end end diff --git a/spec/spyke/model/attributes_spec.rb b/spec/spyke/model/attributes_spec.rb index bc249ab..fb8ea06 100644 --- a/spec/spyke/model/attributes_spec.rb +++ b/spec/spyke/model/attributes_spec.rb @@ -24,21 +24,23 @@ # TODO: Rewrite this spec to be less dependent on ActiveModel's internals describe ".attribute_method_matchers" do it "doesn't include a plain entry" do - matcher = if test_class.respond_to?(:attribute_method_patterns) - test_class.attribute_method_patterns.first - else - test_class.attribute_method_matchers.first - end - target = if matcher.respond_to?(:proxy_target) - # ActiveModel >= 7.1 - matcher.proxy_target - elsif matcher.respond_to?(:target) - # ActiveModel >= 6, < 7.1 - matcher.target - else - # ActiveModel <= 5 - matcher.method_missing_target - end + matcher = + if test_class.respond_to?(:attribute_method_patterns) + test_class.attribute_method_patterns.first + else + test_class.attribute_method_matchers.first + end + target = + if matcher.respond_to?(:proxy_target) + # ActiveModel >= 7.1 + matcher.proxy_target + elsif matcher.respond_to?(:target) + # ActiveModel >= 6, < 7.1 + matcher.target + else + # ActiveModel <= 5 + matcher.method_missing_target + end expect(target).to_not eq("attribute") end end