middleman-core 3.1.0.beta.1 → 3.1.0.beta.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 162338185650a24dbf63fc3f9e937c325696e8a4
+  data.tar.gz: 4127281186efb590b13ffcbcab498ece1db4b418
+SHA512:
+  metadata.gz: a3e4a7d833d68f8e60a518db42e581a765197fa2904fbaaade630abdd69cdb2143e4dc058a7724fce4e022251ebd108d98e5ab94186e9ab0bffb61e7b8c31cf7
+  data.tar.gz: 26736224cbb3f390c8be6877e357f6cc83daa09bdbcca78c8e9276b1bdfd25acf0a5cf5c215d793cb43be00320627119230b0a70dddbe6f4de40fb7cd5b997e5

data/lib/middleman-core/core_extensions/data.rb

@@ -177,6 +177,11 @@ module Middleman
           super
         end
 
+        # Needed so that method_missing makes sense
+        def respond_to?(method, include_private = false)
+          super || @local_data.has_key?(method.to_s) || !!(data_for_path(method))
+        end
+
         # Convert all the data into a static hash
         #
         # @return [Hash]

data/lib/middleman-core/core_extensions/extensions.rb

@@ -37,6 +37,7 @@ module Middleman
       class << self
         # @private
         def registered(app)
+          app.define_hook :initialized
           app.define_hook :after_configuration
           app.define_hook :before_configuration
           app.define_hook :build_config
@@ -68,19 +69,15 @@ module Middleman
         # @param [Hash] options Per-extension options hash
         # @return [void]
         def register(extension, options={}, &block)
-          if extension.instance_of? Module
-            extend extension
-            if extension.respond_to?(:registered)
-              if extension.method(:registered).arity === 1
-                extension.registered(self, &block)
-              else
-                extension.registered(self, options, &block)
-              end
+          extend extension
+          if extension.respond_to?(:registered)
+            if extension.method(:registered).arity === 1
+              extension.registered(self, &block)
+            else
+              extension.registered(self, options, &block)
             end
-            extension
-          elsif extension.instance_of?(Class) && extension.ancestors.include?(::Middleman::Extension)
-            extension.new(self, options, &block)
           end
+          extension
         end
       end
 
@@ -105,7 +102,22 @@ module Middleman
             logger.error "== Unknown Extension: #{ext}"
           else
             logger.debug "== Activating: #{ext}"
-            extensions[ext] = self.class.register(ext_module, options, &block)
+
+            if ext_module.instance_of? Module
+              extensions[ext] = self.class.register(ext_module, options, &block)
+            elsif ext_module.instance_of?(Class) && ext_module.ancestors.include?(::Middleman::Extension)
+              if ext_module.supports_multiple_instances?
+                extensions[ext] ||= {}
+                key = "instance_#{extensions[ext].keys.length}"
+                extensions[ext][key] = ext_module.new(self.class, options, &block)
+              else
+                if extensions[ext]
+                  logger.error "== #{ext} already activated."
+                else
+                  extensions[ext] = ext_module.new(self.class, options, &block)
+                end
+              end
+            end
           end
         end
 
@@ -144,11 +156,19 @@ module Middleman
           run_hook :build_config if build?
           run_hook :development_config if development?
 
+          run_hook :initialized
+
           run_hook :after_configuration
 
           logger.debug "Loaded extensions:"
           self.extensions.each do |ext,_|
-            logger.debug "== Extension: #{ext}"
+            if ext.is_a?(Hash)
+              ext.each do |k,_|
+                logger.debug "== Extension: #{k}"
+              end
+            else
+              logger.debug "== Extension: #{ext}"
+            end
           end
         end
       end

data/lib/middleman-core/core_extensions/rendering.rb

@@ -25,6 +25,8 @@ module Middleman
           ::Tilt.mappings.delete('html') # WTF, Tilt?
           ::Tilt.mappings.delete('csv')
 
+          require 'active_support/core_ext/string/output_safety'
+
           # Activate custom renderers
           require "middleman-core/renderers/erb"
           app.register Middleman::Renderers::ERb
@@ -127,9 +129,10 @@ module Middleman
 
           # Store last engine for later (could be inside nested renders)
           @current_engine, engine_was = engine, @current_engine
-          old_locale = ::I18n.locale
-
-          I18n.locale = opts[:lang] if opts[:lang]
+          if defined?(::I18n)
+            old_locale = ::I18n.locale
+            ::I18n.locale = opts[:lang] if opts[:lang]
+          end
 
           # Use a dup of self as a context so that instance variables set within
           # the template don't persist for other templates.
@@ -167,7 +170,7 @@ module Middleman
         ensure
           # Pop all the saved variables from earlier as we may be returning to a
           # previous render (layouts, partials, nested layouts).
-          ::I18n.locale = old_locale
+          ::I18n.locale = old_locale if defined?(::I18n)
           @current_engine = engine_was
           @content_blocks = nil
           @current_locs = nil
@@ -274,7 +277,9 @@ module Middleman
             content = callback.call(content, path, locs, template_class)
           end
 
-          return content
+          output = ::ActiveSupport::SafeBuffer.new
+          output.safe_concat content
+          output
         ensure
           # Reset stored buffer
           @_out_buf = _buf_was
@@ -408,7 +413,7 @@ module Middleman
             @_out_buf = _buf_was
           end
 
-          concat_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
+          concat_safe_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
         ensure
           @current_engine = engine_was
         end

data/lib/middleman-core/extensions.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/class/attribute"
+
 module Middleman
 
   module Extensions
@@ -82,7 +84,7 @@ module Middleman
     def rubygems_latest_specs
       # If newer Rubygems
       if ::Gem::Specification.respond_to? :latest_specs
-        ::Gem::Specification.latest_specs
+        ::Gem::Specification.latest_specs(true)
       else
         ::Gem.source_index.latest_specs
       end
@@ -102,6 +104,10 @@ module Middleman
   end
 
   class Extension
+    class_attribute :supports_multiple_instances, :instance_reader => false, :instance_writer => false
+    class_attribute :defined_helpers, :instance_reader => false, :instance_writer => false
+    class_attribute :ext_name, :instance_reader => false, :instance_writer => false
+
     class << self
       def config
         @_config ||= ::Middleman::Configuration::ConfigurationManager.new
@@ -110,11 +116,29 @@ module Middleman
       def option(key, default=nil, description=nil)
         config.define_setting(key, default, description)
       end
+
+      def helpers(&block)
+        self.defined_helpers ||= []
+
+        m = Module.new
+        m.module_eval(&block)
+        self.defined_helpers << m
+      end
+
+      def extension_name
+        self.ext_name || self.name.underscore.split("/").last.to_sym
+      end
+
+      def register(n=self.extension_name)
+        ::Middleman::Extensions.register(n, self)
+      end
     end
 
     attr_accessor :app, :options
 
     def initialize(klass, options_hash={})
+      @_helpers = []
+
       @options = self.class.config.dup
       @options.finalize!
 
@@ -125,14 +149,23 @@ module Middleman
       yield @options if block_given?
 
       ext = self
-      klass.after_configuration do
+      klass.initialized do
         ext.app = self
-        ext.after_configuration
+        
+        (ext.class.defined_helpers || []).each do |m|
+          ext.app.class.send(:include, m)
+        end
       end
-    end
 
-    def after_configuration
-      nil
+      klass.after_configuration do
+        if ext.respond_to?(:after_configuration)
+          ext.after_configuration
+        end
+
+        if ext.respond_to?(:manipulate_resource_list)
+          ext.app.sitemap.register_resource_list_manipulator(ext.class.extension_name, ext)
+        end
+      end
     end
   end
 end

data/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -32,7 +32,7 @@ module Middleman
           'Path' => @resource.path,
           'Build Path' => @resource.destination_path,
           'URL' => content_tag(:a, @resource.url, :href => @resource.url),
-          'Template' => @resource.source_file,
+          'Source File' => @resource.source_file,
         }
 
         data = @resource.data

data/lib/middleman-core/renderers/slim.rb

@@ -19,7 +19,9 @@ module Middleman
           # Setup Slim options to work with partials
           ::Slim::Engine.set_default_options(
             :buffer    => '@_out_buf',
-            :generator => ::Temple::Generators::StringBuffer
+            :use_html_safe => true,
+            :generator => ::Temple::Generators::RailsOutputBuffer,
+            :disable_escape => true
           )
           
           app.after_configuration do

data/lib/middleman-core/sitemap/extensions/traversal.rb

@@ -68,6 +68,9 @@ module Middleman
         # (e.g., if the resource is named 'gallery.html' and a path exists named 'gallery/', this would return true)
         # @return [Boolean]
         def eponymous_directory?
+          if !path.end_with?("/#{app.index_file}") && destination_path.end_with?("/#{app.index_file}")
+            return true
+          end
           full_path = File.join(app.source_dir, eponymous_directory_path)
           !!(File.exists?(full_path) && File.directory?(full_path))
         end

data/lib/middleman-core/templates/extension/Gemfile

@@ -6,14 +6,14 @@ source 'http://rubygems.org'
 gemspec
 
 group :development do
-  gem "rake",     "~> 0.9.2"
-  gem "rdoc",     "~> 3.9"
-  gem "yard",     "~> 0.8.0"
+  gem "rake"
+  gem "rdoc"
+  gem "yard"
 end
 
 group :test do
-  gem "cucumber", "~> 1.2.0"
+  gem "cucumber"
   gem "fivemat"
-  gem "aruba",    "~> 0.4.11"
-  gem "rspec",    "~> 2.7"
+  gem "aruba"
+  gem "rspec"
 end

data/lib/middleman-core/templates/extension/gitignore

@@ -1,2 +1,5 @@
 # Ignore bundler lock file
-Gemfile.lock
+/Gemfile.lock
+
+# Ignore pkg folder
+/pkg

data/lib/middleman-core/templates/extension/lib/lib.rb

@@ -2,19 +2,16 @@
 require "middleman-core"
 
 # Extension namespace
-module MyExtension < Middleman::Extension
+class MyExtension < ::Middleman::Extension
   option :my_option, "default", "An example option"
 
-  def initialize(app, options_hash={})
+  def initialize(app, options_hash={}, &block)
     # Call super to build options from the options_hash
     super
 
     # Require libraries only when activated
     # require 'necessary/library'
 
-    # Include helpers or instance methods for the Middleman app
-    # app.send :include, Helpers
-
     # set up your extension
     # puts options.my_option
   end
@@ -23,7 +20,11 @@ module MyExtension < Middleman::Extension
     # Do something
   end
 
-  # module Helpers
+  # A Sitemap Manipulator
+  # def manipulate_resource_list(resources)
+  # end
+
+  # module do
   #   def a_helper
   #   end
   # end
@@ -32,9 +33,7 @@ end
 
 # Register extensions which can be activated
 # Make sure we have the version of Middleman we expect
-# ::Middleman::Extensions.register(:extension_name) do
-#
-#   # Return the extension class
-#   ::MyExtension
-#
-# end
+# Name param may be omited, it will default to underscored
+# version of class name
+
+# MyExtension.register(:my_extension)

data/lib/middleman-core/templates/shared/Gemfile.tt

@@ -4,6 +4,9 @@ source 'http://rubygems.org'
 
 gem "middleman", "~><%= Middleman::VERSION %>"
 
+# Live-reloading plugin
+gem "middleman-livereload"
+
 # For faster file watcher updates:
 # gem "rb-fsevent", "~> 0.9.3") # OS X
 # gem "rb-inotify", "~> 0.9.0") # Linux

data/lib/middleman-core/templates/shared/config.tt

@@ -2,10 +2,6 @@
 # Compass
 ###
 
-# Susy grids in Compass
-# First: gem install susy
-# require 'susy'
-
 # Change Compass configuration
 # compass_config do |config|
 #   config.output_style = :compact
@@ -82,11 +78,6 @@ configure :build do
   # Use relative URLs
   # activate :relative_assets
 
-  # Compress PNGs after build
-  # First: gem install middleman-smusher
-  # require "middleman-smusher"
-  # activate :smusher
-
   # Or use a different image path
   # set :http_path, "/Content/images/"
 end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.1.0.beta.1' unless const_defined?(:VERSION)
+  VERSION = '3.1.0.beta.2' unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -19,20 +19,18 @@ Gem::Specification.new do |s|
   
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
-  s.add_dependency("rack", ["~> 1.4.1"])
+  s.add_dependency("rack", [">= 1.4.5"])
   s.add_dependency("tilt", ["~> 1.3.6"])
   
   # Builder
   s.add_dependency("rack-test", ["~> 0.6.1"])
   
   # CLI
-  s.add_dependency("thor", ["~> 0.15.4"])
+  s.add_dependency("thor", ["~> 0.17.0"])
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.7.3"])
-  # s.add_dependency("rb-fsevent", ["~> 0.9.3"]) # OS X
-  # s.add_dependency("rb-inotify", ["~> 0.9.0"]) # Linux
+  s.add_dependency("listen", ["~> 1.0.2"])
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta.1
-  prerelease: 6
+  version: 3.1.0.beta.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,23 +28,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,23 +70,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,19 +98,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 1.0.2
 description: A static site generator. Provides dozens of templating languages (Haml,
   Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
   busting, Yaml data (and more) an easy part of your development cycle.
@@ -638,30 +623,26 @@ files:
 homepage: http://middlemanapp.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4098219803529430260
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hand-crafted frontend development
 test_files:
 - features/3rd_party_cli.feature