octopress-ink 1.0.0.rc.40 → 1.0.0.rc.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a89f28e51ee7ad62be2b3b82f3eab970633d96e6
-  data.tar.gz: addb76d7efda7eaa527508d1ecc122d4fa2dbcd3
+  metadata.gz: ae4c767603111477b17cc1a114faa2b21f496f5b
+  data.tar.gz: 1270563568f44529d5ae82c59acd1678d6877f0d
 SHA512:
-  metadata.gz: 0c27542401b8df9a907e1f45f0c2d209b3418771f694aec430d68bfa79c0897d39ca61f9070602538ddc4fee05ffb80ed95e1c5b1252a002bf65a8ab366ca886
-  data.tar.gz: c67e1a389461818bdf350b0541dbfc6b8f7abdbf455acf099ee665756b8ee3724f2786b63e568c12d462fa4c37605a10109191db3559b0677f99249344edf885
+  metadata.gz: fa63a50bfbdfcca6225ec32528d2adae7803bc6746be374bb82f5bc8ad62ee9d5f96c290520d526a1481a5ddcfcd60cff1c1f723392978cf75300ff6adcd8d2a
+  data.tar.gz: 6aad860f4d89d61c12de9ab41e679377b58ab93aca49b9590326009e25951c64d36dfdc56ff9f16c3b362291f0dd79db4d34c2f86de90e8bdbffd1132d7d6ee7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC41 - 2015-02-13
+- Fix: Properly copies pages without permalinks.
+- Permalink configurations now allow directories and file extensions in config keys.
+
 ### 1.0.0 RC40 - 2015-02-08
 - Improvements to ink list command output.
 - Ensures plugins cannot be registered multiple times.

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

@@ -100,7 +100,7 @@ module Octopress
         end
 
         def destination
-          File.join(dir, file)
+          File.join(base, plugin.slug, file)
         end
 
         def content

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

@@ -3,7 +3,7 @@ module Octopress
     module Assets
       class Coffeescript < Javascript
         def tag
-          "<script src='#{Filters.expand_url(File.join(dir, file.sub(/\.coffee$/,'.js')))}'></script>"
+          "<script src='#{Filters.expand_url(File.join(dir, File.basename(file, '.*') << '.js'))}'></script>"
         end
 
         def add
@@ -16,7 +16,7 @@ module Octopress
         end
 
         def destination
-          File.join(base, plugin.slug, file.sub(/\.coffee/,'.js'))
+          File.join(base, plugin.slug, File.basename(file, '.*') << '.js')
         end
       end
     end

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

@@ -33,8 +33,26 @@ module Octopress
             config = Jekyll::Utils.deep_merge_hashes(config, user_config)
           end
 
+          fix_permalinks(config)
+        end
+
+        # Permalinks should not contain file extensions
+        # This replaces file extensions in the keys so they
+        # still work
+        #
+        def fix_permalinks(config)
+          fixed_permalinks = {}
           config['permalinks'] ||= {}
 
+          config['permalinks'].each do |k,v|
+            if k.match('.')
+              key = k.sub(File.extname(k), '')
+              fixed_permalinks[key] = v
+              config['permalinks'].delete(k)
+            end
+          end
+
+          config['permalinks'] = fixed_permalinks
           config
         end
       end

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

@@ -23,6 +23,10 @@ module Octopress
           end
         end
 
+        def destination
+          File.join(dir, file)
+        end
+
         private
 
         def filename

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

@@ -16,7 +16,7 @@ module Octopress
           @dir  = File.dirname(file)
           @file = File.basename(file)
           @exists = {}
-          @permalink_name = File.basename(file, '.*')
+          @permalink_name = file.sub(File.extname(file), '')
           @data = {}
           file_check
         end
@@ -27,18 +27,22 @@ module Octopress
           if page.url && !find_page(page)
             Octopress.site.pages << page
             plugin.config['permalinks'] ||= {}
-            plugin.config['permalinks'][File.basename(filename, '.*')] ||= page.url
+            plugin.config['permalinks'][@permalink_name] ||= page.url
           end
         end
 
-        def clone(permalink_name, permalink, data={})
+        def clone(permalink, permalink_name=nil)
           p = PageAsset.new(plugin, base, file)
           p.permalink_name = permalink_name
           p.permalink ||= permalink
-          p.data.merge!(data)
           p
         end
 
+        def merge_data(data={})
+          self.data.merge!(data)
+          self
+        end
+
         def find_page(page)
           site_dir = Octopress.site.dest
           dest = page.destination(site_dir)
@@ -50,7 +54,7 @@ module Octopress
         end
 
         def page
-          @page ||= begin 
+          @page ||= begin
             page = Page.new(Octopress.site, source_dir, page_dir, file, self)
             page.data.merge!(@data)
             page
@@ -69,7 +73,10 @@ module Octopress
         end
 
         def permalink=(url)
-          @permalink = plugin.config['permalinks'][permalink_name] = url
+          @permalink = url
+          if permalink_name
+            plugin.config['permalinks'][permalink_name] = url
+          end
         end
 
         private

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

@@ -79,7 +79,7 @@ module Octopress
         end
 
         def output_file_name
-          file.sub(/@/,'-').sub(/s.ss/, 'css')
+          File.basename(file.sub('@','-'), '.*') << '.css'
         end
       end
     end

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

@@ -42,7 +42,7 @@ module Octopress
         end
 
         def output_file_name
-          file.sub(/@/,'-')
+          file.sub('@','-')
         end
       end
     end

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

@@ -35,19 +35,19 @@ module Octopress
       def url
         @url ||= begin
           @asset.permalink ||= self.data['permalink']
-          url = @asset.permalink
+          @url = @asset.permalink
 
           super
 
-          if url && url =~ /\/$/
+          if @url && @url =~ /\/$/
             if self.ext == '.xml'
-              url = File.join(url, "index.xml")
+              @url = File.join(url, "index.xml")
             else
-              url = File.join(url, "index.html")
+              @url = File.join(url, "index.html")
             end
           end
 
-          url
+          @url
         end
       end
     end

data/lib/octopress-ink/plugin.rb

@@ -192,6 +192,10 @@ module Octopress
         Pathname.new(@includes.find{|i| i.filename == file }.path)
       end
 
+      def find_page(path)
+        @pages.find {|page| page.filename == path }
+      end
+
       private
 
       def get_paths(files)

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.40
+  version: 1.0.0.rc.41
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll