octopress-ink 1.0.0.rc.15 → 1.0.0.rc.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c418b320600ccde0e84cc5250117b3d8c5aadba
-  data.tar.gz: e3b8474832d3515c04a3deb208f190eed65c8421
+  metadata.gz: 9ba88def84f65ef7503c5b5a941a26f14e97c5b3
+  data.tar.gz: 4e8400a9687891cd1ad840793aef6a7062e7993b
 SHA512:
-  metadata.gz: b032d79261a2a9a5edef35dfe846c915d0ade487d099307f72992adfc67d6238b85c80b4a0c291e3a7b5c946f9b459ac434246b4d6fd8a271d58a05d0ea84e18
-  data.tar.gz: e12bb1b356643d00c6c80e22c2e7fe72fbd040742aeac083537661ee3a5fa0390d233ed1ecf09bec489c9c853180a24f9ca63594b33656477fd9a93174901d13
+  metadata.gz: e6ccd4603c14136e57c40062bd378d437cc329cd5d5e644fc0652ea7f094d49228a66c9afb95bd1a3802e7e79ef298c70677cecfe50493199f814ea52a3ad50f
+  data.tar.gz: 09e3fe1c274b60c291a08ed4ad1cc46ae5332fcb0aebaa6fde7c76c10408ec0ea53fbf2be61787871739b2361717c8ed2577dabf195ca59e132d0e8b9ee87d03

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.0.0 RC16 - 2014-08-21
+
+- New: Access the url for a plugin's page from anywhere with `{{ theme.permalinks.page_name }}` or `{{ plugins.pugin-name.permalinks.page_name }}`.
+- Fix: Properly invalidate caches for `jekyll build --watch` support.
+
 ### 1.0.0 RC15 - 2014-08-17
 
 - Fixed an issue where Octopress would trigger site_payload too early. 

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

@@ -21,8 +21,10 @@ module Octopress
         # Add page to Jekyll pages if no other page has a conflicting destination
         #
         def add
-          if page.url && !Octopress.config['docs_mode']
-            Octopress.site.pages << page unless find_page(page)
+          if page.url && !Octopress.config['docs_mode'] && !find_page(page)
+            Octopress.site.pages << page
+            plugin.config['permalinks'] ||= {}
+            plugin.config['permalinks'][File.basename(filename, '.*')] ||= page.url
           end
         end
 

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -86,6 +86,7 @@ module Octopress
       end
 
       def self.write_combined_stylesheet
+        @combined_stylesheets = nil
         css = combine_stylesheets
         css.keys.each do |media|
           contents = compile_css(css[media])
@@ -135,8 +136,8 @@ module Octopress
       end
 
       def self.combine_javascripts
-        if @combined_javascript
-          @combined_javascript
+        if @combined_javascripts
+          @combined_javascripts
         else
           js = ""
           javascripts.clone.each do |file| 
@@ -145,7 +146,7 @@ module Octopress
             end
             js += (file.ext.match(/.coffee/) ? file.compile : file.content)
           end
-          @combined_javascript = js
+          @combined_javascripts = js
         end
       end
 
@@ -154,6 +155,7 @@ module Octopress
       end
 
       def self.write_combined_javascript
+        @combined_javascripts = nil
         js = combine_javascripts
         unless js == ''
           if Octopress.config['compress_js']

data/lib/octopress-ink/version.rb

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

data/octopress-ink.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "octopress-filters", "~> 1.1"
   spec.add_runtime_dependency "octopress"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry-debugger"
+  spec.add_development_dependency "bundler", "~> 1.6", "<= 1.6.2"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "clash"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.15
+  version: 1.0.0.rc.16
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -95,35 +95,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="