sinatra-browse 0.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bdedea1f30918fa4b4e9e40329b5d36d376e26a
-  data.tar.gz: a3f543ea671453b43857a83971491ebc70469aef
+  metadata.gz: 384ebcd1b7b85008042e92d2e9c4b7a78b9f006f
+  data.tar.gz: cbb00fef429bd54edd3c5adbdb57c8f684e9f58f
 SHA512:
-  metadata.gz: 5d9ca106f1fc4d51484e5985cfa8f6e66ff18a2fd5deedb325010decb99e1d76dbb86925a436fb1b47e4c1f2cedc0c8f1190d75d92dbba9d39db92c7db378ad9
-  data.tar.gz: 792cb9ccd3f3103046644bc72eb23aa71de835cb7b1b2af7cc0cd5313a8fa9b4a63c0f3cf4fe56ab8af5f63222548fe833b4684dcffce8095a986c80bce3e66e
+  metadata.gz: bd0eb333f9d40697743186ed15895917b7f32485b752feaa590f9124168e2758601ec479c69d25b7994b0ec1a84953c91f024c03fbad5585b12efc9a8f2de675
+  data.tar.gz: b4ae0d59dee7d1fb5a2dbc9d49ea19f0ae316d683cb3fb183a8b06ed23de36eea45bbf18c013dfa48d3491d254e3822132588b9cc76344ad2a9789b5ce96ef9a

data/lib/sinatra/browse/parameter_type.rb

@@ -53,6 +53,10 @@ module Sinatra::Browse
       @default.is_a?(Proc) ? @default.call : @default
     end
 
+    def default_set?
+      ! @default.nil?
+    end
+
     def required?
       @required
     end

data/lib/sinatra/browse/route.rb

@@ -40,7 +40,7 @@ module Sinatra::Browse
       @param_declarations.each do |name, pd|
         name = name.to_s # The params hash uses strings but declarations use symbols
 
-        params[name] ||= pd.default
+        params[name] ||= pd.default if pd.default_set?
 
         # We specifically check for nil here since a boolean's default can be false
         if params[name].nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-browse
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
 platform: ruby
 authors:
 - Axsh Co. LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies: []
 description: Parameter declaration framework and browsable API for Sinatra
 email: dev@axsh.net
@@ -22,7 +22,6 @@ files:
 - lib/sinatra/browse/erb_templates/html.erb
 - lib/sinatra/browse/parameter_type.rb
 - lib/sinatra/browse/errors.rb
-- lib/sinatra/browse/validators/in.rb
 - lib/sinatra/browse/route.rb
 - lib/sinatra/browse/parameter_types/min_max.rb
 - lib/sinatra/browse/parameter_types/float.rb

data/lib/sinatra/browse/validators/in.rb

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module Sinatra::Browse
-  module Validators
-    class In < Validator
-      class InvalidFormat < Exception; end
-      class UnableToCoerce < Exception; end
-
-      def intialize(parameter_type, criteria)
-        if ! criteria.respond_to?(:each)
-          raise InvalidFormat, "#{criteria} does not have an .each method. " +
-                               "Can't be used for 'in'."
-        end
-
-        criteria.map!
-
-        super(parameter_type, criteria)
-      end
-
-      def _validate
-        @criteria.member?(@value)
-      end
-    end
-  end
-end