octopress-ink 1.0.0.alpha.31 → 1.0.0.alpha.32

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

@@ -1,25 +1,27 @@
 module Octopress
-  class StaticFile
-    def initialize(source, dest)
-      @source = source
-      @dest = dest
-    end
+  module Ink
+    class StaticFile
+      def initialize(source, dest)
+        @source = source
+        @dest = dest
+      end
 
-    def destination(dest)
-      File.join(dest, @dest)
-    end
+      def destination(dest)
+        File.join(dest, @dest)
+      end
 
-    def path
-      @source
-    end
+      def path
+        @source
+      end
 
-    def write(dest)
-      dest_path = destination(dest)
+      def write(dest)
+        dest_path = destination(dest)
 
-      FileUtils.mkdir_p(File.dirname(dest_path))
-      FileUtils.cp(@source, dest_path)
+        FileUtils.mkdir_p(File.dirname(dest_path))
+        FileUtils.cp(@source, dest_path)
 
-      true
+        true
+      end
     end
   end
 end

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

@@ -1,12 +1,14 @@
 module Octopress
-  class StaticFileContent < StaticFile
-    def write(dest)
-      dest_path = destination(dest)
+  module Ink
+    class StaticFileContent < StaticFile
+      def write(dest)
+        dest_path = destination(dest)
 
-      FileUtils.mkdir_p(File.dirname(dest_path))
-      File.open(dest_path, 'w') { |f| f.write(@source) }
+        FileUtils.mkdir_p(File.dirname(dest_path))
+        File.open(dest_path, 'w') { |f| f.write(@source) }
 
-      true
+        true
+      end
     end
   end
 end

data/lib/octopress-ink/plugin.rb

@@ -1,190 +1,235 @@
+require 'find'
+
 module Octopress
-  class Plugin
-    attr_accessor :name, :type, :asset_override, :assets_path,
-                  :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
-                  :layouts, :includes, :stylesheets, :javascripts, :images, :sass, :fonts, :files
-
-    def initialize(name, type)
-      @layouts_dir       = 'layouts'
-      @files_dir         = 'files'
-      @pages_dir         = 'pages'
-      @fonts_dir         = 'fonts'
-      @images_dir        = 'images'
-      @includes_dir      = 'includes'
-      @javascripts_dir   = 'javascripts'
-      @stylesheets_dir   = 'stylesheets'
-      @plugins_dir       = 'plugins'
-      @config_file       = 'config.yml'
-      @name              = name
-      @type              = type
-      @layouts           = []
-      @includes          = []
-      @stylesheets       = []
-      @javascripts       = []
-      @images            = []
-      @sass              = []
-      @fonts             = []
-      @files             = []
-      @pages             = []
-      add_assets
-      add_layouts
-      add_pages
-      add_includes
-      add_config
-      require_plugins
-    end
+  module Ink
+    class Plugin
+      attr_accessor :name, :type, :asset_override, :assets_path,
+                    :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
+                    :layouts, :includes, :stylesheets, :javascripts, :images, :sass, :fonts, :files, :pages,
+                    :website, :description, :version
+
+      def initialize(name, type)
+        @layouts_dir       = 'layouts'
+        @files_dir         = 'files'
+        @pages_dir         = 'pages'
+        @fonts_dir         = 'fonts'
+        @images_dir        = 'images'
+        @includes_dir      = 'includes'
+        @javascripts_dir   = 'javascripts'
+        @stylesheets_dir   = 'stylesheets'
+        @plugins_dir       = 'plugins'
+        @config_file       = 'config.yml'
+        @name              = name
+        @type              = type
+        @layouts           = []
+        @includes          = {}
+        @stylesheets       = []
+        @javascripts       = []
+        @images            = []
+        @sass              = []
+        @fonts             = []
+        @files             = []
+        @pages             = []
+        @version         ||= false
+        @description     ||= false
+        @website         ||= false
+        add_assets
+        add_layouts
+        add_pages
+        add_includes
+        add_config
+        require_plugins
+      end
 
-    def add_assets; end
+      def add_assets; end
 
-    def add_config
-      @config_file = Assets::Config.new(self, @config_file)
-    end
+      def add_config
+        @config_file = Assets::Config.new(self, @config_file)
+      end
 
-    def namespace
-      if @type == 'local_plugin'
-        ''
-      else
-        @type == 'theme' ? @type : @name
+      def slug
+        if @type == 'local_plugin'
+          ''
+        else
+          @type == 'theme' ? @type : @name
+        end
       end
-    end
 
-    def add_stylesheet(file, media=nil)
-      @stylesheets << Assets::Stylesheet.new(self, @stylesheets_dir, file, media)
-    end
+      def assets
+        {
+          'layouts'     => @layouts,
+          'includes'    => @includes.values,
+          'pages'       => @pages, 
+          'sass'        => @sass, 
+          'stylesheets' => @stylesheets,
+          'javascripts' => @javascripts, 
+          'images'      => @images, 
+          'fonts'       => @fonts, 
+          'files'       => @files
+        }
+      end
 
-    def add_sass(file, media=nil)
-      @sass << Assets::Sass.new(self, @stylesheets_dir, file, media)
-    end
+      def info(options={})
+        message =  @name
+        message += " (theme)" if @type == 'theme'
+        message += " - v#{@version}" if @version
+        message += " - #{@description}" if @description
+        message += "\n"
+        if options == {}
+          asset_types = assets
+        else
+          asset_types = assets.select{|k,v| options.keys.include?(k)}
+        end
+        asset_types.each do |name, assets|
+          if assets.size > 0
+            message += "#{name.capitalize}:\n"
+            assets.each do |t|
+              message += "  - #{t.info}\n"
+            end
+          elsif options != {}
+            message += "#{name.capitalize}: none\n"
+          end
+        end
+        message
+      end
 
-    def add_javascript(file)
-      @javascripts << Assets::Javascript.new(self, @javascripts_dir, file)
-    end
+      def add_stylesheet(file, media=nil)
+        @stylesheets << Assets::Stylesheet.new(self, @stylesheets_dir, file, media)
+      end
+
+      def add_sass(file, media=nil)
+        @sass << Assets::Sass.new(self, @stylesheets_dir, file, media)
+      end
 
-    def add_pages
-      if @assets_path
-        base = File.join(@assets_path, @pages_dir)
-        entries = []
-        if Dir.exists?(base)
-          Dir.chdir(base) { entries = Dir['**/*.*'] }
-          entries.each do |file|
-            @files << Assets::PageAsset.new(self, @pages_dir, file)
+      def add_javascript(file)
+        @javascripts << Assets::Javascript.new(self, @javascripts_dir, file)
+      end
+
+      def add_pages
+        if @assets_path
+          find_assets(File.join(@assets_path, @pages_dir)).each do |file|
+            @pages << Assets::PageAsset.new(self, @pages_dir, file)
           end
         end
       end
-    end
 
-    def require_plugins
-      if @assets_path
-        base = File.join(@assets_path, @plugins_dir)
-        entries = []
-        if Dir.exists?(base)
-          Dir.chdir(base) { entries = Dir['**/*.rb'] }
-          entries.each do |file|
+      def require_plugins
+        if @assets_path
+          find_assets(File.join(@assets_path, @plugins_dir)).each do |file|
             require File.join base, file
           end
         end
       end
-    end
 
-    def add_layouts
-      if @assets_path
-        base = File.join(@assets_path, @layouts_dir)
-        entries = []
-        if Dir.exists?(base)
-          Dir.chdir(base) { entries = Dir['**/*.*'] }
-          entries.each do |file|
-            @layouts << Assets::Layout.new(self, @layouts_dir, file)
+      def find_assets(dir)
+        found = []
+        if Dir.exist? dir
+          Find.find(dir) do |file|
+            found << file.sub(dir+'/', '') unless File.directory? file
           end
         end
+        found
       end
-    end
 
-    def remove_jekyll_assets(files)
-      files.each {|f| f.remove_jekyll_asset }
-    end
+      def add_layouts
+        if @assets_path
+          find_assets(File.join(@assets_path, @layouts_dir)).each do |layout|
+            @layouts << Assets::Layout.new(self, @layouts_dir, layout)
+          end
+        end
+      end
 
-    def add_includes
-      @includes = Assets::Include.new(self, @includes_dir)
-    end
+      def remove_jekyll_assets(files)
+        files.each {|f| f.remove_jekyll_asset }
+      end
 
-    def add_image(file)
-      @images << Assets::Asset.new(self, @images_dir, file)
-    end
+      def add_includes
+        if @assets_path
+          find_assets(File.join(@assets_path, @includes_dir)).each do |include_file|
+            @includes[include_file] = Assets::Asset.new(self, @includes_dir, include_file)
+          end
+        end
+      end
 
-    def add_root_files(files)
-      files.each { |f| add_root_file(f) }
-    end
+      def add_image(file)
+        @images << Assets::Asset.new(self, @images_dir, file)
+      end
 
-    def add_root_file(file)
-      @files << Assets::RootAsset.new(self, @files_dir, file)
-    end
+      def add_root_files(files)
+        files.each { |f| add_root_file(f) }
+      end
 
-    def add_font(file)
-      @fonts << Assets::Asset.new(self, @fonts_dir, file)
-    end
+      def add_root_file(file)
+        @files << Assets::RootAsset.new(self, @files_dir, file)
+      end
 
-    def add_file(file)
-      @files << Assets::Asset.new(self, @files_dir, file)
-    end
+      def add_font(file)
+        @fonts << Assets::Asset.new(self, @fonts_dir, file)
+      end
 
-    def add_stylesheets(files, media=nil)
-      files.each { |f| add_stylesheet(f, media) }
-    end
+      def add_file(file)
+        @files << Assets::Asset.new(self, @files_dir, file)
+      end
 
-    def add_sass_files(files, media=nil)
-      files.each { |f| add_sass(f, media) }
-    end
+      def add_stylesheets(files, media=nil)
+        files.each { |f| add_stylesheet(f, media) }
+      end
 
-    def add_javascripts(files)
-      files.each { |f| add_javascript(f) }
-    end
+      def add_sass_files(files, media=nil)
+        files.each { |f| add_sass(f, media) }
+      end
 
-    def add_images(files)
-      files.each { |f| add_image(f) }
-    end
+      def add_javascripts(files)
+        files.each { |f| add_javascript(f) }
+      end
 
-    def add_fonts(files)
-      files.each { |f| add_font(f) }
-    end
+      def add_images(files)
+        files.each { |f| add_image(f) }
+      end
 
-    def add_files(files)
-      files.each { |f| add_file(f) }
-    end
+      def add_fonts(files)
+        files.each { |f| add_font(f) }
+      end
 
-    def stylesheet_paths
-      get_paths @stylesheets
-    end
+      def add_files(files)
+        files.each { |f| add_file(f) }
+      end
 
-    def javascript_paths
-      get_paths @javascripts
-    end
+      def stylesheet_paths
+        get_paths @stylesheets
+      end
 
-    def stylesheet_tags
-      get_tags @stylesheets
-    end
+      def javascript_paths
+        get_paths @javascripts
+      end
 
-    def sass_tags
-      get_tags @sass
-    end
+      def stylesheet_tags
+        get_tags @stylesheets
+      end
 
-    def javascript_tags
-      get_tags @javascripts
-    end
+      def sass_tags
+        get_tags @sass
+      end
 
-    def get_paths(files)
-      files.dup.map { |f| f.path }
-    end
+      def javascript_tags
+        get_tags @javascripts
+      end
 
-    def get_tags(files)
-      files.dup.map { |f| f.tag }
-    end
+      def get_paths(files)
+        files.dup.map { |f| f.path }
+      end
 
-    def include(file)
-      @includes.file file
-    end
+      def get_tags(files)
+        files.dup.map { |f| f.tag }
+      end
+
+      def include(file)
+        @includes[file].path
+      end
 
-    def config
-      @config ||= @config_file.read
+      def config
+        @config ||= @config_file.read
+      end
     end
   end
 end

data/lib/octopress-ink/plugins.rb

@@ -1,299 +1,318 @@
 module Octopress
-  module Plugins
+  module Ink
+    module Plugins
 
-    @plugins = []
-    @local_plugins = []
-    @site = nil
+      @plugins = []
+      @local_plugins = []
+      @site = nil
 
-    def self.theme
-      @theme
-    end
-
-    def self.plugin(name)
-      if name == 'theme'
+      def self.theme
         @theme
-      else
-        found = plugins.reject { |p| p.name != name }
-        if found.empty?
-          raise IOError.new "No Theme or Plugin with the name '#{name}' was found."
+      end
+
+      def self.each(&block)
+        plugins.each(&block)
+      end
+
+      def self.size
+        plugins.size
+      end
+
+      def self.plugin(name)
+        if name == 'theme'
+          @theme
+        else
+          found = plugins.reject { |p| p.name != name }
+          if found.empty?
+            raise IOError.new "No Theme or Plugin with the name '#{name}' was found."
+          end
+          found.first
         end
-        found.first
       end
-    end
 
-    def self.plugins
-      [@theme].concat(@plugins).concat(@local_plugins).compact
-    end
+      def self.plugins
+        [@theme].concat(@plugins).concat(@local_plugins).compact
+      end
 
-    def self.site=(site)
-      @site = site
-    end
+      def self.site=(site)
+        @site = site
+      end
 
-    def self.site
-      @site
-    end
+      def self.site
+        @site
+      end
 
-    def self.config
-      if @config
-        @config
-      else
-        @config            = {}
-        @config['plugins'] = {}
-        @config['theme']   = @theme.nil? ? {} : @theme.config
+      def self.config
+        if @config
+          @config
+        else
+          @config            = {}
+          @config['plugins'] = {}
+          @config['theme']   = @theme.nil? ? {} : @theme.config
 
 
-        plugins.each do |p| 
-          unless p == @theme
-            @config['plugins'][p.name] = p.config
+          plugins.each do |p| 
+            unless p == @theme
+              @config['plugins'][p.name] = p.config
+            end
           end
+
+          @config
         end
+      end
 
-        @config
+      def self.include(name, file)
+        p = plugin(name)
+        p.include(file)
       end
-    end
 
-    def self.include(name, file)
-      p = plugin(name)
-      p.include(file)
-    end
+      def self.register_plugin(plugin, name, type='plugin')
+        new_plugin = plugin.new(name, type)
 
-    def self.register_plugin(plugin, name, type='plugin')
-      new_plugin = plugin.new(name, type)
+        case type
+        when 'theme'
+          @theme = new_plugin
+        when 'local_plugin'
+          @local_plugins << new_plugin
+        else
+          @plugins << new_plugin
+        end
+      end
 
-      case type
-      when 'theme'
-        @theme = new_plugin
-      when 'local_plugin'
-        @local_plugins << new_plugin
-      else
-        @plugins << new_plugin
+      def self.register_layouts
+        plugins.each do |p|
+          p.layouts.clone.each { |layout| layout.register }
+        end
       end
-    end
 
-    def self.register_layouts
-      plugins.each do |p|
-        p.layouts.clone.each { |layout| layout.register }
+      def self.layouts
+        names = []
+        plugins.each do |p|
+          p.layouts.each { |layout| names << layout.name }
+        end
+        names
       end
-    end
 
-    def self.custom_dir
-      @site.config['plugins']
-    end
+      def self.custom_dir
+        @site.config['plugins']
+      end
 
-    def self.fingerprint(paths)
-      paths = [paths] unless paths.is_a? Array
-      Digest::MD5.hexdigest(paths.clone.map! { |path| "#{File.mtime(path).to_i}" }.join)
-    end
-    
-    def self.combined_stylesheet_path(media)
-      File.join('stylesheets', "#{media}-#{@combined_stylesheets[media][:fingerprint]}.css")
-    end
+      def self.fingerprint(paths)
+        paths = [paths] unless paths.is_a? Array
+        Digest::MD5.hexdigest(paths.clone.map! { |path| "#{File.mtime(path).to_i}" }.join)
+      end
+      
+      def self.combined_stylesheet_path(media)
+        File.join('stylesheets', "#{media}-#{@combined_stylesheets[media][:fingerprint]}.css")
+      end
 
-    def self.combined_javascript_path
-      print = @javascript_fingerprint || ''
-      File.join('javascripts', "#{print}.js")
-    end
+      def self.combined_javascript_path
+        print = @javascript_fingerprint || ''
+        File.join('javascripts', "#{print}.js")
+      end
 
-    def self.write_files(source, dest)
-      @site.static_files << StaticFileContent.new(source, dest)
-    end
+      def self.write_files(source, dest)
+        @site.static_files << StaticFileContent.new(source, dest)
+      end
 
-    def self.compile_sass_file(path, options)
-      ::Sass.compile_file(path, options)
-    end
+      def self.compile_sass_file(path, options)
+        ::Sass.compile_file(path, options)
+      end
 
-    def self.compile_sass(contents, options)
-      ::Sass.compile(contents, options)
-    end
+      def self.compile_sass(contents, options)
+        ::Sass.compile(contents, options)
+      end
 
-    def self.sass_config(item, default)
-      config = @site.config
-      if config['octopress'] && config['octopress']['sass'] && config['octopress']['sass'][item]
-        config['octopress']['sass'][item]
-      else
-        default
+      def self.sass_config(item, default)
+        config = @site.config
+        if config['octopress'] && config['octopress']['sass'] && config['octopress']['sass'][item]
+          config['octopress']['sass'][item]
+        else
+          default
+        end
+      end
+      
+      def self.sass_options
+        options = {
+          style:        sass_config('output_style', 'compressed').to_sym,
+          trace:        sass_config('trace', false),
+          line_numbers: sass_config('line_numbers', false)
+        }
       end
-    end
-    
-    def self.sass_options
-      options = {
-        style:        sass_config('output_style', 'compressed').to_sym,
-        trace:        sass_config('trace', false),
-        line_numbers: sass_config('line_numbers', false)
-      }
-    end
 
-    def self.write_combined_stylesheet
-      css = combine_stylesheets
-      css.keys.each do |media|
-        options = sass_options
-        options[:line_numbers] = false
-        contents = compile_sass(css[media][:contents], options)
-        write_files(contents, combined_stylesheet_path(media)) 
+      def self.write_combined_stylesheet
+        css = combine_stylesheets
+        css.keys.each do |media|
+          options = sass_options
+          options[:line_numbers] = false
+          contents = compile_sass(css[media][:contents], options)
+          write_files(contents, combined_stylesheet_path(media)) 
+        end
       end
-    end
 
-    def self.write_combined_javascript
-      js = combine_javascripts
-      write_files(js, combined_javascript_path) unless js == ''
-    end
+      def self.write_combined_javascript
+        js = combine_javascripts
+        write_files(js, combined_javascript_path) unless js == ''
+      end
 
-    def self.combine_stylesheets
-      unless @combined_stylesheets
-        css = {}
-        paths = {}
-        plugins.each do |plugin|
-          if plugin.type == 'theme'
-            plugin_header = "/* Theme: #{plugin.name} */\n"
-          else
-            plugin_header = "/* Plugin: #{plugin.name} */\n"
-          end
-          stylesheets = plugin.stylesheets.clone.concat plugin.sass
-          stylesheets.each do |file|
-            css[file.media] ||= {}
-            css[file.media][:contents] ||= ''
-            css[file.media][:contents] << plugin_header
-            css[file.media][:paths] ||= []
-            
-            # Add Sass files
-            if file.respond_to? :compile
-              css[file.media][:contents].concat file.compile
+      def self.combine_stylesheets
+        unless @combined_stylesheets
+          css = {}
+          paths = {}
+          plugins.each do |plugin|
+            if plugin.type == 'theme'
+              plugin_header = "/* Theme: #{plugin.name} */\n"
             else
-              css[file.media][:contents].concat file.path.read.strip
+              plugin_header = "/* Plugin: #{plugin.name} */\n"
+            end
+            stylesheets = plugin.stylesheets.clone.concat plugin.sass
+            stylesheets.each do |file|
+              css[file.media] ||= {}
+              css[file.media][:contents] ||= ''
+              css[file.media][:contents] << plugin_header
+              css[file.media][:paths] ||= []
+              
+              # Add Sass files
+              if file.respond_to? :compile
+                css[file.media][:contents].concat file.compile
+              else
+                css[file.media][:contents].concat file.path.read.strip
+              end
+              css[file.media][:paths] << file.path
+              plugin_header = ''
             end
-            css[file.media][:paths] << file.path
-            plugin_header = ''
           end
-        end
 
-        css.keys.each do |media|
-          css[media][:fingerprint] = fingerprint(css[media][:paths])
+          css.keys.each do |media|
+            css[media][:fingerprint] = fingerprint(css[media][:paths])
+          end
+          @combined_stylesheets = css
         end
-        @combined_stylesheets = css
+        @combined_stylesheets
       end
-      @combined_stylesheets
-    end
 
-    def self.combine_javascripts
-      unless @combined_javascripts
-        js = ''
-        plugins.each do |plugin| 
-          paths = plugin.javascript_paths
-          @javascript_fingerprint = fingerprint(paths)
-          paths.each do |file|
-            js.concat Pathname.new(file).read
+      def self.combine_javascripts
+        unless @combined_javascripts
+          js = ''
+          plugins.each do |plugin| 
+            paths = plugin.javascript_paths
+            @javascript_fingerprint = fingerprint(paths)
+            paths.each do |file|
+              js.concat Pathname.new(file).read
+            end
           end
+          @combined_javascripts = js
         end
-        @combined_javascripts = js
+        @combined_javascripts
       end
-      @combined_javascripts
-    end
 
-    def self.combined_stylesheet_tag
-      tags = ''
-      combine_stylesheets.keys.each do |media|
-        tags.concat "<link href='#{Filters.expand_url(combined_stylesheet_path(media))}' media='#{media}' rel='stylesheet' type='text/css'>"
+      def self.combined_stylesheet_tag
+        tags = ''
+        combine_stylesheets.keys.each do |media|
+          tags.concat "<link href='#{Filters.expand_url(combined_stylesheet_path(media))}' media='#{media}' rel='stylesheet' type='text/css'>"
+        end
+        tags
       end
-      tags
-    end
 
-    def self.combined_javascript_tag
-      unless combine_javascripts == ''
-        "<script src='#{Filters.expand_url(combined_javascript_path)}'></script>"
+      def self.combined_javascript_tag
+        unless combine_javascripts == ''
+          "<script src='#{Filters.expand_url(combined_javascript_path)}'></script>"
+        end
       end
-    end
 
-    def self.stylesheet_tags
-      if concat_css
-        combined_stylesheet_tag
-      else
-        css = []
-        plugins.each do |plugin| 
-          css.concat plugin.stylesheet_tags
-          css.concat plugin.sass_tags
+      def self.stylesheet_tags
+        if concat_css
+          combined_stylesheet_tag
+        else
+          css = []
+          plugins.each do |plugin| 
+            css.concat plugin.stylesheet_tags
+            css.concat plugin.sass_tags
+          end
+          css
         end
-        css
       end
-    end
 
-    def self.concat_css
-      config = @site.config
-      if config['octopress'] && !config['octopress']['concat_css'].nil?
-        config['octopress']['concat_css'] != false
-      else
-        true
+      def self.concat_css
+        config = @site.config
+        if config['octopress'] && !config['octopress']['concat_css'].nil?
+          config['octopress']['concat_css'] != false
+        else
+          true
+        end
       end
-    end
 
-    def self.concat_js
-      config = @site.config
-      if config['octopress'] && !config['octopress']['concat_js'].nil?
-        config['octopress']['concat_js'] != false
-      else
-        true
+      def self.concat_js
+        config = @site.config
+        if config['octopress'] && !config['octopress']['concat_js'].nil?
+          config['octopress']['concat_js'] != false
+        else
+          true
+        end
       end
-    end
 
-    def self.javascript_tags
-      if concat_js
-        combined_javascript_tag
-      else
-        js = []
+      def self.javascript_tags
+        if concat_js
+          combined_javascript_tag
+        else
+          js = []
+          plugins.each do |plugin| 
+            js.concat plugin.javascript_tags
+          end
+          js
+        end
+      end
+
+      def self.copy_javascripts
         plugins.each do |plugin| 
-          js.concat plugin.javascript_tags
+          copy plugin.javascripts
         end
-        js
       end
-    end
 
-    def self.copy_javascripts
-      plugins.each do |plugin| 
-        copy plugin.javascripts
+      def self.copy_stylesheets
+        stylesheets = plugins.clone.map { 
+          |p| p.stylesheets.clone.concat(p.sass) 
+        }.flatten
+        copy stylesheets
       end
-    end
 
-    def self.copy_stylesheets
-      stylesheets = plugins.clone.map { 
-        |p| p.stylesheets.clone.concat(p.sass) 
-      }.flatten
-      copy stylesheets
-    end
+      def self.add_static_files
+       
+        plugin('user stylesheets').add_files
+   
+        # Copy/Generate Stylesheets
+        #
+        if concat_css
+          write_combined_stylesheet
+        else
+          copy_stylesheets
+        end
 
-    def self.add_static_files
-     
-      plugin('user stylesheets').add_files
- 
-      # Copy/Generate Stylesheets
-      #
-      if concat_css
-        write_combined_stylesheet
-      else
-        copy_stylesheets
-      end
-
-      # Copy/Generate Javascripts
-      #
-      if concat_js
-        write_combined_javascript
-      else
-        copy_javascripts
-      end
-
-      # Copy other assets
-      #
-      copy_static_files
-    end
+        # Copy/Generate Javascripts
+        #
+        if concat_js
+          write_combined_javascript
+        else
+          copy_javascripts
+        end
 
-    def self.copy_static_files
-      plugins.each do |plugin| 
-        copy plugin.files
-        copy plugin.images
-        copy plugin.fonts
+        # Copy other assets
+        #
+        copy_static_files
       end
-    end
 
-    def self.copy(files)
-      files.each { |f| f.copy }
+      def self.copy_static_files
+        plugins.each do |plugin| 
+          copy plugin.files
+          copy plugin.pages
+          copy plugin.images
+          copy plugin.fonts
+        end
+      end
+
+      def self.copy(files)
+        files.each { |f| f.copy }
+      end
     end
   end
 end