dm-sanitizer 0.1.4 → 0.2.0

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.0 2010-09-06
+* 1 major enhancement
+  * DataMapper 1.0 support
+
+* 1 enhancement
+  * property types control through :property_types options 
+
 == 0.1.4 2010-08-28
 * 1 enhancement
   * integrated with jeweler

data/README.rdoc

@@ -10,9 +10,9 @@ This package lets DataMapper properties be easily sanitized using Sanitize.
 
 === Features
 
-* Sanitize String based properties by default
-* Lets choose sanitization mode on per property basis
-* Allows user defined sanitization modes
+* Sanitize String and Text properties by default (configurable)
+* Per property sanitization modes
+* User defined sanitization modes
 
 === problems
 
@@ -22,6 +22,7 @@ This package lets DataMapper properties be easily sanitized using Sanitize.
 
   require 'rubygems'
   require 'dm-core'
+  require 'dm-migrations'
   require 'dm-sanitizer'
 
   DataMapper.setup(:default, 'sqlite3::memory:')

data/Rakefile

@@ -17,11 +17,12 @@ begin
 
     gem.rubyforge_project = 'dm-sanitizer'
 
-    gem.add_dependency 'dm-core', '>= 0.10.1'
-    gem.add_dependency 'sanitize', '>= 1.0.0'
+    gem.add_dependency 'dm-core', '>= 1.0'
+    gem.add_dependency 'sanitize', '>= 1.0'
 
     gem.add_development_dependency 'rspec', '~> 1.3'
     gem.add_development_dependency 'jeweler', '~> 1.4'
+    gem.add_development_dependency 'dm-migrations', '>= 1.0'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/dm-sanitizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-sanitizer}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Zimakov"]
-  s.date = %q{2010-08-28}
+  s.date = %q{2010-09-06}
   s.description = %q{DataMapper plugin for automated/configurable user input sanitization.}
   s.email = %q{zimakov@gmail.com}
   s.extra_rdoc_files = [
@@ -47,21 +47,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, [">= 0.10.1"])
-      s.add_runtime_dependency(%q<sanitize>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<dm-core>, [">= 1.0"])
+      s.add_runtime_dependency(%q<sanitize>, [">= 1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.4"])
+      s.add_development_dependency(%q<dm-migrations>, [">= 1.0"])
     else
-      s.add_dependency(%q<dm-core>, [">= 0.10.1"])
-      s.add_dependency(%q<sanitize>, [">= 1.0.0"])
+      s.add_dependency(%q<dm-core>, [">= 1.0"])
+      s.add_dependency(%q<sanitize>, [">= 1.0"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.4"])
+      s.add_dependency(%q<dm-migrations>, [">= 1.0"])
     end
   else
-    s.add_dependency(%q<dm-core>, [">= 0.10.1"])
-    s.add_dependency(%q<sanitize>, [">= 1.0.0"])
+    s.add_dependency(%q<dm-core>, [">= 1.0"])
+    s.add_dependency(%q<sanitize>, [">= 1.0"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.4"])
+    s.add_dependency(%q<dm-migrations>, [">= 1.0"])
   end
 end
 

data/lib/dm-sanitizer.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'dm-core', '>= 0.10.1'
+gem 'dm-core', '>= 1.0'
 require 'dm-core'
 
 gem 'sanitize', '>= 1.0.0'
@@ -17,7 +17,8 @@ module DataMapper
           :relaxed      => Sanitize::Config::RELAXED
         },
         :default_mode   => :default,
-        :with_dirty     => false
+        :with_dirty     => false,
+        :property_types => [DataMapper::Property::String, DataMapper::Property::Text]
       }
     end
     module_function :default_options
@@ -38,11 +39,10 @@ module DataMapper
           end
         RUBY
         
+        before :save, :sanitize! unless self.sanitization_options
         self.sanitization_options = DataMapper::Sanitizer.default_options.merge(options)
         remap_sanitization_modes!
         check_sanitization_modes
-        
-        before :save, :sanitize! unless hooks_with_scope(:instance)[:update_hook][:before].include?({:name => :sanitize!, :from => self})
       end
       
       def disable_sanitization
@@ -79,7 +79,7 @@ module DataMapper
         self.class.properties.each do |property|
           property_name = property.name.to_sym
           
-          next unless property.type == String || property.type == DataMapper::Types::Text
+          next unless options[:property_types].include?(property.class)
           next if !new? && !options[:with_dirty] && !attribute_dirty?(property.name.to_sym)
           next if options[:exclude] && options[:exclude].include?(property_name)
           
@@ -106,4 +106,4 @@ module DataMapper
   end
 end
 
-DataMapper::Model.append_inclusions DataMapper::Sanitizer
+DataMapper::Model.append_inclusions DataMapper::Sanitizer

data/spec/spec_helper.rb

@@ -4,8 +4,9 @@ require 'rubygems'
 gem 'rspec', '~>1.3'
 require 'spec'
  
-gem 'dm-core', '= 0.10.1'
+gem 'dm-core', '>= 1.0'
 require 'dm-core'
+require 'dm-migrations'
 
 gem 'sanitize', '>= 1.0.0'
 require 'sanitize'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-sanitizer
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sergei Zimakov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +04:00
+date: 2010-09-06 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 15
         segments: 
-        - 0
-        - 10
         - 1
-        version: 0.10.1
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +41,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -80,6 +78,21 @@ dependencies:
         version: "1.4"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id005
 description: DataMapper plugin for automated/configurable user input sanitization.
 email: zimakov@gmail.com
 executables: []