css_validator 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f97ca610e810853f305d79c2c44ce14ee523fc
-  data.tar.gz: b05352c7fe8a508185de7d137e128fe3b66c57ef
+  metadata.gz: c88186e16bb12ede012f688d59039d59db05c6d8
+  data.tar.gz: bb0e22aa6502c3215c613fb1e2a6894e634ca884
 SHA512:
-  metadata.gz: 0038dfe753e6a87f64f4fe3378b2e6568d4b72746557cd12577b5629faac9b6cb616532c580194e47010f7c6d4eca8ed6fef2a585a2fc52b1af7086594a220af
-  data.tar.gz: dbfd43c1d94b07362ccacfe68e59cd8bbed045a2c3ae63a8e51630150fcdd19493ac89d118d6f67695722eb2534913febe706bdbd9326be78c91faaaa45febbd
+  metadata.gz: 4fe2a790534678405e67758bfa2ece9766daea3287b4dc7963499ab8151c4f74edd8155d73a9350fc2672631d07bd8a73aa551c2aa216e4c7fb8a517ae6516dd
+  data.tar.gz: e90a399cb3016be36165b3da679a170776ce1207a6574eb0e92cf46b698980e681c52ecbcefecb65d8cdd6ebf39b16ac8c9d92e8e1414f71cf881c4f5f43f412

data/README.md

@@ -1,7 +1,7 @@
 # CSS Validator
 
-This uses the `css-validator.jar` from [W3C](http://jigsaw.w3.org/css-validator/DOWNLOAD.html) to validate CSS in ActiveModel.
-So, your system requires `java` to use this gem.
+This uses the `csslint.js` with `js.jar` from [CSSLint](https://github.com/CSSLint/csslint) to validate CSS in ActiveModel.
+So, your system requires `java` to use this gem.  And, it also works fine on Heroku.
 
 ## Usage
 

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 desc "Run specs"
@@ -6,5 +6,22 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
-task :default => [:spec]
-task :build => [:spec]
+desc "Download csslint jar and js file from Github"
+task :download_csslint do
+  vendor_dir = 'vendor'
+  mkdir(vendor_dir) unless File.directory? vendor_dir
+
+  host_url = 'https://raw.github.com/CSSLint/csslint'
+  dependencies = [ "#{host_url}/master/lib/js.jar", "#{host_url}/master/release/csslint-rhino.js" ]
+  dependencies.each do |dependency|
+    puts "Downloading #{dependency}..."
+
+    file_name = File.basename(dependency)
+
+    File.open("#{vendor_dir}/#{file_name}", "w") do |file|
+      file.write open(dependency).read
+    end
+  end
+end
+
+task default: [ :spec ]

data/css_validator.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "css_validator"
-  s.version       = "1.0.0"
+  s.version       = "2.0.0"
   s.authors       = ["Teng Siong Ong"]
   s.email         = ["siong1987@gmail.com"]
   s.homepage      = "https://github.com/siong1987/css_validator"

data/lib/css_validator.rb

@@ -3,7 +3,7 @@ require 'active_model'
 require 'active_model/validations'
 
 class CssValidator < ActiveModel::EachValidator
-  VALIDATOR = File.join(File.expand_path('../..', __FILE__), 'vendor', 'css-validator.jar')
+  VENDOR_DIR = File.join(File.expand_path('../..', __FILE__), 'vendor')
 
   def validate_each(record, attribute, value)
     java_path = `which java`.rstrip
@@ -16,10 +16,10 @@ class CssValidator < ActiveModel::EachValidator
     css_file.write(value)
     css_file.close
 
-    cmd = "#{java_path} -jar #{VALIDATOR} -output text -profile css3 'file:#{css_file.path}'"
+    cmd = "#{java_path} -jar #{VENDOR_DIR}/js.jar #{VENDOR_DIR}/csslint-rhino.js --quiet #{css_file.path}"
     Open3.popen3(cmd) do |stdin, stdout, stderr|
       result = stdout.read
-      if result =~ /found the following errors \((\d+)\)/
+      if result =~ /error/
         record.errors.add attribute, (options[:message] || 'is invalid')
       end
     end

data/spec/fixtures/invalid_css/1.css

@@ -1,3 +1 @@
-#valid {
-  margin: invalid;
-}
+alert("javascript injection");

data/spec/fixtures/valid_css/1.css

@@ -0,0 +1,3 @@
+#valid {
+  margin: invalid;
+}