asset_packer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fed08b143d17f83d7b3be23dcaba82a34f975260
-  data.tar.gz: f4c6bb6e541dea3ad290fc7c6a8c819a4b0c98cf
+  metadata.gz: 3e37f7b09870b8072534b03416ba0a8c7d69f67f
+  data.tar.gz: 446434d07ecd47d498a73f6bb025b6e362aeb306
 SHA512:
-  metadata.gz: e899b50645ee4bbffde1755cb68871f9819d2110f85848bdc737cba5bf48b7939d0f9c9d2871451ca507902b027342e1e26b686e4868b872c2faab3257c81b6b
-  data.tar.gz: b607f34ef91361c3fa574a013c05f45c201c1168daf0185c07d73bbea573a2793dc87fd0ee6e659db128d36bf6dfccce5e0b981a4357340981c5aaefa1cdc6bd
+  metadata.gz: f4bfe009771b200a0762285f6ec7dfdb43be35f6807d4d25e98dc4a3d37a3215bfe9414dd99f86671cb0f6e3e91c5d931cfad6ef8946689362bc47210d7f6887
+  data.tar.gz: bf3a6e5946c338387aa50c735a460b0202e7c0ef1811be37801a4f4522893961b6487cd329757553e33318fed69ad6eee79ae8905ef84fe56296636800c2cdc5

data/.travis.yml

@@ -2,12 +2,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
   - rbx
   - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.1.0
+    - rvm: 2.1.1
     - rvm: rbx
 script: bundle exec rake mutant

data/Changelog.md

@@ -1,7 +1,17 @@
-# v0.1.0
+### Development
+
+[full diff](http://github.com/plexus/asset_packer/compare/v0.2.0...master)
+
+### v0.2.0
+
+Make rewritten CSS links fully qualified
+
+Bunch of small improvements
+
+### v0.1.0
 
 First major release after extraction from Slippery
 
 * command line and Hexp usage
 * support for img, stylesheet, script
-* taken out StandAlone to focus on Local
+* taken out StandAlone to focus on Local

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    asset_packer (0.1.0)
-      hexp (~> 0.3.3)
+    asset_packer (0.2.0)
+      hexp (~> 0.4.6)
       mime-types (~> 2.2)
 
 GEM
@@ -16,73 +16,79 @@ GEM
       abstract_type (~> 0.0.7)
       adamantium (~> 0.1)
       equalizer (~> 0.0.8)
-    ast (1.1.0)
-    concord (0.1.4)
-      adamantium (~> 0.1)
-      equalizer (~> 0.0.7)
+    ast (2.0.0)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
     diff-lcs (1.2.5)
     equalizer (0.0.9)
-    hexp (0.3.3)
+    hexp (0.4.6)
+      concord (~> 0.0)
       equalizer (~> 0.0)
-      ice_nine (~> 0.9)
       nokogiri (~> 1.6)
-      sass (~> 3.2.19)
-    ice_nine (0.11.0)
-    inflecto (0.0.2)
+    ice_nine (0.11.1)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    mime-types (2.2)
-    mini_portile (0.5.3)
-    morpher (0.2.2)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    morpher (0.2.3)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       anima (~> 0.2.0)
-      ast (~> 1.1.0)
+      ast (~> 2.0.0)
       concord (~> 0.1.4)
       equalizer (~> 0.0.9)
       ice_nine (~> 0.11.0)
       procto (~> 0.0.2)
-    mutant (0.5.10)
+    mutant (0.7.8)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       anima (~> 0.2.0)
-      concord (~> 0.1.4)
+      ast (~> 2.0)
+      concord (~> 0.1.5)
       diff-lcs (~> 1.2)
       equalizer (~> 0.0.9)
-      ice_nine (~> 0.11.0)
-      inflecto (~> 0.0.2)
+      ice_nine (~> 0.11.1)
       memoizable (~> 0.4.2)
-      morpher (~> 0.2.1)
-      parser (~> 2.1)
+      morpher (~> 0.2.3)
+      parallel (~> 1.3)
+      parser (~> 2.2.0.2)
       procto (~> 0.0.2)
-      unparser (~> 0.1.10)
-    mutant-rspec (0.5.10)
-      mutant (~> 0.5.10)
-      rspec-core (>= 2.14.1, <= 3.0.0.beta2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    parser (2.1.8)
-      ast (~> 1.1)
-      slop (~> 3.4, >= 3.4.5)
+      unparser (~> 0.2.2)
+    mutant-rspec (0.7.8)
+      mutant (~> 0.7.8)
+      rspec-core (>= 3.0.0, < 3.3.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    parallel (1.4.1)
+    parser (2.2.0.3)
+      ast (>= 1.1, < 3.0)
     procto (0.0.2)
-    rake (10.3.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    sass (3.2.19)
-    slop (3.5.0)
-    thread_safe (0.3.3)
-    unparser (0.1.12)
+    rake (10.4.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-its (1.2.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    thread_safe (0.3.5)
+    unparser (0.2.2)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
-      concord (~> 0.1.4)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.2.5)
       equalizer (~> 0.0.9)
-      parser (~> 2.1)
+      parser (~> 2.2.0.2)
       procto (~> 0.0.2)
 
 PLATFORMS
@@ -90,6 +96,7 @@ PLATFORMS
 
 DEPENDENCIES
   asset_packer!
-  mutant-rspec (~> 0.5.10)
+  mutant-rspec
   rake (~> 10.2)
-  rspec (~> 2.14)
+  rspec
+  rspec-its

data/Rakefile

@@ -25,7 +25,7 @@ gem.define
 
 desc "Push gem to rubygems.org"
 task :push => :gem do
-  #sh "git tag v#{AssetPacker::VERSION}"
+  sh "git tag v#{AssetPacker::VERSION}"
   sh "git push --tags"
   sh "gem push pkg/asset_packer-#{AssetPacker::VERSION}.gem"
 end

data/asset_packer.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |gem|
   gem.bindir           = 'bin'
   gem.executables      << 'asset_packer'
 
-  gem.add_runtime_dependency 'hexp'       , '~> 0.3.3'
+  gem.add_runtime_dependency 'hexp'       , '~> 0.4.6'
   gem.add_runtime_dependency 'mime-types' , '~> 2.2'
 
   gem.add_development_dependency 'rake'         , '~> 10.2'
-  gem.add_development_dependency 'rspec'        , '~> 2.14'
-  gem.add_development_dependency 'mutant-rspec' , '~> 0.5.10'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec-its'
+  gem.add_development_dependency 'mutant-rspec'
 end

data/code_of_conduct.md

@@ -0,0 +1,32 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect
+all people who contribute through reporting issues, posting feature
+requests, updating documentation, submitting pull requests or patches,
+and other activities.
+
+We are committed to making participation in this project a
+harassment-free experience for everyone, regardless of level of
+experience, gender, gender identity and expression, sexual
+orientation, disability, personal appearance, body size, race, age, or
+religion.
+
+Examples of unacceptable behavior by participants include the use of
+sexual language or imagery, derogatory comments or personal attacks,
+trolling, public or private harassment, insults, or other
+unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct. Project
+maintainers who do not follow the Code of Conduct may be removed from
+the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported by opening an issue or contacting one or more of the
+project maintainers.
+
+This Code of Conduct is adapted from the
+[Contributor Covenant](http:contributor-covenant.org), version 1.0.0,
+available at
+[http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/lib/asset_packer/cli.rb

@@ -55,7 +55,7 @@ module AssetPacker
 
     def run
       asset_dir = outfile.dirname.join("#{outfile.basename(outfile.extname)}_assets")
-      local     = Processor::Local.new(infile, asset_dir, outfile)
+      local = Processor::Local.new(infile, asset_dir, outfile)
       doc = Hexp.parse(local.retrieve_asset(infile))
       File.write(outfile, local.(doc).to_html)
     end

data/lib/asset_packer/processor/local.rb

@@ -9,10 +9,12 @@ module AssetPacker
       end
 
       def save_asset(uri, extension)
+        return uri if uri =~ /^data:/
         asset_dir.mkdir unless asset_dir.directory?
         content = retrieve_asset(uri)
+        content = yield(content) if block_given?
         digest  = Digest::MD5.hexdigest(content)
-        target  = asset_dir.join(digest + '.' + extension)
+        target  = asset_dir.join(extension ? digest + '.' + extension : digest)
         File.write(target, content) unless target.exist?
         target.relative_path_from(destination.dirname)
       end
@@ -38,7 +40,15 @@ module AssetPacker
       class Stylesheet < self
         def call(doc)
           doc.replace('link[rel=stylesheet]') do |link|
-            link.attr(:href, save_asset(link[:href], 'css'))
+            link.attr(:href, save_asset(link[:href], 'css', &extract_css_links(link[:href])))
+          end
+        end
+
+        def extract_css_links(base_url)
+          ->(content) do
+            content.gsub(/url\(['"]?([^\)'"]*)['"]?\)/) {
+              "url(../#{ save_asset(URI.join(full_source_uri, base_url, $1), File.extname($1)[1..-1]) })"
+            }
           end
         end
       end

data/lib/asset_packer/processor.rb

@@ -1,28 +1,42 @@
 module AssetPacker
   class Processor
-    attr_reader :source_uri, :asset_dir, :destination
+    attr_reader :source_uri, :full_source_uri, :asset_dir, :destination
 
     # source_uri: location of the original document, used to retrieve relative URI's
     # asset_dir: location where assets will be stored
     # destination: file that will be generated, used to create relative URI's from
     def initialize(source_uri, asset_dir, destination)
-      @source_uri  = URI(source_uri)
-      if @source_uri.relative?
-        @source_uri  = URI("file://#{Pathname(source_uri).expand_path}")
+      @source_uri  = source_uri
+      @full_source_uri = URI(source_uri)
+      if @full_source_uri.relative?
+        source_file = Pathname(source_uri).expand_path
+        @full_source_uri = URI("file://#{source_file}")
+        @cache_dir  = source_file.dirname.join('.asset_cache')
+        FileUtils.mkdir_p @cache_dir unless @cache_dir.exist?
       end
       @asset_dir   = Pathname(asset_dir)
       @destination = Pathname(destination)
     end
 
     def retrieve_asset(uri)
-      uri = URI.join(source_uri, uri)
-      case
-      when %w[http https].include?(uri.scheme)
-        Net::HTTP.get(uri)
-      when uri.scheme.eql?('file')
-        File.read(uri.path)
+      uri = URI.join(full_source_uri, uri)
+      cache(uri) do
+        case
+        when %w[http https].include?(uri.scheme)
+          Net::HTTP.get(uri)
+        when uri.scheme.eql?('file')
+          File.read(uri.path)
+        end
       end
     end
 
+    def cache(uri)
+      return yield if @cache_dir.nil? || uri.scheme == 'file'
+      hash = Digest::SHA256.hexdigest(uri.to_s)
+      cache_path = @cache_dir.join(hash)
+      cache_path.write(yield) unless cache_path.exist?
+      cache_path.read || ''
+    end
+
   end
 end

data/lib/asset_packer/version.rb

@@ -1,3 +1,3 @@
 module AssetPacker
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/asset_packer.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'net/http'
 require 'base64'
+require 'digest'
 require 'optparse'
 
 require 'hexp'

data/spec/asset_packer/processor_spec.rb

@@ -5,22 +5,22 @@ describe AssetPacker::Processor do
 
   let(:fixture_pathname) { src_dir.join 'section.css' }
 
-  its(:source_uri) { should eq URI("file://#{source_uri}") }
+  its(:full_source_uri) { should eq URI("file://#{source_uri}") }
 
   describe '#initialize' do
-    let(:subject)     { described_class.new('/source/file.html', '/asset_dir', '/dest.html') }
-    its(:source_uri)  { should eq URI('file:///source/file.html') }
+    let(:subject)     { described_class.new('/tmp/source/file.html', '/asset_dir', '/dest.html') }
+    its(:full_source_uri)  { should eq URI('file:///tmp/source/file.html') }
     its(:asset_dir)   { should eq Pathname('/asset_dir') }
     its(:destination) { should eq Pathname('/dest.html') }
 
     context 'with absolute URI' do
       let(:subject)     { described_class.new('http://source/file.html', '/asset_dir', '/dest.html') }
-      its(:source_uri)  { should eq URI('http://source/file.html') }
+      its(:full_source_uri)  { should eq URI('http://source/file.html') }
     end
 
     context 'with a relative file name' do
       let(:subject)     { described_class.new('foo/bar.html', '/asset_dir', 'dest.html') }
-      its(:source_uri)  { should eq URI("file://#{AssetPacker::ROOT.join('foo/bar.html')}") }
+      its(:full_source_uri)  { should eq URI("file://#{AssetPacker::ROOT.join('foo/bar.html')}") }
     end
   end
 
@@ -63,7 +63,7 @@ describe AssetPacker::Processor do
 
       it 'should return nil' do
         expect(Net::HTTP).to_not receive(:get)
-        expect(asset).to be_nil
+        expect(asset).to eql ""
       end
     end
   end

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ require 'fileutils'
 require 'asset_packer'
 require_relative 'shared'
 
+require 'rspec/its'
+
 module FixtureHelpers
   def with_fixture(html_file, assets = [])
     subject(:processor) { described_class.new(source_uri.to_s, dst_dir.to_s, destination.to_s) }

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: asset_packer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hexp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: '0'
 description: Create an offline version of a HTML file.
 email:
 - arne@arnebrasseur.net
@@ -90,8 +104,8 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Gemfile.lock
@@ -100,6 +114,7 @@ files:
 - Rakefile
 - asset_packer.gemspec
 - bin/asset_packer
+- code_of_conduct.md
 - lib/asset_packer.rb
 - lib/asset_packer/cli.rb
 - lib/asset_packer/processor.rb
@@ -134,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Create an offline version of a HTML file.