csspool 2.0.0 → 3.0.0

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 3.0.0
+
+* New Features
+
+  * Pure ruby: no longer uses C based back end.
+
 == 2.0.0
 
 * Bugfixes

data/Manifest.txt

@@ -12,20 +12,11 @@ lib/csspool/css/document.rb
 lib/csspool/css/document_handler.rb
 lib/csspool/css/import_rule.rb
 lib/csspool/css/media.rb
+lib/csspool/css/parser.rb
+lib/csspool/css/parser.y
 lib/csspool/css/rule_set.rb
-lib/csspool/lib_croco.rb
-lib/csspool/lib_croco/cr_additional_sel.rb
-lib/csspool/lib_croco/cr_attr_sel.rb
-lib/csspool/lib_croco/cr_doc_handler.rb
-lib/csspool/lib_croco/cr_num.rb
-lib/csspool/lib_croco/cr_parser.rb
-lib/csspool/lib_croco/cr_parsing_location.rb
-lib/csspool/lib_croco/cr_pseudo.rb
-lib/csspool/lib_croco/cr_rgb.rb
-lib/csspool/lib_croco/cr_selector.rb
-lib/csspool/lib_croco/cr_simple_sel.rb
-lib/csspool/lib_croco/cr_term.rb
-lib/csspool/lib_croco/glist.rb
+lib/csspool/css/tokenizer.rb
+lib/csspool/css/tokenizer.rex
 lib/csspool/node.rb
 lib/csspool/sac.rb
 lib/csspool/sac/document.rb
@@ -48,13 +39,16 @@ lib/csspool/terms/number.rb
 lib/csspool/terms/rgb.rb
 lib/csspool/terms/string.rb
 lib/csspool/terms/uri.rb
-lib/csspool/visitable.rb
 lib/csspool/visitors.rb
+lib/csspool/visitors/children.rb
 lib/csspool/visitors/comparable.rb
+lib/csspool/visitors/iterator.rb
 lib/csspool/visitors/to_css.rb
 lib/csspool/visitors/visitor.rb
 test/css/test_document.rb
 test/css/test_import_rule.rb
+test/css/test_parser.rb
+test/css/test_tokenizer.rb
 test/helper.rb
 test/sac/test_parser.rb
 test/sac/test_properties.rb
@@ -62,5 +56,7 @@ test/sac/test_terms.rb
 test/test_collection.rb
 test/test_parser.rb
 test/test_selector.rb
+test/visitors/test_children.rb
 test/visitors/test_comparable.rb
+test/visitors/test_each.rb
 test/visitors/test_to_css.rb

data/README.rdoc

@@ -10,27 +10,13 @@ well as a document oriented interface for parsing CSS.
 
 == FEATURES/PROBLEMS:
 
-CSSPool now depends on libcroco[http://www.freespiders.org/projects/libcroco/]
-and interfaces with libcroco via FFI.  This means that if libcroco isn't
-installed in one of your default library paths, you'll need to tell CSSPool
-where to find the libcroco shared library.  This is typically the case for
-people using OS X and installing libcroco via macports.
+CSSPool no longer depends on libcroco! There is now a dependency on both the
+{racc}[http://github.com/tenderlove/racc] and
+{rexical}[http://github.com/tenderlove/rexical] gems, so make sure to install
+them first.
 
-You can tell CSSPool where to find the libcroco shared library in a couple ways.
-The first way is to set LD_LIBRARY_PATH to point at the correct directory.  Just
-do this:
-
-  $ export LD_LIBRARY_PATH=/opt/local/lib
-
-Then run your script.
-
-The second way is to tell CSSPool specifically where to find the dynamic
-library.  To do that, just set the LIBCROCO environment variable.  On OS X,
-I would do this:
-
-  $ export LIBCROCO=/opt/local/lib/libcroco-0.6.dylib
-
-Then run my script.
+$ sudo gem install racc
+$ sudo gem install rexical
 
 == SYNOPSIS:
 
@@ -43,7 +29,8 @@ Then run my script.
 
 == REQUIREMENTS:
 
-* libcroco (on OS X do "sudo port install libcroco")
+* racc ("sudo gem install racc")
+* rexical ("sudo gem install rexical")
 
 == INSTALL:
 

data/Rakefile

@@ -3,12 +3,46 @@
 require 'rubygems'
 require 'hoe'
 
+GENERATED_TOKENIZER = "lib/csspool/css/tokenizer.rb"
+GENERATED_PARSER    = "lib/csspool/css/parser.rb"
+
+Hoe.plugin :git
+
 Hoe.spec('csspool') do
   developer('Aaron Patterson', 'aaronp@rubyforge.org')
-  developer('John Barnette', 'jabarnette@rubyforge.org')
+  developer('John Barnette', 'jbarnette@rubyforge.org')
   self.readme_file   = 'README.rdoc'
   self.history_file  = 'CHANGELOG.rdoc'
-  self.extra_deps = ['ffi']
+  self.extra_rdoc_files  = FileList['*.rdoc']
+
+  %w{ racc rexical }.each do |dep|
+    self.extra_dev_deps << [dep, '>= 0']
+  end
+end
+
+[:test, :check_manifest].each do |task_name|
+  Rake::Task[task_name].prerequisites << :compile
+end
+
+task :compile => [GENERATED_TOKENIZER, GENERATED_PARSER]
+
+file GENERATED_TOKENIZER => "lib/csspool/css/tokenizer.rex" do |t|
+  begin
+    sh "rex -i --independent -o #{t.name} #{t.prerequisites.first}"
+  rescue
+    abort "need rexical, sudo gem install rexical"
+  end
+end
+
+file GENERATED_PARSER => "lib/csspool/css/parser.y" do |t|
+  begin
+    racc = `which racc`.strip
+    racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
+    #sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
+    sh "#{racc} -o #{t.name} #{t.prerequisites.first}"
+  rescue
+    abort "need racc, sudo gem install racc"
+  end
 end
 
 # vim: syntax=Ruby

data/lib/csspool/collection.rb

@@ -17,8 +17,8 @@ module CSSPool
       until import_tree.last.all? { |x| x.import_rules.length == 0 }
         level = import_tree.last
         import_tree << []
-        level.each do |doc|
-          doc.import_rules.each do |ir|
+        level.each do |l|
+          l.import_rules.each do |ir|
             next if imported_urls.key? ir.uri
 
             new_doc = ir.load(&@block)

data/lib/csspool/css/charset.rb

@@ -1,7 +1,13 @@
 module CSSPool
   module CSS
-    class Charset < Struct.new(:name, :parse_location)
-      include CSSPool::Visitable
+    class Charset < CSSPool::Node
+      attr_accessor :name
+      attr_accessor :parse_location
+
+      def initialize name, parse_location
+        @name = name
+        @parse_location = parse_location
+      end
     end
   end
 end

data/lib/csspool/css/declaration.rb

@@ -1,8 +1,19 @@
 module CSSPool
   module CSS
-    class Declaration < Struct.new(:property, :expressions, :important, :rule_set)
-      include CSSPool::Visitable
+    class Declaration < CSSPool::Node
+      attr_accessor :property
+      attr_accessor :expressions
+      attr_accessor :important
+      attr_accessor :rule_set
+
       alias :important? :important
+
+      def initialize property, expressions, important, rule_set
+        @property = property
+        @expressions = expressions
+        @important = important
+        @rule_set = rule_set
+      end
     end
   end
 end

data/lib/csspool/css/document_handler.rb

@@ -16,7 +16,7 @@ module CSSPool
         @document.charsets << CSS::Charset.new(name, location)
       end
 
-      def import_style media_list, uri, ns, loc
+      def import_style media_list, uri, ns = nil, loc = {}
         @document.import_rules << CSS::ImportRule.new(
           uri,
           ns,
@@ -39,11 +39,11 @@ module CSSPool
         rs.declarations << Declaration.new(name, exp, important, rs)
       end
 
-      def start_media media_list, parse_location
+      def start_media media_list, parse_location = {}
         @media_stack << media_list.map { |x| CSS::Media.new(x, parse_location) }
       end
 
-      def end_media media_list, parse_location
+      def end_media media_list, parse_location = {}
         @media_stack.pop
       end
     end

data/lib/csspool/css/import_rule.rb

@@ -1,10 +1,22 @@
 module CSSPool
   module CSS
-    class ImportRule < Struct.new(:uri, :namespace, :media, :document, :parse_location)
-      include CSSPool::Visitable
+    class ImportRule < CSSPool::Node
+      attr_accessor :uri
+      attr_accessor :namespace
+      attr_accessor :media
+      attr_accessor :document
+      attr_accessor :parse_location
+
+      def initialize uri, namespace, media, document, parse_location
+        @uri = uri
+        @namespace = namespace
+        @media = media
+        @document = document
+        @parse_location = parse_location
+      end
 
       def load
-        new_doc = CSSPool.CSS(yield uri)
+        new_doc = CSSPool.CSS(yield uri.value)
         new_doc.parent_import_rule = self
         new_doc.parent = document
         new_doc.rule_sets.each { |rs| rs.media = media }

data/lib/csspool/css/media.rb

@@ -1,7 +1,13 @@
 module CSSPool
   module CSS
-    class Media < Struct.new(:name, :parse_location)
-      include CSSPool::Visitable
+    class Media < CSSPool::Node
+      attr_accessor :name
+      attr_accessor :parse_location
+
+      def initialize name, parse_location
+        @name = name
+        @parse_location = parse_location
+      end
     end
   end
 end