theme_bandit 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b98fe31887c36eb16097ad233376fb08bb748b2
-  data.tar.gz: 5e02c75d4d02ed06326a4b3bd5ecece88c31b05f
+  metadata.gz: 81c723824fb7b4fc26fdffc3fced9bac1977b425
+  data.tar.gz: 186064cc76b40f3bcf43b5783b7e7153906e55af
 SHA512:
-  metadata.gz: 0c3013136157eff463dafa95e1d4a1f15a02538fc9a277193988563b619e4a9ce6cd83376dced43e334cf818872fecb66c0502eb14dd4362d3436d1c9301386b
-  data.tar.gz: 7a037df92b3d056545e97f7f93f7b0985ead53307b7db864759e66cde7715fb6e36a26e8be8354ddecf03e757c6e707027d281f723e47c5dfecba195531d01c9
+  metadata.gz: c282373169582e752f8b333f638424fe79f33f23a37782e6bf2b21e79f48ea31321bb628828f85dd4b167ca78d71c346ec3466f765c81f66504d5481cf22bbe6
+  data.tar.gz: 8c8f7d1ffffa25f0ac7788fdb023cfaf21474a1be1b1f986e8a69c03a9d7a9ab29b5f620aa7a828a3afa7a6c4cc43001d43fc3ce8fc456634457434a83c00af2

data/README.md

@@ -2,10 +2,12 @@
 
 Enjoy rapid prototyping with theme bandit :heart:
 
-Convert any site template (Wordpress, Joomla, HTML) into a small and
-simple sinatra rack application.
+Wordpress themes are beautiful! Now you can easily convert your favorite wordpress theme to a small ruby app.
 
-`bandit`
+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.
+
+Usage from the command line: `bandit`
 - Select a url to download
 - Select a templating engine (erb, haml, slim)
 - Start your rack app!
@@ -25,7 +27,7 @@ Or install it yourself as:
     $ gem install theme_bandit
 
 ## Usage
-`./bin/bandit/` -> Builds a rack application in the `theme` directory of
+`bandit` -> Builds a rack application in the `theme` directory of
 your project root.
 
 ## Caveats
@@ -33,11 +35,18 @@ Not all templating engines play nicely with html. If you run into
 templating issues, `erb` will be your safest bet because it renders as
 pure html.
 
-## TODO
+Example: The gem converts html for page A to slim, erb, or haml.
+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
+- Fetch ajax resources
+- HTML Sanitization
 - Support for binaries (images + fonts + embeds)
 - Support for multiple pages
-- HTML Sanitization
 - HTML Formatting
+- Verfiy inline tags
 
 ## Tests
 

data/bin/bandit

@@ -12,7 +12,7 @@ SUPPORTED_ENGINES = /^(erb|haml|slim)$/
 def get_root
   begin
     Gem::Specification.find_by_name('theme_bandit').gem_dir
-  rescue
+  rescue Gem::LoadError
     Dir.pwd
   end
 end

data/lib/theme_bandit/document_writer.rb

@@ -21,36 +21,72 @@ module ThemeBandit
       write_html_revision
     end
 
-    def html
-      document.to_html
-    end
+    private
 
     def write_html_revision
+      make_dir(CSS_FOLDER)
+      make_dir(JS_FOLDER)
       download_css(get_css_files)
       download_js(get_js_files)
       revise_head_tags
       write_html_file
     end
 
-    # def build_rack_app
-    #   ThemeBandit::RackGenerator.build
-    # end
+
+    def html
+      document.to_html
+    end
 
     def make_dir(folder)
       FileUtils.mkdir_p folder
     end
 
-    def download_css(files)
-      make_dir(CSS_FOLDER)
-      files.each_with_index do |file_name, _count|
-        doc = Downloader.fetch(file_name, {})
-        new_file = file_name.split('/').last
-        File.open("#{CSS_FOLDER}#{new_file}", 'w') { |file| file.write(doc.body) }
+    def download_css(files, these_are_import_files=false)
+      files.each_with_index do |file, order|
+        if these_are_import_files
+          download_and_replace_import_in_css_file(file, order)
+        else
+          download_single_css_file(file, order)
+        end
+      end
+    end
+
+    def download_and_replace_import_in_css_file(file, order)
+      destination = file[:destination]
+      rule = file[:rule]
+      doc = Downloader.fetch(destination, {}).body
+      new_doc = @doc_with_imports.gsub(rule, doc)
+      new_file_name = @file_with_imports.split('/').last
+      File.open("#{CSS_FOLDER}#{order}_#{new_file_name}", 'w') { |f| f.write(new_doc) }
+      download_css_imports(new_doc, destination) do |imports|
+        download_css(imports, true) if imports
+      end
+    end
+
+    def download_single_css_file(file_name, order)
+      doc = Downloader.fetch(file_name, {}).body
+      download_css_imports(doc, file_name) do |imports|
+        if imports
+          download_css(imports, true)
+        else
+          new_file_name = file_name.split('/').last
+          File.open("#{CSS_FOLDER}#{order}_#{new_file_name}", 'w') { |file| file.write(doc) }
+        end
+      end
+    end
+
+    # Use recurison to get to deepest level
+    def download_css_imports(doc, file_name)
+      if imports = get_import_urls(doc, file_name)
+        @doc_with_imports  = doc
+        @file_with_imports = file_name
+        yield imports
+      else
+        yield false
       end
     end
 
     def download_js(files)
-      make_dir(JS_FOLDER)
       files.each_with_index do |file_name, order|
         doc = Downloader.fetch(file_name, {})
         new_file = file_name.split('/').last

data/lib/theme_bandit/parser/css.rb

@@ -1,7 +1,10 @@
 module ThemeBandit
   module CSSParser
+
     include ThemeBandit::URLFormatter
 
+    RE_IMPORT = /\@import\s*(?:url\s*)?(?:\()?(?:\s*)["']?([^'"\s\)]*)["']?\)?([\w\s\,^\]\(\))]*)\)?[;\n]?/
+
     def get_css_files
       link_tag_values
     end
@@ -22,5 +25,28 @@ module ThemeBandit
         end
       end
     end
+
+    def get_import_urls(file, file_name)
+      imports = file.scan(RE_IMPORT).map { |import| import.first }.select {|import| import[/\.css/] }
+      imports_arr = []
+      imports.each do |import|
+        dot_dots_length = import.split('/').select { |x| x[/\.\./] }.length
+        if dot_dots_length > 0
+          file_uri  = URI.parse(file_name)
+          matcher   = file_uri.path.split('/').last(dot_dots_length + 1).join('/')
+          destination = import.split('/').last(2).join('/')
+          dest_file = file_name.gsub(matcher, destination)
+          imports_arr << { destination: dest_file, rule: file.match(/\@import.*#{import}(.*\;)?/)[0] }
+        else
+          file_uri  = URI.parse(file_name)
+          matcher   = file_uri.path.split('/').last
+          destination = import
+          dest_file = file_name.gsub(matcher, destination)
+          imports_arr << { destination: dest_file, rule: file.match(/\@import.*#{import}(.*\;)?/)[0] }
+        end
+      end
+      imports_arr.length > 0 ? imports_arr : nil
+    end
+
   end
 end

data/lib/theme_bandit/parser/html.rb

@@ -1,12 +1,17 @@
 module ThemeBandit
   module HTMLParser
     def revise_head_tags
+      remove_base_tags
       remove_link_tags
       remove_script_tags
       inject_link_nodes
       inject_script_nodes
     end
 
+    def remove_base_tags
+      document.search('base').remove
+    end
+
     def remove_link_tags
       document.search('link').remove
     end

data/lib/theme_bandit/rack_generator.rb

@@ -33,7 +33,7 @@ module ThemeBandit
       absolute_to_relative(File.read(index_html))
     end
 
-    # Convert all links in html document to relative for ruby app
+
     def absolute_to_relative(contents)
       contents.gsub("#{Dir.pwd}/theme/public", '')
     end

data/lib/theme_bandit/util/version.rb

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

data/test/fixtures/css/import.css

@@ -0,0 +1 @@
+h1 {color:blue;}

data/test/fixtures/css/style.css

@@ -0,0 +1 @@
+body {color:red}

data/test/fixtures/css/style_with_import.css

@@ -0,0 +1,2 @@
+@import url('import.css');
+body {color:red}

data/test/fixtures/index.html

@@ -5,6 +5,7 @@
 <title>A very simple webpage</title>
 <basefont size=4>
 <link rel='stylesheet' href='/css/style.css'></link>
+<link rel='stylesheet' href='/css/style_with_import.css'></link>
 <script type='text/javascripts' src='/js/script.js'></script>
 <script type='text/javascripts' src='/js/script_2.js'></script>
 </head>

data/test/helper.rb

@@ -1,5 +1,5 @@
-require 'rubygems'
 require 'pry'
+require 'rubygems'
 require 'minitest/autorun'
 require 'webmock/minitest'
 
@@ -11,29 +11,57 @@ def load_html_fixture
   @fixture ||= File.read(File.open("#{Dir.pwd}/test/fixtures/index.html", 'r'))
 end
 
+def load_css_fixture
+  File.read(File.open("#{Dir.pwd}/test/fixtures/css/style.css", 'r'))
+end
+
+def load_import_fixture
+  File.read(File.open("#{Dir.pwd}/test/fixtures/css/import.css", 'r'))
+end
+
+def load_style_with_import_fixture
+  File.read(File.open("#{Dir.pwd}/test/fixtures/css/style_with_import.css", 'r'))
+end
+
+def test_url
+  'http://www.example.com'
+end
+
 def stub_request_stack
-  @url = 'http://www.example.com'
-  stub_request(:get, @url).to_return(body: load_html_fixture)
+  stub_request(:any, test_url).to_return(body: load_html_fixture)
   stub_css
+  stub_import_css
+  stub_style_with_import_css
   stub_js
 end
 
 def prep_config
   ThemeBandit.configure do |config|
     config.template_engine = 'erb'
-    config.url = 'http://www.example.com'
+    config.url = test_url
     config.gem_root = Dir.pwd
   end
 end
 
 def stub_css
   url = 'http://www.example.com/css/style.css'
-  stub_request(:get, url).to_return(body: '')
+  stub_request(:any, url).to_return(body: load_css_fixture)
+end
+
+def stub_import_css
+  url = 'http://www.example.com/css/import.css'
+  stub_request(:any, url).to_return(body: load_import_fixture)
 end
 
+def stub_style_with_import_css
+  url = 'http://www.example.com/css/style_with_import.css'
+  stub_request(:any, url).to_return(body: load_style_with_import_fixture)
+end
+
+
 def stub_js
   url = 'http://www.example.com/js/script.js'
-  stub_request(:get, url).to_return(body: '')
+  stub_request(:any, url).to_return(body: '')
   url = 'http://www.example.com/js/script_2.js'
-  stub_request(:get, url).to_return(body: '')
+  stub_request(:any, url).to_return(body: '')
 end

data/test/test_document_writer.rb

@@ -3,9 +3,9 @@ require 'helper'
 describe ThemeBandit::DocumentWriter do
 
   before do
-    stub_request_stack
     prep_config
-    @subject = ThemeBandit::DocumentWriter.new(load_html_fixture, @url)
+    stub_request_stack
+    @subject = ThemeBandit::DocumentWriter.new(load_html_fixture, test_url)
   end
 
   after do
@@ -32,9 +32,12 @@ describe ThemeBandit::DocumentWriter do
       it 'writes index.html' do
         assert File.file?("#{Dir.pwd}/theme/public/index.html")
       end
+
       it 'writes styles' do
-        assert File.file?("#{Dir.pwd}/theme/public/css/style.css")
+
+        assert File.file?("#{Dir.pwd}/theme/public/css/0_style.css")
       end
+
       describe 'script writers' do
         # Preserve order of script tags
         it 'orders and renames script 1' do
@@ -44,18 +47,38 @@ describe ThemeBandit::DocumentWriter do
           assert File.file?("#{Dir.pwd}/theme/public/js/1_script_2.js")
         end
       end
+
+      describe 'import output' do
+        it 'merges css files' do
+          contents = File.read(File.open("#{Dir.pwd}/theme/public/css/0_style_with_import.css", 'r'))
+          expected = "h1 {color:blue;}\n\nbody {color:red}\n"
+          assert_equal contents, expected
+        end
+      end
+
     end
 
-    describe 'parsers/mixin behavior' do
+    describe 'parser mixin behavior' do
+
       describe ThemeBandit::CSSParser do
         it '#get_css_files' do
-          assert_equal(@subject.get_css_files, ['http://www.example.com/Users/lfender/source/theme_bandit/theme/public/css/style.css'])
+          assert_equal(@subject.get_css_files, ["http://www.example.com#{Dir.pwd}/theme/public/css/0_style.css", "http://www.example.com#{Dir.pwd}/theme/public/css/0_style_with_import.css" ])
+        end
+
+        describe '#get_import_urls' do
+          it 'returns false if none found' do
+            assert_equal(@subject.get_import_urls(load_css_fixture, 'import.css'), nil )
+          end
+          it 'returns import urls' do
+            expected = [{:destination=>"import.css", :rule=>"@import url('import.css');"}]
+            assert_equal(@subject.get_import_urls(load_style_with_import_fixture, 'style_with_import.css'), expected)
+          end
         end
       end
 
       describe ThemeBandit::JSParser do
         it '#get_js_files' do
-          assert_equal(@subject.get_js_files, ['http://www.example.com/Users/lfender/source/theme_bandit/theme/public/js/0_script.js', 'http://www.example.com/Users/lfender/source/theme_bandit/theme/public/js/1_script_2.js'])
+          assert_equal(@subject.get_js_files, ["http://www.example.com#{Dir.pwd}/theme/public/js/0_script.js", "http://www.example.com#{Dir.pwd}/theme/public/js/1_script_2.js"])
         end
       end
     end

data/test/test_rack_generator.rb

@@ -5,10 +5,9 @@ describe ThemeBandit::RackGenerator do
   supported_engines = %w(slim haml erb)
 
   supported_engines.each do |engine|
-    describe "#builds a recipe #{engine}" do
+    describe "#builds #{engine} recipe" do
 
       before do
-        stub_request_stack
         @engine = engine
         configure_and_write_files
         ThemeBandit::RackGenerator.build
@@ -26,13 +25,13 @@ describe ThemeBandit::RackGenerator do
         assert File.file?("#{Dir.pwd}/theme/config.ru")
       end
 
-      it 'config.ru' do
+      it 'application.rb' do
         assert File.file?("#{Dir.pwd}/theme/app/application.rb")
       end
 
       describe 'app/views/templates' do
-        it "build .#{@engine} file" do
-          assert File.file?("#{Dir.pwd}/theme/app/views/templates/index.#{@engine}")
+        it "build .#{engine} file" do
+          assert File.file?("#{Dir.pwd}/theme/app/views/templates/index.#{engine}")
         end
       end
     end
@@ -40,12 +39,14 @@ describe ThemeBandit::RackGenerator do
     private
 
     def configure_and_write_files
+      prep_config
       ThemeBandit.configure do |config|
         config.template_engine = @engine
+        config.url = test_url
         config.gem_root = Dir.pwd
-        config.url = 'http://www.example.com'
       end
-      ThemeBandit::DocumentWriter.new(load_html_fixture, @url).write
+      stub_request_stack
+      ThemeBandit::DocumentWriter.new(load_html_fixture, ThemeBandit.configuration.url).write
     end
   end
 

data/theme_bandit.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Luke Fender']
   spec.summary       = 'Convert any site to a simple rack app'
   spec.description   = 'Convert any site to a simple rack app'
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/lfender6445/theme_bandit'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme_bandit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Luke Fender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -159,7 +159,9 @@ files:
 - lib/theme_bandit/url_formatter.rb
 - lib/theme_bandit/util/configure.rb
 - lib/theme_bandit/util/version.rb
+- test/fixtures/css/import.css
 - test/fixtures/css/style.css
+- test/fixtures/css/style_with_import.css
 - test/fixtures/index.html
 - test/fixtures/js/script.js
 - test/fixtures/js/script_2.js
@@ -170,7 +172,7 @@ files:
 - test/test_rack_generator.rb
 - test/test_url_formatter.rb
 - theme_bandit.gemspec
-homepage: ''
+homepage: https://github.com/lfender6445/theme_bandit
 licenses:
 - MIT
 metadata: {}
@@ -195,7 +197,9 @@ signing_key:
 specification_version: 4
 summary: Convert any site to a simple rack app
 test_files:
+- test/fixtures/css/import.css
 - test/fixtures/css/style.css
+- test/fixtures/css/style_with_import.css
 - test/fixtures/index.html
 - test/fixtures/js/script.js
 - test/fixtures/js/script_2.js