css_parser 1.1.3 → 1.1.4

data/lib/css_parser/parser.rb

@@ -291,7 +291,10 @@ module CssParser
       base_uri = uri if base_uri.nil?
 
       src, charset = read_remote_file(uri)
-      add_block!(src, {:media_types => media_types, :base_uri => base_uri})
+
+      if src
+        add_block!(src, {:media_types => media_types, :base_uri => base_uri})
+      end
     end
     
     # Load a local CSS file.
@@ -381,6 +384,7 @@ module CssParser
         end
       rescue
         raise RemoteFileError if @options[:io_exceptions]
+        return nil, nil
       end
 
       return src, charset  

data/lib/css_parser.rb

@@ -7,7 +7,7 @@ require 'stringio'
 require 'iconv'
 
 module CssParser
-  VERSION = '1.1.2'
+  VERSION = '1.1.4'
 
   # Merge multiple CSS RuleSets by cascading according to the CSS 2.1 cascading rules 
   # (http://www.w3.org/TR/REC-CSS2/cascade.html#cascading-order).

data/test/test_css_parser_basic.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for reading and generating CSS shorthand properties
 class CssParserBasicTests < Test::Unit::TestCase

data/test/test_css_parser_loading.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for the CssParser's loading functions.
 class CssParserLoadingTests < Test::Unit::TestCase
@@ -39,7 +39,7 @@ class CssParserLoadingTests < Test::Unit::TestCase
   end
 
   def test_loading_a_local_file_with_scheme
-    file_name = 'file://' + File.dirname(__FILE__) + '/fixtures/simple.css'
+    file_name = 'file://' + File.expand_path(File.dirname(__FILE__)) + '/fixtures/simple.css'
     @cp.load_uri!(file_name)
     assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
   end

data/test/test_css_parser_media_types.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for the handling of media types
 class CssParserMediaTypesTests < Test::Unit::TestCase

data/test/test_css_parser_misc.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for the CssParser.
 class CssParserTests < Test::Unit::TestCase

data/test/test_css_parser_regexps.rb

@@ -1,5 +1,5 @@
 # coding: iso-8859-1
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for CSS regular expressions
 #

data/test/test_merging.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class MergingTests < Test::Unit::TestCase
   include CssParser

data/test/test_rule_set.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require "set"
 
 # Test cases for parsing CSS blocks

data/test/test_rule_set_creating_shorthand.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 # Test cases for reading and generating CSS shorthand properties
 class RuleSetCreatingShorthandTests < Test::Unit::TestCase

data/test/test_rule_set_expanding_shorthand.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class RuleSetExpandingShorthandTests < Test::Unit::TestCase
   include CssParser

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: css_parser
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Alex Dunae
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -07:00
+date: 2010-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -65,7 +64,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -74,7 +72,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"