smallvictories 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645eeae3478242e8e50693c5c870569981900c6d
-  data.tar.gz: 51c13ab7acb1edace8fea0023e73b1e338cf6baf
+  metadata.gz: 60597733d2a5b4be3a0adc354ab3b8671b93ada2
+  data.tar.gz: dd360b4e031c94dc9dd8a641ca65787e202e4d60
 SHA512:
-  metadata.gz: 601dbb360a1113f48516f974500cdf7d36f46eb2cf90d8ff1c06034be1019718eaba42bb143817d9b08ab86ee6034be2e7431a93ab5506383fd78224dffe52e0
-  data.tar.gz: 102454bbde1a782a7003f606c76fe71cd84602762c1c44e0dd8b6795a7142658bef8b687c828b70d5310e3a24bc866d4c590738a02fae943664943eda891b955
+  metadata.gz: a017cf5c6ccf0594eaff8c873e24f4defb500f34c5877ef184d319bc9a93c44643750496a7023e8e4ad27d5112ac8f253f7419b6b39dbfb0adcc6981d93c660d
+  data.tar.gz: 46319e2de1f416c496d23be41dd12800a18b42148bfbb21b7ec94169380e6e0fbc9bc5c9f62018324aee36796350c1eecfacb32bcf27541ec1d0191d5e021d0b

data/README.md

@@ -70,13 +70,13 @@ Command: `sv watch`
 ### Default Folder Structure
 
 The default setup for Small Victories is to have your production files in the
-root and your development files in the `src` directory.
+root and your development files in the `_src` directory.
 
 ```text
 Dropbox
   └── Small Victories
     └── Your Site
-      └── src
+      └── _src
       │   ├── _includes
       │   │ └── _head.liquid
       │   ├── _layout.liquid
@@ -90,7 +90,7 @@ Dropbox
 ```
 
 You would then run `sv watch` from within `Your Site` and Small Victories will
-watch for changes in `src` and compile them to the `Your Site` folder.
+watch for changes in `_src` and compile them to the `Your Site` folder.
 
 ## How does it work with Small Victories?
 
@@ -141,7 +141,7 @@ You can set the following options:
 ### Default Configuration
 
 ```yaml
-source: 'src'
+source: '_src'
 destination: ''
 source_stylesheet: 'application.css'
 source_javascript: 'application.js'

data/lib/smallvictories/compiler.rb

@@ -40,14 +40,22 @@ module SmallVictories
         return
       end
 
-      Dir.glob([File.join(config.full_source_path, '*.html'), File.join(config.full_source_path, '*.liquid')]) do |path|
+      Dir.glob([File.join(config.full_source_path, '**/*.html'), File.join(config.full_source_path, '**/*.liquid')]) do |path|
         begin
-          file_name = Pathname.new(path).basename.to_s.split('.').first
+          pathname = Pathname.new(path)
+          file_name = pathname.basename.to_s.split('.').first
+          folder_path = pathname.dirname.to_s.gsub(config.full_source_path, '')
+          full_output_path = File.join(config.full_destination_path, folder_path)
+
           next if file_name =~ /^_/ # do not render partials
 
           file = File.open(path).read
           liquid = Liquid::Template.parse(file)
-          data = { 'config' => { 'stylesheet' => config.stylesheets.last, 'javascript' => config.javascripts.last } }
+          stylesheet_path = Pathname.new(config.full_destination_path)
+          file_path = Pathname.new(full_output_path)
+          relative_path = stylesheet_path.relative_path_from(file_path)
+
+          data = { 'config' => { 'stylesheet' => File.join(relative_path, config.stylesheets.last), 'javascript' => File.join(relative_path, config.javascripts.last) } }
           content = liquid.render(data)
           output_file_name = file_name.concat('.html')
           output_path = File.join(config.full_destination_path, output_file_name)
@@ -56,9 +64,9 @@ module SmallVictories
           else
             html = liquid.render(data)
           end
-          Dir.mkdir(config.full_destination_path) unless File.exists?(config.full_destination_path)
-          File.open(File.join(config.full_destination_path, output_file_name), 'w') { |file| file.write(html) }
-          SmallVictories.logger.info "compiled #{config.destination}/#{output_file_name}"
+          Dir.mkdir(full_output_path) unless File.exists?(full_output_path)
+          File.open(File.join(full_output_path, output_file_name), 'w') { |file| file.write(html) }
+          SmallVictories.logger.info "compiled #{File.join(config.destination, folder_path, output_file_name)}"
         rescue => e
           SmallVictories.logger.error "#{path}\n#{e}\n#{e.backtrace.first}"
         end
@@ -117,7 +125,7 @@ module SmallVictories
     end
 
     def premail
-      Dir.glob([File.join(config.full_destination_path, '*.html')]) do |path|
+      Dir.glob([File.join(config.full_destination_path, '**/*.html')]) do |path|
         begin
           premailer = Premailer.new(path, warn_level: Premailer::Warnings::SAFE)
           File.open(path, 'w') { |file| file.write(premailer.to_inline_css) }

data/lib/smallvictories/constants.rb

@@ -1,6 +1,6 @@
 module SmallVictories
   CONFIG_FILE = '_sv_config.yml'
-  DEFAULT_SOURCE = 'src'
+  DEFAULT_SOURCE = '_src'
   DEFAULT_DESTINATION = ''
   DEFAULT_SOURCE_STYLESHEET = 'application.css'
   DEFAULT_SOURCE_JAVASCRIPT = 'application.js'

data/lib/smallvictories/version.rb

@@ -1,3 +1,3 @@
 module SmallVictories
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/builder_spec.rb

@@ -8,15 +8,15 @@ describe SmallVictories do
       builder.setup 'spec/fixtures/new'
       expect(File.exists?('fixtures/new/_sv_config.yml')).to eq true
       expect(File.exists?('fixtures/new/.sv_guardfile')).to eq true
-      expect(File.exists?('fixtures/new/src/_layout.liquid')).to eq true
-      expect(File.exists?('fixtures/new/src/index.liquid')).to eq true
-      expect(File.exists?('fixtures/new/src/_includes/_head.liquid')).to eq true
-      expect(File.exists?('fixtures/new/src/application.js')).to eq true
-      expect(File.exists?('fixtures/new/src/application.css')).to eq true
+      expect(File.exists?('fixtures/new/_src/_layout.liquid')).to eq true
+      expect(File.exists?('fixtures/new/_src/index.liquid')).to eq true
+      expect(File.exists?('fixtures/new/_src/_includes/_head.liquid')).to eq true
+      expect(File.exists?('fixtures/new/_src/application.js')).to eq true
+      expect(File.exists?('fixtures/new/_src/application.css')).to eq true
     end
 
     after do
-      %w(fixtures/new/_sv_config.yml fixtures/new/.sv_guardfile fixtures/new/src/index.liquid fixtures/new/src/application.css fixtures/new/src/application.js fixtures/new/src/_includes/_head.liquid fixtures/new/src/_layout.liquid).each { |path| clean_file(path) }
+      %w(fixtures/new/_sv_config.yml fixtures/new/.sv_guardfile fixtures/new/_src/index.liquid fixtures/new/_src/application.css fixtures/new/_src/application.js fixtures/new/_src/_includes/_head.liquid fixtures/new/_src/_layout.liquid).each { |path| clean_file(path) }
     end
   end
 end

data/spec/configuration_spec.rb

@@ -5,7 +5,7 @@ describe SmallVictories do
 
   context 'with no config file' do
     it 'defaults to source directory' do
-      expect(configuration.source).to eq 'src'
+      expect(configuration.source).to eq '_src'
     end
 
     it 'defaults to destination directory' do

data/src/Guardfile

@@ -2,7 +2,7 @@
 # More info at https://github.com/guard/guard#readme
 
 guard 'livereload' do
-  watch(%r{.+\.(css|js|html)})
+  watch(%r{[^\/]*.(css|js|html)})
 end
 
 logger level: :warn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smallvictories
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Michael Dijkstra