octopress-ink 1.0.0.rc.18 → 1.0.0.rc.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d90edae371a19ba3eae21838264af5a68d4f3ed
-  data.tar.gz: 370c6b18cb9c0237726b3cd1d5c581521990ba40
+  metadata.gz: 7aa2d2440952a5f6b283baf69eb97ad02476a89d
+  data.tar.gz: 4ec408b10ddb22ff6fad321724109f0f93e5e855
 SHA512:
-  metadata.gz: efc282ec1c33f693d3f32fbeaa384c10da418f42bff54eb4261e5655d18ebadbb809567d74a17f6be86a751b423deb4a48d8a4eb465f87a69fff80a9bf52cf74
-  data.tar.gz: fba7caea4927c363bff40f2d6055f2a15ba6cf9a350730bda18cab451351000de3d0ca6a73802e91ce25e092c3ddd11f349e9bc2f5b7601ebe052eeadb9e2fce
+  metadata.gz: e7c73835a88896db10a813a3d44fae35c464ab0ac5e501e7bd076c81b25d47212a879f89ab735f5e357f606596439b20c421c4e7ddd7603d87058f5e5f8924a0
+  data.tar.gz: d6162bf2dc6319d26329bcbd63287e21475bd87b39b25f578edf38c6e776e92fd37b91fe70bd4c2face3a88253b78272fbcbbdf1130b45333145e8c86d1bc6bd

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC19 - 2014-12-09
+
+- Fixes to be compatible with the latest versions of Octopress and Jekyll.
+
 ### 1.0.0 RC18 - 2014-10-07
 
 - Improved integration with octopress-docs for displaying plugin documentation.

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

@@ -16,7 +16,7 @@ module Octopress
             dir = plugin_dir
           end
 
-          Octopress.site.layouts[name] = Jekyll::Layout.new(Octopress.site, dir, file)
+          Octopress.site.layouts[name] = Ink::Layout.new(Octopress.site, dir, file)
         end
 
         def name

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

@@ -40,6 +40,7 @@ module Octopress
 
         def page
           unless @page 
+
             @page = Page.new(Octopress.site, source_dir, page_dir, file, plugin.config)
           end
           @page

data/lib/octopress-ink/configuration.rb

@@ -2,29 +2,21 @@
 require 'yaml'
 
 module Octopress
-  # Override Octopress configuration to Merge with Ink's defaults
-  #
-  class << self
-    alias_method :orig_config, :config
+  module Ink
+    DEFAULT_OPTIONS = {
+      'combine_css' => true,
+      'compress_css' => true,
+      'combine_js' => true,
+      'compress_js' => true,
+      'uglifier' => {},
+      'disable' => [],
+      'date_format' => 'ordinal',
+    }
 
-    def config(options={})
-      Jekyll::Utils.deep_merge_hashes(Ink::Configuration::DEFAULTS, orig_config(options))
+    def self.configuration(options={})
+      @config ||= DEFAULT_OPTIONS.merge(Octopress.configuration(options))
     end
-  end
 
-  module Ink
-    module Configuration
-      DEFAULTS = {
-        'docs_mode' => false,
-        'combine_css' => true,
-        'compress_css' => true,
-        'combine_js' => true,
-        'compress_js' => true,
-        'uglifier' => {},
-        'disable' => [],
-        'date_format' => 'ordinal',
-      }
-    end
   end
 end
 

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

@@ -0,0 +1,30 @@
+module Octopress
+  module Ink
+    module Convertible
+      include Jekyll::Convertible
+
+      # Read the YAML frontmatter.
+      #
+      # base - The String path to the dir containing the file.
+      # name - The String filename of the file.
+      # opts - optional parameter to File.read, default at site configs
+      #
+      # Returns nothing.
+      def read_yaml(base, name, opts = {})
+        begin
+          self.content = File.read(File.join(base, name), merged_file_read_opts(opts))
+          if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+            self.content = $POSTMATCH
+            self.data = SafeYAML.load($1)
+          end
+        rescue SyntaxError => e
+          Jekyll.logger.warn "YAML Exception reading #{File.join(base, name)}: #{e.message}"
+        rescue Exception => e
+          Jekyll.logger.warn "Error reading file #{File.join(base, name)}: #{e.message}"
+        end
+
+        self.data ||= {}
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Octopress
+  module Ink
+    class Layout < Jekyll::Layout
+      include Ink::Convertible
+
+      # Initialize a new Layout.
+      #
+      # site - The Site.
+      # base - The String path to the source.
+      # name - The String filename of the post file.
+      def initialize(site, base, name)
+        @site = site
+        @base = base
+        @name = name
+
+        self.data = {}
+
+        process(name)
+        read_yaml(base, name)
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Octopress
   module Ink
     class Page < Jekyll::Page
-      include Jekyll::Convertible
+      include Ink::Convertible
 
       # Purpose: Configs can override a page's permalink
       #

data/lib/octopress-ink/plugin.rb

@@ -8,7 +8,7 @@ module Octopress
         type: 'plugin'
       }
 
-      attr_reader   :name, :type, :path, :assets_path, :local, :website, :description, :version,
+      attr_reader   :name, :type, :path, :assets_path, :local, :website, :description, :version, :source_url, :website,
                     :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
                     :layouts, :includes, :images, :fonts, :files, :pages, :docs, :docs_url
 
@@ -49,9 +49,9 @@ module Octopress
           add_assets
           add_images
 
-          if Octopress.config['docs_mode'] 
+          if ENV['OCTOPRESS_DOCS']
             add_docs
-          elsif !Octopress.config['docs_site']
+          else
             add_includes
             add_layouts
             add_javascripts

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -7,7 +7,7 @@ module Octopress
       def self.compile_css(content)
         configs = sass_converter.sass_configs
         configs[:syntax] = :scss
-        configs[:style] ||= :compressed if Octopress.config['compress_css']
+        configs[:style] ||= :compressed if Ink.configuration['compress_css']
 
         Sass.compile(content, configs)
       end
@@ -158,8 +158,8 @@ module Octopress
         @combined_javascripts = nil
         js = combine_javascripts
         unless js == ''
-          if Octopress.config['compress_js']
-            settings = Jekyll::Utils.symbolize_hash_keys(Octopress.config['uglifier'])
+          if Ink.configuration['compress_js']
+            settings = Jekyll::Utils.symbolize_hash_keys(Ink.configuration['uglifier'])
             js = Uglifier.new(settings).compile(js)
           end
           write_files(js, combined_javascript_path)

data/lib/octopress-ink/plugins.rb

@@ -117,7 +117,7 @@ module Octopress
       # Copy/Generate Stylesheets
       #
       def self.add_stylesheets
-        if Octopress.config['combine_css']
+        if Ink.configuration['combine_css']
           PluginAssetPipeline.write_combined_stylesheet
         else
           add_assets(%w{css sass})
@@ -127,7 +127,7 @@ module Octopress
       # Copy/Generate Javascripts
       #
       def self.add_javascripts
-        if Octopress.config['combine_js']
+        if Ink.configuration['combine_js']
           PluginAssetPipeline.write_combined_javascript
         else
           add_assets(%w{js coffee})
@@ -135,7 +135,7 @@ module Octopress
       end
 
       def self.css_tags
-        if Octopress.config['combine_css']
+        if Ink.configuration['combine_css']
           PluginAssetPipeline.combined_stylesheet_tag
         else
           @css_tags.join('')
@@ -143,7 +143,7 @@ module Octopress
       end
 
       def self.js_tags
-        if Octopress.config['combine_js']
+        if Ink.configuration['combine_js']
           PluginAssetPipeline.combined_javascript_tag
         else
           @js_tags.join('')

data/lib/octopress-ink/version.rb

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

data/lib/octopress-ink.rb

@@ -12,10 +12,6 @@ require 'octopress-ink/configuration'
 require 'octopress-ink/jekyll/hooks'
 
 module Octopress
-  def self.site(options={})
-    @site ||= init_site(options)
-  end
-
   def self.site=(site)
     # Octopress historically used site.title
     # This allows theme developers to expect site.name
@@ -26,17 +22,12 @@ module Octopress
     @site = site
   end
 
-  def self.init_site(options)
-    Jekyll.logger.log_level = :error
-    site = Jekyll::Site.new(Jekyll.configuration(options))
-    Jekyll.logger.log_level = :info
-    site
-  end
-
   module Ink
 
     autoload :Assets,               'octopress-ink/assets'
+    autoload :Convertible,          'octopress-ink/jekyll/convertible'
     autoload :Page,                 'octopress-ink/jekyll/page'
+    autoload :Layout,               'octopress-ink/jekyll/layout'
     autoload :StaticFile,           'octopress-ink/jekyll/static_file'
     autoload :StaticFileContent,    'octopress-ink/jekyll/static_file_content'
     autoload :Plugins,              'octopress-ink/plugins'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.18
+  version: 1.0.0.rc.19
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -198,7 +198,9 @@ files:
 - lib/octopress-ink/commands/list.rb
 - lib/octopress-ink/commands/new.rb
 - lib/octopress-ink/configuration.rb
+- lib/octopress-ink/jekyll/convertible.rb
 - lib/octopress-ink/jekyll/hooks.rb
+- lib/octopress-ink/jekyll/layout.rb
 - lib/octopress-ink/jekyll/page.rb
 - lib/octopress-ink/jekyll/static_file.rb
 - lib/octopress-ink/jekyll/static_file_content.rb