remote_css 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7d4783e68649ff499540f26ced8049280505bf6
-  data.tar.gz: fa2c849405776d53b07e622a0b6c46cb4e63ee9d
+  metadata.gz: 78aef9720435bb2986191a1067213c3c89cd85c3
+  data.tar.gz: 13cdb7c78dd5c7a1f5e9e354b06c2305742b7e22
 SHA512:
-  metadata.gz: 4363a7c0d8f148861f7f15a7f0a57dc57a79619727befac189623c3624dae0148e398d50285a7e61a930d70fa4f10921ff6ba0d1fb6a573138f1713b70bf7cc3
-  data.tar.gz: 3d8f2df2314297e6c1d5749a7cd5498cef7371bd598cd84a8f0b5d6921487e3e78240ce162f33929f22e5f6e34a08906566841b4fb35c80d70fbe3ad3f2397df
+  metadata.gz: c540cec4b3381b87801144638bf20d7bd0b3e442d3e2b431640e2614b3c547d4d66e108d19c1f734fe8507ddd40a6f583ac852810446306ae2c6e6ea8cb01e93
+  data.tar.gz: 56babd5e5025062d21eaaf9ab341161c9fb66c1f9ec9e253fcaaacd180bc2cbdbcd4254f7666bbdd5b97a21310a30a3cfa418491c0b9e19f2e393a0614034988

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.0
+ruby-2.4.1

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## [0.2.2] - 2017-07-31
+### Added
+- minfiication of css
+- ability to specify body of html to parse
+- multithreaded loading of external urls
+
+## 0.1.0 - ?
+### Added
+- Start of all things

data/lib/remote_css/client.rb

@@ -4,21 +4,46 @@ module RemoteCss
 
     attr_accessor :url
 
-    def initialize(options)
+    def initialize(options={})
       validate_options!(options)
-      @url = options[:url]
+      @options = options
+      @options[:minify] = true unless @options.has_key?(:minify)
+      @options[:verbose] = false unless @options.has_key?(:verbose)
     end
 
     def css
-      doc = Nokogiri::HTML(open(@url))
-      inline_styles = doc.css("style").map{|s| s.text }
-      remote_styles = doc.css("link[rel='stylesheet'][href]").map{|c| open(URI.join(@url, c.attr("href"))).read }
-      [inline_styles, remote_styles].join("\n")
+      verbose("Reading HTML")
+      doc = Nokogiri::HTML(@options[:body] || open(@options[:url]))
+      verbose("Reading inline styles")
+      styles = []
+      inline_styles = doc.css("style").map{|s| styles << {:source => :inline, :style => s.text.strip} }
+      threads = []
+      remote_styles = doc.css("link[rel='stylesheet'][href]").each do |c|
+        verbose("Loading #{c.attr("href")}")
+        threads << Thread.new do
+          styles << {:source => URI.join(@options[:url], c.attr("href")), :style => open(URI.join(@options[:url], c.attr("href"))).read.strip}
+        end
+      end
+
+      threads.each { |thr| thr.join }
+
+      style = styles.map{|s| "/* #{s[:source]} */\n\n#{s[:style]}" }.join("\n\n")
+
+      if @options[:minify]
+        CSSminify.compress(style)
+      else
+        style
+      end
+
     end
 
     private
     def validate_options!(options)
-      raise ":url is required" unless options.has_key?(:url)
+      raise ":url or :body is required" unless options.has_key?(:url) || options.has_key?(:body)
+    end
+
+    def verbose(text)
+      puts text if @options[:verbose]
     end
   end
 end

data/lib/remote_css/version.rb

@@ -1,3 +1,3 @@
 module RemoteCss
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/remote_css.rb

@@ -1,7 +1,7 @@
 require "remote_css/version"
 require "remote_css/client"
 require 'nokogiri'
-
+require 'cssminify'
 module RemoteCss
 
 end

data/remote_css.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency "nokogiri"
+  spec.add_dependency "cssminify"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remote_css
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Stewart McKee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cssminify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Obtains and collates css from another url
 email:
 - stewart@theizone.co.uk
@@ -78,6 +92,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -109,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Obtains and collates css from another url