octopress 3.0.0.alpha2 → 3.0.0.alpha3

data/lib/octopress/js_assets_manager.rb

@@ -1,97 +0,0 @@
-require 'digest/md5'
-require 'stitch-rb'
-require 'uglifier'
-require 'coffee-script'
-
-module Octopress
-  class JSAssetsManager
-
-    attr_reader :config
-
-    def initialize
-      @js_assets_path = File.join(Octopress.root, "javascripts")
-
-      if Dir.exists? @js_assets_path
-        unless Octopress.configuration.has_key? :require_js
-          abort "No :require_js key in configuration. Cannot proceed.".red
-        end
-        unless Octopress.configuration[:require_js].has_key? :lib
-          abort "No :lib key in :require_js configuration. Cannot proceed.".red
-        end
-        unless Octopress.configuration[:require_js].has_key? :modules
-          abort "No :modules key in :require_js configuration. Cannot proceed.".red
-        end
-
-        @lib_config = Octopress.configuration[:require_js][:lib]
-        @lib_config = [@lib_config] unless @lib_config.kind_of?(Array)
-        modules_config = Octopress.configuration[:require_js][:modules]
-
-        # Read js dependencies from require_js.yml configuration
-        @lib = @lib_config.collect {|item| Dir.glob("#{@js_assets_path}/lib/#{item}") }
-        @lib.concat(Dir.glob("#{@js_assets_path}/lib/**/*")).flatten.uniq
-
-        @modules = modules_config.collect {|item| "#{@js_assets_path}/#{item}" }.flatten.uniq
-        @module_files = @modules.collect {|item| Dir[item+'/**/*'] }.flatten.uniq
-
-      else
-        @js_assets_path = false
-      end
-    end
-
-
-    def get_fingerprint
-      Digest::MD5.hexdigest(@module_files.concat(@lib).flatten.uniq.map! { |path| "#{File.mtime(path).to_i}" }.join + @lib_config.join)
-    end
-
-    def url
-      @js_assets_path ?  "/javascripts/build/" + filename : false
-    end
-
-    def filename
-      if @js_assets_path
-        Octopress.env == 'production' ?  "all-#{@fingerprint || get_fingerprint}.js" : "all.js"
-      else
-        false
-      end
-    end
-
-    def identical(file)
-      File.size?(file) && File.open(file) {|f| f.readline} =~ /#{@fingerprint}/
-    end
-
-    def compile
-      if @js_assets_path
-        @fingerprint = get_fingerprint
-
-        relative_dir = File.join(Octopress.configuration[:source], "javascripts/build")
-        dir = File.join(Octopress.root, relative_dir)
-
-        relative_file = File.join(relative_dir, filename)
-        file = File.join(dir, filename)
-
-        if identical(file)
-          "identical ".green + relative_file
-        else
-          write_msg = (File.exists?(file) ? "overwrite " : "   create ").green + relative_file
-          puts "compiling javascripts..."
-
-          js = Stitch::Package.new(:dependencies => @lib.flatten, :paths => @modules.flatten).compile
-          js = Uglifier.new.compile js if Octopress.env == 'production'
-          js = "/* Octopress fingerprint: #{@fingerprint} */\n" + js
-
-          FileUtils.rm_rf dir
-          FileUtils.mkdir_p dir
-          File.open(file, 'w') { |f| f.write js }
-
-          write_msg
-        end
-      else
-        '' # return no message no javascripts to compile 
-      end
-    rescue Exception => e
-      Octopress.logger.fatal "failed to compile javascripts".red
-      raise e
-    end
-  end
-end
-

data/lib/octopress/liquid_helpers/conditional.rb

@@ -1,36 +0,0 @@
-module Octopress
-  module Conditional
-    EXPRESSION = /(.+?)\s+(unless|if)\s+(.+)/i
-    TERNARY = /(.*?)\(\s*(.+?)\s+\?\s+(.+?)\s+:\s+(.+?)\s*\)(.+?)?/
-
-    def strip_expression(markup, context = false)
-      if markup =~ TERNARY
-        result = evaluate_ternary($2, $3, $4, context)
-        markup = "#{$1} #{result} #{$5}"
-      end
-      markup =~ EXPRESSION ? $1 : markup
-    end
-
-    def evaluate_ternary(expression, if_true, if_false, context)
-      evaluate('if', expression, context) ? if_true : if_false
-    end
-
-    def evaluate_expression(markup, context)
-      if markup =~ EXPRESSION
-        evaluate($2, $3, context)
-      else
-        true
-      end
-    end
-
-    def evaluate(type, expression, context)
-      tag = if type == 'if'
-        Liquid::If.new('if', expression, ["true","{% endif %}"])
-      elsif type == 'unless'
-        Liquid::Unless.new('unless', expression, ["true","{% endunless %}"])
-      end
-      result = tag.render(context) != ''
-    end
-  end
-end
-

data/lib/octopress/liquid_helpers/config.rb

@@ -1,58 +0,0 @@
-module Octopress
-  module ConfigHelper
-
-    # Static: Reads a configuration.
-    #
-    # context   - The current site configuration passed from a Liquid tag's context.
-    # key       - The configuration key, eg, url, or twitter.username
-    #
-    # Returns a the value for the key, eg: site.key
-
-    def config(context, key)
-      config = context.registers[:site].config
-      key.split('.').map { |k| config = config[k] }.last
-    end
-
-    # Static: Reads a configuration.
-    #
-    # context   - The current site configuration passed from a Liquid tag's context.
-    # key       - The configuration key, eg, url, or twitter.username
-    # tag       - The name of tag to generate, defaults to 'div'.
-    # classname - String for classname(s), default to dasherized key, eg foo.bar is foo-bar.
-    #
-    # Returns a tag with config values stored as data attributes.
-
-    def config_tag(context, key, tag='div', classname=nil)
-      value       = config(context, key)
-      key         = key.split('.').last
-      classname ||= key.sub(/_/, '-').sub(/\./, '-')
-      
-      "<#{tag} class='#{classname}' #{config_data(key, value)} ></#{tag}>"
-    end
-
-    # Static: Maps values to data attributes
-    #
-    # key   - A string used to create "data-#{key}" if values is not an object.
-    # value - A string or object used to populate values for data attributes.
-    #
-    # Returns a string of data attributes.
-
-    def config_data(key, value)
-      if value.respond_to? 'keys'
-        data = ''
-        value.each do |k,v|
-          data << unless v.nil?
-            v = v.join ',' if v.respond_to? 'join'
-            v = v.to_json if v.respond_to? 'keys'
-            " data-#{k.sub'_','-'}='#{v}'"
-          end
-        end
-        data
-      elsif value.respond_to? 'join'
-        " data-#{key}='#{value.join(',')}'"
-      else
-        " data-#{key}='#{value}'"
-      end
-    end
-  end
-end

data/lib/octopress/liquid_helpers/include.rb

@@ -1,33 +0,0 @@
-module Octopress
-  module IncludeHelper
-    include Conditional
-
-    def render_include(file, context)
-      tag = Jekyll::Tags::IncludeTag.new('', file, [])
-      tag.render(context)
-    end
-
-    def exists(file, context)
-      base = Pathname.new(context.registers[:site].source || 'source').expand_path
-      File.exists? File.join(base, "_includes", file)
-    end
-
-    def get_files(files, context)
-      files = files.split("||").map do |file|
-        file = file.strip
-        context[file].nil? ? file : context[file]
-      end
-    end
-
-    def get_include(files, context)
-      files = get_files(files, context)
-      files.each_with_index do |f, i|
-        if exists(f, context)
-          return f
-        elsif i == files.size - 1
-          return f == 'none' ? false : f
-        end
-      end
-    end
-  end
-end

data/lib/octopress/liquid_helpers/url.rb

@@ -1,29 +0,0 @@
-require "erb"
-
-module Octopress
-  module UrlHelpers
-    include ERB::Util
-
-    def page_url(context)
-      url = (context['post'] || context['page'])['url']
-      prepend_url(url, context['site']['url'])
-    end
-
-    def encode_url(input)
-      url_encode input
-    end
-    
-    # Prepend a local url with a file path
-    # remote urls and urls beginning with ! will be ignored
-    
-    def prepend_url(input, path='')
-      path += '/' unless path.match /\/$/
-      if input.match /^!/
-        input.gsub(/^(!)(.+)/, '\2')
-      else
-        input.gsub(/^(\/)?([^:]+?)$/, "#{path}"+'\2')
-      end
-    end
-
-  end
-end

data/lib/octopress/liquid_helpers/vars.rb

@@ -1,30 +0,0 @@
-module Octopress
-  module VarHelpers
-    VAR_SYNTAX = /(#{Liquid::VariableSignature}+)\s*(=|\+=)\s*(.*)\s*/o
-
-    def determine_value(vars, context)
-      vars.each do |var|
-        rendered = var.render(context)
-        return rendered unless rendered.nil?
-      end
-      nil
-    end
-
-    def get_value(vars, context)
-      vars = vars.strip.split("||").map do |v|
-        Liquid::Variable.new(v.strip)
-      end
-      value = determine_value(vars, context)
-      if value.nil?
-        var = vars.last.name
-        if var == 'nil'
-          nil
-        else
-          vars.last.name.gsub /^['"]?((?:.)+?)["']?$/, '\1'
-        end
-      else
-        value
-      end
-    end
-  end
-end

data/lib/octopress/plugin.rb

@@ -1,33 +0,0 @@
-module Octopress
-  class Plugin
-    def self.included(subclass)
-      @plugins ||= []
-      @plugins << subclass
-      Octopress.logger.debug "Registering Plugin: #{subclass}"
-    end
-
-    def self.init!(context)
-      @plugins.each do |plugin|
-        if plugin.tasks.size > 0
-          plugin.tasks.each do |task_file|
-            context.instance_eval do
-              load task_file
-            end
-          end
-        end
-      end
-    end
-
-    def self.root
-      self.const_get(:ROOT)
-    end
-
-    def self.name
-      self.to_s.underscore
-    end
-
-    def self.tasks
-      Dir[File.join(self.root, 'lib', self.name, 'rake', '*.rake')]
-    end
-  end
-end

data/lib/octopress/rake.rb

@@ -1,16 +0,0 @@
-$:.unshift File.dirname(__FILE__)
-
-require 'helpers/titlecase'
-
-module Octopress
-  class Rake
-    def self.init!(ctx)
-      ctx.instance_eval do
-        tasks_path = File.join(Octopress.lib_root, "rake", "*.rake")
-        Dir[tasks_path].each do |f|
-          load f
-        end
-      end
-    end
-  end
-end

data/lib/octopress/scaffold/.gitignore

@@ -1,18 +0,0 @@
-.bundle
-.DS_Store
-*.sw[mnop]
-*~
-/.sass-cache
-/.gist-cache
-/.pygments-cache
-/_deploy
-/public
-/source/_stash
-/source/stylesheets/site.css
-/source/javascripts/build
-/source/images/icon-*.png
-/vendor
-/lib/vendor
-node_modules
-/_config.yml
-/config/deploy.yml

data/lib/octopress/scaffold/site/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "octopress", "3.0.0.alpha1"

data/lib/octopress/scaffold/site/config.ru

@@ -1,25 +0,0 @@
-require 'bundler/setup'
-require 'sinatra/base'
-
-# The project root directory
-$root = ::File.dirname(__FILE__)
-
-class SinatraStaticServer < Sinatra::Base
-
-  get(/.+/) do
-    send_sinatra_file(request.path) {404}
-  end
-
-  not_found do
-    send_file(File.join(File.dirname(__FILE__), 'public', '404.html'), {:status => 404})
-  end
-
-  def send_sinatra_file(path, &missing_file_block)
-    file_path = File.join(File.dirname(__FILE__), 'public',  path)
-    file_path = File.join(file_path, 'index.html') unless file_path =~ /\.[a-z]+$/i
-    File.exist?(file_path) ? send_file(file_path) : missing_file_block.call
-  end
-
-end
-
-run SinatraStaticServer

data/lib/octopress/scaffold/site/config/compass.rb

@@ -1,27 +0,0 @@
-$:.unshift File.expand_path("../lib", File.dirname(__FILE__)) # For use/testing when no gem is installed
-require "octopress"
-require 'sass-globbing'
-
-config = Octopress.configuration
-
-project_path = Octopress.root
-project_type = :stand_alone
-
-# Publishing paths
-compass_http_path           = config[:destination].gsub('public', '')
-http_path                   = compass_http_path
-http_images_path            = "#{http_path}/images"
-http_generated_images_path  = "#{http_path}/images"
-http_fonts_path             = "#{http_path}/fonts"
-css_dir                     = "#{Octopress.root}/#{config[:destination]}/stylesheets"
-
-# Local development paths
-sass_dir                    = "stylesheets"
-images_dir                  = "#{config[:source]}/images"
-fonts_dir                   = "#{config[:source]}/fonts"
-generated_images_dir        = "#{config[:source]}/images"
-
-unless Octopress.env == 'development'
-  line_comments             = false
-  output_style              = :compressed
-end

data/lib/octopress/scaffold/site/config/rack.rb

@@ -1,25 +0,0 @@
-require 'bundler/setup'
-require 'sinatra/base'
-
-# The project root directory
-$root = ::File.dirname(__FILE__)
-
-class SinatraStaticServer < Sinatra::Base
-
-  get(/.+/) do
-    send_sinatra_file(request.path) {404}
-  end
-
-  not_found do
-    send_file(File.join(File.dirname(__FILE__), 'public', '404.html'), {:status => 404})
-  end
-
-  def send_sinatra_file(path, &missing_file_block)
-    file_path = File.join(File.dirname(__FILE__), 'public',  path)
-    file_path = File.join(file_path, 'index.html') unless file_path =~ /\.[a-z]+$/i
-    File.exist?(file_path) ? send_file(file_path) : missing_file_block.call
-  end
-
-end
-
-run SinatraStaticServer