theme_bandit 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81c723824fb7b4fc26fdffc3fced9bac1977b425
-  data.tar.gz: 186064cc76b40f3bcf43b5783b7e7153906e55af
+  metadata.gz: cc589066445b4257641f73b8bd7d9916ab226f77
+  data.tar.gz: 81ea5575b0132159a2bb684f2ca5b2ea69869c9b
 SHA512:
-  metadata.gz: c282373169582e752f8b333f638424fe79f33f23a37782e6bf2b21e79f48ea31321bb628828f85dd4b167ca78d71c346ec3466f765c81f66504d5481cf22bbe6
-  data.tar.gz: 8c8f7d1ffffa25f0ac7788fdb023cfaf21474a1be1b1f986e8a69c03a9d7a9ab29b5f620aa7a828a3afa7a6c4cc43001d43fc3ce8fc456634457434a83c00af2
+  metadata.gz: 2ef26a8702620eb23ec1841a993dff3761e0a9d2c5ec5ac93bb6a230ae87d69a97b1aaf6df8c374a5ef303b8e7f308364e0317ad14e804561b63d8c56bccdc85
+  data.tar.gz: 43475a0b29b2f3cee58c5257157801c0d5b3a426de15cd6c601303f3726aee891aadadbf76590bcd8c51a99e7231b0abf766a8b0cf80087fdc1ff1979d5cf754

data/README.md

@@ -2,21 +2,24 @@
 
 Enjoy rapid prototyping with theme bandit :heart:
 
-Wordpress themes are beautiful! Now you can easily convert your favorite wordpress theme to a small ruby app.
+Wordpress themes are beautiful - now you can easily convert your favorite themes to a small ruby app
 
-This gem converts any site template (Wordpress, Joomla, HTML) into a small and
-simple sinatra rack application, handling all of the JS and CSS for you.
+This gem converts any site template (Wordpress, Joomla, HTML) into
+simple sinatra rack application, resolving both javascript and css.
 
 Usage from the command line: `bandit`
+
 - Select a url to download
 - Select a templating engine (erb, haml, slim)
 - Start your rack app!
 
+You wouldn't download a website ... would you?!
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'theme_bandit'
+    gem 'theme_bandit', '~> 0.0.5'
 
 And then execute:
 
@@ -40,10 +43,10 @@ Sometimes the html for page A is messy and in turn produces bad slim,
 which can cause the application to blow up until corrected.
 
 ## TODO / Coming Soon
-- Replace & fetch @import declarations in CSS
+- _Replace & fetch @import declarations in CSS_ added in v0.0.5
+- Support for binaries (images + fonts + embeds)
 - Fetch ajax resources
 - HTML Sanitization
-- Support for binaries (images + fonts + embeds)
 - Support for multiple pages
 - HTML Formatting
 - Verfiy inline tags

data/bin/bandit

@@ -45,7 +45,7 @@ end
 
 def ask_user_for_domain
   puts 'Enter the URL of the theme you wish to download (example: http://www.google.com)'
-  url = gets.chomp
+  url = $stdin.gets.chomp
   if url == ''
     raise 'Invalid url'
   else
@@ -55,14 +55,17 @@ end
 
 def ask_user_for_language
   puts 'Select your favorite template engine (erb, haml, slim)'
-  answer = gets.chomp
-  fail "You must select a supported template engine (erb, haml, or slim)" unless match = answer.match(SUPPORTED_ENGINES)
+  answer = $stdin.gets.chomp
+  answer = 'erb' if answer == ''
+  unless match = answer.match(SUPPORTED_ENGINES)
+    fail "You must select a supported template engine (erb, haml, or slim)"
+  end
   match[0]
 end
 
 def ask_user_to_start_rack_app
   puts 'Do you want to start your new rack app? y/n'
-  answer = gets.chomp
+  answer = $stdin.gets.chomp
   if answer == 'y'
     app_message
     puts 'changing directory to ./theme'

data/lib/theme_bandit/downloader.rb

@@ -24,7 +24,11 @@ module ThemeBandit
     end
 
     def get_document(url)
-      self.class.get(url, options)
+      begin
+        self.class.get(url, options)
+      rescue => e
+        p "request failed for #{url} #{e}"
+      end
     end
   end
 end

data/lib/theme_bandit/parser/css.rb

@@ -1,3 +1,4 @@
+require 'pry'
 module ThemeBandit
   module CSSParser
 
@@ -21,7 +22,10 @@ module ThemeBandit
         if href.absolute?
           strip_query_string href.to_s
         else
-          strip_query_string "#{url.scheme}://#{url.host}#{href}"
+          # strip_query_string "#{url.scheme}://#{url.host}#{href}"
+          new_href = strip_query_string(href.to_s)
+          absolute = resolve_dot_dots "#{@url.host}#{@url.path}", new_href
+          "#{url.scheme}://#{absolute}"
         end
       end
     end

data/lib/theme_bandit/parser/js.rb

@@ -18,7 +18,9 @@ module ThemeBandit
         if src.absolute?
           strip_query_string src.to_s
         else
-          strip_query_string "#{url.scheme}://#{url.host}#{src}"
+          new_src = strip_query_string(src.to_s)
+          absolute = resolve_dot_dots "#{@url.host}#{@url.path}", new_src
+          "#{url.scheme}://#{absolute}"
         end
       end
     end

data/lib/theme_bandit/url_formatter.rb

@@ -3,5 +3,18 @@ module ThemeBandit
     def strip_query_string(str)
       str.split('?').first
     end
+
+    # returns an aboslute url with dot dot syntax removed
+    def resolve_dot_dots(host, path)
+      number_of_dot_dots = path.split('/').select { |v| v == '..' }.length
+      if number_of_dot_dots > 0
+        new_path = path.gsub('../', '')
+        new_host = host.split('/')
+        new_host.pop(number_of_dot_dots + 1)
+        new_host.push(new_path).join('/')
+      else
+        "#{host}#{path}"
+      end
+    end
   end
 end

data/lib/theme_bandit/util/version.rb

@@ -1,3 +1,3 @@
 module ThemeBandit
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/test/test_url_formatter.rb

@@ -9,4 +9,10 @@ describe ThemeBandit::URLFormatter do
     assert_equal(strip_query_string(url), 'http://www.example.com')
   end
 
+  it '#resolve_dot_dots' do
+    host = 'www.example.com/demo/abc/test.html'
+    path = '../doc/docs.css'
+    assert_equal(resolve_dot_dots(host, path), 'www.example.com/demo/doc/docs.css')
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme_bandit
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Luke Fender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty