octopress-ink 1.0.0.rc.36 → 1.0.0.rc.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ebfce335676f99bae03bf396ae7ab9fb696bcc
-  data.tar.gz: 63ae8ce72d9f95655334e038043a6fefb5c341f6
+  metadata.gz: ccdb4e645dc51a1054578a2ada97f281d9c18002
+  data.tar.gz: f6fc232afa388a80fa9c2f1cdbf172612cfb23a5
 SHA512:
-  metadata.gz: acafed4ded48d6f87fe82771956310d73372c08d7dd5cbca5b904e6aeeabb0a3b7f18f0a56dbe954decb3f2b7d62f005285061a96d538591eceddb67ddd3a632
-  data.tar.gz: 67295fe9fa34aa4758b867c4c0786d4829fabf2cbd5fe3560470e12ad5283161f7a29451ba55f6b2eb827f3825533995f01c6903c89d91f5bddc9768b0ac9d7e
+  metadata.gz: 1e3b71f0016778d02bec195b12d42adc34ef755b02ddfdf60d1fa342f40167afd85f968fa1d01494431753576ec053f42f9a830bf5dfe8b21865d9f9d646d945
+  data.tar.gz: 4292efba16ea66b024518ae8648592cd31e8bf7e216f6903ced458ff1923e7d3e60f221cdd1ef260f02ece145f1aadc46bbf429e546ab29fc1ed97cc3fdf73b6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.0.0 RC37 - 2015-01-31
+
+- Added `clone` method to page assets.
+- Pages now list permalink settings in `ink list` view.
+- Refactored page permalink system.
+
 ### 1.0.0 RC36 - 2015-01-31
 
 - Fix: Octopress Hooks now fire properly on page assets.

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

@@ -6,6 +6,7 @@ module Octopress
     module Assets
       class PageAsset < Asset
         attr_reader :filename
+        attr_accessor :data, :permalink_name
 
         def initialize(plugin, base, file)
           @root = plugin.assets_path
@@ -15,6 +16,8 @@ module Octopress
           @dir  = File.dirname(file)
           @file = File.basename(file)
           @exists = {}
+          @permalink_name = File.basename(file, '.*')
+          @data = {}
           file_check
         end
 
@@ -28,6 +31,14 @@ module Octopress
           end
         end
 
+        def clone(permalink_name, permalink, data={})
+          p = PageAsset.new(plugin, base, file)
+          p.permalink_name = permalink_name
+          p.permalink ||= permalink
+          p.data.merge!(data)
+          p
+        end
+
         def find_page(page)
           site_dir = Octopress.site.dest
           dest = page.destination(site_dir)
@@ -39,12 +50,25 @@ module Octopress
         end
 
         def page
-          @page ||= Page.new(Octopress.site, source_dir, page_dir, file, plugin.config)
+          @page ||= begin 
+            page = Page.new(Octopress.site, source_dir, page_dir, file, self)
+            page.data.merge!(@data)
+            page
+          end
         end
 
         def info
           message = super
-          message.ljust(25) + url_info
+          message.sub!(/#{filename}/, permalink_name.ljust(filename.size))
+          message.ljust(25) + page.permalink
+        end
+
+        def permalink
+          @permalink ||= plugin.config['permalinks'][permalink_name]
+        end
+
+        def permalink=(url)
+          @permalink = plugin.config['permalinks'][permalink_name] = url
         end
 
         private
@@ -57,10 +81,6 @@ module Octopress
           File.join(plugin_dir, dir, file)
         end
 
-        def url_info
-          "/#{page.url.sub(/^\//,'')}"
-        end
-
         def user_dir
           File.join Octopress.site.source, Plugins.custom_dir, plugin.slug, base
         end
@@ -69,4 +89,3 @@ module Octopress
     end
   end
 end
-

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

@@ -10,17 +10,13 @@ module Octopress
       #         - '/' for the _site/index.html page
       #         - '/archive/' for the _site/archive/index.html page
       #
-      def initialize(site, base, dir, name, config={})
-        @config = config
+      def initialize(site, base, dir, name, asset)
+        @asset = asset
         super(site, base, dir, name)
-        post_init if respond_to?(:post_init)
       end
 
       def destination(dest)
         unless @dest
-          if @config['path']
-            dest = File.join(dest, @config['path'])
-          end
           @dest = File.join(dest, self.url)
         end
         @dest
@@ -35,33 +31,21 @@ module Octopress
       # Allow pages to read url from plugin configuration
       #
       def url
-        if @url
-          @url
-        else
-          begin
-
-            page_name = File.basename(self.name, '.*')
-            config = @config['permalinks'][page_name]
-
-            if config.is_a? String
-              @url = config
-              self.data['permalink'] = nil
-            else
-              @config['permalinks'][File.basename(self.name, '.*')] = self.data['permalink']
-            end
-          rescue; end
+        @url ||= begin
+          @asset.permalink ||= self.data['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/version.rb

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

metadata

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