input_sanitizer 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80975685ea36b822133f114e4f25a86795ab1a84
-  data.tar.gz: fe52c7a9f8039a61e247cc7634a93d176de4ed32
+  metadata.gz: 22a6e4537da366c88f1578e47d886e94319e9104
+  data.tar.gz: d039d03743961d3712a8e651f83af62087837231
 SHA512:
-  metadata.gz: 3fd6f2abb6f51ddfc1e161568515dcb40800f3eb7c7a28962253040d1aa37052de7b3e15f1f6b0b5b739a54276b1d76b7f66f98289ad4052afb2fd84b264ddbb
-  data.tar.gz: cfc6ea3add9b7a3d9089e30830e53e1ffa00ec12daacb0d0ced5c6c8eedc05d22d112a2c29c3617c886ee57dd5559bea455901384b18ad78f7d437c681f9d38d
+  metadata.gz: 5696a63090cd6e7428669dae8f0536c9ef6d04cf2d0fe040c1f36319172be9d11e7b6e385d57dad12efb1357e1c4992e81d2a27f39bd84fd646ea25265589518
+  data.tar.gz: c9a42b2d1ad1b9702d59305a8df143f2a4c3054a6999d24a89c00471b29685cc5cc86d4195c16dd2cb8fa7f54224b6b3c2d5e202ae0d5b1d0e2ed94bd7dea445

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,12 +1,7 @@
 language: ruby
 script: bundle exec rspec spec
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - jruby-18mode
+  - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  
-  # keeps failing
-  #- rbx-18mode
-  #- rbx-19mode

data/Gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: .
+  specs:
+    input_sanitizer (0.2.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    method_source (0.8.2)
+    multi_json (1.10.1)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  input_sanitizer!
+  pry
+  rspec
+  simplecov

data/README.md

@@ -19,12 +19,10 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-
 class PersonSanitizer < InputSanitizer::Sanitizer
   string :name
   string :address
   integer :height
-  float :weight
   date :birthday
 end
 
@@ -57,7 +55,15 @@ PrivilegedSanitizer.clean({:birthday => '1986-10-06'})
 data = PrivilegedSanitizer.clean({:account_id => 3})
 data[:account] # instead of :account_id
 # => InputSanitizer::KeyNotAllowedError: Key not allowed: account
-# => ...
+
+# supports custom value converters
+class SomethingSanitizer < InputSanitizer::Sanitizer
+  custom :backward, :converter => lambda { |v| v.reverse }
+  integer :version
+  custom :name, :provide => :version, :converter => lambda { |name, version|
+    version < 3 ? name.downcase : name
+  }
+end
 ```
 
 

data/input_sanitizer.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "pry"
 end

data/lib/input_sanitizer/extended_converters.rb

@@ -20,6 +20,19 @@ module InputSanitizer
     end
   end
 
+  class CommaJoinedStringsConverter
+    def call(value)
+      non_valid = value.gsub(/[a-zA-Z,]/, "")
+      if non_valid.empty?
+        parts = value.split(",").map(&:to_s)
+      else
+        invalid_chars = non_valid.split(//)
+        invalid_chars_desc = invalid_chars.join(", ")
+        raise InputSanitizer::ConversionError.new("Invalid chars: #{invalid_chars_desc}")
+      end
+    end
+  end
+
   class SpecificValuesConverter
     def initialize(values)
       @valid_values = values

data/lib/input_sanitizer/sanitizer.rb

@@ -25,7 +25,8 @@ class InputSanitizer::Sanitizer
       collection = hash[:options][:collection]
       namespace = hash[:options][:namespace]
       default = hash[:options][:default]
-      clean_field(field, type, required, collection, namespace, default)
+      provide = hash[:options][:provide]
+      clean_field(field, type, required, collection, namespace, default, provide)
     end
     @performed = true
     @cleaned.freeze
@@ -105,10 +106,10 @@ class InputSanitizer::Sanitizer
     array.last.is_a?(Hash) ? array.last : {}
   end
 
-  def clean_field(field, type, required, collection, namespace, default)
+  def clean_field(field, type, required, collection, namespace, default, provide)
     if @data.has_key?(field)
       begin
-        @cleaned[field] = convert(field, type, collection, namespace)
+        @cleaned[field] = convert(field, type, collection, namespace, provide)
       rescue InputSanitizer::ConversionError => ex
         add_error(field, :invalid_value, @data[field], ex.message)
       end
@@ -132,21 +133,29 @@ class InputSanitizer::Sanitizer
     add_error(field, :missing, nil, nil)
   end
 
-  def convert(field, type, collection, namespace)
+  def convert(field, type, collection, namespace, provide)
     if collection
       @data[field].map { |v|
-        convert_single(type, v, namespace)
+        convert_single(type, v, namespace, provide)
       }
     else
-      convert_single(type, @data[field], namespace)
+      convert_single(type, @data[field], namespace, provide)
     end
   end
 
-  def convert_single(type, value, namespace)
+  def convert_single(type, value, namespace, provide)
     if namespace
-      { namespace => converter(type).call(value[namespace]) }
+      { namespace => convert_value(converter(type), value[namespace], provide) }
     else
-      converter(type).call(value)
+      convert_value(converter(type), value, provide)
+    end
+  end
+
+  def convert_value(converter, value, provide)
+    if provide
+      converter.call(value, @data[provide])
+    else
+      converter.call(value)
     end
   end
 

data/lib/input_sanitizer/version.rb

@@ -1,3 +1,3 @@
 module InputSanitizer
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/spec/default_converters_spec.rb

@@ -32,35 +32,35 @@ describe InputSanitizer::BooleanConverter do
   let(:converter) { InputSanitizer::BooleanConverter.new }
 
   it "casts 'true' to true" do
-    converter.call('true').should be_true
+    converter.call('true').should eq(true)
   end
 
   it "casts true to true" do
-    converter.call(true).should be_true
+    converter.call(true).should eq(true)
   end
 
   it "casts '1' to true" do
-    converter.call('1').should be_true
+    converter.call('1').should eq(true)
   end
 
   it "casts 'yes' to true" do
-    converter.call('yes').should be_true
+    converter.call('yes').should eq(true)
   end
 
   it "casts 'false' to false" do
-    converter.call('false').should be_false
+    converter.call('false').should eq(false)
   end
 
   it "casts false to false" do
-    converter.call(false).should be_false
+    converter.call(false).should eq(false)
   end
 
   it "casts '0' to false" do
-    converter.call('0').should be_false
+    converter.call('0').should eq(false)
   end
 
   it "casts 'no' to false" do
-    converter.call('no').should be_false
+    converter.call('no').should eq(false)
   end
 
   it "raises error if cannot cast" do
@@ -116,4 +116,8 @@ describe InputSanitizer::TimeConverter do
     t = Time.now
     converter.call(t).should == t.utc
   end
+
+  it "raises error if value is of invalid type" do
+    lambda { converter.call({}) }.should raise_error(InputSanitizer::ConversionError)
+  end
 end

data/spec/extended_converters_spec.rb

@@ -23,6 +23,10 @@ end
 describe InputSanitizer::PositiveIntegerConverter do
   let(:converter) { InputSanitizer::PositiveIntegerConverter.new }
 
+  it "casts string to integer" do
+    converter.call("3").should == 3
+  end
+
   it "raises error if integer less than zero" do
     lambda { converter.call("-3") }.should raise_error(InputSanitizer::ConversionError)
   end
@@ -44,6 +48,18 @@ describe InputSanitizer::CommaJoinedIntegersConverter do
   end
 end
 
+describe InputSanitizer::CommaJoinedStringsConverter do
+  let(:converter) { described_class.new }
+
+  it "parses to array of ids" do
+    converter.call("input,Sanitizer,ROCKS").should == ["input", "Sanitizer", "ROCKS"]
+  end
+
+  it "raises on invalid character" do
+    lambda { converter.call(":") }.should raise_error(InputSanitizer::ConversionError)
+  end
+end
+
 describe InputSanitizer::SpecificValuesConverter do
   let(:converter) { InputSanitizer::SpecificValuesConverter.new([:a, :b]) }
 

data/spec/sanitizer_spec.rb

@@ -14,6 +14,9 @@ class BasicSanitizer < InputSanitizer::Sanitizer
   time :updated_at
   custom :cust1, :cust2, :converter => lambda { |v| v.reverse }
   nested :stuff, :sanitizer => NestedSanitizer, :collection => true, :namespace => :nested
+  custom :custom3, :provide => :num, :converter => lambda { |v, num|
+    num == 1 ? v.reverse : v
+  }
 end
 
 class BrokenCustomSanitizer < InputSanitizer::Sanitizer
@@ -132,7 +135,7 @@ describe InputSanitizer::Sanitizer do
 
       cleaned.should have_key(:num)
       cleaned[:num].should == 23
-      cleaned[:is_nice].should be_false
+      cleaned[:is_nice].should eq(false)
     end
 
     it "overrides inherited fields" do
@@ -183,9 +186,17 @@ describe InputSanitizer::Sanitizer do
     end
 
     it "raises an error when converter is not defined" do
-      expect do
+      lambda do
         BrokenCustomSanitizer.custom(:x)
-      end.to raise_error
+      end.should raise_error
+    end
+
+    it "provides the converter with requested value" do
+      @params = { :custom3 => 'three', :num => 1 }
+      cleaned.should have_key(:custom3)
+      cleaned.should have_key(:num)
+      cleaned[:custom3].should eq('eerht')
+      cleaned[:num].should eq(1)
     end
   end
 

data/spec/spec_helper.rb

@@ -6,4 +6,15 @@ unless ENV['CI']
   SimpleCov.start
 end
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :should
+  end
+
+  config.mock_with :rspec do |c|
+    c.syntax = :should
+  end
+end
+
 require 'input_sanitizer'
+require 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: input_sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Tomek Paczkowski
@@ -10,34 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem to sanitize hash of incoming data
@@ -49,10 +63,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -77,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gem to sanitize hash of incoming data
@@ -97,4 +112,3 @@ test_files:
 - spec/restricted_hash_spec.rb
 - spec/sanitizer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: