octopress-ink 1.0.0.alpha.44 → 1.0.0.alpha.45

data/lib/octopress-ink/plugins.rb

@@ -1,9 +1,12 @@
 module Octopress
   module Ink
     module Plugins
+
+      @static_files = []
       @plugins = []
       @user_plugins = []
-      @site = nil
+      @css_tags = []
+      @js_tags = []
 
       def self.theme
         @theme
@@ -13,6 +16,12 @@ module Octopress
         plugins.each(&block)
       end
 
+      # Store static files to be written
+      #
+      def self.static_files
+        @static_files
+      end
+
       def self.size
         plugins.size
       end
@@ -33,18 +42,14 @@ module Octopress
         [@theme].concat(@plugins).concat(@user_plugins).compact
       end
 
-      def self.register(site)
-        unless @site
-          @site = site
-          plugins.each do |p| 
-            p.register
-          end
+      def self.register
+        plugins.each do |p| 
+          p.register
         end
       end
 
       def self.add_files
         add_assets(%w{images pages files fonts docs})
-        plugin('octopress-asset-pipeline').register_assets
         add_stylesheets
         add_javascripts
       end
@@ -55,8 +60,12 @@ module Octopress
         end
       end
 
-      def self.site
-        @site
+      def self.add_css_tag(tag)
+        @css_tags << tag
+      end
+
+      def self.add_js_tag(tag)
+        @js_tags << tag
       end
 
       def self.register_plugin(plugin, options=nil)
@@ -109,187 +118,54 @@ module Octopress
         plugin_docs
       end
 
+      # Inclue partials from plugins
+      #
       def self.include(name, file)
         p = plugin(name)
         p.include(file)
       end
 
+      # Read plugin dir from site configs
+      #
       def self.custom_dir
-        site.config['plugins']
-      end
-
-      def self.fingerprint(paths)
-        paths = [paths] unless paths.is_a? Array
-        Digest::MD5.hexdigest(paths.clone.map! { |path| "#{File.mtime(path).to_i}" }.join)
-      end
-      
-      def self.combined_stylesheet_path(media)
-        File.join('stylesheets', "#{media}-#{@combined_stylesheets[media][:fingerprint]}.css")
-      end
-
-      def self.combined_javascript_path
-        print = ''
-
-        if @js_fingerprint
-          print = "-" + @js_fingerprint
-        end
-
-        File.join('javascripts', "all#{print}.js")
-      end
-
-      def self.write_files(source, dest)
-        @site.static_files << StaticFileContent.new(source, dest)
-      end
-
-      def self.compile_sass_file(path, options)
-        ::Sass.compile_file(path, options)
-      end
-
-      def self.compile_sass(contents, options)
-        ::Sass.compile(contents, options)
-      end
-
-      def self.sass_options
-        config = @site.config
-        
-        defaults = {
-          'style'        => :compressed,
-          'trace'        => false,
-          'line_numbers' => false
-        }
-
-        options = defaults.deep_merge(config['sass'] || {}).symbolize_keys
-        options = options.each{ |k,v| options[k] = v.to_sym if v.is_a? String }
-        options
-      end
-
-      def self.write_combined_stylesheet
-        css = combine_stylesheets
-        css.keys.each do |media|
-          contents = compile_sass(css[media][:contents], sass_options)
-          write_files(contents, combined_stylesheet_path(media)) 
-        end
-      end
-
-      def self.write_combined_javascript
-        js = combine_javascripts
-        write_files(js, combined_javascript_path) unless js == ''
-      end
-
-      def self.combine_stylesheets
-        unless @combined_stylesheets
-          css = {}
-          paths = {}
-          plugins.each do |plugin|
-            if plugin.type == 'theme'
-              plugin_header = "/* Theme: #{plugin.name} */\n"
-            else
-              plugin_header = "/* Plugin: #{plugin.name} */\n"
-            end
-            stylesheets = plugin.stylesheets
-            stylesheets.each do |file|
-              css[file.media] ||= {}
-              css[file.media][:contents] ||= ''
-              css[file.media][:contents] << plugin_header
-              css[file.media][:paths] ||= []
-              
-              # Add Sass files
-              if file.respond_to? :compile
-                css[file.media][:contents].concat file.compile
-              else
-                css[file.media][:contents].concat file.path.read.strip
-              end
-              css[file.media][:paths] << file.path
-              plugin_header = ''
-            end
-          end
-
-          css.keys.each do |media|
-            css[media][:fingerprint] = fingerprint(css[media][:paths])
-          end
-          @combined_stylesheets = css
-        end
-        @combined_stylesheets
-      end
-
-      def self.combine_javascripts
-        unless @combined_javascripts
-          js = ''
-          plugins.each do |plugin| 
-            paths = plugin.javascript_paths
-            @js_fingerprint = fingerprint(paths)
-            paths.each do |file|
-              js.concat Pathname.new(file).read
-            end
-          end
-          @combined_javascripts = js
-        end
-        @combined_javascripts
-      end
-
-      def self.combined_stylesheet_tag
-        tags = ''
-        combine_stylesheets.keys.each do |media|
-          tags.concat "<link href='#{Filters.expand_url(combined_stylesheet_path(media))}' media='#{media}' rel='stylesheet' type='text/css'>"
-        end
-        tags
-      end
-
-      def self.combined_javascript_tag
-        unless combine_javascripts == ''
-          "<script src='#{Filters.expand_url(combined_javascript_path)}'></script>"
-        end
-      end
-
-      def self.stylesheet_tags
-        if Ink.config['concat_css']
-          combined_stylesheet_tag
-        else
-          css = []
-          plugins.each do |plugin| 
-            css.concat plugin.stylesheet_tags
-            css.concat plugin.sass_tags
-          end
-          css
-        end
-      end
-
-      def self.javascript_tags
-        if Ink.config['concat_js']
-          combined_javascript_tag
-        else
-          js = []
-          plugins.each do |plugin| 
-            js.concat plugin.javascript_tags
-          end
-          js
-        end
+        Ink.site.config['plugins']
       end
 
       # Copy/Generate Stylesheets
       #
       def self.add_stylesheets
-       
-        if Ink.config['concat_css']
-          write_combined_stylesheet
+        if Ink.config['combine_css']
+          PluginAssetPipeline.write_combined_stylesheet
         else
           add_assets(%w{css sass})
         end
       end
-
+      
       # Copy/Generate Javascripts
       #
       def self.add_javascripts
-
-        if Ink.config['concat_js']
-          write_combined_javascript
+        if Ink.config['combine_js']
+          PluginAssetPipeline.write_combined_javascript
         else
-          add_assets(['javascripts'])
+          add_assets(%w{js coffee})
         end
+      end
 
+      def self.css_tags
+        if Ink.config['combine_css']
+          PluginAssetPipeline.combined_stylesheet_tag
+        else
+          @css_tags.join('')
+        end
       end
 
+      def self.js_tags
+        if Ink.config['combine_js']
+          PluginAssetPipeline.combined_javascript_tag
+        else
+          @js_tags.join('')
+        end
+      end
     end
   end
 end
-

data/lib/octopress-ink/tags/javascript.rb

@@ -3,7 +3,7 @@ module Octopress
     module Tags
       class JavascriptTag < Liquid::Tag
         def render(context)
-          Plugins.javascript_tags
+          Plugins.js_tags
         end
       end
     end

data/lib/octopress-ink/tags/render.rb

@@ -25,7 +25,7 @@ module Octopress
           content = read(markup, context)
 
           if content =~ /\A-{3}(.+[^\A])-{3}\n(.+)/m
-            local_vars = YAML.safe_load($1.strip)
+            local_vars = SafeYAML.load($1.strip)
             content = $2.strip
           end
 
@@ -36,7 +36,9 @@ module Octopress
           partial = Liquid::Template.parse(content)
           content = context.stack {
             context['include'] = include_tag.parse_params(context)
-            context['page'] = context['page'].deep_merge(local_vars) if local_vars
+            if local_vars
+              context['page'] = Jekyll::Utils.deep_merge_hashes(context['page'], local_vars)
+            end
             partial.render!(context)
           }.strip
 

data/lib/octopress-ink/tags/stylesheet.rb

@@ -3,7 +3,7 @@ module Octopress
     module Tags
       class StylesheetTag < Liquid::Tag
         def render(context)
-          Plugins.stylesheet_tags
+          Plugins.css_tags
         end
       end
     end

data/lib/octopress-ink/utils.rb

@@ -0,0 +1,42 @@
+module Octopress
+  module Utils
+
+    # Smart capitalization for titles
+    #
+    def self.titlecase(input)
+      small_words = %w(a an and as at but by en for if in of on or the to v v. via vs vs.)
+
+      x = input.split(" ").map do |word|
+        # note: word could contain non-word characters!
+        # downcase all small_words, capitalize the rest
+        small_words.include?(word.gsub(/\W/, "").downcase) ? word.downcase! : smart_capitalize!(word)
+        word
+      end
+      # capitalize first and last words
+      smart_capitalize!(x.first)
+      smart_capitalize!(x.last)
+      # small words are capitalized after colon, period, exclamation mark, question mark
+      x.join(" ").gsub(/(:|\.|!|\?)\s?(\W*#{small_words.join("|")}\W*)\s/) { "#{$1} #{smart_capitalize($2)} " }
+    end
+
+    def self.titlecase!(input)
+      input.replace(titlecase(input))
+    end
+
+    def self.smart_capitalize(input)
+      target = input.dup
+      # ignore any leading crazy characters and capitalize the first real character
+      if target =~ /^['"\(\[']*([a-z])/
+        i = input.index($1)
+        x = target[i,target.length]
+        # word with capitals and periods mid-word are left alone
+        target[i,1] = target[i,1].upcase unless x =~ /[A-Z]/ or x =~ /\.\w+/
+      end
+      target
+    end
+    
+    def self.smart_capitalize!(input)
+      input.replace(smart_capitalize(input))
+    end
+  end
+end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.44"
+    VERSION = "1.0.0.alpha.45"
   end
 end

data/lib/octopress-ink.rb

@@ -1,12 +1,14 @@
 require 'jekyll'
 require 'sass'
+require 'autoprefixer-rails'
 require 'digest/md5'
 
 require 'octopress-ink/version'
+
+require 'octopress-ink/utils'
 require 'octopress-ink/generators/plugin_assets'
 require 'octopress-ink/jekyll/hooks'
 require 'octopress-ink/version'
-require 'octopress-ink/helpers/titlecase'
 
 module Octopress
   module Ink
@@ -20,6 +22,7 @@ module Octopress
     autoload :StaticFileContent,    'octopress-ink/jekyll/static_file_content'
     autoload :Plugins,              'octopress-ink/plugins'
     autoload :Plugin,               'octopress-ink/plugin'
+    autoload :PluginAssetPipeline,  'octopress-ink/plugin_asset_pipeline'
     autoload :Tags,                 'octopress-ink/tags'
 
     if defined? Octopress::Command
@@ -27,6 +30,14 @@ module Octopress
       require 'octopress-ink/commands'
     end
 
+    def self.version
+      version = "Jekyll v#{Jekyll::VERSION}, "
+      if defined? Octopress::VERSION
+        version << "Octopress v#{Octopress::VERSION} "
+      end
+      version << "Octopress Ink v#{Octopress::Ink::VERSION}"
+    end
+
     # Register a new plugin
     # 
     # plugin - A subclass of Plugin
@@ -39,28 +50,41 @@ module Octopress
     # 
     # options - A hash of configuration options.
     #
-    def self.new_plugin(options)
+    def self.add_plugin(options={})
       Plugins.register_plugin Plugin, options
     end
 
-    def self.version
-      version = "Jekyll v#{Jekyll::VERSION}, "
-      if defined? Octopress::VERSION
-        version << "Octopress v#{Octopress::VERSION} "
-      end
-      version << "Octopress Ink v#{Octopress::Ink::VERSION}"
-    end
-
     def self.config
-      Configuration.config
+      @config ||= Configuration.config
     end
 
     def self.site(options={})
+      @site ||= init_site(options)
+    end
+
+    def self.site=(site)
+      @site = site
+    end
+
+    def self.payload(payload={})
+      config = Octopress::Ink::Plugins.config
+      payload['plugins']   = config['plugins']
+      payload['theme']     = config['theme']
+      payload['octopress'] = {}
+      payload['octopress']['version'] = Octopress::Ink.version
+      if Octopress::Ink.config['docs_mode']
+        payload['doc_pages'] = Octopress::Ink::Plugins.doc_pages
+      end
+
+      payload
+    end
+
+    def self.init_site(options)
       log_level = Jekyll.logger.log_level
-      Jekyll.logger.log_level = Jekyll::Stevenson::ERROR
-      @site ||= Jekyll::Site.new(Jekyll.configuration(options))
+      Jekyll.logger.log_level = :error
+      site = Jekyll::Site.new(Jekyll.configuration(options))
       Jekyll.logger.log_level = log_level
-      @site
+      site
     end
 
     def self.plugins
@@ -85,13 +109,14 @@ module Octopress
     #
     #
     def self.list(options={})
-      Plugins.register site(options)
+      site(options)
+      Plugins.register
       options = {'minimal'=>true} if options.empty?
       message = "Octopress Ink - v#{VERSION}\n"
 
       if plugins.size > 0
         plugins.each do |plugin|
-          message += plugin.info(options)
+          message += plugin.list(options)
         end
       else
         message += "You have no plugins installed."
@@ -99,25 +124,27 @@ module Octopress
       puts message
     end
 
-    def self.plugin_info(name, options)
-      Plugins.register site(options)
+    def self.plugin_list(name, options)
+      site(options)
+      Plugins.register
       options.delete('config')
       if p = plugin(name)
-        puts p.info(options)
+        puts p.list(options)
       else
         not_found(name)
       end
     end
 
     def self.copy_plugin_assets(name, options)
-      Plugins.register site(options)
+      site(options)
+      Plugins.register
       if path = options.delete('path')
-        full_path = File.join(Plugins.site.source, path)
+        full_path = File.join(Ink.site.source, path)
         if !Dir["#{full_path}/*"].empty? && options['force'].nil?
           abort "Error: directory #{path} is not empty. Use --force to overwrite files."
         end
       else
-        full_path = File.join(Plugins.site.source, Plugins.custom_dir, name)
+        full_path = File.join(Ink.site.source, Plugins.custom_dir, name)
       end
       if p = plugin(name)
         copied = p.copy_asset_files(full_path, options)
@@ -131,13 +158,9 @@ module Octopress
       end
     end
 
-    def self.not_found(plugin)
-      puts "Plugin '#{plugin}' not found."
-      list_plugins
-    end
-
     def self.list_plugins(options={})
-      Plugins.register site(options)
+      site(options)
+      Plugins.register
       puts "\nCurrently installed plugins:"
       if plugins.size > 0
         plugins.each { |plugin| puts plugin.name }
@@ -150,14 +173,31 @@ module Octopress
       File.expand_path(File.join(File.dirname(__FILE__), '../', *subdirs))
     end
 
+    # Makes it easy for Ink plugins to copy README and CHANGELOG
+    # files to doc folder to be used as a documentation asset file
+    # 
+    # Usage: In rakefile require 'octopress-ink'
+    #        then add task calling Octopress::Ink.copy_doc for each file
+    #
     def self.copy_doc(source, dest, permalink=nil)
       contents = File.open(source).read
+
+      # Convert H1 to title and add permalink in YAML front-matter
+      #
       contents.sub!(/^# (.*)$/, "#{doc_yaml('\1', permalink).strip}")
+
       FileUtils.mkdir_p File.dirname(dest)
       File.open(dest, 'w') {|f| f.write(contents) }
       puts "Updated #{dest} from #{source}"
     end
 
+    private
+
+    def self.not_found(plugin)
+      puts "Plugin '#{plugin}' not found."
+      list_plugins
+    end
+
     def self.doc_yaml(title, permalink)
       yaml  = "---\n"
       yaml += "title: \"#{title.strip}\"\n"
@@ -169,15 +209,14 @@ end
 
 Liquid::Template.register_filter Octopress::Ink::Filters
 
-
 Liquid::Template.register_tag('include', Octopress::Ink::Tags::IncludeTag)
 Liquid::Template.register_tag('assign', Octopress::Ink::Tags::AssignTag)
 Liquid::Template.register_tag('capture', Octopress::Ink::Tags::CaptureTag)
 Liquid::Template.register_tag('return', Octopress::Ink::Tags::ReturnTag)
 Liquid::Template.register_tag('filter', Octopress::Ink::Tags::FilterTag)
 Liquid::Template.register_tag('render', Octopress::Ink::Tags::RenderTag)
-Liquid::Template.register_tag('octopress_js', Octopress::Ink::Tags::JavascriptTag)
-Liquid::Template.register_tag('octopress_css', Octopress::Ink::Tags::StylesheetTag)
+Liquid::Template.register_tag('css_asset_tag', Octopress::Ink::Tags::JavascriptTag)
+Liquid::Template.register_tag('js_asset_tag', Octopress::Ink::Tags::StylesheetTag)
 Liquid::Template.register_tag('content_for', Octopress::Ink::Tags::ContentForTag)
 Liquid::Template.register_tag('yield', Octopress::Ink::Tags::YieldTag)
 Liquid::Template.register_tag('wrap', Octopress::Ink::Tags::WrapTag)
@@ -186,8 +225,5 @@ Liquid::Template.register_tag('_', Octopress::Ink::Tags::LineCommentTag)
 Liquid::Template.register_tag('doc_url', Octopress::Ink::Tags::DocUrlTag)
 
 require 'octopress-ink/plugins/ink'
-require 'octopress-ink/plugins/asset_pipeline'
 
 Octopress::Ink.register_plugin(Octopress::Ink::InkPlugin)
-Octopress::Ink.register_plugin(Octopress::Ink::AssetPipelinePlugin)
-

data/octopress-ink.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "jekyll", "~> 1.5", ">= 1.5.0"
-  spec.add_runtime_dependency "sass", "~> 3.3.0"
+  spec.add_runtime_dependency "jekyll", "~> 2.0"
+  spec.add_runtime_dependency "autoprefixer-rails", "~> 1.1", ">= 1.1.20140403"
 
   spec.add_development_dependency "octopress"
   spec.add_development_dependency "bundler", "~> 1.3"

data/test/_combine_false.yml

@@ -0,0 +1,4 @@
+combine_css: false
+combine_js: false
+compress_css: false
+compress_js: false

data/test/_config.yml

@@ -1,6 +1,6 @@
 name: Your New Jekyll Site
 markdown: redcarpet
-pygments: true
+highlighter: pygments
 source: source
 destination: site
 include_test: foo.html

data/test/combine_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css

@@ -0,0 +1,15 @@
+/* Theme: Classic Theme */
+body {
+  margin: 2px;
+  padding: 2px; }
+
+.main {
+  color: #444; }
+
+body {
+  background: black; }
+
+/* Plugin: Awesome Sauce */
+.plugin-widget {
+  background: red;
+  color: #fff; }

data/test/{sass_expanded → combine_css}/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css

@@ -1,10 +1,8 @@
 /* Theme: Classic Theme */
 * {
   background: none;
-  color: #000;
-}
+  color: #000; }
 
 /* Plugin: Awesome Sauce */
 article a:after {
-  content: attr(href);
-}
+  content: attr(href); }

data/test/combine_js/javascripts/all-d41d8cd98f00b204e9800998ecf8427e.js

@@ -0,0 +1,7 @@
+/* Theme: Classic Theme */
+console.log('bar')
+console.log('omg')
+(function() {
+  console.log('dang');
+
+}).call(this);

data/test/combine_js_false/javascripts/test.js

@@ -0,0 +1,10 @@
+(function() {
+  var num, _i, _len, _ref;
+
+  _ref = [1, 2, 3];
+  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+    num = _ref[_i];
+    console.log(num);
+  }
+
+}).call(this);