applied_css 0.0.2 → 0.0.3

data/.ruby-gemset

@@ -0,0 +1 @@
+applied_csv

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p429

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    applied_css (0.0.1)
+    applied_css (0.0.3)
       addressable
       awesome_print
       bundler
@@ -14,63 +14,67 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.2)
+    addressable (2.3.5)
     awesome_print (1.1.0)
-    cobweb (1.0.1)
+    cobweb (1.0.11)
       addressable
       awesome_print
       haml
       json
-      namespaced_redis (>= 1.0.2)
+      namespaced_redis
       nokogiri
       redis
       resque
       rspec
       sinatra
+      slop
       thin
-    css_parser (1.2.6)
+    css_parser (1.3.4)
       addressable
-      rdoc
     daemons (1.1.9)
-    diff-lcs (1.1.3)
-    eventmachine (1.0.0)
+    diff-lcs (1.2.4)
+    eventmachine (1.0.3)
     fakeweb (1.3.0)
-    haml (3.1.7)
-    json (1.7.5)
-    multi_json (1.5.0)
+    haml (4.0.3)
+      tilt
+    json (1.8.0)
+    mini_portile (0.5.1)
+    mono_logger (1.1.0)
+    multi_json (1.7.7)
     namespaced_redis (1.0.4)
       redis
-    nokogiri (1.5.6)
-    rack (1.4.1)
-    rack-protection (1.3.2)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
-    rdoc (3.12)
-      json (~> 1.4)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
-    resque (1.23.0)
+    resque (1.24.1)
+      mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
+      redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    thin (1.5.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.3)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+    sinatra (1.4.3)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slop (3.4.5)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.3.3)
+    tilt (1.4.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
 

data/lib/applied_css/version.rb

@@ -1,3 +1,3 @@
 module AppliedCss
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/applied_css.rb

@@ -12,6 +12,8 @@ class AppliedCSS
     @options = {:ancestors => false}.merge(options)
     @options[:cache] = 120 unless @options.has_key? :cache
     @options[:cache_type] = :full unless @options.has_key? :cache_type
+
+    @options[:debug] = false unless @options.has_key? :debug
     
     @base_uri = Addressable::URI.parse(@options[:url])
     raise "url must be specified" unless @base_uri
@@ -23,11 +25,14 @@ class AppliedCSS
       @doc = Nokogiri::HTML.parse(html) unless html.nil?
     end
 
+    puts "Genrating Parser." if @options[:debug]
     @parser = CssParser::Parser.new
     styles.each do |uri, style|
+      puts "adding #{style}" if @options[:debug]
       @parser.add_block! style
     end
     @doc.css("style").each do |style_node|
+      puts "adding #{style_node.text()}" if @options[:debug]
       @parser.add_block! style_node.text()
     end
   end
@@ -56,9 +61,11 @@ class AppliedCSS
   private
   def populate_style_hash
     @style_hash = {}
-    @doc.css("link[rel='stylesheet']").each do |link|
-      uri = @base_uri.join(link["href"]).to_s
-      get_style(uri)
+    @doc.search("link").each do |link|
+      if link["rel"].downcase == "stylesheet"
+        uri = @base_uri.join(link["href"]).to_s
+        get_style(uri)
+      end
     end
   end
 
@@ -84,7 +91,7 @@ class AppliedCSS
     declarations = {}
     node_identifications(node).each do |node_path|
       @parser.find_by_selector(node_path).each do |detected_decs|
-        detected_decs.split(";").map{|detected_dec| declarations[detected_dec.split(":")[0].strip.to_sym] = detected_dec.split(":")[1].strip}
+        detected_decs.split(";").map{|detected_dec| declarations[detected_dec.split(":")[0].strip.to_s] = detected_dec.split(":")[1].strip}
       end
     end
     declarations
@@ -114,7 +121,7 @@ class AppliedCSS
       nodes += node.ancestors[0..-2].reverse
     end
     nodes << node
-    nodes
+    nodes.reject{|node| node.nil?}
   end
 
   def get(url)
@@ -136,7 +143,7 @@ class AppliedCSS
         http.request(request)
       }
       if response.code.to_i.between? 300, 399
-        puts "redirecting to #{response["location"]}"
+        puts "redirecting to #{response["location"]}" if @options[:debug]
         uri = uri.merge(response["location"])
       elsif response.code.to_i == 404
         raise "The style #{url} doesen't exist (404)"

data/spec/applied_css/applied_css_spec.rb

@@ -80,11 +80,11 @@ describe AppliedCSS do
     
     describe "load ordering" do
       it "should overwrite earlier declarations" do
-        @applied_css.css("#container")[:height].should == "600px"
+        @applied_css.css("#container")["height"].should == "600px"
       end
     
       it "should not take settings from ancestors" do
-        @applied_css.css("#container")[:"font-size"].should be_nil
+        @applied_css.css("#container")["font-size"].should be_nil
       end
     
       describe "with ancestors" do
@@ -92,28 +92,28 @@ describe AppliedCSS do
           @applied_css = AppliedCSS.new(:url => @sample_html, :ancestors => true)
         end
         it "should take settings from ancestors" do
-          @applied_css.css("#container")[:"font-size"].should == "20px"
+          @applied_css.css("#container")["font-size"].should == "20px"
         end
       end
     end
 
     describe "using ids" do 
       it "should find declarations using ids" do
-        @applied_css.css("#container")[:width].should == "900px"
+        @applied_css.css("#container")["width"].should == "900px"
       end
     end
 
     describe "using classes" do
       it "should find declarations using classes" do
-        @applied_css.css("#container > span").keys.should include :color
-        @applied_css.css("#container > span")[:color].should == "#ff0000"
+        @applied_css.css("#container > span").keys.should include "color"
+        @applied_css.css("#container > span")["color"].should == "#ff0000"
       end
     end
     
     describe "for imported stylesheets using @import" do
       it "should find declarations delared on imported stylesheets" do
-        @applied_css.css("#from-imported").keys.should include :color
-        @applied_css.css("#from-imported")[:color].should == "green"
+        @applied_css.css("#from-imported").keys.should include "color"
+        @applied_css.css("#from-imported")["color"].should == "green"
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: applied_css
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70166700522100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166700522100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70166700520840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166700520840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70166700519920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166700519920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: css_parser
-  requirement: &70166700519100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166700519100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70166700518260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166700518260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70166700517300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166700517300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70166700516040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166700516040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cobweb
-  requirement: &70166700515320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166700515320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem for interrogating CSS and Script elements of a html document
 email:
 - stewart@theizone.co.uk
@@ -108,7 +148,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -148,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: applied_css
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: CSS and Script extraction tool for html documents

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.2@applied_css