spinto 0.2.7 → 0.2.8

data/_plugins/include_tree.rb

@@ -10,6 +10,18 @@ Jekyll::Post.class_eval do
 
 end
 
+Jekyll::Layout.class_eval do
+
+  def location_on_server
+    nil
+  end
+
+  def path_to_source
+    "/_layouts/#{File.join(@name)}"
+  end
+
+end
+
 Jekyll::Page.class_eval do
 
   # It is important that this is the same
@@ -41,51 +53,95 @@ Jekyll::Site.class_eval do
 
   alias :render_without_include_tree :render
   def render
-    Thread.current[:jekyll_inclusions]  = {}
-    # First, render like Jekyll normally does
+    
+    # Clean up this thread.
+    #
+    Thread.current[:jekyll_inclusions] = {}
+
+    # Render like Jekyll normally does
+    #
     render_without_include_tree
 
-    # Set a blank array for files that did not have
-    # inclusions fired.
-    (pages + posts + unpublished_posts + static_files).each do |file|
-      Jekyll::IncludeWatcher.inclusions[file.location_on_server] ||= {}
-      Jekyll::IncludeWatcher.inclusions[file.location_on_server].merge!(source: file.path_to_source)
-      if file.respond_to?(:data) && file.data
-        data = {}
-        ['editable', '_content', 'title', 'description'].each do |key|
-          data[key] = file.data[key] if file.data[key]
-        end
-        if file.respond_to?(:published)
-          data['published'] = file.published
-        end
-        Jekyll::IncludeWatcher.inclusions[file.location_on_server].merge!(data)
-      end
-    end
+    spinto_data = {}
 
-    # Clean up index.html to be '/'
-    Jekyll::IncludeWatcher.inclusions.keys.each do |key|
-      matches = key.match(/^(.*\/)index.html$/)
+    url_cleaner = lambda {|dirty_url|
+      matches = dirty_url.match(/^(.*\/)index.html$/)
+      clean_url = dirty_url
       if matches
-        clean_name = if matches[1] == '/'
+        clean_url = if matches[1] == '/'
           matches[1]
         else
           matches[1].gsub(/\/$/, '')
         end
-        Jekyll::IncludeWatcher.inclusions[clean_name] = \
-          Jekyll::IncludeWatcher.inclusions.delete(key)
       end
+      clean_url
+    }
+
+    # Add pages to the Spinto data
+    #
+    spinto_data['pages'] = pages.collect do |page|
+      spinto_page_data = {
+        'includes'  => (Jekyll::IncludeWatcher.inclusions[page.location_on_server] || []),
+        'source_path' => page.path_to_source,
+        'url'         => url_cleaner.call( page.location_on_server )
+      }
+      
+      if page.data
+        %w{ editable title description }.each do |key|
+          spinto_page_data[key] = page.data[key] if page.data[key]
+        end
+      end
+
+      spinto_page_data
+    end.sort {|a,b| a['url'] <=> b['url'] }
+
+    # Add layouts to the Spinto data
+    #
+    spinto_data['layouts'] = layouts.values.collect do |layout|
+      {
+        'source_path' => layout.path_to_source
+      }
+    end.sort {|a,b| a['source_path'] <=> b['source_path'] }
+
+    # Add posts to Spinto data
+    #
+    %w{ posts unpublished_posts }.each do |post_type|
+      spinto_data[post_type] = send(post_type.to_sym).collect do |post|
+        spinto_post_data = {
+          'source_path' => post.path_to_source,
+          'url'         => url_cleaner.call( post.location_on_server ),
+          'published'   => post.published
+        }
+        
+        if post.data
+          %w{ title description }.each do |key|
+            spinto_post_data[key] = post.data[key] if post.data[key]
+          end
+        end
+        spinto_post_data
+      end.sort {|a,b| a['url'] <=> b['url'] }
     end
 
+    # Add pages to the Spinto data
+    #
+    spinto_data['static_files'] = static_files.collect do |file|
+      {
+        'source_path' => file.path_to_source,
+        'url'         => url_cleaner.call( file.location_on_server )
+      }
+    end.sort {|a,b| a['url'] <=> b['url'] }
+
     # Write our inclusions to a dot-file
-    filename = '.include_tree'
+    #
+    filename = '.spinto_data'
     
     File.open(File.join(source, filename), "w") do |f|
-      f.write JSON.dump( Jekyll::IncludeWatcher.inclusions )
+      f.write JSON.dump( spinto_data )
     end
 
-    # Ensure Jekyll doesn't clean ths up.
+    # Ensure Jekyll doesn't clean this up.
+    #
     static_files << Jekyll::StaticFile.new(self, source, "/", filename)
   end
 
 end
-

data/_plugins/include_watcher.rb

@@ -7,12 +7,8 @@ module Jekyll
     end
 
     def render(context)
-      Jekyll::IncludeWatcher.inclusions[context.registers[:page]['url']] ||= {}
-      Jekyll::IncludeWatcher.inclusions[context.registers[:page]['url']][:includes] ||= {}
-      Jekyll::IncludeWatcher.inclusions[context.registers[:page]['url']][:includes] = \
-        (Jekyll::IncludeWatcher.inclusions[context.registers[:page]['url']][:includes] || {}).merge(
-          @file => { 'editable' => true }
-        )
+      Jekyll::IncludeWatcher.inclusions[context.registers[:page]['url']] ||= []
+      Jekyll::IncludeWatcher.inclusions[context.registers[:page]['url']] << @file
       super
     end
 

data/lib/spinto.rb

@@ -1,5 +1,5 @@
 module Spinto
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
   PLUGINS_PATH = File.join(File.dirname(__FILE__), '..', '_plugins')
 
 end

data/spinto.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'spinto'
-  s.version           = '0.2.7'
-  s.date              = '2012-02-23'
+  s.version           = '0.2.8'
+  s.date              = '2012-02-28'
 
   s.summary     = "The site generator used at spintoapp.com"
   s.description = "Spinto uses Jekyll and plugins to build static sites, this gem provides the spinto-site builder."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinto
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spinto-jekyll
-  requirement: &2154563560 !ruby/object:Gem::Requirement
+  requirement: &2153826460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.11.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2154563560
+  version_requirements: *2153826460
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2154563100 !ruby/object:Gem::Requirement
+  requirement: &2153853880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154563100
+  version_requirements: *2153853880
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2154562640 !ruby/object:Gem::Requirement
+  requirement: &2153853420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *2154562640
+  version_requirements: *2153853420
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &2154562180 !ruby/object:Gem::Requirement
+  requirement: &2153852960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *2154562180
+  version_requirements: *2153852960
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2154561720 !ruby/object:Gem::Requirement
+  requirement: &2153852500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *2154561720
+  version_requirements: *2153852500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154561260 !ruby/object:Gem::Requirement
+  requirement: &2153852040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2154561260
+  version_requirements: *2153852040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2154560800 !ruby/object:Gem::Requirement
+  requirement: &2153851580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *2154560800
+  version_requirements: *2153851580
 description: Spinto uses Jekyll and plugins to build static sites, this gem provides
   the spinto-site builder.
 email: matt.beale@madhatted.com
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2400488915217448452
+      hash: -1742459230377426559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: