pliny 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmVlMTRhYThlZWVjYzA2MjNlYjZjZDY5NTkyMDY5YmE5NWEwNDAyMA==
-  data.tar.gz: !binary |-
-    MTczNDRhNTY2N2UwMmUyY2I4YWQ5NDFlN2MwYzhlN2JlNTVhOWIwYw==
+SHA1:
+  metadata.gz: 062483bed93d424e25354d0f8ea06a181a28430c
+  data.tar.gz: b1c03ea6b109d2f66bd858f35b9ed1b1662a8ade
 SHA512:
-  metadata.gz: !binary |-
-    MTM1OTZkNmMxMDcwMTg4ZWVkYWFkN2MxMjQ3MWM5MzdhNmE4M2NkZmYxMjA4
-    YzM5MGRmZmFlM2YyMzJmMTE3YzM3ZGVmMjYxNTk3YWRjOTdhODA4YTcwY2Ew
-    OWQyNjQ3YTlhZmZmYTBjN2UxMjFlMDEwZGRlMTA5NTI0OTJhYmM=
-  data.tar.gz: !binary |-
-    OGY5YmExZmE5YTQwMGQ4MWNiNzkyYTMwZDA1NjNmZTI5YmM1ZWY4YTFjYTQx
-    ZDIwZDkxZDdjNmY1ZjlkZDQ2Y2EyM2NlZTNhY2NmNjQ1N2M1MzY4MTViN2Q0
-    ZmIxZmY1MTQ0MjIyNmNiOGE2OTQwZTk3YzJkOTBiMzQwNWM5Mjk=
+  metadata.gz: 1f22ef6e9a03877ea2b9e41451579c708fc54553e2b6cc979262859bccc204a2f9e10ea43111aacb3bd033945a315337996288abd7b419f4c835952181e7c406
+  data.tar.gz: 94fac3320131a3cc7fe13bdb52752dcedc6aadd17e832ef4e21f37c7a68d9df1ace62277c28685ac1c073ae422faa01ba2a0ea1172ba9804d8b571d170736ff5

data/README.md

@@ -19,7 +19,7 @@ And gems/helpers to tie these together and support operations:
 - [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)
+- [Puma](http://puma.io/) as the web server, [configured for optimal performance on Heroku](lib/template/config/puma.rb)
 - [Rack-test](https://github.com/brynary/rack-test) to test the API endpoints
 - [Request IDs](lib/pliny/middleware/request_id.rb)
 - [RequestStore](http://brandur.org/antipatterns), thread safe option to store data with the current request
@@ -141,7 +141,6 @@ Run tests:
 
 ```
 $ bundle install
-$ git submodule update --init
 $ rake
 ```
 

data/lib/pliny/commands/creator.rb

@@ -1,5 +1,5 @@
-require 'pliny/version'
 require 'fileutils'
+require 'pathname'
 require 'uri'
 
 module Pliny::Commands
@@ -55,11 +55,11 @@ module Pliny::Commands
     end
 
     def template_dir
-      File.expand_path('../../../template', File.dirname(__FILE__))
+      File.expand_path('../../template', File.dirname(__FILE__))
     end
 
     def app_dir
-      "./#{name}"
+      Pathname.new(name).expand_path
     end
   end
 end

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

@@ -39,12 +39,16 @@ module Pliny::Commands
         stream.puts msg
       end
 
-      def render_template(template_file, destination_path, vars = {})
+      def render_template(template_file, vars = {})
         template_path = File.dirname(__FILE__) + "/../../templates/#{template_file}"
         template = ERB.new(File.read(template_path), 0, '>')
         context = OpenStruct.new(vars)
+        template.result(context.instance_eval { binding })
+      end
+
+      def write_template(template_file, destination_path, vars = {})
         write_file(destination_path) do
-          template.result(context.instance_eval { binding })
+          render_template(template_file, vars)
         end
       end
 

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

@@ -6,7 +6,7 @@ module Pliny::Commands
       def create
         endpoint = "./lib/endpoints/#{pluralized_file_name}.rb"
         template = options[:scaffold] ? 'endpoint_scaffold.erb' : 'endpoint.erb'
-        render_template(template, endpoint,
+        write_template(template, endpoint,
                         plural_class_name: plural_class_name,
                         singular_class_name: singular_class_name,
                         field_name: field_name,
@@ -18,7 +18,7 @@ module Pliny::Commands
 
       def create_test
         test = "./spec/endpoints/#{pluralized_file_name}_spec.rb"
-        render_template('endpoint_test.erb', test,
+        write_template('endpoint_test.erb', test,
                         plural_class_name: plural_class_name,
                         singular_class_name: singular_class_name,
                         url_path: url_path)
@@ -28,7 +28,7 @@ module Pliny::Commands
       def create_acceptance_test
         test = "./spec/acceptance/#{pluralized_file_name}_spec.rb"
         template = options[:scaffold] ? 'endpoint_scaffold_acceptance_test.erb' : 'endpoint_acceptance_test.erb'
-        render_template(template, test,
+        write_template(template, test,
                         plural_class_name: plural_class_name,
                         field_name: field_name,
                         singular_class_name: singular_class_name,

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

@@ -5,14 +5,14 @@ module Pliny::Commands
     class Mediator < Base
       def create
         mediator = "./lib/mediators/#{field_name}.rb"
-        render_template('mediator.erb', mediator,
+        write_template('mediator.erb', mediator,
                         singular_class_name: singular_class_name)
         display "created mediator file #{mediator}"
       end
 
       def create_test
         test = "./spec/mediators/#{field_name}_spec.rb"
-        render_template('mediator_test.erb', test,
+        write_template('mediator_test.erb', test,
                         singular_class_name: singular_class_name)
         display "created test #{test}"
       end

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

@@ -5,7 +5,7 @@ module Pliny::Commands
     class Migration < Base
       def create
         migration = "./db/migrate/#{Time.now.to_i}_#{name}.rb"
-        render_template('migration.erb', migration)
+        write_template('migration.erb', migration)
         display "created migration #{migration}"
       end
     end

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

@@ -5,7 +5,7 @@ module Pliny::Commands
     class Model < Base
       def create
         model = "./lib/models/#{field_name}.rb"
-        render_template('model.erb', model,
+        write_template('model.erb', model,
                         singular_class_name: singular_class_name,
                         paranoid: options[:paranoid])
         display "created model file #{model}"
@@ -13,7 +13,7 @@ module Pliny::Commands
 
       def create_migration
         migration = "./db/migrate/#{Time.now.to_i}_create_#{table_name}.rb"
-        render_template('model_migration.erb', migration,
+        write_template('model_migration.erb', migration,
                         table_name: table_name,
                         paranoid: options[:paranoid])
         display "created migration #{migration}"
@@ -21,7 +21,7 @@ module Pliny::Commands
 
       def create_test
         test = "./spec/models/#{field_name}_spec.rb"
-        render_template('model_test.erb', test,
+        write_template('model_test.erb', test,
                         singular_class_name: singular_class_name)
         display "created test #{test}"
       end

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

@@ -5,14 +5,14 @@ module Pliny::Commands
     class Serializer < Base
       def create
         serializer = "./lib/serializers/#{field_name}.rb"
-        render_template('serializer.erb', serializer,
+        write_template('serializer.erb', serializer,
                         singular_class_name: singular_class_name)
         display "created serializer file #{serializer}"
       end
 
       def create_test
         test = "./spec/serializers/#{field_name}_spec.rb"
-        render_template('serializer_test.erb', test,
+        write_template('serializer_test.erb', test,
                         singular_class_name: singular_class_name)
         display "created test #{test}"
       end

data/lib/pliny/config_helpers.rb

@@ -83,4 +83,4 @@ module Pliny
 end
 
 # Supress the "use RbConfig instead" warning.
-Object.send :remove_const, :Config
+Object.send(:remove_const, :Config) if Object.const_defined?(:Config)

data/lib/pliny/tasks/db.rake

@@ -13,6 +13,7 @@ namespace :db do
       Sequel::Migrator.apply(db, "./db/migrate")
       puts "Migrated `#{name_from_uri(database_url)}`"
     end
+    disconnect
   end
 
   desc "Rollback the database"
@@ -23,6 +24,7 @@ namespace :db do
       Sequel::Migrator.apply(db, "./db/migrate", -1)
       puts "Rolled back `#{name_from_uri(database_url)}`"
     end
+    disconnect
   end
 
   desc "Nuke the database (drop all tables)"
@@ -34,6 +36,7 @@ namespace :db do
       end
       puts "Nuked `#{name_from_uri(database_url)}`"
     end
+    disconnect
   end
 
   desc "Seed the database with data"
@@ -43,6 +46,7 @@ namespace :db do
         Sequel.connect(database_url)
         load 'db/seeds.rb'
       end
+      disconnect
     end
   end
 
@@ -51,8 +55,8 @@ namespace :db do
 
   desc "Create the database"
   task :create do
-    db = Sequel.connect("postgres:///postgres")
     database_urls.each do |database_url|
+      db = Sequel.connect("#{postgres_location_from_uri(database_url)}/postgres")
       exists = false
       name = name_from_uri(database_url)
       begin
@@ -63,16 +67,18 @@ namespace :db do
       end
       puts "Created `#{name}`" if !exists
     end
+    disconnect
   end
 
   desc "Drop the database"
   task :drop do
-    db = Sequel.connect("postgres:///postgres")
     database_urls.each do |database_url|
+      db = Sequel.connect("#{postgres_location_from_uri(database_url)}/postgres")
       name = name_from_uri(database_url)
       db.run(%{DROP DATABASE IF EXISTS "#{name}"})
       puts "Dropped `#{name}`"
     end
+    disconnect
   end
 
   namespace :schema do
@@ -85,6 +91,7 @@ namespace :db do
           db.run(schema)
           puts "Loaded `#{name_from_uri(database_url)}`"
         end
+        disconnect
       else
         puts "Skipped schema load, schema.sql not present"
       end
@@ -109,23 +116,29 @@ namespace :db do
           schema << db[:schema_migrations].insert_sql(migration) + ";\n"
         end
       end
+      disconnect
 
       File.open(file, "w") { |f| f.puts schema }
       puts "Dumped `#{name_from_uri(database_url)}` to #{file}"
     end
 
     desc "Merges migrations into schema and removes them"
-    task :merge => ["db:setup", "db:schema:load", "db:migrate", "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, :migrate]
+  task :setup => [:drop, :create, "schema:load", :migrate]
 
   private
 
+  def disconnect
+    Sequel::DATABASES.each { |db| db.disconnect }
+    Sequel::DATABASES.clear
+  end
+
   def database_urls
     if ENV["DATABASE_URL"]
       [ENV["DATABASE_URL"]]
@@ -144,4 +157,10 @@ namespace :db do
   def name_from_uri(uri)
     URI.parse(uri).path[1..-1]
   end
+
+  def postgres_location_from_uri(uri)
+    p = URI.parse(uri)
+    p.path = ""
+    p.to_s
+  end
 end

data/lib/pliny/templates/endpoint.erb

@@ -11,19 +11,19 @@ module Endpoints
 
       post do
         status 201
-        encode {}
+        encode Hash.new
       end
 
       get "/:id" do
-        encode {}
+        encode Hash.new
       end
 
       patch "/:id" do |id|
-        encode {}
+        encode Hash.new
       end
 
       delete "/:id" do |id|
-        encode {}
+        encode Hash.new
       end
     end
   end

data/lib/pliny/templates/endpoint_acceptance_test.erb

@@ -15,7 +15,7 @@ describe Endpoints::<%= plural_class_name %> do
   describe 'GET <%= url_path %>' do
     it 'returns correct status code and conforms to schema' do
       get '<%= url_path %>'
-      expect(last_response.status).to eq(200)
+      assert_equal 200, last_response.status
       assert_schema_conform
     end
   end
@@ -24,7 +24,7 @@ describe Endpoints::<%= plural_class_name %> do
     it 'returns correct status code and conforms to schema' do
       header "Content-Type", "application/json"
       post '<%= url_path %>', MultiJson.encode({})
-      expect(last_response.status).to eq(201)
+      assert_equal 201, last_response.status
       assert_schema_conform
     end
   end
@@ -32,7 +32,7 @@ describe Endpoints::<%= plural_class_name %> do
   describe 'GET <%= url_path %>/:id' do
     it 'returns correct status code and conforms to schema' do
       get "<%= url_path %>/123"
-      expect(last_response.status).to eq(200)
+      assert_equal 200, last_response.status
       assert_schema_conform
     end
   end
@@ -41,7 +41,7 @@ describe Endpoints::<%= plural_class_name %> do
     it 'returns correct status code and conforms to schema' do
       header "Content-Type", "application/json"
       patch '<%= url_path %>/123', MultiJson.encode({})
-      expect(last_response.status).to eq(200)
+      assert_equal 200, last_response.status
       assert_schema_conform
     end
   end
@@ -49,7 +49,7 @@ describe Endpoints::<%= plural_class_name %> do
   describe 'DELETE <%= url_path %>/:id' do
     it 'returns correct status code and conforms to schema' do
       delete '<%= url_path %>/123'
-      expect(last_response.status).to eq(200)
+      assert_equal 200, last_response.status
       assert_schema_conform
     end
   end

data/lib/pliny/templates/endpoint_test.erb

@@ -6,7 +6,7 @@ describe Endpoints::<%= plural_class_name %> do
   describe "GET <%= url_path %>" do
     it "succeeds" do
       get "<%= url_path %>"
-      expect(last_response.status).to eq(200)
+      assert_equal 200, last_response.status
     end
   end
 end

data/lib/pliny/version.rb

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

data/lib/template/.ruby-version

@@ -0,0 +1 @@
+2.2.0

data/{template → lib/template}/Gemfile

@@ -1,20 +1,20 @@
 source "https://rubygems.org"
-ruby "2.1.4"
+ruby "2.2.0"
 
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny"
+gem "pliny", "~> 0.5"
 gem "pry"
 gem "pry-doc"
-gem "puma"
+gem "puma", "~> 2.10"
 gem "rack-ssl"
 gem "rake"
 gem "rollbar"
-gem "sequel"
+gem "sequel", "~> 4.16"
 gem "sequel-paranoid"
-gem "sequel_pg", require: "sequel"
-gem "sinatra", require: "sinatra/base"
+gem "sequel_pg", "~> 1.6", require: "sequel"
+gem "sinatra", "~> 1.4", require: "sinatra/base"
 gem "sinatra-contrib", require: ["sinatra/namespace", "sinatra/reloader"]
 gem "sinatra-router"
 gem "sucker_punch"
@@ -23,13 +23,10 @@ group :development, :test do
   gem "pry-byebug"
 end
 
-group :development do
-  gem "dotenv"
-end
-
 group :test do
   gem "committee"
   gem "database_cleaner"
+  gem "dotenv"
   gem "rack-test"
   gem "rspec"
 end