theme_bandit 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1feaabd974b8c53b878efa185272e62cd157d4
-  data.tar.gz: fdf1c431def302ee0ccafba20e617de569254a5f
+  metadata.gz: 0111051d7708ed2501faccdc2dae5c174023a9a3
+  data.tar.gz: f9a5c5eb5eaade14121d9e1a9dd8f45616e8dbd4
 SHA512:
-  metadata.gz: a96154643d9addc33d62ddb79686713478552784f2c0e37047176492cd15e48683711e07631539b3ca7b2641e3ed207f4760541f1df3bda025173d8daac82b17
-  data.tar.gz: 7591c424dc88e71b98f53a5a0d71466ad52b6c8831dc491fca558ee606c51894555ea9af461ad0273239f0f9282bdbe48afb4eedd1f1437731c701f85b5019d7
+  metadata.gz: e0ffe2ab326ce6e5031f9d739a7162e8c79fa75784c73b8f94f13bc04a22b3cd1d33a3db4a19667174f073deda186708493a5da766565935af083153fcb0f7dd
+  data.tar.gz: 554ae507f4c57b8dee9c0270569d122052dd2ecfbe7235c7aee6a064145383c1fb9041030fb6a2de6c62923f81d131d3ffd5b4e2a6584fe7f913fd8267096954

data/README.md

@@ -37,7 +37,7 @@ and cause the application to blow up until adjusted.
 
 Add this line to your application's Gemfile:
 
-    gem 'theme_bandit', '~> 0.0.7'
+    gem 'theme_bandit', '~> 0.0.8'
 
 And then execute:
 

data/bin/bandit

@@ -46,10 +46,13 @@ end
 def ask_user_for_domain
   puts 'Enter the URL of the theme you wish to download (example: http://www.google.com)'
   url = $stdin.gets.chomp
-  if url == ''
-    raise 'Invalid url'
-  else
-    url
+
+  begin
+    URI.parse(url)
+    return url
+  rescue => e
+    ThemeBandit::Logger.red e
+    exit
   end
 end
 
@@ -58,7 +61,8 @@ def ask_user_for_language
   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)"
+    ThemeBandit::Logger.red "You must select a supported template engine (erb, haml, or slim)"
+    exit
   end
   match[0]
 end
@@ -68,18 +72,17 @@ def ask_user_to_start_rack_app
   answer = $stdin.gets.chomp
   if answer == 'y'
     app_message
-    puts 'changing directory to ./theme'
     Dir.chdir 'theme' do
       Bundler.with_clean_env do
-        puts "running bundle in #{Dir.pwd}/"
+        ThemeBandit::Logger.green "running `bundle` in #{Dir.pwd}/"
         `bundle install`
-        puts 'running `bundle exec rackup -p 3000`'
+        ThemeBandit::Logger.green 'running `bundle exec rackup -p 3000`'
         system('bundle exec rackup -p 3000')
       end
     end
   else
     app_message
-    puts "Don't forget to bundle before starting!"
+    ThemeBandit::Logger.red "Don't forget to bundle before starting!"
   end
 end
 
@@ -94,3 +97,5 @@ rescue LoadError => e
   require 'rubygems'
   require 'theme_bandit'
 end
+
+

data/lib/theme_bandit/downloader.rb

@@ -13,7 +13,7 @@ module ThemeBandit
     end
 
     def self.error
-      fail 'Invalid configuration, please configure through ./bin wrapper'
+      Logger.red 'Invalid configuration, please configure through ./bin wrapper'
     end
 
     attr_reader :url, :options, :document
@@ -25,9 +25,10 @@ module ThemeBandit
 
     def get_document(url)
       begin
+        Logger.green "Downloading #{url}"
         self.class.get(url, options)
       rescue => e
-        p "request failed for #{url} #{e}"
+        Logger.red "request failed for #{url} #{e}"
       end
     end
   end

data/lib/theme_bandit/init.rb

@@ -1,6 +1,8 @@
 require 'uri'
 require 'nokogiri'
 
+require_relative 'util/logger'
+
 require_relative 'downloader'
 require_relative 'url_formatter'
 

data/lib/theme_bandit/parser/js.rb

@@ -14,7 +14,9 @@ module ThemeBandit
 
     def script_tag_values
       script_tags.map do |tag|
-        src = URI.parse(tag.attribute('src'))
+        src = tag.attribute('src').to_s
+        src = cdn_to_fdq(src)
+        src = URI.parse(src)
         if src.absolute?
           strip_query_string src.to_s
         else

data/lib/theme_bandit/url_formatter.rb

@@ -4,6 +4,10 @@ module ThemeBandit
       str.split('?').first
     end
 
+    def cdn_to_fdq(src)
+      src[/^\/\//] ? "http:#{src}" : src
+    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

data/lib/theme_bandit/util/logger.rb

@@ -0,0 +1,23 @@
+module ThemeBandit
+  class Logger
+    class << self
+
+      attr_accessor :message
+
+      def colorize(text, color_code)
+        $stdout.write "\e[#{color_code}m#{text}\e[0m\n"
+      end
+
+      def red text
+        @message = text
+        colorize(text, 31)
+      end
+
+      def green text
+        @message = text
+        colorize(text, 32)
+      end
+    end
+
+  end
+end

data/lib/theme_bandit/util/version.rb

@@ -1,3 +1,3 @@
 module ThemeBandit
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/helper.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] = 'test'
+
 require 'pry'
 require 'rubygems'
 require 'minitest/autorun'
@@ -65,3 +67,13 @@ def stub_js
   url = 'http://www.example.com/js/script_2.js'
   stub_request(:any, url).to_return(body: '')
 end
+
+# supress log output when running tests
+module ThemeBandit
+  class Logger
+    class << self
+      def colorize(text, color_code)
+      end
+    end
+  end
+end

data/test/test_downloader.rb

@@ -14,7 +14,8 @@ describe ThemeBandit::Downloader do
 
     it 'requires url configuration' do
       ThemeBandit.configure { |config| config.url = nil }
-      lambda { @subject.get_theme }.must_raise RuntimeError
+      @subject.get_theme
+      assert_equal(ThemeBandit::Logger.message, "Invalid configuration, please configure through ./bin wrapper")
     end
 
     describe 'attributes' do

data/test/test_url_formatter.rb

@@ -14,5 +14,11 @@ describe ThemeBandit::URLFormatter do
     path = '../doc/docs.css'
     assert_equal(resolve_dot_dots(host, path), 'www.example.com/demo/doc/docs.css')
   end
+  it '#cdn_to_fdq' do
+    src = '//cdn.optimizely.com/js/2953003.js'
+    assert_equal(cdn_to_fdq(src), "http:#{src}")
+    src = 'https://cdn.optimizely.com/js/2953003.js'
+    assert_equal(cdn_to_fdq(src), src)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theme_bandit
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Luke Fender
@@ -158,6 +158,7 @@ files:
 - lib/theme_bandit/recipes/sinatra/slim/config.ru
 - lib/theme_bandit/url_formatter.rb
 - lib/theme_bandit/util/configure.rb
+- lib/theme_bandit/util/logger.rb
 - lib/theme_bandit/util/version.rb
 - test/fixtures/css/import.css
 - test/fixtures/css/style.css