parameters_schema 0.42 → 1.0.1

data/test/helpers.rb

@@ -1,56 +1,56 @@
-module ActiveSupport
-  class HashWithIndifferentAccess < Hash
-    def must_equal_hash(other)
-      self.must_equal(other.with_indifferent_access)
-    end
-  end
-end
-
-module ParametersSchema
-  class Schema
-    def must_allow(values)
-      [values].flatten.each do |value|
-        if value.kind_of?(Range)
-          value.each do |v|
-            execute_must_allow(v)
-          end
-        else
-          execute_must_allow(value)
-        end
-      end
-
-      self
-    end
-
-    def must_deny(values, error_code = ParametersSchema::ErrorCode::DISALLOWED)
-      [values].flatten.each do |value|
-        if value.kind_of?(Range)
-          value.each do |v|
-            execute_must_deny(v, error_code)
-          end
-        else
-          execute_must_deny(value, error_code)
-        end
-      end
-
-      self
-    end
-
-    private
-
-    def execute_must_allow(value)
-      self
-        .validate!(potatoe: value)
-        .must_equal_hash(potatoe: value)
-    end
-
-    def execute_must_deny(value, error_code)
-        Proc.new do
-          self
-            .validate!(potatoe: value)
-        end
-          .must_raise(ParametersSchema::InvalidParameters)
-          .errors.must_equal_hash(potatoe: error_code)
-    end
-  end
-end
+module ActiveSupport
+  class HashWithIndifferentAccess < Hash
+    def must_equal_hash(other)
+      self.must_equal(other.with_indifferent_access)
+    end
+  end
+end
+
+module ParametersSchema
+  class Schema
+    def must_allow(values)
+      [values].flatten.each do |value|
+        if value.kind_of?(Range)
+          value.each do |v|
+            execute_must_allow(v)
+          end
+        else
+          execute_must_allow(value)
+        end
+      end
+
+      self
+    end
+
+    def must_deny(values, error_code = ParametersSchema::ErrorCode::DISALLOWED)
+      [values].flatten.each do |value|
+        if value.kind_of?(Range)
+          value.each do |v|
+            execute_must_deny(v, error_code)
+          end
+        else
+          execute_must_deny(value, error_code)
+        end
+      end
+
+      self
+    end
+
+    private
+
+    def execute_must_allow(value)
+      self
+        .validate!(potatoe: value)
+        .must_equal_hash(potatoe: value)
+    end
+
+    def execute_must_deny(value, error_code)
+        Proc.new do
+          self
+            .validate!(potatoe: value)
+        end
+          .must_raise(ParametersSchema::InvalidParameters)
+          .errors.must_equal_hash(potatoe: error_code)
+    end
+  end
+end

data/test/test_options.rb

@@ -1,74 +1,74 @@
-require 'minitest/autorun'
-require 'parameters_schema'
-require_relative 'helpers'
-
-describe 'Skipping parameters' do
-  before do
-    ParametersSchema::Options.reset_defaults
-
-    @schema = ParametersSchema::Schema.new do
-      param :potatoe
-    end
-  end
-
-  it 'skip default parameters in a Rails context' do
-    @schema
-      .validate!(potatoe: 'Ac Belmont', controller: 'potatoes', action: 'create', format: 'json')
-      .must_equal_hash(potatoe: 'Ac Belmont')
-  end
-
-  it 'redefines parameters to skip' do
-    ParametersSchema::Options.skip_parameters = [:banana]
-
-    @schema
-      .validate!(potatoe: 'Ac Belmont', banana: 'Cavendish')
-      .must_equal_hash(potatoe: 'Ac Belmont')
-
-    Proc
-      .new{ @schema.validate!(potatoe: 'Ac Belmont', controller: 'potatoes', action: 'create', format: 'json') }
-      .must_raise(ParametersSchema::InvalidParameters)
-  end
-
-  it 'augments parameters to skip' do
-    ParametersSchema::Options.skip_parameters = ParametersSchema::Options.skip_parameters + [:banana]
-    @schema
-      .validate!(potatoe: 'Ac Belmont', banana: 'Cavendish', controller: 'potatoes', action: 'create', format: 'json')
-      .must_equal_hash(potatoe: 'Ac Belmont')
-  end
-end
-
-describe 'Empty keyword' do
-  before do
-    ParametersSchema::Options.reset_defaults
-
-    @schema = ParametersSchema::Schema.new do
-      param :potatoe, allow: :empty
-    end
-  end
-
-  it 'uses the default value' do
-    ParametersSchema::Schema.new do
-      param :potatoe, allow: :empty
-    end
-      .validate!(potatoe: '')
-      .must_equal_hash(potatoe: '')
-  end
-
-  it 'redefines the value' do
-    ParametersSchema::Options.empty_keyword = :allow_empty
-
-    ParametersSchema::Schema.new do
-      param :potatoe, allow: :allow_empty
-    end
-      .validate!(potatoe: '')
-      .must_equal_hash(potatoe: '')
-
-    Proc.new do
-      ParametersSchema::Schema.new do
-        param :potatoe, allow: :empty
-      end.validate!(potatoe: '')
-    end
-      .must_raise(ParametersSchema::InvalidParameters)
-      .errors.must_equal_hash(potatoe: ParametersSchema::ErrorCode::EMPTY)
-  end
-end
+require 'minitest/autorun'
+require 'parameters_schema'
+require_relative 'helpers'
+
+describe 'Skipping parameters' do
+  before do
+    ParametersSchema::Options.reset_defaults
+
+    @schema = ParametersSchema::Schema.new do
+      param :potatoe
+    end
+  end
+
+  it 'skip default parameters in a Rails context' do
+    @schema
+      .validate!(potatoe: 'Ac Belmont', controller: 'potatoes', action: 'create', format: 'json')
+      .must_equal_hash(potatoe: 'Ac Belmont')
+  end
+
+  it 'redefines parameters to skip' do
+    ParametersSchema::Options.skip_parameters = [:banana]
+
+    @schema
+      .validate!(potatoe: 'Ac Belmont', banana: 'Cavendish')
+      .must_equal_hash(potatoe: 'Ac Belmont')
+
+    Proc
+      .new{ @schema.validate!(potatoe: 'Ac Belmont', controller: 'potatoes', action: 'create', format: 'json') }
+      .must_raise(ParametersSchema::InvalidParameters)
+  end
+
+  it 'augments parameters to skip' do
+    ParametersSchema::Options.skip_parameters = ParametersSchema::Options.skip_parameters + [:banana]
+    @schema
+      .validate!(potatoe: 'Ac Belmont', banana: 'Cavendish', controller: 'potatoes', action: 'create', format: 'json')
+      .must_equal_hash(potatoe: 'Ac Belmont')
+  end
+end
+
+describe 'Empty keyword' do
+  before do
+    ParametersSchema::Options.reset_defaults
+
+    @schema = ParametersSchema::Schema.new do
+      param :potatoe, allow: :empty
+    end
+  end
+
+  it 'uses the default value' do
+    ParametersSchema::Schema.new do
+      param :potatoe, allow: :empty
+    end
+      .validate!(potatoe: '')
+      .must_equal_hash(potatoe: '')
+  end
+
+  it 'redefines the value' do
+    ParametersSchema::Options.empty_keyword = :allow_empty
+
+    ParametersSchema::Schema.new do
+      param :potatoe, allow: :allow_empty
+    end
+      .validate!(potatoe: '')
+      .must_equal_hash(potatoe: '')
+
+    Proc.new do
+      ParametersSchema::Schema.new do
+        param :potatoe, allow: :empty
+      end.validate!(potatoe: '')
+    end
+      .must_raise(ParametersSchema::InvalidParameters)
+      .errors.must_equal_hash(potatoe: ParametersSchema::ErrorCode::EMPTY)
+  end
+end

data/test/test_schema_allow.rb

@@ -1,114 +1,114 @@
-require 'minitest/autorun'
-require 'parameters_schema'
-require_relative 'helpers'
-
-describe 'Allow and Deny' do
-  before do
-    ParametersSchema::Options.reset_defaults
-  end
-
-  it 'allows :any and denies :none by default' do
-    [{}, { allow: :any }, { deny: :none }, { allow: :any, deny: :none }].each do |options|
-      schema = ParametersSchema::Schema.new do
-        param :potatoe, options.merge(type: Fixnum)
-      end
-        .must_allow((-10..10))
-    end
-  end
-
-  it 'allows multiple :allow values' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, allow: [(1..2), (4..5)]
-    end
-      .must_allow([1, 2, 4, 5])
-      .must_deny(3)
-  end
-
-  it 'allows multiple :deny values' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, deny: [(1..2), (4..5)]
-    end
-      .must_allow([-1, 0, 3, 6, 7])
-      .must_deny([1, 2, 4, 5])
-  end
-
-  it 'gives priority to :any and :none in multiple :allow values' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, allow: [(1..2), :any]
-    end
-      .must_allow((-10..10))
-
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, allow: [(1..2), :none]
-    end
-      .must_deny((-10..10))
-  end
-
-  it 'gives priority to :any and :none in  multiple :deny values' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, deny: [(1..2), :none]
-    end
-      .must_allow((-10..10))
-
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, deny: [(1..2), :any]
-    end
-      .must_deny((-10..10))
-  end
-
-  it 'when using an array, the :allow is applied on the array values' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, array: true, allow: (1..3)
-    end
-
-    schema
-      .validate!(potatoe: [1, 2, 3, 2, 1])
-      .must_equal_hash(potatoe: [1, 2, 3, 2, 1])
-
-    Proc.new do
-      schema.validate!(potatoe: [1, 2, 3, 2, 1, 0])
-    end
-      .must_raise(ParametersSchema::InvalidParameters)
-      .errors.must_equal_hash(potatoe: ParametersSchema::ErrorCode::DISALLOWED)
-  end
-
-  it 'when using an array, the :deny is applied on the array values' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, array: true, deny: (1..3)
-    end
-
-    schema
-      .validate!(potatoe: [-1, 0, 4, 5, 6])
-      .must_equal_hash(potatoe: [-1, 0, 4, 5, 6])
-
-    Proc.new do
-      schema.validate!(potatoe: [-1, 0, 4, 5, 6, 1])
-    end
-      .must_raise(ParametersSchema::InvalidParameters)
-      .errors.must_equal_hash(potatoe: ParametersSchema::ErrorCode::DISALLOWED)
-  end
-
-  it 'allows a subset of values defined by a range' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, type: Fixnum, allow: (1..10)
-    end
-      .must_allow((1..10))
-      .must_deny(((-10..0).to_a + (11..20).to_a))
-  end
-
-  it 'allows a subset of values by choices' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, allow: ['a', 'b', 'c']
-    end
-      .must_allow(['a', 'b', 'c'])
-      .must_deny('d')
-  end
-
-  it 'allows a subset of values by regex' do
-    schema = ParametersSchema::Schema.new do
-      param :potatoe, allow: /^[A-Z]+$/
-    end
-      .must_allow(['A', 'BB', 'CDE'])
-      .must_deny(['a', 'Aa', 'F1'])
-  end
-end
+require 'minitest/autorun'
+require 'parameters_schema'
+require_relative 'helpers'
+
+describe 'Allow and Deny' do
+  before do
+    ParametersSchema::Options.reset_defaults
+  end
+
+  it 'allows :any and denies :none by default' do
+    [{}, { allow: :any }, { deny: :none }, { allow: :any, deny: :none }].each do |options|
+      schema = ParametersSchema::Schema.new do
+        param :potatoe, options.merge(type: Fixnum)
+      end
+        .must_allow((-10..10))
+    end
+  end
+
+  it 'allows multiple :allow values' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, allow: [(1..2), (4..5)]
+    end
+      .must_allow([1, 2, 4, 5])
+      .must_deny(3)
+  end
+
+  it 'allows multiple :deny values' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, deny: [(1..2), (4..5)]
+    end
+      .must_allow([-1, 0, 3, 6, 7])
+      .must_deny([1, 2, 4, 5])
+  end
+
+  it 'gives priority to :any and :none in multiple :allow values' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, allow: [(1..2), :any]
+    end
+      .must_allow((-10..10))
+
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, allow: [(1..2), :none]
+    end
+      .must_deny((-10..10))
+  end
+
+  it 'gives priority to :any and :none in  multiple :deny values' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, deny: [(1..2), :none]
+    end
+      .must_allow((-10..10))
+
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, deny: [(1..2), :any]
+    end
+      .must_deny((-10..10))
+  end
+
+  it 'when using an array, the :allow is applied on the array values' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, array: true, allow: (1..3)
+    end
+
+    schema
+      .validate!(potatoe: [1, 2, 3, 2, 1])
+      .must_equal_hash(potatoe: [1, 2, 3, 2, 1])
+
+    Proc.new do
+      schema.validate!(potatoe: [1, 2, 3, 2, 1, 0])
+    end
+      .must_raise(ParametersSchema::InvalidParameters)
+      .errors.must_equal_hash(potatoe: ParametersSchema::ErrorCode::DISALLOWED)
+  end
+
+  it 'when using an array, the :deny is applied on the array values' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, array: true, deny: (1..3)
+    end
+
+    schema
+      .validate!(potatoe: [-1, 0, 4, 5, 6])
+      .must_equal_hash(potatoe: [-1, 0, 4, 5, 6])
+
+    Proc.new do
+      schema.validate!(potatoe: [-1, 0, 4, 5, 6, 1])
+    end
+      .must_raise(ParametersSchema::InvalidParameters)
+      .errors.must_equal_hash(potatoe: ParametersSchema::ErrorCode::DISALLOWED)
+  end
+
+  it 'allows a subset of values defined by a range' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, type: Fixnum, allow: (1..10)
+    end
+      .must_allow((1..10))
+      .must_deny(((-10..0).to_a + (11..20).to_a))
+  end
+
+  it 'allows a subset of values by choices' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, allow: ['a', 'b', 'c']
+    end
+      .must_allow(['a', 'b', 'c'])
+      .must_deny('d')
+  end
+
+  it 'allows a subset of values by regex' do
+    schema = ParametersSchema::Schema.new do
+      param :potatoe, allow: /^[A-Z]+$/
+    end
+      .must_allow(['A', 'BB', 'CDE'])
+      .must_deny(['a', 'Aa', 'F1'])
+  end
+end

data/test/test_schema_allow_empty.rb

@@ -1,30 +1,30 @@
-require 'minitest/autorun'
-require 'parameters_schema'
-require_relative 'helpers'
-
-describe 'Allow empty' do
-  before do
-    ParametersSchema::Options.reset_defaults
-  end
-
-  it 'requires a non-empty value by default' do
-    ParametersSchema::Schema.new do
-      param :potatoe
-    end
-      .must_deny('', ParametersSchema::ErrorCode::EMPTY)
-  end
-
-  it 'can be set to accept empty value' do
-    ParametersSchema::Schema.new do
-      param :potatoe, allow: :empty
-    end
-      .must_allow('')
-  end
-
-  it 'when set to accept empty, it still reject nil value' do
-    ParametersSchema::Schema.new do
-      param :potatoe, allow: :empty
-    end
-      .must_deny(nil, ParametersSchema::ErrorCode::NIL)
-  end
+require 'minitest/autorun'
+require 'parameters_schema'
+require_relative 'helpers'
+
+describe 'Allow empty' do
+  before do
+    ParametersSchema::Options.reset_defaults
+  end
+
+  it 'requires a non-empty value by default' do
+    ParametersSchema::Schema.new do
+      param :potatoe
+    end
+      .must_deny('', ParametersSchema::ErrorCode::EMPTY)
+  end
+
+  it 'can be set to accept empty value' do
+    ParametersSchema::Schema.new do
+      param :potatoe, allow: :empty
+    end
+      .must_allow('')
+  end
+
+  it 'when set to accept empty, it still reject nil value' do
+    ParametersSchema::Schema.new do
+      param :potatoe, allow: :empty
+    end
+      .must_deny(nil, ParametersSchema::ErrorCode::NIL)
+  end
 end

data/test/test_schema_allow_nil.rb

@@ -1,34 +1,34 @@
-require 'minitest/autorun'
-require 'parameters_schema'
-require_relative 'helpers'
-
-describe 'Allow nil' do
-  before do
-    ParametersSchema::Options.reset_defaults
-    
-    @schema = ParametersSchema::Schema.new do
-      param :potatoe
-    end
-  end
-
-  it 'requires a non-nil value by default' do
-    ParametersSchema::Schema.new do
-      param :potatoe
-    end
-      .must_deny(nil, ParametersSchema::ErrorCode::NIL)
-  end
-
-  it 'can be set to accept nil' do
-    ParametersSchema::Schema.new do
-      param :potatoe, allow: :nil
-    end
-      .must_allow(nil)
-  end
-
-  it 'when set to accept nil, it still reject empty value' do
-    ParametersSchema::Schema.new do
-      param :potatoe, allow: :nil
-    end
-      .must_deny('', ParametersSchema::ErrorCode::EMPTY)
-  end
+require 'minitest/autorun'
+require 'parameters_schema'
+require_relative 'helpers'
+
+describe 'Allow nil' do
+  before do
+    ParametersSchema::Options.reset_defaults
+    
+    @schema = ParametersSchema::Schema.new do
+      param :potatoe
+    end
+  end
+
+  it 'requires a non-nil value by default' do
+    ParametersSchema::Schema.new do
+      param :potatoe
+    end
+      .must_deny(nil, ParametersSchema::ErrorCode::NIL)
+  end
+
+  it 'can be set to accept nil' do
+    ParametersSchema::Schema.new do
+      param :potatoe, allow: :nil
+    end
+      .must_allow(nil)
+  end
+
+  it 'when set to accept nil, it still reject empty value' do
+    ParametersSchema::Schema.new do
+      param :potatoe, allow: :nil
+    end
+      .must_deny('', ParametersSchema::ErrorCode::EMPTY)
+  end
 end