pliny 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWRlYjI3YjI4NTRlZGYzMWQ1NTEzYjQ4ZDRmNTkyNTk0OGNiMzNlZg==
+    NmVlMTRhYThlZWVjYzA2MjNlYjZjZDY5NTkyMDY5YmE5NWEwNDAyMA==
   data.tar.gz: !binary |-
-    NjVlZTZlNDhmODRhZTY1MDNiZDJlOGQyYmViY2U3NmUxYTNhMzIzYg==
-!binary "U0hBNTEy":
+    MTczNDRhNTY2N2UwMmUyY2I4YWQ5NDFlN2MwYzhlN2JlNTVhOWIwYw==
+SHA512:
   metadata.gz: !binary |-
-    ZDNjYTczMGI3YTk2YzhlZTcxYTk5ZWYxOGUzZTVkYzBiYTM3OTEzMmRjZWRm
-    ZDg2ZTYwYTkxOTc5NzI0NjVkNGZkMjRkMjY1ZDVjNGU5MzNmZDc1ZDk1ODFl
-    YzU4N2E2ZjU2OTc3ZWQ0YjI5ODA5ZjNjZTJiOTNkYzIyZTk2ZGM=
+    MTM1OTZkNmMxMDcwMTg4ZWVkYWFkN2MxMjQ3MWM5MzdhNmE4M2NkZmYxMjA4
+    YzM5MGRmZmFlM2YyMzJmMTE3YzM3ZGVmMjYxNTk3YWRjOTdhODA4YTcwY2Ew
+    OWQyNjQ3YTlhZmZmYTBjN2UxMjFlMDEwZGRlMTA5NTI0OTJhYmM=
   data.tar.gz: !binary |-
-    MGNhMjNiOTU3ZTJkYTBjMWZkMmVkOWE2NmQ0NWExZWJmZGZmZmU5MmY1MGQ3
-    MTM2Zjg4ODNkYmJmMTg0OTI2YTEwMjg1ZDAzNDAyZDUyOThhOGJmMGY2Njc5
-    Nzc5N2Y0MWM3YzEyYTE4ZDUyYTkzYWU1NzhkNzJmZDc2NDE2MjA=
+    OGY5YmExZmE5YTQwMGQ4MWNiNzkyYTMwZDA1NjNmZTI5YmM1ZWY4YTFjYTQx
+    ZDIwZDkxZDdjNmY1ZjlkZDQ2Y2EyM2NlZTNhY2NmNjQ1N2M1MzY4MTViN2Q0
+    ZmIxZmY1MTQ0MjIyNmNiOGE2OTQwZTk3YzJkOTBiMzQwNWM5Mjk=

data/README.md

@@ -16,7 +16,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
 - [Rollbar](https://www.rollbar.com/) 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)
+- [Log helper](spec/log_spec.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](https://github.com/interagent/pliny-template/blob/master/config/puma.rb)
@@ -121,7 +121,6 @@ rake db:schema:merge  # Merges migrations into schema and removes them
 rake db:seed          # Seed the database with data
 rake db:setup         # Setup the database
 rake schema           # Rebuild schema.json
-rake test             # Run tests
 ```
 
 ### Commands

data/lib/pliny/log.rb

@@ -10,7 +10,7 @@ module Pliny
       self.local_context = old.merge(data)
       res = block.call
     ensure
-      local_context = old
+      self.local_context = old
       res
     end
 
@@ -39,11 +39,7 @@ module Pliny
     def log_to_stream(stream, data, &block)
       unless block
         str = unparse(data)
-        if RUBY_PLATFORM == "java"
-          stream.puts str
-        else
-          mtx.synchronize { stream.puts str }
-        end
+        stream.print(str + "\n")
       else
         data = data.dup
         start = Time.now
@@ -61,10 +57,6 @@ module Pliny
       end
     end
 
-    def mtx
-      @mtx ||= Mutex.new
-    end
-
     def quote_string(k, v)
       # try to find a quote style that fits
       if !v.include?('"')

data/lib/pliny/tasks/db.rake

@@ -30,7 +30,7 @@ namespace :db do
     database_urls.each do |database_url|
       db = Sequel.connect(database_url)
       db.tables.each do |table|
-        db.run(%{DROP TABLE "#{table}"})
+        db.run(%{DROP TABLE "#{table}" CASCADE})
       end
       puts "Nuked `#{name_from_uri(database_url)}`"
     end
@@ -78,11 +78,15 @@ namespace :db do
   namespace :schema do
     desc "Load the database schema"
     task :load do
-      schema = File.read("./db/schema.sql")
-      database_urls.each do |database_url|
-        db = Sequel.connect(database_url)
-        db.run(schema)
-        puts "Loaded `#{name_from_uri(database_url)}`"
+      if File.exists?("./db/schema.sql")
+        schema = File.read("./db/schema.sql")
+        database_urls.each do |database_url|
+          db = Sequel.connect(database_url)
+          db.run(schema)
+          puts "Loaded `#{name_from_uri(database_url)}`"
+        end
+      else
+        puts "Skipped schema load, schema.sql not present"
       end
     end
 
@@ -98,8 +102,15 @@ namespace :db do
       # replay such statements in certain production databases
       schema.gsub!(/^COMMENT ON EXTENSION.*\n/, "")
 
-      File.open(file, "w") { |f| f.puts schema }
+      # add migrations used to compose this schema
+      db = Sequel.connect(database_urls.first)
+      if db.table_exists?(:schema_migrations)
+        db[:schema_migrations].each do |migration|
+          schema << db[:schema_migrations].insert_sql(migration) + ";\n"
+        end
+      end
 
+      File.open(file, "w") { |f| f.puts schema }
       puts "Dumped `#{name_from_uri(database_url)}` to #{file}"
     end
 
@@ -111,7 +122,7 @@ namespace :db do
   end
 
   desc "Setup the database"
-  task :setup => [:drop, :create]
+  task :setup => [:drop, :create, :migrate]
 
   private
 

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/{test/commands/creator_test.rb → spec/commands/creator_spec.rb}

@@ -1,5 +1,5 @@
 require 'pliny/commands/creator'
-require "test_helper"
+require 'spec_helper'
 
 describe Pliny::Commands::Creator do
   before do

data/{test/commands/generator/base_test.rb → spec/commands/generator/base_spec.rb}

@@ -1,6 +1,6 @@
 require 'pliny/commands/generator'
 require 'pliny/commands/generator/base'
-require 'test_helper'
+require 'spec_helper'
 
 describe Pliny::Commands::Generator::Base do
   subject { Pliny::Commands::Generator::Base.new(model_name, {}, StringIO.new) }

data/{test/commands/generator/endpoint_test.rb → spec/commands/generator/endpoint_spec.rb}

@@ -1,6 +1,6 @@
 require 'pliny/commands/generator'
 require 'pliny/commands/generator/endpoint'
-require 'test_helper'
+require 'spec_helper'
 
 describe Pliny::Commands::Generator::Endpoint do
   subject { Pliny::Commands::Generator::Endpoint.new(model_name, {}, StringIO.new) }

data/{test/commands/generator_test.rb → spec/commands/generator_spec.rb}

@@ -1,6 +1,6 @@
 require 'pliny/commands/generator'
 require 'pliny/commands/generator/base'
-require 'test_helper'
+require 'spec_helper'
 
 describe Pliny::Commands::Generator do
 subject { Pliny::Commands::Generator.new }

data/{test/errors_test.rb → spec/errors_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Errors do
   it "includes a general error that requires an identifier" do

data/{test/extensions/instruments_test.rb → spec/extensions/instruments_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Extensions::Instruments do
   def app

data/{test/integration_test.rb → spec/integration_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe "Pliny integration test" do
   before do

data/{test/log_test.rb → spec/log_spec.rb}

@@ -1,32 +1,32 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Log do
   before do
     @io = StringIO.new
     Pliny.stdout = @io
-    stub(@io).puts
+    stub(@io).print
   end
 
   it "logs in structured format" do
-    mock(@io).puts "foo=bar baz=42"
+    mock(@io).print "foo=bar baz=42\n"
     Pliny.log(foo: "bar", baz: 42)
   end
 
   it "supports blocks to log stages and elapsed" do
-    mock(@io).puts "foo=bar at=start"
-    mock(@io).puts "foo=bar at=finish elapsed=0.000"
+    mock(@io).print "foo=bar at=start\n"
+    mock(@io).print "foo=bar at=finish elapsed=0.000\n"
     Pliny.log(foo: "bar") do
     end
   end
 
   it "merges context from RequestStore" do
     Pliny::RequestStore.store[:log_context] = { app: "pliny" }
-    mock(@io).puts "app=pliny foo=bar"
+    mock(@io).print "app=pliny foo=bar\n"
     Pliny.log(foo: "bar")
   end
 
   it "supports a context" do
-    mock(@io).puts "app=pliny foo=bar"
+    mock(@io).print "app=pliny foo=bar\n"
     Pliny.context(app: "pliny") do
       Pliny.log(foo: "bar")
     end
@@ -34,10 +34,18 @@ describe Pliny::Log do
 
   it "local context does not overwrite global" do
     Pliny::RequestStore.store[:log_context] = { app: "pliny" }
-    mock(@io).puts "app=not_pliny foo=bar"
+    mock(@io).print "app=not_pliny foo=bar\n"
     Pliny.context(app: "not_pliny") do
       Pliny.log(foo: "bar")
     end
     assert Pliny::RequestStore.store[:log_context][:app] = "pliny"
   end
+
+  it "local context does not propagate outside" do
+    Pliny::RequestStore.store[:log_context] = { app: "pliny" }
+    mock(@io).print "app=pliny foo=bar\n"
+    Pliny.context(app: "not_pliny", test: 123) do
+    end
+    Pliny.log(foo: "bar")
+  end
 end

data/{test/middleware/cors_test.rb → spec/middleware/cors_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Middleware::CORS do
   def app

data/{test/middleware/request_id_test.rb → spec/middleware/request_id_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Middleware::RequestID do
   def app

data/{test/middleware/request_store_test.rb → spec/middleware/request_store_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Middleware::RequestStore do
   def app

data/{test/middleware/rescue_errors_test.rb → spec/middleware/rescue_errors_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Middleware::RescueErrors do
   include Rack::Test::Methods

data/{test/middleware/timeout_test.rb → spec/middleware/timeout_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Middleware::Timeout do
   include Rack::Test::Methods

data/{test/middleware/versioning_test.rb → spec/middleware/versioning_spec.rb}

@@ -1,7 +1,12 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::Middleware::Versioning do
   include Rack::Test::Methods
+  before do
+    @io = StringIO.new
+    Pliny.stdout = @io
+    stub(@io).print
+  end
 
   def app
     Rack::Builder.new do

data/{test/request_store_test.rb → spec/request_store_spec.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Pliny::RequestStore do
   before do

data/{test/router_test.rb → spec/router_spec.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "spec_helper"
 
 describe Pliny::Router do
 

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+# make sure this is set before Sinatra is required
+ENV["RACK_ENV"] = "test"
+
+require "bundler"
+Bundler.require(:default, :test)
+
+require_relative "../lib/pliny"
+
+RSpec.configure do |config|
+  config.include Rack::Test::Methods
+
+  config.expect_with :minitest
+  config.mock_with :rr
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  config.before :each do
+    Pliny::RequestStore.clear!
+  end
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # 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'
+end

data/template/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.4

data/template/Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "2.1.2"
+ruby "2.1.4"
 
 gem "multi_json"
 gem "oj"
@@ -24,8 +24,7 @@ group :development, :test do
 end
 
 group :development do
-  gem 'dotenv'
-  gem "foreman"
+  gem "dotenv"
 end
 
 group :test do

data/template/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.1)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -23,18 +23,16 @@ GEM
     diff-lcs (1.2.5)
     dotenv (0.7.0)
     erubis (2.7.0)
-    foreman (0.67.0)
-      dotenv (~> 0.7.0)
-      thor (~> 0.17.0)
-    http_accept (0.1.5)
-    i18n (0.6.9)
+    http_accept (0.1.6)
+    i18n (0.6.11)
     json (1.8.1)
+    json_schema (0.3.0)
     method_source (0.8.2)
-    minitest (5.3.5)
+    minitest (5.4.2)
     multi_json (1.10.1)
     oj (2.9.0)
     pg (0.17.1)
-    pliny (0.1.0)
+    pliny (0.4.0)
       activesupport (~> 4.1, >= 4.1.0)
       http_accept (~> 0.1, >= 0.1.5)
       multi_json (~> 1.9, >= 1.9.3)
@@ -43,8 +41,10 @@ GEM
       sequel (~> 4.9, >= 4.9.0)
       sinatra (~> 1.4, >= 1.4.5)
       sinatra-router (~> 0.2, >= 0.2.3)
-    prmd (0.3.2)
+      thor (~> 0.19, >= 0.19.1)
+    prmd (0.6.2)
       erubis (~> 2.7)
+      json_schema (~> 0.1)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
@@ -79,7 +79,7 @@ GEM
     rspec-mocks (3.0.1)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.0)
-    sequel (4.11.0)
+    sequel (4.15.0)
     sequel-paranoid (0.4.3)
       sequel
     sequel_pg (1.6.9)
@@ -101,11 +101,11 @@ GEM
     slop (3.5.0)
     sucker_punch (1.0.5)
       celluloid (~> 0.15.2)
-    thor (0.17.0)
+    thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
     timers (1.1.0)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yard (0.8.7.4)
 
@@ -116,7 +116,6 @@ DEPENDENCIES
   committee
   database_cleaner
   dotenv
-  foreman
   multi_json
   oj
   pg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -326,7 +326,6 @@ files:
 - 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
 - lib/pliny/templates/endpoint_scaffold.erb
@@ -342,23 +341,23 @@ files:
 - lib/pliny/templates/serializer_test.erb
 - lib/pliny/utils.rb
 - lib/pliny/version.rb
-- test/commands/creator_test.rb
-- test/commands/generator/base_test.rb
-- test/commands/generator/endpoint_test.rb
-- test/commands/generator_test.rb
-- test/errors_test.rb
-- test/extensions/instruments_test.rb
-- test/integration_test.rb
-- test/log_test.rb
-- test/middleware/cors_test.rb
-- test/middleware/request_id_test.rb
-- test/middleware/request_store_test.rb
-- test/middleware/rescue_errors_test.rb
-- test/middleware/timeout_test.rb
-- test/middleware/versioning_test.rb
-- test/request_store_test.rb
-- test/router_test.rb
-- test/test_helper.rb
+- spec/commands/creator_spec.rb
+- spec/commands/generator/base_spec.rb
+- spec/commands/generator/endpoint_spec.rb
+- spec/commands/generator_spec.rb
+- spec/errors_spec.rb
+- spec/extensions/instruments_spec.rb
+- spec/integration_spec.rb
+- spec/log_spec.rb
+- spec/middleware/cors_spec.rb
+- spec/middleware/request_id_spec.rb
+- spec/middleware/request_store_spec.rb
+- spec/middleware/rescue_errors_spec.rb
+- spec/middleware/timeout_spec.rb
+- spec/middleware/versioning_spec.rb
+- spec/request_store_spec.rb
+- spec/router_spec.rb
+- spec/spec_helper.rb
 - template/.env.sample
 - template/.env.test
 - template/.gitignore
@@ -412,9 +411,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra
 test_files: []
-has_rdoc: 

data/lib/pliny/tasks/test.rake

@@ -1,8 +0,0 @@
-require "rake/testtask"
-
-Rake::TestTask.new do |task|
-  task.libs << "lib"
-  task.libs << "test"
-  task.name = :test
-  task.test_files = FileList["test/**/*_test.rb"]
-end

data/test/test_helper.rb

@@ -1,18 +0,0 @@
-# make sure this is set before Sinatra is required
-ENV["RACK_ENV"] = "test"
-
-require "bundler"
-Bundler.require(:default, :test)
-
-require "minitest/autorun"
-require "rr"
-
-require_relative "../lib/pliny"
-
-class MiniTest::Spec
-  include Rack::Test::Methods
-
-  before do
-    Pliny::RequestStore.clear!
-  end
-end