elsmore 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff6fae9fc1f96066e8c755fa7ae3625e067a53c
-  data.tar.gz: 0745051590992a18546840199a85d50defff3769
+  metadata.gz: c5ea0ee5842f11d5c686b5904b963cccb7e55c5e
+  data.tar.gz: 41422ea9b6381c4d2f7e873c3e3b198dd66bfe2d
 SHA512:
-  metadata.gz: a156725315f92cc72094bac0a58e224158dc3d01433a194a66389df20f740c67491ed4ccdab5cbd0688e468170beefe68abfecb10e930bbdd50289b97bae70ef
-  data.tar.gz: f8974e4d1fa3ae7e73a37b9f1047de010c25a6d6501a7e5a21ba1dc71279a8a4534a4f31cdb4b8b8891c0a65590a375563a2424ad77fe7262a9721fb64c63c1c
+  metadata.gz: 06daf64396d3cef4e3fdb65d942d668161959af0eeb2f7b426804d8cc76bcfa66f1cdae19f35a4de1e8da41fe7a9e1a3d98c4c0333618f6217269d7113805ad9
+  data.tar.gz: 746aa284b811bfe5670f495a5a95491449d48628e3b4fd067e915fc55618625d11dcec60f5643d90c4db98951068f97a8848e5bdb458efbf93479d5a76c9ecc5

data/.gitignore

@@ -1,2 +1,3 @@
 site
 pkg
+hackference.co.uk

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elsmore (0.2.1)
+    elsmore (0.3.0)
       awesome_print
       colorize
       commander

data/Rakefile

@@ -4,8 +4,3 @@ require 'rake/testtask'
 task :console do
   exec "irb -r elsmore -I ./lib"
 end
-
-task :bin do
-  ARGV.shift
-  exec "ruby -Ilib ./bin/elsmore #{ARGV.join(' ')}"
-end

data/lib/elsmore/command.rb

@@ -19,25 +19,36 @@ module Elsmore
       global_option('--debug') { emitter.debug! }
 
       command :snap do |c|
-        c.syntax = 'spider <url> [options]'
+        c.syntax = 'spider <url>'
         c.description = 'Spiders a URL within from the given page, sticking within the original domain'
         c.action do |args, options|
           scraper = Elsmore::Scraper.new(args.first)
           scraper.emitter = emitter
-          result = scraper.run
+          scraper.run
 
           emitter.newline
           emitter.newline
           emitter.say "Processed"
-          emitter.pretty result[:processed]
+          emitter.pretty scraper.processed
           emitter.newline
           emitter.say "Could not be processed"
-          emitter.pretty result[:invalid]
+          emitter.pretty scraper.invalid
+
+          emitter.newline
+          emitter.say "Run 'elsmore serve #{args.first}' to start a webserver on port 8000 with your local copy"
         end
       end
       alias_command :'go fetch', :'snap'
       default_command :snap
 
+      command :serve do |c|
+        c.syntax = 'serve <folder_name>'
+        c.description = 'Serve local folder'
+        c.action do |args, options|
+          exec "ruby -run -ehttpd ./#{ARGV[1]} -p8000"
+        end
+      end
+
       run!
     end
   end

data/lib/elsmore/emitter.rb

@@ -14,7 +14,7 @@ module Elsmore
     end
 
     def newline
-      say "\n"
+      puts "\n"
     end
 
     def pretty value

data/lib/elsmore/resource.rb

@@ -2,13 +2,16 @@ require 'httparty'
 
 module Elsmore
   class Resource
-    attr_accessor :url, :filename, :emitter
+    attr_accessor :url, :filename, :emitter, :parent
 
     def initialize url, parent
       self.url = Elsmore::Url.new(url, parent)
+      self.parent = parent
     end
 
-    def write!
+    def write! nested_urls = false
+      process_nested_urls if nested_urls
+
       writer = Elsmore::Writer.new(self)
       writer.emitter = emitter
       writer.write
@@ -18,5 +21,25 @@ module Elsmore
     def data
       @data ||= HTTParty.get(url.canonical_url)
     end
+
+    private
+
+    def process_nested_urls
+      urls = data.scan(/url\((.*?)\)/i).map do |match|
+        if match[0].start_with?('"') || match[0].start_with?("'")
+          match[0][1...-1]
+        else
+          match[0]
+        end
+      end
+
+      urls.each do |nested_url|
+        resource = Elsmore::Resource.new(nested_url, url)
+        resource.emitter = emitter
+        resource.write!
+
+        @data.gsub!(nested_url, resource.url.resource_path)
+      end
+    end
   end
 end

data/lib/elsmore/rewriter.rb

@@ -21,28 +21,28 @@ module Elsmore
 
     def write_css
       resource.doc.xpath('//link[@rel="stylesheet"]').each do |element|
-        write_element(element, 'href')
+        write_element(element, 'href', replace: true)
       end
     end
 
     def write_images
       resource.doc.xpath('//img').each do |element|
-        write_element(element, 'src')
+        write_element(element, 'src', replace: false)
       end
     end
 
     def write_js
       resource.doc.xpath('//script').each do |element|
-        write_element(element, 'src')
+        write_element(element, 'src', replace: false)
       end
     end
 
-    def write_element element, key
+    def write_element element, key, options = {}
       return unless element.attribute(key)
       url = element.attribute(key).value
       _resource = Elsmore::Resource.new(url, resource.url)
       _resource.emitter = emitter
-      _resource.write!
+      _resource.write!(options[:replace])
 
       emitter.log("# Rewriting #{url} => #{_resource.filename}") if url != _resource.filename
       element.attribute(key).value = _resource.filename

data/lib/elsmore/scraper.rb

@@ -19,11 +19,7 @@ module Elsmore
         document = unprocessed.shift
         process document
       end
-
-      {
-        processed: processed,
-        invalid: invalid
-      }
+      self
     end
 
     private

data/lib/elsmore/url.rb

@@ -36,6 +36,14 @@ module Elsmore
       end
     end
 
+    def resource_path
+      if parent && parent.host == host
+        uri.path
+      else
+        canonical_url.gsub('http:/', '').gsub('https:/', '')
+      end
+    end
+
     private
 
     def sanitize_string

data/lib/elsmore/version.rb

@@ -1,3 +1,3 @@
 module Elsmore
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elsmore
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Cristiano Betta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake