pliny 0.32.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8de7550e51b73562d5fbf52d648945f5f07925cc5df89b5526faba9fc5b27075
-  data.tar.gz: 46f1ed81d71d0b9b70332085bc6dc61038a98d8f66ba2645db6651f355f85fd4
+  metadata.gz: 0737c4e1c61ecef9881625ff6bb0d2afeacc63977f239b7e2562d4aec3c3609a
+  data.tar.gz: f8db4293037c673ff3e33e025c75e86664f19cd207f3e36a2934e47eb981e942
 SHA512:
-  metadata.gz: 90130887007a82d06b841e6e4ca27f0f242f24eb782f273037a50a849d8a8a19ce73b7d4fb42ee75bc983b8cdfac57f02057e6322d11ab00678ef5c51b2d8d13
-  data.tar.gz: a77f028909da4a10a07db20f96e3fa872c351114395adbbbe500a1106bc0b3882676bdd94fbb52ec91a23676ba92cce2b84a76277a385321f29c16c64ede2fc1
+  metadata.gz: bad71b767121811048ca67857644d74d6b7e565461e96cc6f52fa3b8207a41cb6f5fa8b4d32d14fc49894709a7959c55ddd7a6c8972f1555f6d5b6108c160978
+  data.tar.gz: d0e2adac5319670b3c12344f6b4d40a989e74770f4ffdbffdbf7082941ed7f2590802babf478966a63c475638f4736961855a449cf9629779baf696f98f2eb28

data/lib/pliny/commands/creator.rb

@@ -35,7 +35,7 @@ module Pliny::Commands
       Dir.glob("#{app_dir}/{*,.*}.erb").each do |file|
         static_file = file.gsub(/\.erb$/, '')
 
-        template = ERB.new(File.read(file), 0)
+        template = ERB.new(File.read(file))
         context = OpenStruct.new(app_name: name)
         content = template.result(context.instance_eval { binding })
 

data/lib/pliny/commands/generator/base.rb

@@ -41,7 +41,7 @@ module Pliny::Commands
 
       def render_template(template_file, vars = {})
         template_path = File.dirname(__FILE__) + "/../../templates/#{template_file}"
-        template = ERB.new(File.read(template_path), 0, '>')
+        template = ERB.new(File.read(template_path), trim_mode: '>')
         context = OpenStruct.new(vars)
         template.result(context.instance_eval { binding })
       end

data/lib/pliny/errors.rb

@@ -4,7 +4,7 @@ module Pliny
       attr_accessor :id
 
       def self.render(error)
-        headers = { "Content-Type" => "application/json; charset=utf-8" }
+        headers = { "content-type" => "application/json; charset=utf-8" }
         data = { id: error.id, message: error.message }
         [error.status, headers, [MultiJson.encode(data)]]
       end

data/lib/pliny/metrics.rb

@@ -16,11 +16,13 @@ module Pliny
       counts
     end
 
-    def measure(*names, **opts, &block)
+    def measure(*inputs, &block)
       if block
         elapsed, return_value = time_elapsed(&block)
       end
 
+      opts = inputs.last.is_a?(Hash) ? inputs.pop : {}
+
       measurement =
         if opts.has_key?(:value)
           opts[:value]
@@ -30,7 +32,7 @@ module Pliny
           0
         end
 
-      measures = Hash[names.map { |n| ["#{Config.app_name}.#{n}", measurement] }]
+      measures = Hash[inputs.map { |n| ["#{Config.app_name}.#{n}", measurement] }]
 
       backends.each do |backend|
         report_and_catch { backend.report_measures(measures) }

data/lib/pliny/middleware/cors.rb

@@ -44,12 +44,12 @@ module Pliny::Middleware
 
     def cors_headers(env)
       {
-        'Access-Control-Allow-Origin'      => env["HTTP_ORIGIN"],
-        'Access-Control-Allow-Methods'     => ALLOW_METHODS.join(', '),
-        'Access-Control-Allow-Headers'     => allow_headers.join(', '),
-        'Access-Control-Allow-Credentials' => "true",
-        'Access-Control-Max-Age'           => "1728000",
-        'Access-Control-Expose-Headers'    => EXPOSE_HEADERS.join(', ')
+        'access-control-allow-origin'      => env["HTTP_ORIGIN"],
+        'access-control-allow-methods'     => ALLOW_METHODS.join(', '),
+        'access-control-allow-headers'     => allow_headers.join(', '),
+        'access-control-allow-credentials' => "true",
+        'access-control-max-age'           => "1728000",
+        'access-control-expose-headers'    => EXPOSE_HEADERS.join(', ')
       }
     end
   end

data/lib/pliny/middleware/versioning.rb

@@ -26,7 +26,7 @@ module Pliny::Middleware
             error = { id: :bad_version, message: <<-eos }
 Please specify a version along with the MIME type. For example, `Accept: application/vnd.#{@app_name}+json; version=1`.
             eos
-            return [400, { "Content-Type" => "application/json; charset=utf-8" },
+            return [400, { "content-type" => "application/json; charset=utf-8" },
               [MultiJson.encode(error)]]
           end
 

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.32.0"
+  VERSION = "1.1.0"
 end

data/lib/template/Gemfile

@@ -6,22 +6,22 @@ gem "oj"
 gem "pg"
 gem "pliny", "~> 0.32"
 gem "pry"
-gem "puma", "~> 3"
+gem "puma", "~> 6"
 gem "rack-ssl"
-gem "rack-timeout", "~> 0.4"
+gem "rack-timeout", "~> 0.6"
 gem "rake"
 gem "rollbar"
-gem "sequel", "~> 4.34"
+gem "sequel", "~> 5.73"
 gem "sequel-paranoid"
-gem "sequel_pg", "~> 1.6", require: "sequel"
-gem "sinatra", [">= 1.4", "< 3.0"], require: "sinatra/base"
+gem "sequel_pg", "~> 1.17", require: "sequel"
+gem "sinatra", [">= 2.0", "< 3.0"], require: "sinatra/base"
 gem "sinatra-contrib", require: ["sinatra/namespace", "sinatra/reloader"]
 gem "sinatra-router"
 gem "sucker_punch"
 
 group :development, :test do
   gem "pry-byebug"
-  gem "rubocop", "~> 0.52.1", require: false
+  gem "rubocop", "~> 1.56", require: false
   gem "rubocop-rspec", require: false
 end
 

data/spec/helpers/zulu_time_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "active_support/core_ext/numeric/time"
 
 describe Pliny::Helpers::ZuluTime do
   context "zulu_time" do

data/spec/integration_spec.rb

@@ -1,6 +1,5 @@
 require "spec_helper"
 require "open3"
-require 'active_support/core_ext/object/blank'
 
 describe "Pliny integration test" do
   describe "bin/setup" do

data/spec/metrics_spec.rb

@@ -102,5 +102,21 @@ describe Pliny::Metrics do
         "pliny.waldo" => 0
       )
     end
+
+    it "measures value in implicit hash with multiple metrics names" do
+      metrics.measure("metric.name", "another.name", value: 3.14, foo: :bar)
+      expect(test_backend).to have_received(:report_measures).once.with(
+        "pliny.metric.name" => 3.14,
+        "pliny.another.name" => 3.14
+      )
+    end
+
+    it "measures value in explicit hash with multiple metrics names" do
+      metrics.measure("metric.name", "another.name", { value: 3.14, foo: :bar })
+      expect(test_backend).to have_received(:report_measures).once.with(
+        "pliny.metric.name" => 3.14,
+        "pliny.another.name" => 3.14
+      )
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ ENV["TEST_DATABASE_URL"] ||= "postgres://localhost/pliny-gem-test"
 require "bundler"
 Bundler.require
 
+require "active_support/all"
 require "fileutils"
 require "rack/test"
 require "sequel"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brandur Leach
 - Pedro Belo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -77,20 +77,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: http_accept
   requirement: !ruby/object:Gem::Requirement
@@ -171,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -205,20 +205,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -497,7 +497,7 @@ homepage: https://github.com/interagent/pliny
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -512,8 +512,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra
 test_files: []