pliny 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfe2c266b812feb72f369c7f4948d9e598ee887e
-  data.tar.gz: fb25f44da90206ceffa0b43830d6c4c076778bfc
+  metadata.gz: 337f0a1c9784e2c41009e2aa6001ff6e79b4d5be
+  data.tar.gz: 9d67fc07db66c537931d4ce40c1a072077a49bdd
 SHA512:
-  metadata.gz: 780a91278cdd16c28c911f96be667b5f399b03ec13c2707d44fe823725e9fd170e1351af0b676a60efae270e45150987f9a4f2b7e5637d607ac6196f003ccb83
-  data.tar.gz: 06e9501612f28d03c56cf03ff08057014626fa9229522378cc5c54bed5c2d4963b6a1da4f132e6fea15e59c5a734c2d673996abb090ffd4c850510f285ea058f
+  metadata.gz: 92788bde19907756871bb04f9205c2221be2dcaf557aa72ea323910790712fa5e9cec12fa5fba6503bd6ba243a9ef0f338bae7a35ffbdbdf21dfa2d939571d7b
+  data.tar.gz: ceaea90eaeb893e0ed855a2607b19c535234b24b9cb1877468359037f05b511d173ad423e6a1557a4ea646d01872327a8daa2496eafbb250fe8ec41504ab8a34

data/README.md

@@ -17,6 +17,7 @@ And gems/helpers to tie these together and support operations:
 - [CORS middleware](lib/pliny/middleware/cors.rb) to allow JS developers to consume your API
 - [Honeybadger](https://www.honeybadger.io/) for tracking exceptions
 - [Log helper](test/log_test.rb) that logs in [data format](https://www.youtube.com/watch?v=rpmc-wHFUBs) [to stdout](https://adam.heroku.com/past/2011/4/1/logs_are_streams_not_files)
+- [Mediators](http://brandur.org/mediator) to help encapsulate more complex interactions
 - [Rspec](https://github.com/rspec/rspec) for lean and fast testing
 - [Puma](http://puma.io/) as the web server, [configured for optimal performance on Heroku](config/puma.rb)
 - [Rack-test](https://github.com/brynary/rack-test) to test the API endpoints

data/bin/pliny-generate

@@ -1,5 +1,16 @@
 #!/usr/bin/env ruby
 
-require "pliny"
+require "optparse"
+require_relative "../lib/pliny"
 
-Pliny::Commands::Generator.run(ARGV.dup)
+ARGV.options do |options|
+  opts = {}
+
+  options.on("--paranoid", "Generate paranoid support in models") do
+    opts[:paranoid] = true
+  end
+
+  options.parse!
+
+  Pliny::Commands::Generator.run(ARGV.dup, opts)
+end

data/bin/pliny-new

@@ -1,5 +1,12 @@
 #!/usr/bin/env ruby
 
-require "pliny"
+require "optparse"
+require_relative "../lib/pliny"
 
-Pliny::Commands::Creator.run(ARGV.dup)
+ARGV.options do |options|
+  opts = {}
+
+  options.parse!
+
+  Pliny::Commands::Creator.run(ARGV.dup, opts)
+end

data/lib/pliny.rb

@@ -1,21 +1,22 @@
 require "multi_json"
 require "sinatra/base"
 
-require "pliny/version"
-require "pliny/commands/creator"
-require "pliny/commands/generator"
-require "pliny/errors"
-require "pliny/extensions/instruments"
-require "pliny/log"
-require "pliny/request_store"
-require "pliny/router"
-require "pliny/utils"
-require "pliny/middleware/cors"
-require "pliny/middleware/request_id"
-require "pliny/middleware/request_store"
-require "pliny/middleware/rescue_errors"
-require "pliny/middleware/timeout"
-require "pliny/middleware/versioning"
+require_relative "pliny/version"
+require_relative "pliny/commands/creator"
+require_relative "pliny/commands/generator"
+require_relative "pliny/errors"
+require_relative "pliny/extensions/instruments"
+require_relative "pliny/helpers/params"
+require_relative "pliny/log"
+require_relative "pliny/request_store"
+require_relative "pliny/router"
+require_relative "pliny/utils"
+require_relative "pliny/middleware/cors"
+require_relative "pliny/middleware/request_id"
+require_relative "pliny/middleware/request_store"
+require_relative "pliny/middleware/rescue_errors"
+require_relative "pliny/middleware/timeout"
+require_relative "pliny/middleware/versioning"
 
 module Pliny
   extend Log

data/lib/pliny/commands/creator.rb

@@ -2,14 +2,15 @@ require "fileutils"
 
 module Pliny::Commands
   class Creator
-    attr_accessor :args, :stream
+    attr_accessor :args, :opts, :stream
 
-    def self.run(args, stream=$stdout)
-      new(args, stream).run!
+    def self.run(args, opts={}, stream=$stdout)
+      new(args, opts, stream).run!
     end
 
-    def initialize(args={}, stream=$stdout)
+    def initialize(args={}, opts={}, stream=$stdout)
       @args = args
+      @opts = opts
       @stream = stream
     end
 
@@ -20,12 +21,31 @@ module Pliny::Commands
 
       FileUtils.copy_entry template_dir, app_dir
       FileUtils.rm_rf("#{app_dir}/.git")
+      setup_database_urls
       display "Pliny app created. To start, run:"
       display "cd #{app_dir} && bin/setup"
     end
 
     protected
 
+    def setup_database_urls
+      db = URI.parse("postgres:///#{name}")
+      {
+        ".env.sample" => "development",
+        ".env.test"   => "test"
+      }.each do |env_file, db_env_suffix|
+        env_path = "#{app_dir}/#{env_file}"
+        db.path  = "/#{name}-#{db_env_suffix}"
+        env      = File.read(env_path)
+        File.open(env_path, "w") do |f|
+          # ruby's URI#to_s renders foo:/bar when there's no host
+          # we want foo:///bar instead!
+          db_url = db.to_s.sub(":/", ":///")
+          f.puts env.sub(/DATABASE_URL=.*/, "DATABASE_URL=#{db_url}")
+        end
+      end
+    end
+
     def display(msg)
       stream.puts msg
     end

data/lib/pliny/commands/generator.rb

@@ -6,14 +6,15 @@ require "prmd"
 
 module Pliny::Commands
   class Generator
-    attr_accessor :args, :stream
+    attr_accessor :args, :opts, :stream
 
-    def self.run(args, stream=$stdout)
-      new(args).run!
+    def self.run(args, opts={}, stream=$stdout)
+      new(args, opts).run!
     end
 
-    def initialize(args={}, stream=$stdout)
+    def initialize(args={}, opts={}, stream=$stdout)
       @args = args
+      @opts = opts
       @stream = stream
     end
 
@@ -39,8 +40,6 @@ module Pliny::Commands
         create_model
         create_model_migration
         create_model_test
-        create_serializer
-        create_serializer_test
       when "scaffold"
         create_endpoint(scaffold: true)
         create_endpoint_test
@@ -71,6 +70,10 @@ module Pliny::Commands
       args[1]
     end
 
+    def paranoid
+      opts[:paranoid]
+    end
+
     def singular_class_name
       name.gsub(/-/, '_').singularize.camelize
     end
@@ -92,7 +95,7 @@ module Pliny::Commands
     end
 
     def create_endpoint(options = {})
-      endpoint = "./lib/endpoints/#{name.pluralize}.rb"
+      endpoint = "./lib/endpoints/#{table_name}.rb"
       template = options[:scaffold] ? "endpoint_scaffold.erb" : "endpoint.erb"
       render_template(template, endpoint, {
         plural_class_name: plural_class_name,
@@ -106,7 +109,7 @@ module Pliny::Commands
     end
 
     def create_endpoint_test
-      test = "./spec/endpoints/#{name.pluralize}_spec.rb"
+      test = "./spec/endpoints/#{table_name}_spec.rb"
       render_template("endpoint_test.erb", test, {
         plural_class_name: plural_class_name,
         singular_class_name: singular_class_name,
@@ -116,7 +119,7 @@ module Pliny::Commands
     end
 
     def create_endpoint_acceptance_test(options = {})
-      test = "./spec/acceptance/#{name.pluralize}_spec.rb"
+      test = "./spec/acceptance/#{table_name}_spec.rb"
       template = options[:scaffold] ? "endpoint_scaffold_acceptance_test.erb" :
         "endpoint_acceptance_test.erb"
       render_template(template, test, {
@@ -129,13 +132,13 @@ module Pliny::Commands
     end
 
     def create_mediator
-      mediator = "./lib/mediators/#{name}.rb"
+      mediator = "./lib/mediators/#{field_name}.rb"
       render_template("mediator.erb", mediator, plural_class_name: plural_class_name)
       display "created mediator file #{mediator}"
     end
 
     def create_mediator_test
-      test = "./spec/mediators/#{name}_spec.rb"
+      test = "./spec/mediators/#{field_name}_spec.rb"
       render_template("mediator_test.erb", test, plural_class_name: plural_class_name)
       display "created test #{test}"
     end
@@ -147,26 +150,29 @@ module Pliny::Commands
     end
 
     def create_model
-      model = "./lib/models/#{name}.rb"
-      render_template("model.erb", model, singular_class_name: singular_class_name)
+      model = "./lib/models/#{field_name}.rb"
+      render_template("model.erb", model,
+        singular_class_name: singular_class_name,
+        paranoid: paranoid)
       display "created model file #{model}"
     end
 
     def create_model_migration
       migration = "./db/migrate/#{Time.now.to_i}_create_#{table_name}.rb"
       render_template("model_migration.erb", migration,
-        table_name: table_name)
+        table_name: table_name,
+        paranoid: paranoid)
       display "created migration #{migration}"
     end
 
     def create_model_test
-      test = "./spec/models/#{name}_spec.rb"
+      test = "./spec/models/#{field_name}_spec.rb"
       render_template("model_test.erb", test, singular_class_name: singular_class_name)
       display "created test #{test}"
     end
 
     def create_schema
-      schema = "./docs/schema/schemata/#{name.singularize}.yaml"
+      schema = "./docs/schema/schemata/#{field_name}.yaml"
       write_file(schema) do
         Prmd.init(name.singularize, yaml: true)
       end

data/lib/pliny/config_helpers.rb

@@ -3,18 +3,28 @@ module Pliny
     def optional(*attrs)
       attrs.each do |attr|
         instance_eval "def #{attr}; @#{attr} ||= ENV['#{attr.upcase}'] end", __FILE__, __LINE__
+        ConfigHelpers.add_question_method(attr)
       end
     end
 
     def mandatory(*attrs)
       attrs.each do |attr|
         instance_eval "def #{attr}; @#{attr} ||= ENV['#{attr.upcase}'] || raise('missing=#{attr.upcase}') end", __FILE__, __LINE__
+        ConfigHelpers.add_question_method(attr)
       end
     end
 
     def override(attrs)
       attrs.each do |attr, value|
         instance_eval "def #{attr}; @#{attr} ||= ENV['#{attr.upcase}'] || '#{value}'.to_s end", __FILE__, __LINE__
+        ConfigHelpers.add_question_method(attr)
+      end
+    end
+
+    def self.add_question_method(attr)
+      define_method "#{attr}?" do
+        return false if send(attr).nil?
+        !!(send(attr) =~ /\Atrue|yes|on\z/i || send(attr).to_i > 0)
       end
     end
   end

data/lib/pliny/helpers/params.rb

@@ -0,0 +1,21 @@
+module Pliny::Helpers
+  module Params
+    def body_params
+      @body_params ||= parse_body_params
+    end
+
+    private
+
+    def parse_body_params
+      if request.content_type == "application/json"
+        p = indifferent_params(MultiJson.decode(request.body.read))
+        request.body.rewind
+        p
+      elsif request.form_data?
+        indifferent_params(request.POST)
+      else
+        {}
+      end
+    end
+  end
+end

data/lib/pliny/middleware/rescue_errors.rb

@@ -1,7 +1,8 @@
 module Pliny::Middleware
   class RescueErrors
-    def initialize(app)
+    def initialize(app, options = {})
       @app = app
+      @raise = options[:raise]
     end
 
     def call(env)
@@ -9,8 +10,12 @@ module Pliny::Middleware
     rescue Pliny::Errors::Error => e
       render(e, env)
     rescue Exception => e
-    # Pliny.log_exception(e)
-      render(Pliny::Errors::InternalServerError.new, env)
+      if @raise
+        raise
+      else
+        # Pliny.log_exception(e)
+        render(Pliny::Errors::InternalServerError.new, env)
+      end
     end
 
     private

data/lib/pliny/tasks/db.rake

@@ -36,12 +36,22 @@ namespace :db do
     end
   end
 
+  desc "Seed the database with data"
+  task :seed do
+    if File.exist?('./db/seeds.rb')
+      database_urls.each do |database_url|
+        Sequel.connect(database_url)
+        load 'db/seeds.rb'
+      end
+    end
+  end
+
   desc "Reset the database"
-  task :reset => [:nuke, :migrate]
+  task :reset => [:nuke, :migrate, :seed]
 
   desc "Create the database"
   task :create do
-    db = Sequel.connect("postgres://localhost/postgres")
+    db = Sequel.connect("postgres:///postgres")
     database_urls.each do |database_url|
       exists = false
       name = name_from_uri(database_url)
@@ -57,7 +67,7 @@ namespace :db do
 
   desc "Drop the database"
   task :drop do
-    db = Sequel.connect("postgres://localhost/postgres")
+    db = Sequel.connect("postgres:///postgres")
     database_urls.each do |database_url|
       name = name_from_uri(database_url)
       db.run(%{DROP DATABASE IF EXISTS "#{name}"})

data/lib/pliny/tasks/schema.rake

@@ -0,0 +1,8 @@
+task :schema do
+  require "prmd"
+  schemata = "./docs/schema.json"
+  File.open(schemata, "w") do |f|
+    f.puts Prmd.combine("./docs/schema/schemata", meta: "./docs/schema/meta.json")
+  end
+  puts "rebuilt #{schemata}"
+end

data/lib/pliny/templates/endpoint.erb

@@ -2,7 +2,7 @@ module Endpoints
   class <%= plural_class_name %> < Base
     namespace "<%= url_path %>" do
       before do
-        content_type :json
+        content_type :json, charset: 'utf-8'
       end
 
       get do

data/lib/pliny/templates/endpoint_scaffold.erb

@@ -2,7 +2,7 @@ module Endpoints
   class <%= plural_class_name %> < Base
     namespace "<%= url_path %>" do
       before do
-        content_type :json
+        content_type :json, charset: 'utf-8'
       end
 
       get do
@@ -11,7 +11,7 @@ module Endpoints
 
       post do
         # warning: not safe
-        <%= field_name %> = <%= singular_class_name %>.new(params)
+        <%= field_name %> = <%= singular_class_name %>.new(body_params)
         <%= field_name %>.save
         status 201
         MultiJson.encode serialize(<%= field_name %>)
@@ -25,7 +25,7 @@ module Endpoints
       patch "/:id" do |id|
         <%= field_name %> = <%= singular_class_name %>.first(uuid: id) || halt(404)
         # warning: not safe
-        #<%= field_name %>.update(params)
+        #<%= field_name %>.update(body_params)
         MultiJson.encode serialize(<%= field_name %>)
       end
 

data/lib/pliny/templates/endpoint_scaffold_acceptance_test.erb

@@ -9,7 +9,7 @@ describe Endpoints::<%= plural_class_name %> do
   end
 
   def schema_path
-    App.root + "/docs/schema.json"
+    "./docs/schema.json"
   end
 
   before do

data/lib/pliny/templates/model.erb

@@ -1,5 +1,8 @@
 class <%= singular_class_name %> < Sequel::Model
 
   plugin :timestamps
+<% if paranoid %>
+  plugin :paranoid
+<% end %>
 
 end

data/lib/pliny/templates/model_migration.erb

@@ -4,7 +4,9 @@ Sequel.migration do
       uuid         :uuid, default: Sequel.function(:uuid_generate_v4), primary_key: true
       timestamptz  :created_at, default: Sequel.function(:now), null: false
       timestamptz  :updated_at
+<% if paranoid %>
       timestamptz  :deleted_at
+<% end %>
     end
   end
 end

data/lib/pliny/templates/serializer.erb

@@ -8,7 +8,7 @@
 <%   ident << "  " %>
 <% end %>
 <%=  ident %>class <%= modules.last %> < Serializers::Base
-<%=  ident %>  def structure(args) do |arg|
+<%=  ident %>  structure(:default) do |arg|
 <%=  ident %>    {
 <%=  ident %>    }
 <%=  ident %>  end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/template/.env.sample

@@ -1,3 +1,6 @@
 DATABASE_URL=postgres://localhost/pliny-development
 RACK_ENV=development
 TZ=UTC
+RESCUE_ERRORS=false
+FORCE_SSL=false
+TIMEOUT=false

data/template/.env.test

@@ -1,3 +1,5 @@
 DATABASE_URL=postgres://localhost/pliny-test
 RACK_ENV=test
 TZ=UTC
+RESCUE_ERRORS=false
+FORCE_SSL=false

data/template/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.1.2

data/template/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
-ruby "2.1.1"
+ruby "2.1.2"
 
-gem "honeybadger"
+gem "honeybadger", '~> 1.14'
 gem "multi_json"
 gem "oj"
 gem "pg"
@@ -10,6 +10,7 @@ gem "puma"
 gem "rack-ssl"
 gem "rake"
 gem "sequel"
+gem "sequel-paranoid"
 gem "sequel_pg", require: "sequel"
 gem "sinatra", require: "sinatra/base"
 gem "sinatra-contrib", require: ["sinatra/namespace", "sinatra/reloader"]

data/template/Gemfile.lock

@@ -18,7 +18,7 @@ GEM
     foreman (0.67.0)
       dotenv (~> 0.7.0)
       thor (~> 0.17.0)
-    honeybadger (1.13.0)
+    honeybadger (1.15.0)
       json
     http_accept (0.1.5)
     i18n (0.6.9)
@@ -27,7 +27,7 @@ GEM
     multi_json (1.10.1)
     oj (2.9.0)
     pg (0.17.1)
-    pliny (0.0.1)
+    pliny (0.0.3)
       activesupport (~> 4.1, >= 4.1.0)
       http_accept (~> 0.1, >= 0.1.5)
       multi_json (~> 1.9, >= 1.9.3)
@@ -52,7 +52,9 @@ GEM
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    sequel (4.10.0)
+    sequel (4.11.0)
+    sequel-paranoid (0.4.3)
+      sequel
     sequel_pg (1.6.9)
       pg (>= 0.8.0)
       sequel (>= 3.39.0)
@@ -70,9 +72,9 @@ GEM
     sinatra-router (0.2.3)
       sinatra (~> 1.4)
     thor (0.17.0)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -82,7 +84,7 @@ DEPENDENCIES
   committee
   database_cleaner
   foreman
-  honeybadger
+  honeybadger (~> 1.14)
   multi_json
   oj
   pg
@@ -95,6 +97,7 @@ DEPENDENCIES
   rspec-core
   rspec-expectations
   sequel
+  sequel-paranoid
   sequel_pg
   sinatra
   sinatra-contrib

data/template/config/config.rb

@@ -19,7 +19,10 @@ module Config
 
   # Optional -- value is returned or `nil` if it wasn't present.
   optional \
-    :placeholder
+    :honeybadger_api_key,
+    :placeholder,
+    :versioning_default,
+    :versioning_app_name
 
   # Override -- value is returned or the set default. Remember to typecast.
   override \
@@ -28,5 +31,9 @@ module Config
     puma_max_threads: 16,
     puma_min_threads: 1,
     puma_workers:     3,
-    rack_env:         "development"
+    rack_env:         'development',
+    rescue_errors:    'true',
+    timeout:          45,
+    force_ssl:        'true',
+    versioning:       'false'
 end

data/template/config/initializers/database.rb

@@ -0,0 +1 @@
+Sequel.connect(Config.database_url, max_connections: Config.db_pool)

data/template/config/initializers/honeybadger.rb

@@ -1,3 +1,3 @@
 Honeybadger.configure do |config|
-  config.api_key = ENV["HONEYBADGER_API_KEY"]
+  config.api_key = Config.honeybadger_api_key
 end

data/template/db/seeds.rb

@@ -0,0 +1,6 @@
+# This file should contain all the record creation needed to seed the database
+# with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the
+# db with db:setup).
+#
+# A Sequel database connection can be obtained via Sequel::Model.db

data/template/lib/endpoints/base.rb

@@ -3,6 +3,7 @@ module Endpoints
   class Base < Sinatra::Base
     register Pliny::Extensions::Instruments
     register Sinatra::Namespace
+    helpers Pliny::Helpers::Params
 
     configure :development do
       register Sinatra::Reloader

data/template/lib/initializer.rb

@@ -1,29 +1,30 @@
 module Initializer
   def self.run
     require_config
-    initialize_database
     require_lib
     require_initializers
+    require_models
   end
 
   def self.require_config
     require! "config/config"
   end
 
-  def self.initialize_database
-    Sequel.connect(Config.database_url, max_connections: Config.db_pool)
-  end
-
   def self.require_lib
     require! %w(
       lib/endpoints/base
       lib/endpoints/**/*
       lib/mediators/base
       lib/mediators/**/*
-      lib/models/**/*
       lib/routes
       lib/serializers/base
-      lib/serializers/**/*.rb
+      lib/serializers/**/*
+    )
+  end
+
+  def self.require_models
+    require! %w(
+      lib/models/**/*
     )
   end
 

data/template/lib/routes.rb

@@ -1,13 +1,16 @@
 Routes = Rack::Builder.new do
-  use Pliny::Middleware::RescueErrors unless Config.rack_env == "development"
-  use Honeybadger::Rack
+  use Pliny::Middleware::RescueErrors, raise: !Config.rescue_errors?
+  use Honeybadger::Rack::ErrorNotifier if Config.honeybadger_api_key
   use Pliny::Middleware::CORS
   use Pliny::Middleware::RequestID
   use Pliny::Middleware::RequestStore, store: Pliny::RequestStore
-  use Pliny::Middleware::Timeout, timeout: 45
+  use Pliny::Middleware::Timeout, timeout: Config.timeout.to_i if Config.timeout.to_i > 0
+  use Pliny::Middleware::Versioning,
+      default: Config.versioning_default,
+      app_name: Config.versioning_app_name if Config.versioning.downcase == 'true'
   use Rack::Deflater
   use Rack::MethodOverride
-  use Rack::SSL if Config.rack_env == "production"
+  use Rack::SSL if Config.force_ssl.downcase == 'true'
 
   use Pliny::Router do
     # mount all endpoints here

data/template/spec/spec_helper.rb

@@ -25,6 +25,10 @@ Pliny::Utils.require_glob("#{Initializer.root}/spec/support/**/*.rb")
 RSpec.configure do |config|
   config.mock_framework = :rr
 
+  config.before :all do
+    load('db/seeds.rb') if File.exist?('db/seeds.rb')
+  end
+  
   config.before :each do
     DatabaseCleaner.start
   end

data/test/commands/creator_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe Pliny::Commands::Creator do
   before do
-    @gen = Pliny::Commands::Creator.new(["foobar"], StringIO.new)
+    @gen = Pliny::Commands::Creator.new(["foobar"], {}, StringIO.new)
   end
 
   describe "#run!" do
@@ -22,5 +22,21 @@ describe Pliny::Commands::Creator do
       @gen.run!
       refute File.exists?("./foobar/.git")
     end
+
+    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|
+        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|
+        line.include?("DATABASE_URL=")
+      end
+      assert_equal "DATABASE_URL=postgres:///foobar-test", db_url
+    end
   end
 end

data/test/commands/generator_test.rb

@@ -2,7 +2,19 @@ require "test_helper"
 
 describe Pliny::Commands::Generator do
   before do
-    @gen = Pliny::Commands::Generator.new({}, StringIO.new)
+    @gen = Pliny::Commands::Generator.new({}, {}, StringIO.new)
+  end
+
+  describe "#field_name" do
+    it "uses the singular form" do
+      @gen.args = ["model", "resource_histories"]
+      assert_equal "resource_history", @gen.field_name
+    end
+
+    it "handles hyphens as underscores" do
+      @gen.args = ["model", "resource-histories"]
+      assert_equal "resource_history", @gen.field_name
+    end
   end
 
   describe "#plural_class_name" do
@@ -104,14 +116,6 @@ describe Pliny::Commands::Generator do
       it "creates a test" do
         assert File.exists?("spec/models/artist_spec.rb")
       end
-
-      it "creates a serializer" do
-        assert File.exists?("lib/serializers/artist_serializer.rb")
-      end
-
-      it "creates a serializer test" do
-        assert File.exists?("spec/serializers/artist_serializer_spec.rb")
-      end
     end
 
     describe "generating scaffolds" do

data/test/middleware/rescue_errors_test.rb

@@ -14,14 +14,11 @@ describe Pliny::Middleware::RescueErrors do
   end
 
   def app
-    Rack::Builder.new do
-      use Rack::Lint
-      use Pliny::Middleware::RescueErrors
-      run BadMiddleware.new
-    end
+    @app
   end
 
   it "intercepts Pliny errors and renders" do
+    @app = new_rack_app
     get "/api-error"
     assert_equal 503, last_response.status
     error_json = MultiJson.decode(last_response.body)
@@ -31,6 +28,7 @@ describe Pliny::Middleware::RescueErrors do
   end
 
   it "intercepts exceptions and renders" do
+    @app = new_rack_app
     get "/"
     assert_equal 500, last_response.status
     error_json = MultiJson.decode(last_response.body)
@@ -38,4 +36,21 @@ describe Pliny::Middleware::RescueErrors do
     assert_equal "Internal server error.", error_json["message"]
     assert_equal 500, error_json["status"]
   end
+
+  it "raises given the raise option" do
+    @app = new_rack_app(raise: true)
+    assert_raises(RuntimeError) do
+      get "/"
+    end
+  end
+
+  private
+
+  def new_rack_app(options = {})
+    Rack::Builder.new do
+      use Rack::Lint
+      use Pliny::Middleware::RescueErrors, raise: options[:raise]
+      run BadMiddleware.new
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -205,6 +205,7 @@ files:
 - lib/pliny/config_helpers.rb
 - lib/pliny/errors.rb
 - lib/pliny/extensions/instruments.rb
+- lib/pliny/helpers/params.rb
 - lib/pliny/log.rb
 - lib/pliny/middleware/cors.rb
 - lib/pliny/middleware/request_id.rb
@@ -216,6 +217,7 @@ files:
 - lib/pliny/router.rb
 - lib/pliny/tasks.rb
 - lib/pliny/tasks/db.rake
+- lib/pliny/tasks/schema.rake
 - lib/pliny/tasks/test.rake
 - lib/pliny/templates/endpoint.erb
 - lib/pliny/templates/endpoint_acceptance_test.erb
@@ -248,9 +250,11 @@ files:
 - template/bin/setup
 - template/config.ru
 - template/config/config.rb
+- template/config/initializers/database.rb
 - template/config/initializers/honeybadger.rb
 - template/config/puma.rb
 - template/db/schema.sql
+- template/db/seeds.rb
 - template/docs/schema/meta.json
 - template/docs/schema/schemata/.gitkeep
 - template/lib/endpoints/base.rb
@@ -296,8 +300,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra
 test_files: []
+has_rdoc: