pliny 0.5.0 → 0.6.0

data/lib/template/Rakefile

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

data/{template → lib/template}/bin/console

@@ -3,17 +3,9 @@
 require_relative '../lib/application'
 
 def basic_prompt(target_self, nest_level, pry)
-  # override CONSOLE_BANNER to include something like a release identifier
+  # override DEPLOYMENT to identify console sessions (eg: staging/production/etc)
   nesting = nest_level.zero? ? "" : ":#{nest_level}"
-  "[#{pry.input_array.size}] #{console_prefix}(#{Pry.view_clip(target_self)})#{nesting}"
-end
-
-def console_prefix
-  if Config.console_banner
-    Config.console_banner
-  elsif Config.rack_env == "production"
-    "production"
-  end
+  "[#{pry.input_array.size}] #{Config.deployment}(#{Pry.view_clip(target_self)})#{nesting}"
 end
 
 Pry.prompt = [

data/{template → lib/template}/bin/setup

@@ -5,7 +5,7 @@ function main {
 
   add_new_env_vars
   bundle install
-  bundle exec rake db:setup db:schema:load db:migrate
+  bundle exec rake db:setup
 }
 
 function add_new_env_vars {

data/{template → lib/template}/config/config.rb

@@ -13,13 +13,13 @@ module Config
   mandatory :database_url, string
 
   # Optional -- value is returned or `nil` if it wasn't present.
-  optional :console_banner,      string
   optional :placeholder,         string
   optional :versioning_default,  string
   optional :versioning_app_name, string
 
   # Override -- value is returned or the set default.
   override :db_pool,          5,    int
+  override :deployment,       'production', string
   override :port,             5000, int
   override :puma_max_threads, 16,   int
   override :puma_min_threads, 1,    int

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

@@ -0,0 +1,10 @@
+# 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"
+task :spec do
+  require "rspec/core"
+  code = RSpec::Core::Runner.run(
+    ["./spec"],
+    $stderr, $stdout)
+  exit(code) unless code == 0
+end

data/{template → lib/template}/spec/spec_helper.rb

@@ -36,6 +36,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.expect_with :minitest
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/commands/generator/endpoint_spec.rb

@@ -4,12 +4,54 @@ require 'spec_helper'
 
 describe Pliny::Commands::Generator::Endpoint do
   subject { Pliny::Commands::Generator::Endpoint.new(model_name, {}, StringIO.new) }
+  let(:model_name) { 'resource_history' }
 
   describe '#url_path' do
-    let(:model_name) { 'resource_history' }
-
     it 'builds a URL path' do
       assert_equal '/resource-histories', subject.url_path
     end
   end
+
+  describe 'template' do
+    before do
+      # render the stub endpoint template to a string
+      template = subject.render_template("endpoint.erb",
+        plural_class_name: "Artists",
+        url_path:          "/artists")
+
+      # eval and assign it to rack_app so tests are pointing to it
+      @rack_app = eval(template)
+    end
+
+    it "defines a stub GET /" do
+      get "/artists"
+      assert_equal 200, last_response.status
+      assert_equal [], MultiJson.decode(last_response.body)
+    end
+
+    it "defines a stub POST /" do
+      post "/artists"
+      assert_equal 201, last_response.status
+      assert_equal Hash.new, MultiJson.decode(last_response.body)
+    end
+
+    it "defines a stub GET /:id" do
+      get "/artists/123"
+      assert_equal 200, last_response.status
+      assert_equal Hash.new, MultiJson.decode(last_response.body)
+    end
+
+    it "defines a stub PATCH /:id" do
+      patch "/artists/123"
+      assert_equal 200, last_response.status
+      assert_equal Hash.new, MultiJson.decode(last_response.body)
+    end
+
+    it "defines a stub DELETE /:id" do
+      delete "/artists/123"
+      assert_equal 200, last_response.status
+      assert_equal Hash.new, MultiJson.decode(last_response.body)
+    end
+
+  end
 end

data/spec/integration_spec.rb

@@ -1,19 +1,29 @@
 require "spec_helper"
 
 describe "Pliny integration test" do
-  before do
+  before(:all) do
     FileUtils.rm_rf("/tmp/plinytest")
     FileUtils.mkdir_p("/tmp/plinytest")
     Dir.chdir("/tmp/plinytest")
-  end
 
-  it "works" do
     bash "pliny-new myapp"
     bash_app "bin/setup"
-    assert File.exists?("./myapp/Gemfile.lock")
-    bash_app "pliny-generate model artist"
-    assert File.exists?("./myapp/lib/models/artist.rb")
-    # could use something like bin/run in the template app to facilitate testing this
+  end
+
+  describe "bin/setup" do
+    it "generates .env" do
+      assert File.exists?("./myapp/.env")
+    end
+  end
+
+  describe "pliny-generate model" do
+    before(:all) do
+      bash_app "pliny-generate model artist"
+    end
+
+    it "creates the model file" do
+      assert File.exists?("./myapp/lib/models/artist.rb")
+    end
   end
 
   def bash(cmd)

data/spec/spec_helper.rb

@@ -2,9 +2,15 @@
 ENV["RACK_ENV"] = "test"
 
 require "bundler"
-Bundler.require(:default, :test)
+Bundler.require
+
+require "rack/test"
+require "sinatra/namespace"
+require "sinatra/router"
+require "timecop"
 
 require_relative "../lib/pliny"
+Pliny::Utils.require_glob("./spec/support/**/*.rb")
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
@@ -23,4 +29,11 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  # the rack app to be tested with rack-test:
+  def app
+    @rack_app || fail("Missing @rack_app")
+  end
 end
+
+Pliny.stdout = StringIO.new

data/spec/support/config.rb

@@ -0,0 +1,8 @@
+# Supress the "use RbConfig instead" warning.
+Object.send(:remove_const, :Config) if Object.const_defined?(:Config)
+
+module Config
+  def self.pretty_json
+    true
+  end
+end

data/spec/support/endpoints.rb

@@ -0,0 +1,8 @@
+# create Endpoints::Base so we can test subclasses generated by Pliny:
+module Endpoints
+  class Base < Sinatra::Base
+    register Sinatra::Namespace
+    helpers Pliny::Helpers::Encode
+    helpers Pliny::Helpers::Params
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,280 +9,314 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: prmd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.9'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.9'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: http_accept
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: sinatra-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Pliny is a set of base classes and helpers to help developers write excellent
@@ -341,6 +375,39 @@ files:
 - lib/pliny/templates/serializer_test.erb
 - lib/pliny/utils.rb
 - lib/pliny/version.rb
+- lib/template/.env.sample
+- lib/template/.env.test
+- lib/template/.gitignore
+- lib/template/.rspec
+- lib/template/.ruby-version
+- lib/template/Gemfile
+- lib/template/LICENSE
+- lib/template/Procfile
+- lib/template/README.md
+- lib/template/Rakefile
+- lib/template/bin/console
+- lib/template/bin/run
+- lib/template/bin/setup
+- lib/template/config.ru
+- lib/template/config/config.rb
+- lib/template/config/initializers/database.rb
+- lib/template/config/initializers/rollbar.rb
+- lib/template/config/puma.rb
+- lib/template/db/schema.sql
+- lib/template/db/seeds.rb
+- lib/template/docs/schema/meta.json
+- lib/template/docs/schema/schemata/.gitkeep
+- lib/template/lib/application.rb
+- lib/template/lib/endpoints/base.rb
+- lib/template/lib/endpoints/root.rb
+- lib/template/lib/initializer.rb
+- lib/template/lib/mediators/base.rb
+- lib/template/lib/routes.rb
+- lib/template/lib/serializers/base.rb
+- lib/template/lib/tasks/spec.rake
+- lib/template/spec/spec_helper.rb
+- lib/template/spec/support/auto_define_rack_app.rb
+- lib/template/spec/support/log.rb
 - spec/commands/creator_spec.rb
 - spec/commands/generator/base_spec.rb
 - spec/commands/generator/endpoint_spec.rb
@@ -358,39 +425,8 @@ files:
 - spec/request_store_spec.rb
 - spec/router_spec.rb
 - spec/spec_helper.rb
-- template/.env.sample
-- template/.env.test
-- template/.gitignore
-- template/.rspec
-- template/.ruby-version
-- template/Gemfile
-- template/Gemfile.lock
-- template/LICENSE
-- template/Procfile
-- template/README.md
-- template/Rakefile
-- template/bin/console
-- template/bin/run
-- template/bin/setup
-- template/config.ru
-- template/config/config.rb
-- template/config/initializers/database.rb
-- template/config/initializers/rollbar.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/application.rb
-- template/lib/endpoints/base.rb
-- template/lib/endpoints/root.rb
-- template/lib/initializer.rb
-- template/lib/mediators/base.rb
-- template/lib/routes.rb
-- template/lib/serializers/base.rb
-- template/spec/spec_helper.rb
-- template/spec/support/auto_define_rack_app.rb
-- template/spec/support/log.rb
+- spec/support/config.rb
+- spec/support/endpoints.rb
 homepage: https://github.com/interagent/pliny
 licenses:
 - MIT
@@ -401,12 +437,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -416,3 +452,4 @@ signing_key:
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra
 test_files: []
+has_rdoc: