apiculture 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 917fb8bfc86e8bc1d1a9d02729434c6af8398c1b
-  data.tar.gz: 4c73cab2e1f0a8dfb2756175f1037f32a8336d0b
+  metadata.gz: d0376c2d819d808e7c8857d3eb6eeea9bc057c7d
+  data.tar.gz: 52015f4360aa39a19c0a037f978568ac793a00c7
 SHA512:
-  metadata.gz: d0d6b8796a963cd7814bba03afc1904efeb23e901084eab438ce2af8a6379f5e7b5d1474f89cee53401e6d58d94c68be5290c8ed9677b169b9fd85df98cd4117
-  data.tar.gz: 33a2024a4918f561da343f6df0aa0876b1c458f5ffc9f02d1393284f64af5b5c06811cd65022cb26fa28d9407c332d52f048adcdafdbaa7f7bfc990c52a1eb58
+  metadata.gz: '09068eb0cca7bb8d66806bd501220921418d8a7dc02d5e82f8570f18e3014f6b1c0c929bab30c15118b90b7c3534f4226e66c1eb36ebd6b415208d93cfefbead'
+  data.tar.gz: f6d7f01b4d95527ca815e1eeaccfbc4e19d28ae6dc8aeaa1281fe50f14166d66bb7895081bb2f4c993d75483dcd5ff8e914f72756b4691f1a2e82b0bcd36f1b6

data/apiculture.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: apiculture 0.0.17 ruby lib
+# stub: apiculture 0.0.18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "apiculture"
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/apiculture/sinatra_instance_methods.rb

@@ -3,12 +3,13 @@ require 'json'
 # Some sugary methods for use within Sinatra, when responding to a request/rendering JSON
 module Apiculture::SinatraInstanceMethods
   NEWLINE = "\n"
+  DEFAULT = :__default__
   
   # Convert the given structure to JSON, set the content-type and
   # return the JSON string
-  def json_response(structure, status: 200)
+  def json_response(structure, status: DEFAULT)
     content_type :json
-    status status
+    status(status) unless status == DEFAULT
     JSON.pretty_generate(structure)
   end
   

data/lib/apiculture/version.rb

@@ -1,3 +1,3 @@
 module Apiculture
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

data/spec/apiculture_spec.rb

@@ -201,12 +201,16 @@ describe "Apiculture" do
         api_method :post, '/api-thing/:id_of_thing' do |id|
           raise 'id_of_thing must be passed' unless id == '123456'
           raise "id_of_thing must be present in params, but they were #{params.inspect}" unless params.keys.include?('id_of_thing')
+          raise "id_of_thing must be string-accessible in params" unless params['id_of_thing'] == '123456'
+          raise "id_of_thing must be symbol-accessible in params" unless params[:id_of_thing] == '123456'
           'All is well'
         end
 
         post '/vanilla-thing/:id_of_thing' do |id|
           raise 'id_of_thing must be passed' unless id == '123456'
           raise "id_of_thing must be present in params, but they were #{params.inspect}" unless params.keys.include?('id_of_thing')
+          raise "id_of_thing must be string-accessible in params" unless params['id_of_thing'] == '123456'
+          raise "id_of_thing must be symbol-accessible in params" unless params[:id_of_thing] == '123456'
           'All is well'
         end
       end
@@ -218,6 +222,22 @@ describe "Apiculture" do
       expect(last_response).to be_ok
     end
 
+    it 'does not clobber the status set in a separate mutating call when using json_response' do
+      @app_class = Class.new(Sinatra::Base) do
+        settings.show_exceptions = false
+        settings.raise_errors = true
+        extend Apiculture
+
+        api_method :post, '/api/:id' do
+          status 201
+          json_response({was_created: true})
+        end
+      end
+      
+      post '/api/123'
+      expect(last_response.status).to eq(201)
+    end
+    
     it 'raises when describing a route parameter that is not included in the path' do
       expect {
         Class.new(Sinatra::Base) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiculture
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Julik Tarkhanov