pliny 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48a24aea604685a3fb76c52cf1f6019cdadb389a
-  data.tar.gz: b67a25fcf927be13c8c223f8c6ba090a93362b43
+  metadata.gz: 496e99cb519fa1bf2b5ecbafae836cf88fa0e26b
+  data.tar.gz: 7571df6685a3ec6a9a13c8fb1bfdb4e23c1a5b08
 SHA512:
-  metadata.gz: c743117d694c26fc792db548da9230e0b769655cbd3d4a9da672dffb6211fc327ac73e230320ac8946be1e0334c219a675fb8c81d6be25d3ee7d0013705c96fd
-  data.tar.gz: a92aea7a99f0bc6173f591609601d4ce6c4143e3c51a2d95a7ac4e30bbd295366756c0b81b4b05efba4ea4a81cf4f1e08d7c96f574aed83ca7135117c146d825
+  metadata.gz: f7d1b9eb9510d0f0b37dcd1353a9309447cababbd30ed913b4d291ac1b6f5170f9ec2ccaa51b087368ea6f7e157b94bda63e45af5d4461018724f0aaa89ab1d6
+  data.tar.gz: 7a41e25b27d471f24454dba7c60b58c853611fe6da9f49ce1ac7f83a42b0c0c89a70dd719e12e18a4c1ba6b7143db369ef5126623da08b2e79b9efe677d222ff

data/lib/pliny/commands/creator.rb

@@ -2,6 +2,8 @@ require 'fileutils'
 require 'pathname'
 require 'pliny/version'
 require 'uri'
+require 'erb'
+require 'ostruct'
 
 module Pliny::Commands
   class Creator
@@ -22,29 +24,25 @@ module Pliny::Commands
 
       FileUtils.copy_entry template_dir, app_dir
       FileUtils.rm_rf("#{app_dir}/.git")
-      setup_environments
+      parse_erb_files
       display 'Pliny app created. To start, run:'
       display "cd #{app_dir} && bin/setup"
     end
 
     protected
 
-    def setup_environments
-      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(/APP_NAME=.*/, "APP_NAME=#{name}")
-                    .sub(/DATABASE_URL=.*/, "DATABASE_URL=#{db_url}")
+    def parse_erb_files
+      Dir.glob("#{app_dir}/{*,.*}.erb").each do |file|
+        static_file = file.gsub(/\.erb$/, '')
+
+        template = ERB.new(File.read(file), 0)
+        context = OpenStruct.new(app_name: name)
+        content = template.result(context.instance_eval { binding })
+
+        File.open(static_file, "w") do |f|
+          f.write content
         end
+        FileUtils.rm(file)
       end
     end
 

data/lib/pliny/helpers/serialize.rb

@@ -0,0 +1,35 @@
+module Pliny::Helpers
+  module Serialize
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
+    def serialize(data, structure = :default)
+      if self.class.serializer_class.nil?
+        raise <<-eos.strip
+No serializer has been specified for this endpoint. Please specify one with
+`serializer Serializers::ModelName` in the endpoint.
+        eos
+      end
+
+      self.class.serializer_class.new(structure).serialize(data)
+    end
+
+    module ClassMethods
+      # Provide a way to specify endpoint serializer class.
+      #
+      # class Endpoints::User < Base
+      #   serializer Serializers::User
+      #
+      #   get do
+      #     encode serialize(User.all)
+      #   end
+      # end
+      def serializer(serializer_class)
+        @serializer_class = serializer_class
+      end
+
+      attr_reader :serializer_class
+    end
+  end
+end

data/lib/pliny/templates/endpoint_scaffold.erb

@@ -1,6 +1,9 @@
 module Endpoints
   class <%= plural_class_name %> < Base
     namespace "<%= url_path %>" do
+      serializer Serializers::<%= singular_class_name %>
+
+
       get do
         encode serialize(<%= singular_class_name %>.all)
       end
@@ -30,12 +33,6 @@ module Endpoints
         <%= field_name %>.destroy
         encode serialize(<%= field_name %>)
       end
-
-      private
-
-      def serialize(data, structure = :default)
-        Serializers::<%= singular_class_name %>.new(structure).serialize(data)
-      end
     end
   end
 end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.14.2"
+  VERSION = "0.15.0"
 end

data/lib/pliny.rb

@@ -5,6 +5,7 @@ require_relative "pliny/version"
 require_relative "pliny/errors"
 require_relative "pliny/helpers/encode"
 require_relative "pliny/helpers/params"
+require_relative "pliny/helpers/serialize"
 require_relative "pliny/log"
 require_relative "pliny/request_store"
 require_relative "pliny/router"

data/lib/template/{.env.sample → .env.sample.erb}

@@ -1,5 +1,5 @@
-APP_NAME=pliny
-DATABASE_URL=postgres://localhost/pliny-development
+APP_NAME=<%= app_name %>
+DATABASE_URL=postgres:///<%= app_name %>-development
 DEPLOYMENT=development
 PLINY_ENV=development
 TZ=UTC

data/lib/template/{.env.test → .env.test.erb}

@@ -1,5 +1,5 @@
-APP_NAME=pliny
-DATABASE_URL=postgres://localhost/pliny-test
+APP_NAME=<%= app_name %>
+DATABASE_URL=postgres:///<%= app_name %>-test
 DEPLOYMENT=test
 PLINY_ENV=test
 TZ=UTC

data/lib/template/Gemfile

@@ -4,7 +4,7 @@ ruby "2.2.3"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.14"
+gem "pliny", "~> 0.15"
 gem "pry"
 gem "puma", "~> 2.10"
 gem "rack-ssl"

data/lib/template/app.json.erb

@@ -0,0 +1,14 @@
+{
+  "name": "<%= app_name %>",
+  "description": "A new instance of <%= app_name %>",
+
+  "env": {
+    "APP_NAME": "<%= app_name %>",
+    "DEPLOYMENT": "production",
+    "PLINY_ENV": "production"
+  },
+
+  "addons": [
+    "heroku-postgresql"
+  ]
+}

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

@@ -5,6 +5,7 @@ module Endpoints
 
     helpers Pliny::Helpers::Encode
     helpers Pliny::Helpers::Params
+    helpers Pliny::Helpers::Serialize
 
     set :dump_errors, false
     set :raise_errors, true

data/lib/template/lib/initializer.rb

@@ -12,13 +12,13 @@ module Initializer
 
   def self.require_lib
     require! %w(
+      lib/serializers/base
+      lib/serializers/**/*
       lib/endpoints/base
       lib/endpoints/**/*
       lib/mediators/base
       lib/mediators/**/*
       lib/routes
-      lib/serializers/base
-      lib/serializers/**/*
     )
   end
 

data/spec/commands/creator_spec.rb

@@ -24,6 +24,11 @@ describe Pliny::Commands::Creator do
       refute File.exists?("./foobar/.git")
     end
 
+    it "deletes the .erb files from it" do
+      @gen.run!
+      assert_equal 0, Dir.glob("./foobar/**/{*,.*}.erb").length
+    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|
@@ -39,5 +44,13 @@ describe Pliny::Commands::Creator do
       end
       assert_equal "DATABASE_URL=postgres:///foobar-test", db_url
     end
+
+    it "changes APP_NAME in app.json to use the app name" do
+      @gen.run!
+      db_url = File.read("./foobar/app.json").split("\n").detect do |line|
+        line.include?("\"name\":")
+      end
+      assert_equal "  \"name\": \"foobar\",", db_url
+    end
   end
 end

data/spec/helpers/serialize_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+
+describe Pliny::Helpers::Serialize do
+  context "without a serializer" do
+    def app
+      Sinatra.new do
+        helpers Pliny::Helpers::Serialize
+
+        get "/" do
+          MultiJson.encode(serialize([]))
+        end
+      end
+    end
+
+    it "sets the Content-Type" do
+      assert_raises(RuntimeError) do
+        get "/"
+      end
+    end
+  end
+
+  context "with a serializer" do
+    class Serializer
+      def initialize(opts); end
+      def serialize(data)
+        data
+      end
+    end
+
+    def app
+      Sinatra.new do
+        helpers Pliny::Helpers::Serialize
+
+        serializer Serializer
+
+        get "/" do
+          MultiJson.encode(serialize([]))
+        end
+      end
+    end
+
+    it "encodes as json" do
+      get "/"
+      assert_equal 200, last_response.status
+      assert_equal MultiJson.encode([]), last_response.body
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -351,6 +351,7 @@ files:
 - lib/pliny/errors.rb
 - lib/pliny/helpers/encode.rb
 - lib/pliny/helpers/params.rb
+- lib/pliny/helpers/serialize.rb
 - lib/pliny/log.rb
 - lib/pliny/middleware/cors.rb
 - lib/pliny/middleware/instruments.rb
@@ -378,8 +379,8 @@ 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/.env.sample.erb
+- lib/template/.env.test.erb
 - lib/template/.gitignore
 - lib/template/.rspec
 - lib/template/.ruby-version
@@ -388,6 +389,7 @@ files:
 - lib/template/Procfile
 - lib/template/README.md
 - lib/template/Rakefile
+- lib/template/app.json.erb
 - lib/template/bin/console
 - lib/template/bin/run
 - lib/template/bin/setup
@@ -432,6 +434,7 @@ files:
 - spec/db_support_spec.rb
 - spec/errors_spec.rb
 - spec/helpers/encode_spec.rb
+- spec/helpers/serialize_spec.rb
 - spec/integration_spec.rb
 - spec/log_spec.rb
 - spec/middleware/cors_spec.rb
@@ -465,7 +468,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra