pliny 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f7798798dae08063fe4342597451263c19d327
-  data.tar.gz: 311315ca6d6dc5490edbdb0db1be00e2b871f76f
+  metadata.gz: 004648bb41bd9b42b488da08c6bfb88c511cb9e9
+  data.tar.gz: 028e79c785b698a736c844f55b7d6b893c981fc8
 SHA512:
-  metadata.gz: e191efaa8f571017d1be9a75ce8204264cedf3222e7ecb48ccb41f436aad6c8f61830e50d6c06853de35c37a25b6bb6844ce149921cc813cfbc5f72aabb1562e
-  data.tar.gz: 9e893cca95172aabfdfa2860873c529685c896bc9a0bad477ac08928c2bd009b7ba9b16e10e7a181351187c59ae20f944a71f0c2544bb97fc9d1e791408e220a
+  metadata.gz: c8f55bc31871bd47ad2097ef2ab00810d117c9a3b132099e78177749fa7dfcd6103d8c71aacd0f42e8872facd17659e8779901d3a7eea590c237d308a0903477
+  data.tar.gz: b5320ef0938d9ace02977eb8639e70be0957ac2df3bc1d66f463143a95449555fd2011c1dd65b5693331f06cf27c29052ed18707c1ae45f60a6434b79a6f6d75

data/lib/pliny/helpers/params.rb

@@ -7,7 +7,7 @@ module Pliny::Helpers
     private
 
     def parse_body_params
-      if request.content_type == "application/json"
+      if request.media_type == "application/json"
         p = indifferent_params(MultiJson.decode(request.body.read))
         request.body.rewind
         p

data/lib/pliny/middleware/request_id.rb

@@ -2,8 +2,14 @@
 
 module Pliny::Middleware
   class RequestID
+    # note that this pattern supports either a full UUID, or a "squashed" UUID
+    # like the kind Hermes sends:
+    #
+    #     full:     01234567-89ab-cdef-0123-456789abcdef
+    #     squashed: 0123456789abcdef0123456789abcdef
+    #
     UUID_PATTERN =
-      /\A[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}\Z/
+      /\A[a-f0-9]{8}-?[a-f0-9]{4}-?[a-f0-9]{4}-?[a-f0-9]{4}-?[a-f0-9]{12}\Z/
 
     def initialize(app)
       @app = app
@@ -30,13 +36,23 @@ module Pliny::Middleware
     private
 
     def extract_request_ids(env)
-      request_ids = []
-      if env["HTTP_REQUEST_ID"]
-        request_ids = env["HTTP_REQUEST_ID"].split(",")
-        request_ids.map! { |id| id.strip }
-        request_ids.select! { |id| id =~ UUID_PATTERN }
-      end
+      request_ids = raw_request_ids(env)
+      request_ids.map! { |id| id.strip }
+      request_ids.select! { |id| id =~ UUID_PATTERN }
       request_ids
     end
+
+    def raw_request_ids(env)
+      # We had a little disagreement around the inception of the Request-Id
+      # field as to whether it should be prefixed with `X-` or not. API went
+      # with no prefix, but Hermes went with one. Support both formats on
+      # input.
+      %w(HTTP_REQUEST_ID HTTP_X_REQUEST_ID).inject([]) do |request_ids, key|
+        if ids = env[key]
+          request_ids += ids.split(",")
+        end
+        request_ids
+      end
+    end
   end
 end

data/lib/pliny/templates/endpoint.erb

@@ -18,11 +18,11 @@ module Endpoints
         encode Hash.new
       end
 
-      patch "/:id" do |id|
+      patch "/:id" do
         encode Hash.new
       end
 
-      delete "/:id" do |id|
+      delete "/:id" do
         encode Hash.new
       end
     end

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/template/Gemfile

@@ -4,9 +4,8 @@ ruby "2.2.0"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.5"
+gem "pliny", "~> 0.6"
 gem "pry"
-gem "pry-doc"
 gem "puma", "~> 2.10"
 gem "rack-ssl"
 gem "rake"

data/lib/template/config/config.rb

@@ -27,7 +27,7 @@ module Config
   override :rack_env,         'development', string
   override :raise_errors,     false,         bool
   override :root,             File.expand_path("../../", __FILE__), string
-  override :timeout,          45,    int
+  override :timeout,          10,    int
   override :force_ssl,        true,  bool
   override :versioning,       false, bool
   override :pretty_json,      false, bool

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

@@ -16,7 +16,7 @@ module Endpoints
       also_reload '../**/*.rb'
     end
 
-    not_found do
+    error Sinatra::NotFound do
       content_type :json
       status 404
       "{}"

data/lib/template/spec/support/auto_define_rack_app.rb

@@ -1,7 +1,7 @@
 RSpec.configure do |config|
   config.before(:context) do |spec|
     # weird ruby syntax, but test if the described_class inherits Sinatra::Base:
-    if !@rack_app && spec.described_class < Sinatra::Base
+    if !@rack_app && spec.described_class && spec.described_class < Sinatra::Base
       @rack_app = spec.described_class
     end
   end

data/spec/commands/generator_spec.rb

@@ -1,3 +1,4 @@
+require 'pliny/commands/creator'
 require 'pliny/commands/generator'
 require 'pliny/commands/generator/base'
 require 'spec_helper'
@@ -6,8 +7,6 @@ describe Pliny::Commands::Generator do
 subject { Pliny::Commands::Generator.new }
 
   before do
-    FileUtils.mkdir_p('/tmp/plinytest')
-    Dir.chdir('/tmp/plinytest')
     Timecop.freeze(@t = Time.now)
 
     any_instance_of(Pliny::Commands::Generator::Base) do |klass|
@@ -15,8 +14,16 @@ subject { Pliny::Commands::Generator.new }
     end
   end
 
+  around do |example|
+    Dir.mktmpdir do |dir|
+      app_dir = File.join(dir, "app")
+      # some generators depend on files seeded by the template
+      Pliny::Commands::Creator.run([app_dir], {}, StringIO.new)
+      Dir.chdir(app_dir, &example)
+    end
+  end
+
   after do
-    FileUtils.rmdir('/tmp/plinytest')
     Timecop.return
   end
 

data/spec/middleware/request_id_spec.rb

@@ -25,4 +25,11 @@ describe Pliny::Middleware::RequestID do
     get "/"
     assert_includes last_response.body, id
   end
+
+  it "accepts incoming request IDs with an `X-` prefix" do
+    id = SecureRandom.uuid
+    header "X-Request-Id", id
+    get "/"
+    assert_includes last_response.body, id
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,16 +75,16 @@ dependencies:
   name: prmd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement