octopress-ink 1.0.0.rc.28 → 1.0.0.rc.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5a0fff7675e6e4fb71daeb25bdc9182ba46733
-  data.tar.gz: 7f7b16f0b24ed3950c4a443d78f9014d68d26814
+  metadata.gz: e38e29560f069cec7661d28c370c84cbd7d75dd8
+  data.tar.gz: 5d1da51d9f5553c320dcadae6a5acbb3721ef915
 SHA512:
-  metadata.gz: b42fa1b59613766cc22f41186cad54981c8dd261273e53e1bc69400b08c5a0d59ef9772ecfe71ae06ce64dbc91271525d3cacb54d72457015d97565ca88db4a2
-  data.tar.gz: 19dd65c91260292c6a6912ef3a633eb3b687100f9f26b4a58b15d761b66e8d468c93ba3c8ace4da7723e9924ac74fef24cfb9ee99427fc022c36655734117ca3
+  metadata.gz: 528bdf642e98127d79a00d808a0f2ae6c424b2994032e09529e3d6a42a6ccc1abeff6f61096596e6a839b95e800e1fdc26d2f0199c17cb6805f8360b23fc920c
+  data.tar.gz: ecc263199a90a9f479e1d28d66ca1ed4b7c3c22ca9362fa057f5803e0f0ba48b03c3936041b5832fce611cd78981656c2aa1826697c47efcfd4c4f9a08fa317a

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-### 1.0.0 RC27 - 2015-01-14
+### 1.0.0 RC29 - 2015-01-14
+
+- Fixed path issues when writing stylesheet tags.
+
+### 1.0.0 RC28 - 2015-01-14
 
 - Minified javascripts (whatever.min.js) are not re-compressed and are added first in the builds
 

data/assets/docs/creating-a-plugin.markdown

@@ -1,6 +1,6 @@
 ---
 title: "Create an Octopress Ink Plugin"
-permalink: /guides/creating-a-plugin/
+permalink: /ink/creating-a-plugin/
 ---
 
 *This guide assumes you have already installed Git, and have Ruby 1.9.3 or greater.*
@@ -17,6 +17,7 @@ require "octopress-ink"
 Octopress::Ink.add_plugin({
   name:          "My Plugin",
   slug:          "my-plugin",
+  gem:           "my-plugin",
   path:          File.expand_path(File.join(File.dirname(__FILE__), "../")),
   type:          "plugin",
 
@@ -35,6 +36,7 @@ The configuration options are as follows.
 | name          | The display name for your plugin, e.g. "My Plugin" |
 | path          | Path to your plugin's root directory | 
 | slug          | Optional: The slug is how users will reference your plugin, (Default: sluggified name) |
+| gem           | Optional: This is displayed in plugin info and on the local docs site. |
 | type          | Optional: "plugin" or "theme" (Default: "plugin") |
 | version       | Optional: Version will be displayed with plugin info |
 | description   | Optional: Description will be displayed with plugin info |

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

@@ -14,7 +14,7 @@ module Octopress
         end
 
         def tag
-          "<link href='#{Filters.expand_url(File.join(dir, file))}' media='#{@media}' rel='stylesheet' type='text/css'>"
+          "<link href='#{Filters.expand_url(File.join(dir, output_file_name))}' media='#{@media}' rel='stylesheet' type='text/css'>"
         end
 
         def add
@@ -43,7 +43,7 @@ module Octopress
         end
 
         def destination
-          File.join(base, plugin.slug, file.sub(/@(.+?)\./,'.').sub(/s.ss/, 'css'))
+          File.join(base, plugin.slug, output_file_name)
         end
 
         private
@@ -71,6 +71,9 @@ module Octopress
           file.sub(ext, alt_ext)
         end
 
+        def output_file_name
+          file.sub(/@/,'-').sub(/s.ss/, 'css')
+        end
       end
     end
   end

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

@@ -27,7 +27,7 @@ module Octopress
         end
 
         def tag
-          "<link href='#{Filters.expand_url(File.join(dir, file))}' media='#{media}' rel='stylesheet' type='text/css'>"
+          "<link href='#{Filters.expand_url(File.join(dir, output_file_name))}' media='#{media}' rel='stylesheet' type='text/css'>"
         end
 
         def add
@@ -38,7 +38,11 @@ module Octopress
         private
 
         def destination
-          File.join(base, plugin.slug, file.sub(/@(.+?)\./,'.'))
+          File.join(base, plugin.slug, output_file_name)
+        end
+
+        def output_file_name
+          file.sub(/@/,'-')
         end
       end
     end

data/lib/octopress-ink/plugin.rb

@@ -381,7 +381,7 @@ module Octopress
       def find_assets(dir)
         full_dir = File.join(@assets_path, dir)
         glob_assets(full_dir).map do |file|
-          file.sub(full_dir+'/', '')
+          file.sub(File.join(full_dir, ''), '')
         end
       end
 

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -144,7 +144,7 @@ module Octopress
       end
 
       def self.combine_no_compress_javascripts
-        @combined_no_compress_javascripts ||= combine_js(no_compress_js)
+        @combined_no_compress_javascripts ||= combine_js(no_compress_js) || ''
       end
 
       def self.combine_js(files)

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.28
+  version: 1.0.0.rc.29
 platform: ruby
 authors:
 - Brandon Mathis