dm-sanitizer 0.1.1 → 0.1.4

data/.gitignore

@@ -0,0 +1,6 @@
+pkg
+pkg/*
+doc
+coverage
+*/coverage
+*.db

data/History.txt

@@ -1,3 +1,17 @@
+== 0.1.4 2010-08-28
+* 1 enhancement
+  * integrated with jeweler
+
+== 0.1.3 2009-11-10
+
+* 1 bug fix
+  * Changes to meet dm-core 0.10.1 requirements
+
+== 0.1.2 2009-06-03
+
+* 1 enhancement
+  * Sanitize dirty properties if you want (:with_dirty => true)
+
 == 0.1.1 2009-06-01
 
 * 2 enhancements

data/{README.txt → README.rdoc}

@@ -78,21 +78,4 @@ sudo gem install dm-sanitizer
 
 Copyright (c) 2009 Sergei Zimakov
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+See LICENSE for details.

data/Rakefile

@@ -2,80 +2,39 @@ require 'pathname'
 require 'rubygems'
 require 'rake'
 require "rake/clean"
-require "rake/gempackagetask"
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
 
-require ROOT + 'lib/dm-sanitizer/version'
+  Jeweler::Tasks.new do |gem|
+    gem.name = 'dm-sanitizer'
+    gem.summary = 'DataMapper plugin for automated/configurable user input sanitization.'
+    gem.description = 'DataMapper plugin for automated/configurable user input sanitization.'
+    gem.email = 'zimakov@gmail.com'
+    gem.homepage = "http://github.com/pat/dm-sanitizer/tree/master/"
+    gem.authors = [ 'Sergei Zimakov' ]
 
-AUTHOR = 'Sergei Zimakov'
-EMAIL  = 'zimakov@gmail.com'
-GEM_NAME = 'dm-sanitizer'
-GEM_VERSION = DataMapper::Sanitizer::VERSION
-GEM_DEPENDENCIES = [['dm-core', '>= 0.9.4'], ['sanitize', '>= 1.0.0']]
-GEM_CLEAN = %w[ log pkg coverage ]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE History.txt ] }
+    gem.rubyforge_project = 'dm-sanitizer'
 
-PROJECT_NAME = 'dm-sanitizer'
-PROJECT_URL  = "http://github.com/pat/#{GEM_NAME}/tree/master/"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for automated/configurable user input sanitization.'
+    gem.add_dependency 'dm-core', '>= 0.10.1'
+    gem.add_dependency 'sanitize', '>= 1.0.0'
 
-[ ROOT ].each do |dir|
-  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
-end
-# 
-# spec = Gem::Specification.new do |s|
-#   s.name         = GEM_NAME
-#   s.version      = GEM_VERSION
-#   s.platform     = Gem::Platform::RUBY
-#   s.author       = AUTHOR
-#   s.email        = EMAIL
-#   s.homepage     = PROJECT_URL
-#   s.summary      = PROJECT_SUMMARY
-#   s.description  = PROJECT_DESCRIPTION
-#   s.require_path = 'lib'
-#   s.files        = %w[ LICENSE README.txt Rakefile History.txt TODO ] + Dir['lib/**/*'] + Dir['spec/**/*']
-#   s.rubyforge_project = GEM_NAME
-#  
-#   # rdoc
-#   s.has_rdoc         = false
-#   s.extra_rdoc_files = %w[ LICENSE README.txt History.txt ]
-#  
-#   # Dependencies
-#   GEM_DEPENDENCIES.each {|dep| s.add_dependency( dep[0], dep[1] )}
-# end
-#  
-# Rake::GemPackageTask.new(spec) do |package|
-#   package.gem_spec = spec
-# end
-# 
-# Specs
+    gem.add_development_dependency 'rspec', '~> 1.3'
+    gem.add_development_dependency 'jeweler', '~> 1.4'
+  end
 
-begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
-  require 'spec/rake/spectask'
+  Jeweler::GemcutterTasks.new
 
-  task :default => [ :spec ]
+  FileList['tasks/**/*.rake'].each { |task| import task }
 
-  desc 'Run specifications'
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+rescue LoadError => e
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+  puts '-----------------------------------------------------------------------------'
+  puts e.backtrace # Let's help by actually showing *which* dependency is missing
+end
 
-    begin
-      gem 'rcov', '~>0.8'
-      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
-      t.rcov_opts << '--exclude' << 'spec'
-      t.rcov_opts << '--text-summary'
-      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-    rescue LoadError
-      # rcov not installed
-    end
-  end
-rescue LoadError
-  # rspec not installed
-end
+gem 'rspec', '~>1.3'
+require 'spec'
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec)

data/TODO

@@ -4,5 +4,4 @@ TODO list
 * add options for before :valid? hooking
 * add options for redefining properties filtering method
 * add spec heplers for testing property sanitization options
-* add possibility for sanitizing dirty properties
 * validate options

data/VERSION

@@ -0,0 +1 @@
+0.1.4

data/dm-sanitizer.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-sanitizer}
+  s.version = "0.1.4"
+
+  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.description = %q{DataMapper plugin for automated/configurable user input sanitization.}
+  s.email = %q{zimakov@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc",
+     "TODO"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "dm-sanitizer.gemspec",
+     "lib/dm-sanitizer.rb",
+     "spec/dm-sanitizer_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/pat/dm-sanitizer/tree/master/}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{dm-sanitizer}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{DataMapper plugin for automated/configurable user input sanitization.}
+  s.test_files = [
+    "spec/dm-sanitizer_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    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_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.4"])
+    else
+      s.add_dependency(%q<dm-core>, [">= 0.10.1"])
+      s.add_dependency(%q<sanitize>, [">= 1.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<jeweler>, ["~> 1.4"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, [">= 0.10.1"])
+    s.add_dependency(%q<sanitize>, [">= 1.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<jeweler>, ["~> 1.4"])
+  end
+end
+

data/lib/dm-sanitizer.rb

@@ -1,9 +1,6 @@
-require 'pathname'
 require 'rubygems'
 
-require Pathname(__FILE__).dirname.expand_path + 'dm-sanitizer/version'
-
-gem 'dm-core', '>= 0.9.4'
+gem 'dm-core', '>= 0.10.1'
 require 'dm-core'
 
 gem 'sanitize', '>= 1.0.0'
@@ -19,7 +16,8 @@ module DataMapper
           :basic        => Sanitize::Config::BASIC,
           :relaxed      => Sanitize::Config::RELAXED
         },
-        :default_mode   => :default
+        :default_mode   => :default,
+        :with_dirty     => false
       }
     end
     module_function :default_options
@@ -44,7 +42,7 @@ module DataMapper
         remap_sanitization_modes!
         check_sanitization_modes
         
-        before :save, :sanitize! unless hooks_with_scope(:instance)[:save][:before].include?({:name => :sanitize!, :from => self})
+        before :save, :sanitize! unless hooks_with_scope(:instance)[:update_hook][:before].include?({:name => :sanitize!, :from => self})
       end
       
       def disable_sanitization
@@ -82,7 +80,7 @@ module DataMapper
           property_name = property.name.to_sym
           
           next unless property.type == String || property.type == DataMapper::Types::Text
-          next if !new_record? && !attribute_dirty?(property.name.to_sym)
+          next if !new? && !options[:with_dirty] && !attribute_dirty?(property.name.to_sym)
           next if options[:exclude] && options[:exclude].include?(property_name)
           
           property_mode = options[:modes] ? options[:modes][property_name] || options[:default_mode] : options[:default_mode]
@@ -108,4 +106,4 @@ module DataMapper
   end
 end
 
-DataMapper::Resource.append_inclusions DataMapper::Sanitizer
+DataMapper::Model.append_inclusions DataMapper::Sanitizer

data/spec/dm-sanitizer_spec.rb

@@ -101,6 +101,15 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       @object.title = 'Really new <strong>value</strong>'
       @object.save
     end
+    
+    it "should_receive sanitize dirty properties if this option forced" do
+      @object.class.sanitize :with_dirty => true
+      @object.should_receive(:sanitize_property!).with(:title,anything).twice
+      @object.should_receive(:sanitize_property!).with(:story,anything).twice
+      @object.save
+      @object.title = 'Really new <strong>value</strong>'
+      @object.save
+    end
   end
   
   describe "DataMapper::Model sanitize_property! method" do

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 require 'pathname'
 require 'rubygems'
  
-gem 'rspec', '~>1.2'
+gem 'rspec', '~>1.3'
 require 'spec'
  
-gem 'dm-core', '>= 0.9.4'
+gem 'dm-core', '= 0.10.1'
 require 'dm-core'
 
 gem 'sanitize', '>= 1.0.0'

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-sanitizer
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sergei Zimakov
@@ -9,79 +15,128 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 +04:00
+date: 2010-08-28 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        hash: 53
+        segments: 
+        - 0
+        - 10
+        - 1
+        version: 0.10.1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sanitize
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :development
+  version_requirements: *id004
 description: DataMapper plugin for automated/configurable user input sanitization.
-email: 
-- zimakov@gmail.com
+email: zimakov@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
 - LICENSE
-- History.txt
+- README.rdoc
+- TODO
 files: 
+- .gitignore
 - History.txt
 - LICENSE
-- Manifest.txt
+- README.rdoc
 - Rakefile
-- README.txt
 - TODO
+- VERSION
+- dm-sanitizer.gemspec
 - lib/dm-sanitizer.rb
-- lib/dm-sanitizer/version.rb
 - spec/dm-sanitizer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/hoe.rb
 has_rdoc: true
 homepage: http://github.com/pat/dm-sanitizer/tree/master/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: dm-sanitizer
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin for automated/configurable user input sanitization.
-test_files: []
-
+test_files: 
+- spec/dm-sanitizer_spec.rb
+- spec/spec_helper.rb

data/Manifest.txt

@@ -1,12 +0,0 @@
-History.txt
-LICENSE
-Manifest.txt
-Rakefile
-README.txt
-TODO
-lib/dm-sanitizer.rb
-lib/dm-sanitizer/version.rb
-spec/dm-sanitizer_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-tasks/hoe.rb

data/lib/dm-sanitizer/version.rb

@@ -1,5 +0,0 @@
-module DataMapper
-  module Sanitizer
-    VERSION = '0.1.1'
-  end  
-end

data/tasks/hoe.rb

@@ -1,46 +0,0 @@
-require 'hoe'
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-# Remove hoe dependency
-class Hoe
-  def extra_dev_deps
-    @extra_dev_deps.reject! { |dep| dep[0] == "hoe" }
-    @extra_dev_deps
-  end
-end
-
-hoe = Hoe.new(GEM_NAME, GEM_VERSION) do |p|
-
-  p.developer(AUTHOR, EMAIL)
-
-  p.description = PROJECT_DESCRIPTION
-  p.summary = PROJECT_SUMMARY
-  p.url = PROJECT_URL
-
-  p.rubyforge_name = PROJECT_NAME if PROJECT_NAME
-  p.clean_globs |= GEM_CLEAN
-  p.spec_extras = GEM_EXTRAS if GEM_EXTRAS
-
-  GEM_DEPENDENCIES.each do |dep|
-    p.extra_deps << dep
-  end
-
-end