octopress-ink 1.0.0.rc.38 → 1.0.0.rc.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 182dc18c793481cbefe86627bfe01d7a1e182175
-  data.tar.gz: c983262245e178fc5a476a25651ce19fd3614af9
+  metadata.gz: 2fefc72653c604f6032907e28920a720c14dac6d
+  data.tar.gz: 6948d4deaf142cbf2da3cf6d2aa3b9dce5cc01da
 SHA512:
-  metadata.gz: bb78fc5a2eb6762ae371313df89f659f9571848853cf9798b01c84bb1fb737ac52d3319d4430b8fbb962b1459ac15ac8c3d3a13e20d1920c63e010f106502787
-  data.tar.gz: d4b46f2bf3f6413758487e77bf07a090c65ea02a3991d3d42991773de4243f9d0b79d4b03e09ec14be891ec904d2f301da7500032f854f98afd5a72ea6509701
+  metadata.gz: 2dd6f7519fefc7dbde61d38c1278676d573a8b687da792b9055fd0b0e0d18473529e8b2c26e31ca35ed461cf1463621af3c82380545883d51aaada8e02421ab6
+  data.tar.gz: c0c6f57fc24b1d99b4f33cc9696df24f8852b3259371f4859f93eb8453577d078ecf91a34ea4271c65ac9c5e3679c9d0058cddbc090c94c55c38fd55176ede64

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.0.0 RC39 - 2015-02-07
+- New: Octopress Page assets have methods for accessing the plugin and asset that generated them.
+
 ### 1.0.0 RC38 - 2015-02-05
 - Fix: Plugin asset paths were improperly generated.
 

data/lib/octopress-ink.rb

@@ -16,6 +16,7 @@ require 'octopress-ink/cache'
 module Octopress
   module Ink
 
+    autoload :Utils,                'octopress-ink/utils'
     autoload :Assets,               'octopress-ink/assets'
     autoload :Convertible,          'octopress-ink/jekyll/convertible'
     autoload :Page,                 'octopress-ink/jekyll/page'
@@ -42,8 +43,8 @@ module Octopress
       version << "Octopress Ink v#{Octopress::Ink::VERSION}"
     end
 
-    def self.payload
-      config = Plugins.config
+    def self.payload(lang=nil)
+      config = Plugins.config(lang)
       ink_payload = {
         'plugins'   => config['plugins'],
         'theme'     => config['theme'],
@@ -145,7 +146,6 @@ module Octopress
 
       path = copy_path(name, options)
 
-
       if p = plugin(name)
         copied = p.copy_asset_files(path, options)
         if !copied.empty?

data/lib/octopress-ink/assets.rb

@@ -3,6 +3,7 @@ module Octopress
     module Assets
       autoload :Asset,                'octopress-ink/assets/asset'
       autoload :Config,               'octopress-ink/assets/config'
+      autoload :LangConfig,           'octopress-ink/assets/lang_config'
       autoload :FileAsset,            'octopress-ink/assets/file'
       autoload :PageAsset,            'octopress-ink/assets/page'
       autoload :Javascript,           'octopress-ink/assets/javascript'

data/lib/octopress-ink/assets/asset.rb

@@ -20,11 +20,11 @@ module Octopress
         def info
           message = filename.ljust(35)
           if disabled?
-            message += "disabled"
+            message += "-disabled-"
           elsif self.respond_to?(:url_info)
             message += url_info
           elsif path.to_s != plugin_path
-            shortpath = File.join(Plugins.custom_dir, dir)
+            shortpath = File.join(Plugins.custom_dir.sub(Dir.pwd,''), dir).sub('/','')
             message += "from: #{shortpath}/#{filename}"
           end
           "  - #{message}"
@@ -81,6 +81,7 @@ module Octopress
           else
             target_dir = user_dir
           end
+
           FileUtils.mkdir_p File.join(target_dir, File.dirname(file))
           FileUtils.cp plugin_path, File.join(target_dir, file)
           target_dir.sub!(Dir.pwd+'/', '')

data/lib/octopress-ink/assets/config.rb

@@ -15,9 +15,9 @@ module Octopress
         # If config plugin config file exists, return contents for list command
         def info
           if exists?(config = plugin_path)
-            File.open(config).read.gsub(/^/,'    ')
+            Ink::Utils.pretty_print_yaml(read)
           else
-            "  none"
+            "   none"
           end
         end
 

data/lib/octopress-ink/assets/lang_config.rb

@@ -0,0 +1,15 @@
+module Octopress
+  module Ink
+    module Assets
+      class LangConfig < Config
+        attr_reader :lang
+
+        def initialize(plugin, path, lang)
+          super(plugin, path)
+          @lang = lang
+        end
+      end
+    end
+  end
+end
+

data/lib/octopress-ink/assets/page.rb

@@ -59,8 +59,9 @@ module Octopress
 
         def info
           message = super
-          message.sub!(/#{filename}/, permalink_name.ljust(filename.size))
-          message.ljust(25) + page.permalink
+          name = permalink_name << page.ext
+          message.sub!(/#{filename}/, name.ljust(filename.size))
+          message.ljust(25) << (permalink || page.permalink || '')
         end
 
         def permalink

data/lib/octopress-ink/jekyll/page.rb

@@ -2,6 +2,7 @@ module Octopress
   module Ink
     class Page < Jekyll::Page
       include Ink::Convertible
+      attr_reader :asset, :plugin
 
       # Purpose: Configs can override a page's permalink
       #
@@ -12,6 +13,7 @@ module Octopress
       #
       def initialize(site, base, dir, name, asset)
         @asset = asset
+        @plugin = asset.plugin
         super(site, base, dir, name)
       end
 

data/lib/octopress-ink/plugin.rb

@@ -26,7 +26,7 @@ module Octopress
         @includes_dir      = 'includes'
         @javascripts_dir   = 'javascripts'
         @stylesheets_dir   = 'stylesheets'
-        @config_file       = 'config.yml'
+        @lang_configs      = []
         @layouts           = []
         @includes          = []
         @css               = []
@@ -43,7 +43,6 @@ module Octopress
       end
 
       def register
-
         unless @assets_path.nil?
           disable_assets
           add_assets
@@ -118,12 +117,68 @@ module Octopress
         @no_compress_js.reject(&:disabled?).compact
       end
 
+      def user_plugin_dir
+        File.join(Plugins.custom_dir, slug)
+      end
+
       # Plugin configuration
       #
       # returns: Hash of merged user and default config.yml files
       #
-      def config
-        @read_config ||= config_defaults.read
+      def config(lang=nil)
+        @config ||= configs.first.read
+        lang_config_hash[lang] || @config
+      end
+
+      # Language configurations
+      #
+      # returns: Hash of configs for files matching: conifg_[lang].yml
+      #
+      #   Example:
+      #   { 
+      #     'de' => { configs },
+      #     'fr' => { configs }
+      #   }
+      #
+      def lang_config_hash
+        @lang_config_hash ||= begin 
+          configs = {}
+
+          user_lang_configs.each do |lang, file|
+            configs[lang] = SafeYAML.load_file(file)
+          end
+
+          plugin_lang_configs.each do |lang, file|
+            # Add to lang
+            @lang_configs << Assets::LangConfig.new(self, File.basename(file), lang)
+            configs[lang] = @lang_configs.last.read
+          end
+
+          configs
+        end
+      end
+
+      def plugin_lang_configs
+        lang_config_files(@assets_path)
+      end
+
+      def user_lang_configs
+        files = lang_config_files(user_plugin_dir)
+        plugin_lang_configs.keys.each {|k| files.delete(k)}
+        files
+      end
+
+      def lang_config_files(dir)
+        configs = {}
+        if defined?(Octopress::Multilingual) && Octopress.site.config['lang']
+          files = Dir[File.join(dir, 'config_*.yml')]
+          files.each do |file|
+            # Determine the language from the filename pattern: conifg_[lang].yml
+            lang = File.basename(file, '.*').split('_').last
+            configs[lang] = file
+          end
+        end
+        configs
       end
 
       # Remove files from Jekyll since they'll be proccessed by Ink instead
@@ -158,11 +213,6 @@ module Octopress
         config['disable'] = disabled
       end
 
-      def config_defaults
-        @config ||= Assets::Config.new(self, @config_file)
-      end
-
-
       def can_disable
         [
           'pages',
@@ -180,18 +230,19 @@ module Octopress
 
       def assets
         {
-          'layouts'     => @layouts,
-          'includes'    => @includes,
-          'pages'       => @pages,
-          'sass'        => @sass,
-          'css'         => @css,
-          'js'          => @js,
-          'minjs'       => @no_compress_js,
-          'coffee'      => @coffee,
-          'images'      => @images,
-          'fonts'       => @fonts,
-          'files'       => @files,
-          'config-file' => [@config]
+          'layouts'      => @layouts,
+          'includes'     => @includes,
+          'pages'        => @pages,
+          'sass'         => @sass,
+          'css'          => @css,
+          'js'           => @js,
+          'minjs'        => @no_compress_js,
+          'coffee'       => @coffee,
+          'images'       => @images,
+          'fonts'        => @fonts,
+          'files'        => @files,
+          'config-file'  => @configs,
+          'lang-configs' => @lang_configs
         }
       end
 
@@ -206,14 +257,20 @@ module Octopress
           case name
           when 'pages'
             header = "pages:".ljust(36) + "urls"
-            message += asset_list(assets, header)
+            message << asset_list(assets, header)
           when 'config-file'
-            message += asset_list(assets, 'default configuration')
+            message << asset_list(assets, 'config')
+          when 'lang-configs'
+            lang_config_hash.keys.each do |lang|
+              message << " config_#{lang}:\n"
+              message << Ink::Utils.pretty_print_yaml(config(lang))
+              message << "\n"
+            end
           else
-            message += asset_list(assets, name)
+            message << asset_list(assets, name)
           end
 
-          message += "\n"
+          message << "\n"
         end
 
         message
@@ -222,7 +279,7 @@ module Octopress
       def asset_list(assets, heading)
         list = " #{heading}:\n"
         assets.each do |asset|
-          list += "#{asset.info}\n"
+          list << "#{asset.info.rstrip}\n"
         end
 
         list
@@ -233,7 +290,7 @@ module Octopress
         message += " (#{slug})"
         message += " - v#{@version}" if @version
         if @description && !@description.empty?
-          message = "#{message.ljust(30)} - #{@description}"
+          message = "#{message.ljust(30)}\n#{@description}"
         end
         message += "\n"
       end
@@ -322,6 +379,10 @@ module Octopress
         end
       end
 
+      def configs
+        @configs ||= [Assets::Config.new(self, 'config.yml')]
+      end
+
       def add_stylesheets
         find_assets(@stylesheets_dir).each do |asset|
           if File.extname(asset) =~ /s[ca]ss/

data/lib/octopress-ink/plugins.rb

@@ -83,22 +83,24 @@ module Octopress
         end
       end
 
-      def self.config
-        if @config
-          @config
-        else
-          @config            = {}
-          @config['plugins'] = {}
-          @config['theme']   = @theme.nil? ? {} : @theme.config
-
-          plugins.each do |p| 
-            unless p == @theme
-              @config['plugins'][p.slug] = p.config
-            end
-          end
+      def self.config(lang=nil)
+        @configs ||= {}
+        @configs[lang || 'default'] ||= get_config(lang)
+      end
+
+      def self.get_config(lang=nil)
+        config            = {}
+        config['plugins'] = {}
 
-          @config
+        plugins.each do |p|
+          if p == theme
+            config['theme'] = p.config(lang)
+          else
+            config['plugins'][p.slug] = p.config(lang)
+          end
         end
+
+        config
       end
 
       # Inclue partials from plugins

data/lib/octopress-ink/utils.rb

@@ -0,0 +1,21 @@
+require 'json'
+
+module Octopress
+  module Ink
+    module Utils
+      extend self
+
+      def pretty_print_yaml(yaml)
+        # Use json pretty_print, but make it look like yaml
+        #
+        JSON.pretty_generate(yaml)
+          .sub(/\A{\n/,'')           # remove leading {
+          .sub(/}\z/,'')           # remove trailing }
+          .gsub(/^/,' ')           # indent
+          .gsub(/"(.+?)":/,'\1:')  # remove quotes around keys
+          .gsub(/,$/,'')        # remove commas from end of lines
+          .gsub(/\w+: {\s+}\n/,'')  # remove keys with empty hashes
+      end
+    end
+  end
+end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.38"
+    VERSION = "1.0.0.rc.39"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.38
+  version: 1.0.0.rc.39
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: octopress-multilingual
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  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
@@ -173,6 +187,7 @@ files:
 - lib/octopress-ink/assets/config.rb
 - lib/octopress-ink/assets/file.rb
 - lib/octopress-ink/assets/javascript.rb
+- lib/octopress-ink/assets/lang_config.rb
 - lib/octopress-ink/assets/layout.rb
 - lib/octopress-ink/assets/page.rb
 - lib/octopress-ink/assets/sass.rb
@@ -198,6 +213,7 @@ files:
 - lib/octopress-ink/tags/javascript.rb
 - lib/octopress-ink/tags/set_lang.rb
 - lib/octopress-ink/tags/stylesheet.rb
+- lib/octopress-ink/utils.rb
 - lib/octopress-ink/version.rb
 homepage: https://github.com/octopress/ink
 licenses: