clean_room 0.1.1 → 0.1.2

data/README.md

@@ -26,14 +26,14 @@ CleanRoom accepts any attributes for which readers and writers are available. Th
 * html: allow the tags as by Sanitize::Config::RELAXED
 
   
-    class SanitizedAttributes
-      attr_accessor :normal, :strict, :very_strict, :simple_html, :html
-
-      sanitize_attribute :normal
-      sanitize_attribute :strict, allow: :strict, character_class: "a-z"
-      sanitize_attribute :simple_html, allow: :simple_html
-      sanitize_attribute :html, allow: :html
-    end
+      class SanitizedAttributes
+        attr_accessor :normal, :strict, :very_strict, :simple_html, :html
+
+        sanitize_attribute :normal
+        sanitize_attribute :strict, allow: :strict, character_class: "a-z"
+        sanitize_attribute :simple_html, allow: :simple_html
+        sanitize_attribute :html, allow: :html
+      end
 
 
 ## Contributing

data/clean_room.gemspec

@@ -13,9 +13,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "clean_room"
   gem.require_paths = ["lib"]
+  gem.version       = CleanRoom::VERSION
 
-  gem.add_runtime_dependency "activesupport", ">= 3.0.0"
   gem.add_runtime_dependency "sanitize", ">= 2.0.0"
-
-  gem.version       = CleanRoom::VERSION
+  gem.add_runtime_dependency "sanitize-url", ">= 0.1.4"
 end

data/lib/clean_room.rb

@@ -4,3 +4,5 @@ require "clean_room/air_lock"
 require "clean_room/dsl"
 require "clean_room/exceptions"
 require "clean_room/version"
+
+require "pry"

data/lib/clean_room/air_lock.rb

@@ -1,7 +1,10 @@
 require 'sanitize'
+require 'sanitize-url'
 
 module CleanRoom
   class AirLock
+    include SanitizeUrl
+
     def shower(value, options)
       if value
         allow = options[:allow] || :plain_text
@@ -14,6 +17,8 @@ module CleanRoom
         when :strict
           regex =  /[^#{options[:character_class] || "a-zA-Z0-9 "}]/
           Sanitize.clean(value).gsub(regex, "")
+        when :url
+          sanitize_url(value)
         else
           Sanitize.clean(value)
         end

data/lib/clean_room/dsl.rb

@@ -1,12 +1,12 @@
 module CleanRoom
   module DSL
-    extend ActiveSupport::Concern
 
-    included do
-      self.sanitizable_attributes = {}
+    def self.included(base)
+      base.extend ClassMethods
+      base.sanitizable_attributes = {}
 
-      if respond_to? :before_save
-        before_save :sanitize_attributes
+      if base.respond_to? :before_save
+        base.before_save :sanitize_attributes
       end
     end
 

data/lib/clean_room/version.rb

@@ -1,3 +1,3 @@
 module CleanRoom
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/clean_room_test.rb

@@ -30,30 +30,42 @@ class CleanRoomTest < MiniTest::Unit::TestCase
     attribute_test(:simple_html, "<b>Test-tesT</b>", "<b>Test-tesT</b>")
     attribute_test(:simple_html, "<b>Test-tesT</b><div>block</div><table><tr><td>table</td></tr></table>", "<b>Test-tesT</b> block table")
     attribute_test(:html, "<b>Test-tesT</b><div>block</div><table><tr><td>table</td></tr></table>", "<b>Test-tesT</b> block <table><tr><td>table</td></tr></table>")
+    attribute_test(:url, "www.google.com/?q=<script>test</script>", "http://www.google.com/?q=%3Cscript%3Etest%3C/script%3E")
   end
 
 
   def attribute_test(field, value_in, value_out)
-    test_object.send("#{field}=".to_sym, value_in)
-    test_object.sanitize_attributes
-    assert_equal value_out, test_object.send(field)
+    object = object_generator
+    object.send("#{field}=".to_sym, value_in)
+    object.sanitize_attributes
+    assert_equal value_out, object.send(field)
   end
 
-  def test_object
-    unless @test_object
-      test_class = Class.new do 
-        include CleanRoom::DSL
-        attr_accessor :normal, :strict, :very_strict, :simple_html, :html
-
-        sanitize_attribute :normal
-        sanitize_attribute :strict, allow: :strict
-        sanitize_attribute :very_strict, allow: :strict, character_class: "a-z"
-        sanitize_attribute :simple_html, allow: :simple_html
-        sanitize_attribute :html, allow: :html
-      end
+  def object_generator
+    test_class = Class.new do 
+      include CleanRoom::DSL
+      attr_accessor :normal, :strict, :very_strict, :simple_html, :html, :url
 
-      @test_object = test_class.new
+      sanitize_attribute :normal
+      sanitize_attribute :strict, allow: :strict
+      sanitize_attribute :very_strict, allow: :strict, character_class: "a-z"
+      sanitize_attribute :simple_html, allow: :simple_html
+      sanitize_attribute :html, allow: :html
+      sanitize_attribute :url, allow: :url
     end
-    @test_object
+
+    test_class.new
   end
+
+
+  def test_with_before_save
+    assert_output("sanitize_attributes\n") do
+      test_class = Class.new do
+        def self.before_save(method_name)
+          puts method_name
+        end
+        include CleanRoom::DSL
+      end
+    end
+  end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clean_room
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,27 +12,27 @@ cert_chain: []
 date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70355882688980 !ruby/object:Gem::Requirement
+  name: sanitize
+  requirement: &70356218609500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70355882688980
+  version_requirements: *70356218609500
 - !ruby/object:Gem::Dependency
-  name: sanitize
-  requirement: &70355882688480 !ruby/object:Gem::Requirement
+  name: sanitize-url
+  requirement: &70356218609000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70355882688480
+  version_requirements: *70356218609000
 description: Work in progress, this will be a generic attribute sanitizer which can
   be used for sanitizing models and other objects holding data
 email: