pliny 0.27.1 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f293533ee05722c6e85a425dd35414c8bf88e8055371a6b4208486334c6063
-  data.tar.gz: 10c679736c876907897d054ef84053dd1b7fb48b75cf7b364557dfc7e0e644c1
+  metadata.gz: 4fdeb50812c8474db1b462be06a13943d901cc06c51044c39fffe9533c2d67d4
+  data.tar.gz: b70639846466fc0efa37a62fc55551ec4386ccfd0ac3141e041bef88744f4610
 SHA512:
-  metadata.gz: bbe4f48bb7a51e5709684dc8a2261a7286a146b9a58d2326e87f6cf581d2850a1de1f09ad8f469537b1cc7ed19807521ee7e01e0d8244994b83f37a5095fc175
-  data.tar.gz: 9c1360812d50eb5832de40ca3fe3c569e204794397157d985da0fa0c353a16ffece435b158a7073a01627dd263a8932d1be0ccf32961d24bf7574cacaa946b52
+  metadata.gz: f9e248f7961808f6d862d6b77c8065afc7716cf7861ecb0c508d470819ba012a0a0cd2454352b4854bbaad4cb23f18166ace07cca14035eb514ec71fdf908a96
+  data.tar.gz: 7b7120d718e286d1ecb7cead9ed19db8a823b4aefe66f1601d824cfc172b46c89c2cbbe2ebdccfaf0e113b8afb862bd2c85d76bf55438ca1dbd5ea89bfc3f28d

data/lib/pliny/commands/updater.rb

@@ -1,7 +1,7 @@
-require 'fileutils'
-require 'pathname'
-require 'pliny/version'
-require 'uri'
+require "fileutils"
+require "pathname"
+require "pliny/version"
+require "uri"
 
 module Pliny::Commands
   class Updater
@@ -37,7 +37,7 @@ module Pliny::Commands
 
     # we need a local copy of the pliny repo to produce a diff
     def ensure_repo_available
-      if File.exists?(repo_dir)
+      if File.exist?(repo_dir)
         unless system("cd #{repo_dir} && git fetch --tags")
           abort("Could not update Pliny repo at #{repo_dir}")
         end

data/lib/pliny/log.rb

@@ -124,7 +124,6 @@ module Pliny
     end
 
     def quote_string(k, v)
-      # try to find a quote style that fits
       if !v.include?('"')
         %{#{k}="#{v}"}
       elsif !v.include?("'")
@@ -140,19 +139,22 @@ module Pliny
 
     def unparse_pair(k, v)
       v = v.call if v.is_a?(Proc)
-      # only quote strings if they include whitespace
+
       if v == nil
         nil
       elsif v == true
         k
       elsif v.is_a?(Float)
         "#{k}=#{format("%.3f", v)}"
-      elsif v.is_a?(String) && v =~ /\s/
-        quote_string(k, v)
       elsif v.is_a?(Time)
         "#{k}=#{v.iso8601}"
       else
-        "#{k}=#{v}"
+        v = "#{v}"
+        if v =~ /\s/
+          quote_string(k, v)
+        else
+          "#{k}=#{v}"
+        end
       end
     end
   end

data/lib/pliny/tasks/db.rake

@@ -32,12 +32,12 @@ begin
 
     desc "Seed the database with data"
     task :seed do
-      if File.exist?('./db/seeds.rb')
+      if File.exist?("./db/seeds.rb")
         database_urls.each do |database_url|
           # make a DB instance available to the seeds file
-          self.class.send(:remove_const, 'DB') if self.class.const_defined?('DB')
-          self.class.const_set('DB', Sequel.connect(database_url))
-          load 'db/seeds.rb'
+          self.class.send(:remove_const, "DB") if self.class.const_defined?("DB")
+          self.class.const_set("DB", Sequel.connect(database_url))
+          load "db/seeds.rb"
         end
         disconnect
       end
@@ -66,7 +66,7 @@ begin
         admin_url = Pliny::DbSupport.admin_url(database_url)
         db = Sequel.connect(admin_url)
         name = name_from_uri(database_url)
-        db.run(%{DROP DATABASE IF EXISTS "#{name}"})
+        db.run(%(DROP DATABASE IF EXISTS "#{name}"))
         puts "Dropped `#{name}`"
       end
       disconnect
@@ -75,7 +75,7 @@ begin
     namespace :schema do
       desc "Load the database schema"
       task :load do
-        if File.exists?("./db/schema.sql")
+        if File.exist?("./db/schema.sql")
           schema = File.read("./db/schema.sql")
           database_urls.each do |database_url|
             db = Sequel.connect(database_url)
@@ -118,14 +118,14 @@ begin
       end
 
       desc "Merges migrations into schema and removes them"
-      task :merge => ["db:setup", "db:schema:dump"] do
+      task merge: ["db:setup", "db:schema:dump"] do
         FileUtils.rm Dir["./db/migrate/*.rb"]
         puts "Removed migrations"
       end
     end
 
     desc "Setup the database"
-    task :setup => [:drop, :create, "schema:load", :migrate, :seed]
+    task setup: [:drop, :create, "schema:load", :migrate, :seed]
 
     private
 
@@ -138,12 +138,10 @@ begin
       if ENV["DATABASE_URL"]
         [ENV["DATABASE_URL"]]
       else
-        %w(.env .env.test).map { |env_file|
+        %w[.env .env.test].map { |env_file|
           env_path = "./#{env_file}"
-          if File.exists?(env_path)
+          if File.exist?(env_path)
             Pliny::Utils.parse_env(env_path)["DATABASE_URL"]
-          else
-            nil
           end
         }.compact
       end
@@ -153,7 +151,6 @@ begin
       URI.parse(uri).path[1..-1]
     end
   end
-
 rescue LoadError
   puts "Couldn't load sequel. Skipping database tasks"
 end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.27.1"
+  VERSION = "0.28.0"
 end

data/lib/template/Gemfile

@@ -4,7 +4,7 @@ ruby "2.4.0"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.27"
+gem "pliny", "~> 0.28"
 gem "pry"
 gem "puma", "~> 3"
 gem "rack-ssl"

data/spec/commands/creator_spec.rb

@@ -1,5 +1,5 @@
-require 'pliny/commands/creator'
-require 'spec_helper'
+require "pliny/commands/creator"
+require "spec_helper"
 
 describe Pliny::Commands::Creator do
   before do
@@ -7,21 +7,23 @@ describe Pliny::Commands::Creator do
   end
 
   describe "#run!" do
-    before do
-      FileUtils.rm_rf("/tmp/plinytest")
-      FileUtils.mkdir_p("/tmp/plinytest")
-      Dir.chdir("/tmp/plinytest")
+    around do |example|
+      Dir.mktmpdir("plinytest-") do |dir|
+        Dir.chdir(dir) do
+          example.run
+        end
+      end
     end
 
     it "copies the template app over" do
       @gen.run!
-      assert File.exists?("./foobar")
-      assert File.exists?("./foobar/Gemfile")
+      assert File.exist?("./foobar")
+      assert File.exist?("./foobar/Gemfile")
     end
 
     it "deletes the .git from it" do
       @gen.run!
-      refute File.exists?("./foobar/.git")
+      refute File.exist?("./foobar/.git")
     end
 
     it "deletes the .erb files from it" do
@@ -31,25 +33,25 @@ describe Pliny::Commands::Creator do
 
     it "changes DATABASE_URL in .env.sample to use the app name" do
       @gen.run!
-      db_url = File.read("./foobar/.env.sample").split("\n").detect do |line|
+      db_url = File.read("./foobar/.env.sample").split("\n").detect { |line|
         line.include?("DATABASE_URL=")
-      end
+      }
       assert_equal "DATABASE_URL=postgres:///foobar-development", db_url
     end
 
     it "changes DATABASE_URL in .env.test to use the app name" do
       @gen.run!
-      db_url = File.read("./foobar/.env.test").split("\n").detect do |line|
+      db_url = File.read("./foobar/.env.test").split("\n").detect { |line|
         line.include?("DATABASE_URL=")
-      end
+      }
       assert_equal "DATABASE_URL=postgres:///foobar-test", db_url
     end
 
     it "changes APP_NAME in app.json to use the app name" do
       @gen.run!
-      db_url = File.read("./foobar/app.json").split("\n").detect do |line|
+      db_url = File.read("./foobar/app.json").split("\n").detect { |line|
         line.include?("\"name\":")
-      end
+      }
       assert_equal "  \"name\": \"foobar\",", db_url
     end
   end

data/spec/commands/updater_spec.rb

@@ -1,5 +1,5 @@
-require 'pliny/commands/updater'
-require 'spec_helper'
+require "pliny/commands/updater"
+require "spec_helper"
 
 describe Pliny::Commands::Updater do
   before do
@@ -10,19 +10,21 @@ describe Pliny::Commands::Updater do
   end
 
   describe "#run!" do
-    before do
-      FileUtils.rm_rf("/tmp/plinytest")
-      FileUtils.mkdir_p("/tmp/plinytest")
-      Dir.chdir("/tmp/plinytest")
-      File.open("/tmp/plinytest/Gemfile.lock", "w") do |f|
-        f.puts "    pliny (0.6.3)"
+    around do |example|
+      Dir.mktmpdir("plinytest-") do |dir|
+        Dir.chdir(dir) do
+          File.open("./Gemfile.lock", "w") do |f|
+            f.puts "    pliny (0.6.3)"
+          end
+          example.run
+        end
       end
     end
 
     it "creates a patch with Pliny diffs between the two versions" do
       @cmd.run!
       patch = File.read(@cmd.patch_file)
-      assert patch.include?('--- a/Gemfile')
+      assert patch.include?("--- a/Gemfile")
       assert patch.include?('-gem "pliny", "~> 0.6"')
     end
   end

data/spec/db_support_spec.rb

@@ -6,15 +6,18 @@ describe Pliny::DbSupport do
   let(:logger) { Logger.new(StringIO.new) }
   let(:support) { Pliny::DbSupport.new(url, logger) }
 
-  before do
-    @path = "/tmp/pliny-test"
+  around do |example|
+    Dir.mktmpdir("plinytest-") do |dir|
+      Dir.chdir(dir) do
+        FileUtils.mkdir_p("./db/migrate")
+
+        example.run
+      end
+    end
   end
 
-  before(:each) do
+  before do
     DB.tables.each { |t| DB.drop_table(t) }
-    FileUtils.rm_rf(@path)
-    FileUtils.mkdir_p("#{@path}/db/migrate")
-    Dir.chdir(@path)
   end
 
   describe ".admin_url" do
@@ -33,7 +36,7 @@ describe Pliny::DbSupport do
 
   describe "#migrate" do
     before do
-      File.open("#{@path}/db/migrate/#{Time.now.to_i}_create_foo.rb", "w") do |f|
+      File.open("./db/migrate/#{Time.now.to_i}_create_foo.rb", "w") do |f|
         f.puts "
           Sequel.migration do
             change do
@@ -57,11 +60,11 @@ describe Pliny::DbSupport do
   describe "#rollback" do
     before do
       @t = Time.now
-      File.open("#{@path}/db/migrate/#{(@t-2).to_i}_first.rb", "w") do |f|
+      File.open("./db/migrate/#{(@t - 2).to_i}_first.rb", "w") do |f|
         f.puts "Sequel.migration { change { create_table(:first) } }"
       end
 
-      File.open("#{@path}/db/migrate/#{(@t-1).to_i}_second.rb", "w") do |f|
+      File.open("./db/migrate/#{(@t - 1).to_i}_second.rb", "w") do |f|
         f.puts "Sequel.migration { change { create_table(:second) } }"
       end
     end
@@ -80,7 +83,7 @@ describe Pliny::DbSupport do
     end
 
     it "handles databases not migrated (schema_migrations is empty)" do
-      support.migrate (@t-2).to_i
+      support.migrate((@t - 2).to_i)
       support.rollback # destroy table, leave schema_migrations
       support.rollback # should noop
     end

data/spec/integration_spec.rb

@@ -2,19 +2,24 @@ require "spec_helper"
 
 describe "Pliny integration test" do
   before(:all) do
-    FileUtils.rm_rf("/tmp/plinytest")
-    FileUtils.mkdir_p("/tmp/plinytest")
-    Dir.chdir("/tmp/plinytest")
+    @original_dir = Dir.pwd
+
+    test_dir = Dir.mktmpdir("plinytest-")
+    Dir.chdir(test_dir)
 
     bash "pliny-new myapp"
 
-    Dir.chdir("/tmp/plinytest/myapp")
+    Dir.chdir("myapp")
     bash "bin/setup"
   end
 
+  after(:all) do
+    Dir.chdir(@original_dir)
+  end
+
   describe "bin/setup" do
     it "generates .env" do
-      assert File.exists?("./.env")
+      assert File.exist?("./.env")
     end
   end
 
@@ -24,19 +29,19 @@ describe "Pliny integration test" do
     end
 
     it "creates the model file" do
-      assert File.exists?("./lib/models/artist.rb")
+      assert File.exist?("./lib/models/artist.rb")
     end
 
     it "creates the endpoint file" do
-      assert File.exists?("./lib/endpoints/artists.rb")
+      assert File.exist?("./lib/endpoints/artists.rb")
     end
 
     it "creates the serializer file" do
-      assert File.exists?("./lib/serializers/artist.rb")
+      assert File.exist?("./lib/serializers/artist.rb")
     end
 
     it "creates the schema file" do
-      assert File.exists?("./schema/schemata/artist.yaml")
+      assert File.exist?("./schema/schemata/artist.yaml")
     end
   end
 

data/spec/log_spec.rb

@@ -5,7 +5,6 @@ describe Pliny::Log do
     @io = StringIO.new
     Pliny.stdout = @io
     Pliny.stderr = @io
-    allow(@io).to receive(:print)
   end
 
   after do
@@ -130,4 +129,66 @@ describe Pliny::Log do
       end
     end
   end
+
+  describe "unparsing" do
+    it "removes nils from log" do
+      expect(@io).to receive(:print).with("\n")
+
+      Pliny.log(foo: nil)
+    end
+
+    it "leaves bare keys for true values" do
+      expect(@io).to receive(:print).with("foo\n")
+
+      Pliny.log(foo: true)
+    end
+
+    it "truncates floats" do
+      expect(@io).to receive(:print).with("foo=3.142\n")
+
+      Pliny.log(foo: Math::PI)
+    end
+
+    it "outputs times in ISO8601 format" do
+      expect(@io).to receive(:print).with("foo=2020-01-01T00:00:00Z\n")
+
+      Pliny.log(foo: Time.utc(2020))
+    end
+
+    it "quotes strings that contain spaces" do
+      expect(@io).to receive(:print).with("foo=\"string with spaces\"\n")
+
+      Pliny.log(foo: "string with spaces")
+    end
+
+    it "by default interpolates objects into strings" do
+      expect(@io).to receive(:print).with("foo=message\n")
+      expect(@io).to receive(:print).with("foo=42\n")
+      expect(@io).to receive(:print).with("foo=bar\n")
+
+      Pliny.log(foo: StandardError.new("message"))
+      Pliny.log(foo: 42)
+
+      klass = Class.new do
+        def to_s
+          "bar"
+        end
+      end
+      Pliny.log(foo: klass.new)
+    end
+
+    it "quotes strings that are generated from object interpolation" do
+      expect(@io).to receive(:print).with("foo=\"message with space\"\n")
+      expect(@io).to receive(:print).with("foo=\"bar with space\"\n")
+
+      Pliny.log(foo: StandardError.new("message with space"))
+
+      klass = Class.new do
+        def to_s
+          "bar with space"
+        end
+      end
+      Pliny.log(foo: klass.new)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.28.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,28 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -157,40 +157,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -530,7 +518,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra