smallvictories 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f731d5d6df1739579b31fcbe694c4795a0f640a4
-  data.tar.gz: 5a5bb5a7266da54154008320f0ca1a0fa96e507c
+  metadata.gz: 12382dc9fd1f3d1688534c4a2df59eaaa1eab52b
+  data.tar.gz: 0da0a7dc2013e224a60376cd9f54303e315b1372
 SHA512:
-  metadata.gz: 245511be3d12b3d8f3971474247a9c353437609c93b6f4283468462382e0e10e2fd607691d749605ca8df98d0515eba22e2d3ba43c7a5162e0a7cb9a8b4a368d
-  data.tar.gz: 6ce3b4d002e499b90c6513ffe1034801fa8d9113ec9dec96e0fcff41ea9d7c26f11079355d33a8787e2c74b96e0fffd383f92a34a6535d593817b1afd6358ab7
+  metadata.gz: 4e8ef9f37f4da27baff4b8f5fb3ffa625a6256d557dc9c96b196729ebfb59437af11e5c5f9cb39ef074ddcc65e9362afffb2941a8726be0508cfbe7bc36ab7ea
+  data.tar.gz: a6ad93cdae7983dfd6eb9b066c335dfa13b6325e8faae02b453d2854c72f0b5a36a4a1697299424d9f0dade517dcce78d9b998ec6c66ce376c5adf073bef669b

data/bin/sv

@@ -12,6 +12,7 @@ def help
     deploy                          Minify and copy files to deploy folder
     inline                          Inline CSS in your HTML files
     minify                          Minify files for production
+    server                          Run Small Victories local HTML development server
     watch                           Watch for changes and compile files
     help                            Prints this help document
     version                         Prints the small victories gem version
@@ -68,6 +69,12 @@ def minify
   compiler.minify_js
 end
 
+def server
+  config = SmallVictories::Configuration.new
+  server = SmallVictories::Server.new(config: config)
+  server.run
+end
+
 def watch
   compile
   config = SmallVictories::Configuration.new
@@ -89,6 +96,10 @@ when 'deploy'
   deploy ARGV[1]
 when 'inline'
   inline
+when 'minify'
+  minify
+when 'server'
+  server
 when 'watch'
   watch
 else

data/lib/smallvictories.rb

@@ -5,10 +5,12 @@ require "smallvictories/version"
 require "smallvictories/constants"
 require "smallvictories/logger"
 require "smallvictories/configuration"
+require "smallvictories/site_file"
 require "smallvictories/builder"
 require "smallvictories/compiler"
 require "smallvictories/deployer"
 require "smallvictories/watcher"
+require "smallvictories/server"
 require "sassc/compressor"
 require "sassc/functions"
 require "sassc/importer"

data/lib/smallvictories/compiler.rb

@@ -156,6 +156,7 @@ module SmallVictories
     end
 
     def sprite
+      SmallVictories.logger.debug "Spriting"
       sprite_directory = File.join(config.full_source_path, config.source_sprite)
       return unless Dir.exists?(sprite_directory)
       css = "@import 'rails-sass-images';\n"

data/lib/smallvictories/constants.rb

@@ -1,6 +1,6 @@
 module SmallVictories
   CONFIG_FILE = '_sv_config.yml'
-  GUARD_FILE = '.sv_guardfile'
+  GUARD_FILE = 'Guardfile'
   DEFAULT_SOURCE = '_sv'
   DEFAULT_DEPLOY = ''
   DEFAULT_DESTINATION = ''

data/lib/smallvictories/deployer.rb

@@ -12,7 +12,7 @@ module SmallVictories
 
     def copy folder=nil
       folder ||= config.deploy
-      deploy_path = File.join(ROOT, folder)
+      deploy_path = File.join(ROOT, "#{folder}/")
       begin
         Find.find(config.full_destination_path) do |source|
           Find.prune if self.ignore_files.include?(File.basename(source))
@@ -29,7 +29,7 @@ module SmallVictories
     end
 
     def ignore_files
-      ['.git', config.source, CONFIG_FILE, GUARD_FILE]
+      ['.DS_Store', '.git', '.gitignore', config.source, CONFIG_FILE, GUARD_FILE]
     end
   end
 end

data/lib/smallvictories/server.rb

@@ -0,0 +1,155 @@
+require 'socket'
+require 'uri'
+require 'liquid'
+require 'mime-types'
+require 'sass'
+require 'sassc'
+
+
+module SmallVictories
+  class Server
+    attr_accessor :config, :socket, :server
+
+    # Files will be served from this directory
+    WEB_ROOT = './'
+    TEMP_FILE = './.sv_temp'
+
+    # Treat as binary data if content type cannot be found
+    DEFAULT_CONTENT_TYPE = 'application/octet-stream'
+
+    # This helper function parses the extension of the
+    # requested file and then looks up its content type.
+
+    def initialize attributes={}
+      self.config = attributes[:config]
+    end
+
+    def content_type(path)
+      if ext = File.extname(path).split(".").last
+        MIME::Types.type_for(ext).first.to_s
+      else
+        'text/html'
+      end
+    end
+
+    # This helper function parses the Request-Line and
+    # generates a path to a file on the server.
+
+    def requested_file(request_line)
+      request_uri  = request_line.split(" ")[1]
+      path         = URI.unescape(URI(request_uri).path)
+
+      clean = []
+
+      # Split the path into components
+      parts = path.split("/")
+
+      parts.each do |part|
+        # skip any empty or current directory (".") path components
+        next if part.empty? || part == '.'
+        # If the path component goes up one directory level (".."),
+        # remove the last clean component.
+        # Otherwise, add the component to the Array of clean components
+        part == '..' ? clean.pop : clean << part
+      end
+
+      # return the web root joined to the clean path
+      File.join(WEB_ROOT, *clean)
+    end
+
+    # This helper function saves the string to
+    # a temp file and streams it
+
+    def render_file file, content_type=nil
+      socket.print "HTTP/1.1 200 OK\r\n" +
+                  "Content-Type: #{content_type || content_type(file)}\r\n" +
+                  "Content-Length: #{file.size}\r\n" +
+                  "Connection: close\r\n"
+
+      socket.print "\r\n"
+
+      # write the contents of the file to the socket
+      IO.copy_stream(file, socket)
+    end
+
+    def render_string string, content_type=nil
+      File.open(TEMP_FILE, "w") do |f|
+        f.write(string)
+        f.close
+      end
+
+      File.open(TEMP_FILE, "rb") { |f| render_file(f, content_type) }
+    end
+
+    def render_stylesheet
+      if File.exist?(File.join(WEB_ROOT, '_sv_custom.scss'))
+        begin
+          engine = Sass::Engine.new(File.open(File.join(WEB_ROOT, '_sv_custom.scss')).read, syntax: :scss)
+          render_string(engine.render, 'text/css')
+        rescue => e
+          socket.print e
+        end
+      elsif File.exist?(File.join(WEB_ROOT, '_sv_custom.sass'))
+        begin
+          engine = Sass::Engine.new(File.open(File.join(WEB_ROOT, '_sv_custom.sass')).read, syntax: :sass)
+          render_string(engine.render, 'text/css')
+        rescue => e
+          socket.print e
+        end
+      elsif File.exist?(File.join(WEB_ROOT, '_sv_custom.css'))
+        # Open _sv_custom.css
+        File.open(File.join(WEB_ROOT, '_sv_custom.css'), "rb") do |file|
+          render_file(file)
+        end
+      end
+    end
+
+    def run
+      # Except where noted below, the general approach of
+      # handling requests and generating responses is
+      # similar to that of the "Hello World" example
+      # shown earlier.
+
+      @server = TCPServer.new('localhost', 2345)
+
+      loop do
+        @socket = @server.accept
+        request_line = socket.gets
+        socket.close if request_line == nil
+
+        STDERR.puts request_line
+
+        path = requested_file(request_line)
+        path = File.join(path, 'index.html') if File.directory?(path)
+
+        if path == File.join(WEB_ROOT, '_sv_custom.css')
+          render_stylesheet
+        elsif File.exist?(path) && !File.directory?(path)
+          File.open(path, "rb") do |file|
+            if File.extname(path) == '.html'
+              # parse liquid
+              template = Liquid::Template.parse(file.read, error_mode: :warn)
+              render_string(template.render(SiteFile.files_hash))
+            else
+              render_file(file)
+            end
+          end
+        else
+          message = "File not found\n"
+
+          # respond with a 404 error code to indicate the file does not exist
+          socket.print "HTTP/1.1 404 Not Found\r\n" +
+                      "Content-Type: text/plain\r\n" +
+                      "Content-Length: #{message.size}\r\n" +
+                      "Connection: close\r\n"
+
+          socket.print "\r\n"
+
+          socket.print message
+        end
+
+        socket.close
+      end
+    end
+  end
+end

data/lib/smallvictories/site_file.rb

@@ -0,0 +1,104 @@
+module SmallVictories
+  class SiteFile
+    attr_accessor :path
+
+    def self.files_hash folder_path=SmallVictories::Server::WEB_ROOT
+      hash = {}
+
+      Dir.glob(File.join(folder_path, '*')) do |path|
+        next if path == '.' or path == '..'
+        file = SiteFile.new path
+        key = path.gsub(folder_path, '').gsub(/^\//, '').gsub('/', '.')
+        key = key.gsub(/\.#{file.extension}$/, '')
+
+        if Dir.exists?(path)
+          hash[key] = SiteFile.files_hash(path)
+        else
+          hash[key] = file.downloadable? ? path : file.read
+        end
+      end
+
+      hash
+    end
+
+    def initialize path
+      @path = path
+    end
+
+    def extension
+      File.extname(path).gsub(/^./,'')
+    end
+
+    def file
+      File.open(path)
+    end
+
+    def read
+      file.read
+    end
+
+    def file_type
+      MIME::Types.type_for('css')
+    end
+
+    def asset?
+      audio? or image? or video? or css? or js?
+    end
+
+    def media_asset?
+      audio? or image? or video?
+    end
+
+    def audio?
+      file_type =~ /audio/ ? true : false
+    end
+
+    def css?
+      extension == 'css'
+    end
+
+    def downloadable?
+      asset? || pdf?
+    end
+
+    def image?
+      file_type =~ /image/ ? true : false
+    end
+
+    def js?
+      extension == 'js'
+    end
+
+    def video?
+      file_type =~ /video/ ? true : false
+    end
+
+    def render
+      read
+    end
+
+    def text?
+      extension == 'txt'
+    end
+
+    def html?
+      extension == 'html'
+    end
+
+    def markdown?
+      extension == 'md'
+    end
+
+    def webloc?
+      extension == 'webloc' || extension.downcase == 'url'
+    end
+
+    def pdf?
+      extension == 'pdf'
+    end
+
+    def text_based_file?
+      markdown? || text? || html? || webloc? || pdf?
+    end
+  end
+end

data/lib/smallvictories/version.rb

@@ -1,3 +1,3 @@
 module SmallVictories
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/lib/smallvictories/watcher.rb

@@ -40,14 +40,18 @@ module SmallVictories
       SmallVictories.logger.debug "👋"
       SmallVictories.logger.debug "👀"
 
-      pid = Process.fork { system('guard -i --guardfile .sv_guardfile') }
-      Process.detach(pid)
+      if File.exists?('Guardfile')
+        pid = Process.fork { system('guard -i') }
+        Process.detach(pid)
+      end
 
       listener = build_listener
       listener.start
 
       trap("INT") do
-        Process.kill "TERM", pid
+        if File.exists?('Guardfile')
+          Process.kill "TERM", pid
+        end
         listener.stop
         puts "✋  Halting auto-regeneration."
         exit 0

data/smallvictories.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sprite-factory', '~> 1.7'
   spec.add_runtime_dependency 'rmagick', '~> 2.15'
   spec.add_runtime_dependency 'rails-sass-images', '~> 1.0'
+  spec.add_runtime_dependency 'mime-types'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/builder_spec.rb

@@ -2,13 +2,12 @@ require 'spec_helper'
 
 describe SmallVictories do
   let(:builder) { SmallVictories::Builder.new(config: SmallVictories::Configuration.new) }
-  let(:files) { %w(fixtures/new/_sv_config.yml fixtures/new/.sv_guardfile fixtures/new/_sv/index.liquid fixtures/new/_sv/application.scss fixtures/new/_sv/application.js fixtures/new/_sv/_includes/_head.liquid fixtures/new/_sv/_layout.liquid fixtures/new/_sv/_sprite/empty.png) }
+  let(:files) { %w(fixtures/new/_sv_config.yml fixtures/new/Guardfile fixtures/new/_sv/index.liquid fixtures/new/_sv/application.scss fixtures/new/_sv/application.js fixtures/new/_sv/_includes/_head.liquid fixtures/new/_sv/_layout.liquid fixtures/new/_sv/_sprite/empty.png) }
 
   context 'with folder' do
     it 'sets up default files' do
       builder.setup 'spec/fixtures/new'
       files.each do |file|
-        puts file
         expect(File.exists?(file)).to eq true
       end
     end

data/spec/compiler_spec.rb

@@ -128,7 +128,7 @@ describe SmallVictories do
 
     it 'inlines the compiled files' do
       compiler.inline_html
-      expect(File.open(destination_html).read).to include "<p style=\"font-size: 12px\">Hello Email Friend</p>"
+      expect(File.open(destination_html).read).to include "<p style=\"font-size: 12px;\">Hello Email Friend</p>"
     end
   end
 

data/spec/fixtures/liquid/index.html

@@ -0,0 +1,17 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>Small Victories</title>
+    <meta name="description" content="{{ site.description }}">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" type="image/png" href="favicon.png">
+    <link rel="stylesheet" href="_sv_custom.css">
+  </head>
+  <body>
+    <h1>{{ settings.title }}</h1>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+    <script src="_sv_custom.js"></script>
+  </body>
+</html>

data/spec/fixtures/liquid/settings/title.txt

@@ -0,0 +1 @@
+My Title

data/spec/site_file_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe SmallVictories::SiteFile do
+  context 'with folder' do
+    it 'creates files hash' do
+      files = SmallVictories::SiteFile.files_hash 'fixtures/liquid'
+      expect(files['settings']['title']).to eq "My Title\n"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smallvictories
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Michael Dijkstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -290,23 +304,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- _sv/_includes/_snippet.liquid
-- _sv/_javascripts/scripts.coffee
-- _sv/_javascripts/scripts.js
-- _sv/_layout.liquid
-- _sv/_sprite/.gitkeep
-- _sv/_sprite/blank.png
-- _sv/_stylesheets/bootstrap.scss
-- _sv/_stylesheets/extra.scss
-- _sv/_stylesheets/stylesheet.scss
-- _sv/application.css
-- _sv/application.js
-- _sv/index.html
-- _sv_config.yml
 - _sv_custom.css
 - _sv_custom.js
-- application.css
-- application.js
 - bin/sv
 - index.html
 - lib/sassc/compressor.rb
@@ -320,6 +319,8 @@ files:
 - lib/smallvictories/constants.rb
 - lib/smallvictories/deployer.rb
 - lib/smallvictories/logger.rb
+- lib/smallvictories/server.rb
+- lib/smallvictories/site_file.rb
 - lib/smallvictories/version.rb
 - lib/smallvictories/watcher.rb
 - smallvictories.gemspec
@@ -355,6 +356,8 @@ files:
 - spec/fixtures/invalid/_layout.liquid
 - spec/fixtures/invalid/_sass/stylesheet.scss
 - spec/fixtures/invalid/index.html
+- spec/fixtures/liquid/index.html
+- spec/fixtures/liquid/settings/title.txt
 - spec/fixtures/source/_includes/_snippet.liquid
 - spec/fixtures/source/_javascripts/scripts.coffee
 - spec/fixtures/source/_javascripts/scripts.js
@@ -368,6 +371,7 @@ files:
 - spec/fixtures/source/application.css
 - spec/fixtures/source/application.js
 - spec/fixtures/source/index.html
+- spec/site_file_spec.rb
 - spec/spec_helper.rb
 - src/Guardfile
 - src/config.yml
@@ -397,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A command line utility for building websites.
@@ -434,6 +438,8 @@ test_files:
 - spec/fixtures/invalid/_layout.liquid
 - spec/fixtures/invalid/_sass/stylesheet.scss
 - spec/fixtures/invalid/index.html
+- spec/fixtures/liquid/index.html
+- spec/fixtures/liquid/settings/title.txt
 - spec/fixtures/source/_includes/_snippet.liquid
 - spec/fixtures/source/_javascripts/scripts.coffee
 - spec/fixtures/source/_javascripts/scripts.js
@@ -447,4 +453,5 @@ test_files:
 - spec/fixtures/source/application.css
 - spec/fixtures/source/application.js
 - spec/fixtures/source/index.html
+- spec/site_file_spec.rb
 - spec/spec_helper.rb

data/_sv/_includes/_snippet.liquid

@@ -1 +0,0 @@
-<p>My snippet</p>

data/_sv/_javascripts/scripts.coffee

@@ -1 +0,0 @@
-alert 'hi'

data/_sv/_javascripts/scripts.js

@@ -1 +0,0 @@
-console.log('hi');

data/_sv/_layout.liquid

@@ -1,3 +0,0 @@
-<html>
-{{content_for_layout}}
-</html>

data/_sv/_stylesheets/bootstrap.scss

@@ -1,4 +0,0 @@
-.bootstrap {
-  color: black;
-  box-sizing: content-box;
-}

data/_sv/_stylesheets/extra.scss

@@ -1,3 +0,0 @@
-html {
-  background: white;
-}

data/_sv/_stylesheets/stylesheet.scss

@@ -1,5 +0,0 @@
-body {
-  div {
-    background: red;
-  }
-}

data/_sv/application.css

@@ -1,19 +0,0 @@
-/* Small Victories Sprockets File
- *
- * Any CSS and SCSS file within this directory and your sass directory
- * can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- * Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
- * about supported directives.
- *
- *= require_tree .
- */
-
-p {
-  font-size: 30px;
-}

data/_sv/application.js

@@ -1,14 +0,0 @@
-// Small Victories Sprockets File
-//
-// For more details see
-// https://github.com/rails/sprockets#the-directive-processor
-// Any JavaScript/Coffee file within this directory
-// can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/_sv/index.html

@@ -1,2 +0,0 @@
-<h1>Index</h1>
-{% include 'snippet' %}

data/_sv_config.yml

@@ -1,16 +0,0 @@
-source: '/my-source-folder/'
-destination: 'my-site-folder/'
-deploy: '../my-deploy-folder'
-source_stylesheet: 'my-stylesheet.css'
-source_javascript: 'my-javascript.js'
-source_sprite: 'my-sprite'
-destination_stylesheet: 'stylesheet.css'
-destination_javascript: 'javascript.js'
-destination_sprite_file: 'my-sprite.png'
-destination_sprite_style: 'my-sprite.css'
-layout: '_my-template.liquid'
-includes: 'snippets'
-compile_html: false
-compile_js: false
-compile_css: false
-compile_sprite: false

data/application.css

@@ -1,4 +0,0 @@
-html {
-  background: red;
-  box-sizing: content-box;
-}

data/application.js

@@ -1 +0,0 @@
-(function(){alert("hi")}).call(this),console.log("hi");