pliny 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17e76a1800d179c9271ab0bf1b67dad549e7fed
-  data.tar.gz: badd208c4a7ad6e3b58735cd3d8edde7b485bab2
+  metadata.gz: 07ee81425520e48b9096f3d05164ff1793e6e3e8
+  data.tar.gz: dce7f63b5664b66b7ad219d54ed5bb9818a8de9d
 SHA512:
-  metadata.gz: cc9b96fad0c7fca0f0ced728dc148cda49ac22b330cb45614b0068ee166ed528ada6d8f331bafbf6be5ac340ac6cd6d569e97b6c83270684b82da814e59cd4a6
-  data.tar.gz: 6b7f260a8c291e1435920ba61d6ac5aa63246b1efc3dffbbc01b2adb1c2cec8f61954096b71780ed3b0ed1d9fe5b1422dd6d94bb22067c696b38ac9248d5e41b
+  metadata.gz: 622a31e59a1124f435b6954036ce1bb0e3692fd7b998409a68460a91e63d815f17bfc211ab9781f61f95f3a6d58234731d32b208e4f9f26a31b87e100d21d897
+  data.tar.gz: c53473f9fd7bf1289c799007c132fd2a529d27cbafab745f3cc08bbdc5a0137ed2508f00b37cc15313bb4f30373942c52f9a6dd3529379a5b57b0d35e7dae0f8

data/lib/pliny/error_reporters/rollbar.rb

@@ -19,7 +19,7 @@ module Pliny
 
       def fetch_scope(context:, rack_env:)
         scope = {}
-        if rack_env.respond_to?(:body)
+        unless rack_env.empty?
           scope[:request] = proc { extract_request_data_from_rack(rack_env) }
         end
         scope

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.21.0"
+  VERSION = "0.22.0"
 end

data/lib/template/.rubocop.yml

@@ -0,0 +1,29 @@
+require:
+ - rubocop-rspec
+AllCops:
+  TargetRubyVersion: 2.3
+# Offense count: 8
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
+# URISchemes: http, https
+Metrics/LineLength:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Enabled: false
+
+# Offense count: 1
+Style/ClassVars:
+  Enabled: false
+
+# Offense count: 6
+Style/Documentation:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/lib/template/Gemfile

@@ -4,7 +4,7 @@ ruby "2.3.3"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.21"
+gem "pliny", "~> 0.22"
 gem "pry"
 gem "puma", "~> 2.16"
 gem "rack-ssl"
@@ -21,13 +21,15 @@ gem "sucker_punch"
 
 group :development, :test do
   gem "pry-byebug"
+  gem "rubocop", "~> 0.46.0", require: false
+  gem "rubocop-rspec", require: false
 end
 
 group :test do
-  gem "simplecov", require: false
   gem "committee"
   gem "database_cleaner"
   gem "dotenv"
   gem "rack-test"
   gem "rspec"
+  gem "simplecov", require: false
 end

data/lib/template/Rakefile

@@ -1,6 +1,7 @@
+
 require "pliny/tasks"
 
 # Add your rake tasks to lib/tasks!
 Dir["./lib/tasks/*.rake"].each { |task| load task }
 
-task :default => :spec
+task default: :spec

data/lib/template/bin/console

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/application'
+require_relative "../lib/application"
 
 def basic_prompt(target_self, nest_level, pry)
   # override DEPLOYMENT to identify console sessions (eg: staging/production/etc)
@@ -9,13 +9,13 @@ def basic_prompt(target_self, nest_level, pry)
 end
 
 Pry.prompt = [
-   proc { |target_self, nest_level, pry|
-     basic_prompt(target_self, nest_level, pry) + "> "
-   },
+  proc do |target_self, nest_level, pry|
+    basic_prompt(target_self, nest_level, pry) + "> "
+  end,
 
-   proc { |target_self, nest_level, pry|
-     basic_prompt(target_self, nest_level, pry) + "* "
-   }
+  proc do |target_self, nest_level, pry|
+    basic_prompt(target_self, nest_level, pry) + "* "
+  end
 ]
 
 Pry.start

data/lib/template/bin/run

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
-require_relative '../lib/application'
+# rubocop:disable Lint/Eval
+
+require_relative "../lib/application"
 
 eval ARGV.join(" ")

data/lib/template/config.ru

@@ -1,4 +1,4 @@
-require_relative 'lib/application'
+require_relative "lib/application"
 
 $stdout.sync = true
 $stderr.sync = true

data/lib/template/config/config.rb

@@ -20,9 +20,9 @@ module Config
   # Override -- value is returned or the set default.
   override :database_timeout, 10,           int
   override :db_pool,          5,            int
-  override :deployment,       'production', string
+  override :deployment,       "production", string
   override :force_ssl,        true,         bool
-  override :app_env,          'production', string
+  override :app_env,          "production", string
   override :port,             5000,         int
   override :pretty_json,      false,        bool
   override :puma_max_threads, 16,           int

data/lib/template/config/initializers/database.rb

@@ -1,10 +1,10 @@
 database_setup_proc = lambda do |conn|
   # identify postgres connections coming from this process in pg_stat_activity
-  process_identifier = ENV["DYNO"] || File.basename($0).gsub(/\W+/, "_")
+  process_identifier = ENV["DYNO"] || File.basename($PROGRAM_NAME).gsub(/\W+/, "_")
   conn.execute "SET statement_timeout = '#{Config.database_timeout}s'"
   conn.execute "SET application_name = '#{process_identifier}'"
 end
 
 DB = Sequel.connect(Config.database_url,
-  max_connections: Config.db_pool,
-  after_connect: database_setup_proc)
+                    max_connections: Config.db_pool,
+                    after_connect: database_setup_proc)

data/lib/template/config/initializers/rollbar.rb

@@ -1,13 +1,12 @@
-require 'pliny/error_reporters/rollbar'
+require "pliny/error_reporters/rollbar"
 
 Pliny::ErrorReporters.error_reporters << Pliny::ErrorReporters::Rollbar
 
 Rollbar.configure do |config|
-  config.enabled = ENV.has_key?('ROLLBAR_ACCESS_TOKEN')
+  config.enabled = ENV.key?("ROLLBAR_ACCESS_TOKEN")
   config.disable_rack_monkey_patch = true
   config.access_token = ENV["ROLLBAR_ACCESS_TOKEN"]
-  config.environment = ENV['ROLLBAR_ENV']
+  config.environment = ENV["ROLLBAR_ENV"]
   config.logger = Pliny::RollbarLogger.new
   config.use_sucker_punch
 end
-

data/lib/template/config/puma.rb

@@ -8,7 +8,7 @@ workers Config.puma_workers
 
 on_worker_boot do
   # force Sequel's thread pool to be refreshed
-  Sequel::DATABASES.each { |db| db.disconnect }
+  Sequel::DATABASES.each(&:disconnect)
 end
 
 preload_app!

data/lib/template/lib/application.rb

@@ -1,4 +1,4 @@
-require 'bundler'
+require "bundler"
 Bundler.require
 
-require_relative 'initializer'
+require_relative "initializer"

data/lib/template/lib/endpoints/health.rb

@@ -1,11 +1,11 @@
 module Endpoints
   class Health < Base
-    namespace '/health' do
+    namespace "/health" do
       get do
         encode({})
       end
 
-      get '/db' do
+      get "/db" do
         database?
         database_available?
         encode({})
@@ -14,14 +14,14 @@ module Endpoints
       private
 
       def database?
-        fail Pliny::Errors::NotFound if DB.nil?
+        raise Pliny::Errors::NotFound if DB.nil?
       end
 
       def database_available?
-        fail Pliny::Errors::ServiceUnavailable unless DB.test_connection
+        raise Pliny::Errors::ServiceUnavailable unless DB.test_connection
       rescue Sequel::Error => e
         message = e.message.strip
-        Pliny.log(db: true, health: true, at: 'exception', message: message)
+        Pliny.log(db: true, health: true, at: "exception", message: message)
         raise Pliny::Errors::ServiceUnavailable
       end
     end

data/lib/template/lib/endpoints/schema.rb

@@ -3,9 +3,9 @@ module Endpoints
     get "/schema.json" do
       content_type "application/schema+json"
       headers["Cache-Control"] = "public, max-age=3600"
-      unless File.exists?(schema_filename)
+      unless File.exist?(schema_filename)
         message = "This application does not have a schema file."
-        raise Pliny::Errors::NotFound.new(message)
+        raise Pliny::Errors::NotFound, message
       end
       File.read(schema_filename)
     end

data/lib/template/lib/mediators/base.rb

@@ -1,6 +1,6 @@
 module Mediators
   class Base
-    def self.run(options={})
+    def self.run(options = {})
       new(options).call
     end
   end

data/lib/template/lib/routes.rb

@@ -6,11 +6,15 @@ Routes = Rack::Builder.new do
   use Pliny::Middleware::Metrics
   use Pliny::Middleware::Instruments
   use Pliny::Middleware::RescueErrors, raise: Config.raise_errors?
-  use Rack::Timeout,
-      service_timeout: Config.timeout if Config.timeout > 0
-  use Pliny::Middleware::Versioning,
-      default: Config.versioning_default,
-      app_name: Config.versioning_app_name if Config.versioning?
+  if Config.timeout.positive?
+    use Rack::Timeout,
+        service_timeout: Config.timeout
+  end
+  if Config.versioning?
+    use Pliny::Middleware::Versioning,
+        default: Config.versioning_default,
+        app_name: Config.versioning_app_name
+  end
   use Rack::Deflater
   use Rack::MethodOverride
   use Rack::SSL if Config.force_ssl?

data/lib/template/lib/serializers/base.rb

@@ -3,7 +3,7 @@ module Serializers
     @@structures = {}
 
     def self.structure(type, &blk)
-      @@structures["#{self.name}::#{type}"] = blk
+      @@structures["#{name}::#{type}"] = blk
     end
 
     def initialize(type)
@@ -11,7 +11,7 @@ module Serializers
     end
 
     def serialize(object)
-      object.respond_to?(:map) ? object.map{|item| serializer.call(item)} : serializer.call(object)
+      object.respond_to?(:map) ? object.map { |item| serializer.call(item) } : serializer.call(object)
     end
 
     private
@@ -19,6 +19,5 @@ module Serializers
     def serializer
       @@structures["#{self.class.name}::#{@type}"]
     end
-
   end
 end

data/lib/template/lib/tasks/rubocop.rake

@@ -0,0 +1,6 @@
+
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new do |task|
+  task.requires << "rubocop-rspec"
+end

data/lib/template/lib/tasks/spec.rake

@@ -1,3 +1,4 @@
+
 # define our own version of the spec task because rspec might not be available
 # in the production environment, so we can't rely on RSpec::Core::RakeTask
 desc "Run all app specs"
@@ -5,6 +6,7 @@ task :spec do
   require "rspec/core"
   code = RSpec::Core::Runner.run(
     ["./spec"],
-    $stderr, $stdout)
-  exit(code) unless code == 0
+    $stderr, $stdout
+  )
+  exit(code) unless code.zero?
 end

data/lib/template/spec/endpoints/health_spec.rb

@@ -7,48 +7,48 @@ RSpec.describe Endpoints::Health do
     Endpoints::Health
   end
 
-  describe 'GET /health' do
-    it 'returns a 200' do
-      get '/health'
+  describe "GET /health" do
+    it "returns a 200" do
+      get "/health"
       assert_equal(200, last_response.status)
-      assert_equal('application/json;charset=utf-8', last_response.headers['Content-Type'])
-      assert_equal(2, last_response.headers['Content-Length'].to_i)
+      assert_equal("application/json;charset=utf-8", last_response.headers["Content-Type"])
+      assert_equal(2, last_response.headers["Content-Length"].to_i)
       assert_equal({}, MultiJson.decode(last_response.body))
     end
   end
 
-  describe 'GET /health/db' do
-    it 'raises a 404 when no database is available' do
+  describe "GET /health/db" do
+    it "raises a 404 when no database is available" do
       allow(DB).to receive(:nil?).and_return(true)
 
       assert_raises Pliny::Errors::NotFound do
-        get '/health/db'
+        get "/health/db"
       end
     end
 
-    it 'raises a 503 on Sequel exceptions' do
+    it "raises a 503 on Sequel exceptions" do
       allow(DB).to receive(:test_connection).and_raise(Sequel::Error)
 
       assert_raises Pliny::Errors::ServiceUnavailable do
-        get '/health/db'
+        get "/health/db"
       end
     end
 
-    it 'raises a 503 when connection testing fails' do
+    it "raises a 503 when connection testing fails" do
       allow(DB).to receive(:test_connection).and_return(false)
 
       assert_raises Pliny::Errors::ServiceUnavailable do
-        get '/health/db'
+        get "/health/db"
       end
     end
 
-    it 'returns a 200' do
+    it "returns a 200" do
       allow(DB).to receive(:test_connection).and_return(true)
 
-      get '/health/db'
+      get "/health/db"
       assert_equal(200, last_response.status)
-      assert_equal('application/json;charset=utf-8', last_response.headers['Content-Type'])
-      assert_equal(2, last_response.headers['Content-Length'].to_i)
+      assert_equal("application/json;charset=utf-8", last_response.headers["Content-Type"])
+      assert_equal(2, last_response.headers["Content-Length"].to_i)
       assert_equal({}, MultiJson.decode(last_response.body))
     end
   end

data/lib/template/spec/endpoints/schema_spec.rb

@@ -3,10 +3,10 @@ require "spec_helper"
 RSpec.describe Endpoints::Schema do
   include Rack::Test::Methods
 
-  let(:schema_filename) { "#{Config.root}/schema/schema.json" }
-
   subject(:get_schema) { get "/schema.json" }
 
+  let(:schema_filename) { "#{Config.root}/schema/schema.json" }
+
   context "without a schema.json" do
     before do
       allow(File).to receive(:exists?).and_return(false)

data/lib/template/spec/spec_helper.rb

@@ -10,7 +10,7 @@ ENV["RACK_ENV"] = "test"
 require "bundler"
 require "dotenv"
 Bundler.require(:default, :test)
-Dotenv.load('.env.test')
+Dotenv.load(".env.test")
 
 # Get only App Config first, to avoid pulling in libraries until
 # spec_support has a chance to run, which is important for at least
@@ -29,7 +29,7 @@ RSpec.configure do |config|
   end
 
   config.before :all do
-    load('db/seeds.rb') if File.exist?('db/seeds.rb')
+    load("db/seeds.rb") if File.exist?("db/seeds.rb")
   end
 
   config.before :each do
@@ -49,10 +49,10 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 
   # the rack app to be tested with rack-test:
   def app
-    @rack_app || fail("Missing @rack_app")
+    @rack_app || raise("Missing @rack_app")
   end
 end

data/lib/template/spec/spec_support/log.rb

@@ -1,7 +1,9 @@
 unless ENV["TEST_LOGS"] == "true"
-  module Pliny::Log
-    def log(data, &block)
-      block.call if block
+  module Pliny
+    module Log
+      def log(_data, &block)
+        yield if block
+      end
     end
   end
 end

data/spec/error_reporters/rollbar_spec.rb

@@ -8,7 +8,7 @@ describe Pliny::ErrorReporters::Rollbar do
   describe "#notify" do
     let(:exception) { StandardError.new("Something went wrong") }
     let(:context)   { {} }
-    let(:rack_env)  { double(:rack_env, body: StringIO.new) }
+    let(:rack_env)  { { "rack.input" => StringIO.new } }
 
     subject(:notify) do
       reporter.notify(exception, context: context, rack_env: rack_env)
@@ -41,6 +41,10 @@ describe Pliny::ErrorReporters::Rollbar do
     context "given an empty rack_env" do
       let(:rack_env) { {} }
 
+      it "expects rack_env to be a hash" do
+        assert_kind_of(Hash, rack_env)
+      end
+
       it "reports to Rollbar with an empty scope" do
         notify
         expect(Rollbar).to have_received(:scoped).once.with({})

data/spec/integration_spec.rb

@@ -7,34 +7,36 @@ describe "Pliny integration test" do
     Dir.chdir("/tmp/plinytest")
 
     bash "pliny-new myapp"
-    bash_app "bin/setup"
+
+    Dir.chdir("/tmp/plinytest/myapp")
+    bash "bin/setup"
   end
 
   describe "bin/setup" do
     it "generates .env" do
-      assert File.exists?("./myapp/.env")
+      assert File.exists?("./.env")
     end
   end
 
   describe "pliny-generate scaffold" do
     before(:all) do
-      bash_app "pliny-generate scaffold artist"
+      bash "pliny-generate scaffold artist"
     end
 
     it "creates the model file" do
-      assert File.exists?("./myapp/lib/models/artist.rb")
+      assert File.exists?("./lib/models/artist.rb")
     end
 
     it "creates the endpoint file" do
-      assert File.exists?("./myapp/lib/endpoints/artists.rb")
+      assert File.exists?("./lib/endpoints/artists.rb")
     end
 
     it "creates the serializer file" do
-      assert File.exists?("./myapp/lib/serializers/artist.rb")
+      assert File.exists?("./lib/serializers/artist.rb")
     end
 
     it "creates the schema file" do
-      assert File.exists?("./myapp/schema/schemata/artist.yaml")
+      assert File.exists?("./schema/schemata/artist.yaml")
     end
   end
 
@@ -46,8 +48,4 @@ describe "Pliny integration test" do
       raise "Failed to run #{cmd}"
     end
   end
-
-  def bash_app(cmd)
-    bash "cd myapp && #{cmd}"
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -339,6 +339,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.9.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.46'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.46.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.46'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.46.0
 description: Pliny is a set of base classes and helpers to help developers write excellent
   APIs in Sinatra
 email:
@@ -410,6 +430,7 @@ files:
 - lib/template/.env.test.erb
 - lib/template/.gitignore
 - lib/template/.rspec
+- lib/template/.rubocop.yml
 - lib/template/.ruby-version
 - lib/template/Gemfile
 - lib/template/LICENSE
@@ -438,6 +459,7 @@ files:
 - lib/template/lib/mediators/base.rb
 - lib/template/lib/routes.rb
 - lib/template/lib/serializers/base.rb
+- lib/template/lib/tasks/rubocop.rake
 - lib/template/lib/tasks/spec.rake
 - lib/template/schema/meta.json
 - lib/template/schema/schemata/.gitkeep