copy_tuner_client 2.1.2 → 2.2.0

data/spec/support/fake_copy_tuner_app.rb

@@ -13,12 +13,12 @@ class FakeCopyTunerApp < Sinatra::Base
         Thin::Logging.silent = true
       end
 
-      Rack::Handler::Thin.run self, :Port => port
+      Rack::Handler::Thin.run self, Port: port
     end
   end
 
   def self.port
-    (ENV['COPY_TUNER_PORT'] || 3002).to_i
+    ENV.fetch('COPY_TUNER_PORT', 3002).to_i
   end
 
   def self.add_project(api_key)
@@ -35,11 +35,11 @@ class FakeCopyTunerApp < Sinatra::Base
 
   def with_project(api_key)
     if api_key == 'raise_error'
-      halt 500, { :error => 'Blah ha' }.to_json
-    elsif project = Project.find(api_key)
+      halt 500, { error: 'Blah ha' }.to_json
+    elsif (project = Project.find(api_key))
       yield project
     else
-      halt 404, { :error => 'No such project' }.to_json
+      halt 404, { error: 'No such project' }.to_json
     end
   end
 
@@ -84,47 +84,7 @@ class FakeCopyTunerApp < Sinatra::Base
   class Project
     attr_reader :draft, :published, :api_key
 
-    def initialize(attrs)
-      @api_key = attrs['api_key']
-      @draft = attrs['draft']  || {}
-      @etag = attrs['etag'] || 1
-      @published = attrs['published'] || {}
-    end
-
-    def to_hash
-      {
-        'api_key' => @api_key,
-        'etag' => @etag,
-        'draft' => @draft,
-        'published' => @published
-      }
-    end
-
-    def update(attrs)
-      if attrs['draft']
-        @draft.update attrs['draft']
-      end
-
-      if attrs['published']
-        @published.update attrs['published']
-      end
-
-      @etag += 1
-      self.class.save self
-    end
-
-    def reload
-      self.class.find api_key
-    end
-
-    def deploy
-      @published.update @draft
-      self.class.save self
-    end
-
-    def etag
-      @etag.to_s
-    end
+    MUTEX = Mutex.new
 
     def self.create(api_key)
       project = Project.new('api_key' => api_key)
@@ -134,18 +94,14 @@ class FakeCopyTunerApp < Sinatra::Base
 
     def self.find(api_key)
       open_project_data do |data|
-        if project_hash = data[api_key]
+        if (project_hash = data[api_key])
           Project.new project_hash.dup
-        else
-          nil
         end
       end
     end
 
     def self.delete_all
-      open_project_data do |data|
-        data.clear
-      end
+      open_project_data(&:clear)
     end
 
     def self.save(project)
@@ -154,26 +110,62 @@ class FakeCopyTunerApp < Sinatra::Base
       end
     end
 
-    MUTEX = Mutex.new
     def self.open_project_data
       MUTEX.synchronize do
-        project_file = File.expand_path('../../../tmp/projects.json', __FILE__)
+        project_file = File.expand_path('../../tmp/projects.json', __dir__)
         FileUtils.mkdir_p File.dirname(project_file)
 
-        if File.exist? project_file
-          data = JSON.parse(IO.read(project_file))
-        else
-          data = {}
-        end
+        data =
+          if File.exist? project_file
+            JSON.parse(File.read(project_file))
+          else
+            {}
+          end
 
         result = yield(data)
 
-        File.open(project_file, 'w') do |file|
-          file.write data.to_json
-        end
+        File.write(project_file, data.to_json)
 
         result
       end
     end
+
+    def initialize(attrs)
+      @api_key = attrs['api_key']
+      @draft = attrs.fetch('draft', {})
+      @etag = attrs.fetch('etag', 1)
+      @published = attrs.fetch('published', {})
+    end
+
+    def to_hash
+      {
+        'api_key' => @api_key,
+        'etag' => @etag,
+        'draft' => @draft,
+        'published' => @published,
+      }
+    end
+
+    def update(attrs)
+      @draft.update attrs['draft'] if attrs['draft']
+
+      @published.update attrs['published'] if attrs['published']
+
+      @etag += 1
+      self.class.save self
+    end
+
+    def reload
+      self.class.find api_key
+    end
+
+    def deploy
+      @published.update @draft
+      self.class.save self
+    end
+
+    def etag
+      @etag.to_s
+    end
   end
 end

data/spec/support/fake_html_safe_string.rb

@@ -1,6 +1,6 @@
 class FakeHtmlSafeString < String
-  def initialize(*args)
-    super(*args)
+  def initialize(*)
+    super
     @html_safe = false
   end
 
@@ -17,4 +17,3 @@ class FakeHtmlSafeString < String
     @html_safe
   end
 end
-

data/spec/support/fake_logger.rb

@@ -1,32 +1,32 @@
 class FakeLogger
   def initialize
     @entries = {
-      :info  => [],
-      :debug => [],
-      :warn  => [],
-      :error => [],
-      :fatal => [],
+      info: [],
+      debug: [],
+      warn: [],
+      error: [],
+      fatal: [],
     }
   end
 
-  def info(message = nil, &block)
-    log(:info, message, &block)
+  def info(message = nil, &)
+    log(:info, message, &)
   end
 
-  def debug(message = nil, &block)
-    log(:debug, message, &block)
+  def debug(message = nil, &)
+    log(:debug, message, &)
   end
 
-  def warn(message = nil, &block)
-    log(:warn, message, &block)
+  def warn(message = nil, &)
+    log(:warn, message, &)
   end
 
-  def error(message = nil, &block)
-    log(:error, message, &block)
+  def error(message = nil, &)
+    log(:error, message, &)
   end
 
-  def fatal(message = nil, &block)
-    log(:fatal, message, &block)
+  def fatal(message = nil, &)
+    log(:fatal, message, &)
   end
 
   def log(severity, message = nil, &block)
@@ -56,13 +56,14 @@ RSpec::Matchers.define :have_entry do |severity, entry|
   end
 
   def entries
-    lines = @logger.entries.inject([]) do |result, (severity, entries)|
-      if entries.empty?
-        result
-      else
-        result << "#{severity}:\n#{entries.join("\n")}"
+    lines =
+      @logger.entries.inject([]) do |result, (severity, entries)|
+        if entries.empty?
+          result
+        else
+          result << "#{severity}:\n#{entries.join("\n")}"
+        end
       end
-    end
     lines.join("\n\n")
   end
 end

data/spec/support/fake_passenger.rb

@@ -9,19 +9,17 @@ class FakePassenger
   end
 
   def call_event(name, *args)
-    if @handlers[name]
-      @handlers[name].each do |handler|
-        handler.call(*args)
-      end
+    @handlers[name]&.each do |handler|
+      handler.call(*args)
     end
   end
 
   def become_master
-    $0 = "PassengerApplicationSpawner"
+    $0 = 'PassengerApplicationSpawner'
   end
 
   def spawn
-    $0 = "PassengerFork"
+    $0 = 'PassengerFork'
     call_event(:starting_worker_process, true)
   end
 end

data/spec/support/fake_unicorn.rb

@@ -1,13 +1,11 @@
 class FakeUnicornServer
   def become_master
-    $0 = "unicorn"
+    $0 = 'unicorn'
   end
 
   def spawn
     worker_loop(nil)
   end
 
-  def worker_loop(worker)
-  end
+  def worker_loop(worker); end
 end
-

data/spec/support/middleware_stack.rb

@@ -3,11 +3,11 @@ class MiddlewareStack
     @middlewares = []
   end
 
-  def use(klass, *args)
-    @middlewares << klass.new('fake_app', *args)
+  def use(klass, *)
+    @middlewares << klass.new('fake_app', *)
   end
 
   def include?(klass)
-    @middlewares.any? { |middleware| klass === middleware }
+    @middlewares.any?(klass)
   end
 end

data/spec/support/writing_cache.rb

@@ -1,12 +1,12 @@
 class WritingCache
+  FLUSHED = 'flushed'.freeze
+
   def flush
-    File.open(path, "w") do |file|
-      file.write(object_id.to_s)
-    end
+    File.write(path, FLUSHED)
   end
 
   def written?
-    IO.read(path) == object_id.to_s
+    File.exist?(path) && File.read(path) == FLUSHED
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - SonicGarden