loofah-activerecord 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ec5c3aec119d59c88a3a7ad5ec0827f96fcb14
-  data.tar.gz: f28f8d37c7d11254db4847a85036ad275b5db101
+  metadata.gz: 3e80a565148e9837afac96a9a6b94bbb41c3fba6
+  data.tar.gz: f70b1ae1c4d7589f78652bc38c8404540eb40442
 SHA512:
-  metadata.gz: ff07b7dba65c364a356c25af635f6dcd3de28811f01fd00fc2eba9c394f22d50b0602352db6702d4c50207b435877ac9568612eab85493b3386895a990896e77
-  data.tar.gz: 880a75ab10e8bdb38598f406c3b3b4d0c6a447230475c27b365df5e459a05777666e5043c42a4b874549b2aa67b06b56ea1dff362dbbfb546ede7947ddc79a92
+  metadata.gz: df8f1284727d44ec9df032401b211d1e1e3235977d1f1f193625fcc8ce619e8c3e545f8375cf58ed6e532d3a4f5f092be9928ec031bd59867219c9226d201d34
+  data.tar.gz: 96058cd04d085ed2112e75e22e7b967d1518221e8df33b06c38a7c1432180bd090136a384a809ce5e4ab70a5e5f96c447b2f68c6c0e1aa85a7e125f7bd034a2d

data/CHANGELOG.rdoc

@@ -1,9 +1,21 @@
 
+== 2.0 (2016-11-22)
+
+Backwards incompatibilities:
+
+* Removed support for Rails <= 3.0.
+
+Features:
+
+* Added support for Rails 5.
+
+
 == 1.2.0 (2014-08-22)
 
 Enhancements:
 
 * Support for Rails 4.0 and 4.1.
+* Added an `:unencode_special_chars` option to opt out of entity encoding. (Thanks, @openbl!)
 
 
 == 1.1.0 (2013-01-16)

data/README.rdoc

@@ -49,10 +49,14 @@ Attributes are scrubbed with the +:strip+ scrubber by default, unless
 another scrubber is specified or the attribute is present in an
 +:except+ clause.
 
+
 == Requirements
 
 * Loofah >= 1.0.0
-* Rails 3.2, 3.1, 3.0, 2.3, 2.2, 2.1, 2.0 or 1.2 (pow!)
+* Rails 3.2, 4.2, 5.0
+
+Support for older versions of Rails is available in loofah-activerecord < 2.0.
+
 
 == Installation
 

data/lib/loofah-activerecord.rb

@@ -3,10 +3,10 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.i
 require 'loofah'
 
 module Loofah::ActiveRecord
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end
 
-if defined?(Rails) && [3,4].include?(Rails::VERSION::MAJOR)
+if defined?(Rails) && defined?(Rails::Railtie)
   require 'loofah/activerecord/railtie'
 elsif defined? Rails.configuration and Rails.configuration.frameworks.include?([:active_record]) # >= 2.1
   Rails.configuration.after_initialize do

data/rails_test/Rakefile

@@ -17,16 +17,13 @@ namespace "test" do
   end
 
   def ruby_version_for rails_version
-    case rails_version
-    when /^([12]\.|3\.0)/
-      "1.8.7"
-    when /^3\./
-      "1.9.3"
-    when /^4\.0/
-      "2.0.0"
-    when /^4\./
-      "2.1.2"
-    end
+    ## not needed at the moment; all three supported rails versions run on ruby 2.3.1
+    # case rails_version
+    # when /^4\.0/
+    #   "2.0.0"
+    # when /^4\./
+    #   "2.1.2"
+    # end
   end
 
   def dir_to_version_and_flavor dir
@@ -36,19 +33,19 @@ namespace "test" do
 
   def run(cmd, ruby_version=nil)
     if have_rvm?
-      puts "*running rvm: #{cmd}"
       if ruby_version
         cmd = "rvm \"#{ruby_version}\" do #{cmd}"
       end
+      puts "*running rvm: #{cmd}"
       system cmd
     elsif have_rbenv?
-      puts "* running rbenv: #{cmd}"
       begin
         if ruby_version
           puts "  (with ruby version #{ruby_version})"
           ENV['RBENV_VERSION'] = ruby_version
           cmd = "rbenv exec #{cmd}"
         end
+        puts "* running rbenv: #{cmd}"
         system cmd
       ensure
         ENV.delete('RBENV_VERSION')
@@ -92,11 +89,13 @@ namespace "test" do
 
     @results ||= {}
     Dir.chdir(dir) do
-      ENV['RAILS_ENV'] = "test"
       FileUtils.mkdir_p "log"
       begin
         run "touch db/test.sqlite3" # db:create doesn't exist before rails 2.0
-        Bundler.with_clean_env { run "bundle exec rake db:migrate test:units", ruby_version }
+        Bundler.with_clean_env do
+          ENV['RAILS_ENV'] = "test"
+          run "bundle exec rake db:migrate test:units", ruby_version
+        end
       rescue Object
         @results[dir] = "FAIL"
       else

data/rails_test/common/active_record/app/models/post.rb

@@ -1,3 +1,4 @@
 class Post < ActiveRecord::Base
   html_fragment :body, :scrub => :strip
+  attr_accessible :title, :body if Rails::VERSION::MAJOR == 3
 end

data/rails_test/common/active_record/test/unit/posts_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), "../test_helper")
 begin
   require "test/unit"
-rescue NameError
+rescue NameError, LoadError
   require "minitest"
 end
 

data/rails_test/common/xss_foliate/app/models/post.rb

@@ -1,2 +1,3 @@
 class Post < ActiveRecord::Base
+  attr_accessible :title, :body if Rails::VERSION::MAJOR == 3
 end

data/rails_test/common/xss_foliate/test/unit/posts_test.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), "../test_helper")
 begin
   require "test/unit"
-rescue NameError
+rescue NameError, LoadError
   require "minitest"
 end
 

data/rails_test/generate_test_directory

@@ -13,6 +13,7 @@ version = ARGV[0]
 flavor = ARGV[1]
 
 require "rubygems"
+require "tmpdir"
 
 def run(cmd)
   puts "* running '#{cmd}'"
@@ -21,19 +22,25 @@ def run(cmd)
 end
 
 def rails version, dir
-  begin
-    gem "rails", "=#{version}"
-  rescue Gem::LoadError => e
-    puts "ERROR: could not find rails version #{version}"
-    puts "Try running:"
-    puts "  gem install rails --version=#{version}"
-    exit 1
-  end
-  puts "* successfully detected rails version #{version}"
-  if version >= "3"
-    run "yes | rails _#{version}_ new #{dir} > /dev/null"
-  else
-    run "yes | rails _#{version}_ #{dir} > /dev/null"
+  thisdir = Dir.pwd
+  Dir.mktmpdir do |tmpdir|
+    Dir.chdir tmpdir do
+      begin
+        gem "rails", "=#{version}"
+      rescue Gem::LoadError => e
+        puts "ERROR: could not find rails version #{version}"
+        puts "Try running:"
+        puts "  gem install rails --version=#{version}"
+        exit 1
+      end
+      puts "* successfully detected rails version #{version}"
+      if version >= "3"
+        run "yes | rails _#{version}_ new #{dir} > /dev/null"
+      else
+        run "yes | rails _#{version}_ #{dir} > /dev/null"
+      end
+      FileUtils.mv dir, thisdir
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loofah-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Mike Dalessio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loofah
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.15'
 description: |-
   +loofah-activerecord+ extends +loofah+'s HTML sanitization into Rails
   ActiveRecord models.
@@ -223,11 +223,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: "+loofah-activerecord+ extends +loofah+'s HTML sanitization into Rails ActiveRecord
   models"
-test_files:
-- test/unit/test_xss_foliate.rb
-- test/unit/test_active_record.rb
+test_files: []