pliny 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dbcb16bc8dfd3e1ccf6631213e387368cd0a924
-  data.tar.gz: db1bdaa2c246b5fe2a3209c73810113223fcb336
+  metadata.gz: 4e0f67945b6d0c56fbc12eeeb1f05c27552d34ec
+  data.tar.gz: 0561658c246936f0e5aea4d84bb9594bf547901d
 SHA512:
-  metadata.gz: 04092bcc6e1883e1eddfe41ae889011ccd51adfb586d0e67529a439ffbced16f0eb59c8a38b143bd1804e6cdef25c96be6fce27d045f78866207dcd254318eed
-  data.tar.gz: af57c21f2048c3fdec9ea622179f6ea1be80ad32878c43131323449e034385777465db789ee47b4f6251084dbf7cc56372240945605fef1dc80f80987e5ef367
+  metadata.gz: fc4d4d529b7f99a29fad0261059bea8e038cb5e516fa1f6145d5c549b3e63d19801cbae9889ad30bf25eeec6073fcc35becf4fd190df4e05725e5db8cb3bfa28
+  data.tar.gz: b49455e9fe4a7d1064df6fa29903b35f6be59a297263ef6c3d90f3078a73603184ef1f2053cff12a28ea59a0f200989fde44b3384ff66e29891e7cc44f99c88d

data/bin/pliny-new

@@ -3,10 +3,19 @@
 require "optparse"
 require_relative '../lib/pliny/commands/creator'
 
-ARGV.options do |options|
+OptionParser.new do |options|
   opts = {}
+  options.banner = "Usage: pliny-new app-name [options]"
 
-  options.parse!
-
-  Pliny::Commands::Creator.run(ARGV.dup, opts)
+  begin
+    options.parse!
+    if ARGV.empty?
+      puts options.banner
+    else
+      Pliny::Commands::Creator.run(ARGV.dup, opts)
+    end
+  rescue OptionParser::InvalidOption => e
+    puts e
+    puts options.banner
+  end
 end

data/lib/pliny/commands/updater.rb

@@ -59,9 +59,9 @@ module Pliny::Commands
       # take a diff of changes that happened to the template app in Pliny
       diff = `cd #{repo_dir} && git diff v#{curr}..v#{target} lib/template/`
 
-      # remove lib/template from the path of files in the patch so that we can
+      # remove /lib/template from the path of files in the patch so that we can
       # apply these to the current folder
-      diff.gsub!(/^(\-\-\-|\+\+\+) (\w)\/lib\/template/, '\1 \2')
+      diff.gsub!(/(\w)\/lib\/template/, '\1')
 
       File.open(patch_file, "w") { |f| f.puts diff }
     end

data/lib/pliny/config_helpers.rb

@@ -35,6 +35,20 @@ module Pliny
       ->(v) { v.to_sym }
     end
 
+    # optional :accronyms, array(string)
+    # => ['a', 'b']
+    # optional :numbers, array(int)
+    # => [1, 2]
+    # optional :notype, array
+    # => ['a', 'b']
+    def array(method = nil)
+      -> (v) do
+        if v
+          v.split(",").map{|a| cast(a, method) }
+        end
+      end
+    end
+
     private
 
     def cast(value, method)

data/lib/pliny/db_support.rb

@@ -4,27 +4,46 @@ require "sequel/extensions/migration"
 
 module Pliny
   class DbSupport
-    @@logger = nil
+    def self.admin_url(database_url)
+      uri = URI.parse(database_url)
+      uri.path = "/postgres"
+      uri.to_s
+    end
 
-    def self.logger=(logger)
-      @@logger=logger
+    def self.setup?(database_url)
+      @db = Sequel.connect(database_url)
+      @db.test_connection
+      @db.disconnect
+      return true
+    rescue Sequel::DatabaseConnectionError
+      return false
     end
 
-    def self.run(url)
-      instance = new(url)
+    def self.run(url, sequel_log_io=StringIO.new)
+      logger = Logger.new(sequel_log_io)
+      instance = new(url, logger)
       yield instance
       instance.disconnect
     end
 
     attr_accessor :db
 
-    def initialize(url)
+    def initialize(url, sequel_logger)
       @db = Sequel.connect(url)
-      if @@logger
-        @db.loggers << @@logger
+      if sequel_logger
+        @db.loggers << sequel_logger
       end
     end
 
+    def exists?(name)
+      res = db.fetch("SELECT 1 FROM pg_database WHERE datname = ?", name)
+      return res.count > 0
+    end
+
+    def create(name)
+      db.run(%{CREATE DATABASE "#{name}"})
+    end
+
     def migrate(target=nil)
       Sequel::Migrator.apply(db, "./db/migrate", target)
     end

data/lib/pliny/errors.rb

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

data/lib/pliny/tasks/db.rake

@@ -6,14 +6,12 @@ require "uri"
 require "pliny/db_support"
 require "pliny/utils"
 
-Pliny::DbSupport.logger = Logger.new($stdout)
-
 namespace :db do
   desc "Run database migrations"
   task :migrate do
     next if Dir["./db/migrate/*.rb"].empty?
     database_urls.each do |database_url|
-      Pliny::DbSupport.run(database_url) do |helper|
+      Pliny::DbSupport.run(database_url, $stdout) do |helper|
         helper.migrate
         puts "Migrated `#{name_from_uri(database_url)}`"
       end
@@ -24,7 +22,7 @@ namespace :db do
   task :rollback do
     next if Dir["./db/migrate/*.rb"].empty?
     database_urls.each do |database_url|
-      Pliny::DbSupport.run(database_url) do |helper|
+      Pliny::DbSupport.run(database_url, $stdout) do |helper|
         helper.rollback
         puts "Rolled back `#{name_from_uri(database_url)}`"
       end
@@ -45,16 +43,16 @@ namespace :db do
   desc "Create the database"
   task :create do
     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
-        db.run(%{CREATE DATABASE "#{name}"})
-      rescue Sequel::DatabaseError
-        raise unless $!.message =~ /already exists/
-        exists = true
+      db_name = name_from_uri(database_url)
+      if Pliny::DbSupport.setup?(database_url)
+        puts "Skipping `#{db_name}`, already exists"
+      else
+        admin_url = Pliny::DbSupport.admin_url(database_url)
+        Pliny::DbSupport.run(admin_url) do |helper|
+          helper.create(db_name)
+          puts "Created `#{db_name}`"
+        end
       end
-      puts "Created `#{name}`" if !exists
     end
     disconnect
   end
@@ -62,7 +60,8 @@ namespace :db do
   desc "Drop the database"
   task :drop do
     database_urls.each do |database_url|
-      db = Sequel.connect("#{postgres_location_from_uri(database_url)}/postgres")
+      admin_url = Pliny::DbSupport.admin_url(database_url)
+      db = Sequel.connect(admin_url)
       name = name_from_uri(database_url)
       db.run(%{DROP DATABASE IF EXISTS "#{name}"})
       puts "Dropped `#{name}`"
@@ -146,10 +145,4 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/lib/template/Gemfile

@@ -4,7 +4,7 @@ ruby "2.2.2"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.10"
+gem "pliny", "~> 0.11"
 gem "pry"
 gem "puma", "~> 2.10"
 gem "rack-ssl"

data/lib/template/db/seeds.rb

@@ -3,4 +3,7 @@
 # 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
+# Seeding can occur multiple times during the execution of a single Rake task
+# because seeding should occur in all environments (development, testing,
+# etc.). The currently connected database can be accessed via
+# `Sequel::DATABASES.last`.

data/lib/template/lib/endpoints/base.rb

@@ -18,9 +18,7 @@ module Endpoints
     end
 
     error Sinatra::NotFound do
-      content_type :json
-      status 404
-      "{}"
+      raise Pliny::Errors::NotFound
     end
   end
 end

data/spec/db_support_spec.rb

@@ -2,9 +2,11 @@ require "spec_helper"
 require "pliny/db_support"
 
 describe Pliny::DbSupport do
-  let(:support) { Pliny::DbSupport.new(ENV["TEST_DATABASE_URL"]) }
+  let(:url) { ENV["TEST_DATABASE_URL"] }
+  let(:logger) { Logger.new(StringIO.new) }
+  let(:support) { Pliny::DbSupport.new(url, logger) }
 
-  before(:all) do
+  before do
     @path = "/tmp/pliny-test"
   end
 
@@ -15,6 +17,20 @@ describe Pliny::DbSupport do
     Dir.chdir(@path)
   end
 
+  describe ".admin_url" do
+    it "connects to the postgres system's db" do
+      assert_equal "postgres://1.2.3.4/postgres",
+        Pliny::DbSupport.admin_url("postgres://1.2.3.4/my-db")
+    end
+  end
+
+  describe ".setup?" do
+    it "checks if the database is responsive" do
+      assert_equal true, Pliny::DbSupport.setup?(url)
+      assert_equal false, Pliny::DbSupport.setup?("postgres://localhost/does-not-exist")
+    end
+  end
+
   describe "#migrate" do
     before do
       File.open("#{@path}/db/migrate/#{Time.now.to_i}_create_foo.rb", "w") do |f|

data/spec/integration_spec.rb

@@ -16,14 +16,26 @@ describe "Pliny integration test" do
     end
   end
 
-  describe "pliny-generate model" do
+  describe "pliny-generate scaffold" do
     before(:all) do
-      bash_app "pliny-generate model artist"
+      bash_app "pliny-generate scaffold artist"
     end
 
     it "creates the model file" do
       assert File.exists?("./myapp/lib/models/artist.rb")
     end
+
+    it "creates the endpoint file" do
+      assert File.exists?("./myapp/lib/endpoints/artists.rb")
+    end
+
+    it "creates the serializer file" do
+      assert File.exists?("./myapp/lib/serializers/artist.rb")
+    end
+
+    it "creates the schema file" do
+      assert File.exists?("./myapp/schema/schemata/artist.yaml")
+    end
   end
 
   def bash(cmd)
@@ -38,4 +50,4 @@ describe "Pliny integration test" do
   def bash_app(cmd)
     bash "cd myapp && #{cmd}"
   end
-end
+end

data/spec/middleware/rescue_errors_spec.rb

@@ -24,7 +24,6 @@ describe Pliny::Middleware::RescueErrors do
     error_json = MultiJson.decode(last_response.body)
     assert_equal "service_unavailable", error_json["id"]
     assert_equal "Service unavailable.", error_json["message"]
-    assert_equal 503, error_json["status"]
   end
 
   it "intercepts exceptions and renders" do
@@ -34,7 +33,6 @@ describe Pliny::Middleware::RescueErrors do
     error_json = MultiJson.decode(last_response.body)
     assert_equal "internal_server_error", error_json["id"]
     assert_equal "Internal server error.", error_json["message"]
-    assert_equal 500, error_json["status"]
   end
 
   it "raises given the raise option" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -474,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra