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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 162338185650a24dbf63fc3f9e937c325696e8a4
-  data.tar.gz: 4127281186efb590b13ffcbcab498ece1db4b418
+  metadata.gz: e8a279528f24b7e446198070bc0ea4c00013de60
+  data.tar.gz: e1d785013bb97799ccc2e43fbb706aeed5e0fc55
 SHA512:
-  metadata.gz: a3e4a7d833d68f8e60a518db42e581a765197fa2904fbaaade630abdd69cdb2143e4dc058a7724fce4e022251ebd108d98e5ab94186e9ab0bffb61e7b8c31cf7
-  data.tar.gz: 26736224cbb3f390c8be6877e357f6cc83daa09bdbcca78c8e9276b1bdfd25acf0a5cf5c215d793cb43be00320627119230b0a70dddbe6f4de40fb7cd5b997e5
+  metadata.gz: de01893c4f27a36317eab262666d6a148f9a46330fd8d94029055b0b57ea368a39d318b7fedf4d39ca7041132ba1508f1e8e078d4cd995d050944b79c61851c9
+  data.tar.gz: 34065ae04b71a48f48fe441fb56956bfb780b14b0ef76ccef277a1d2f981201d1a39b5f06a39af2e0a118746afc325fbd674e4b64af0fe99ec5cbd9921be899a

data/fixtures/different-engine-layout/source/index.haml

@@ -0,0 +1 @@
+%h1 Welcome

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

@@ -179,7 +179,20 @@ module Middleman
 
         # 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))
+          super || has_key?(method)
+        end
+        
+        # Make DataStore act like a hash. Return requested data, or
+        # nil if data does not exist
+        #
+        # @param [String, Symbol] key The name of the data namespace
+        # @return [Hash, nil]
+        def [](key)
+          __send__(key) if has_key?(key)
+        end
+
+        def has_key?(key)
+          @local_data.has_key?(key.to_s) || !!(data_for_path(key))
         end
 
         # Convert all the data into a static hash

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

@@ -27,6 +27,8 @@ module Middleman
         def registered(app)
           app.send :include, InstanceMethods
 
+          app.config.define_setting :file_watcher_ignore, IGNORE_LIST, 'Regexes for paths that should be ignored when they change.'
+
           # Before parsing config, load the data/ directory
           app.before_configuration do
             files.reload_path(config[:data_dir])
@@ -146,7 +148,7 @@ module Middleman
         # @return [Boolean]
         def ignored?(path)
           path = path.to_s
-          IGNORE_LIST.any? { |r| path =~ r }
+          app.config[:file_watcher_ignore].any? { |r| path =~ r }
         end
 
         # Notify callbacks for a file given an array of callbacks

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

@@ -413,7 +413,8 @@ module Middleman
             @_out_buf = _buf_was
           end
 
-          concat_safe_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
+          # concat_safe_content
+          concat_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
         ensure
           @current_engine = engine_was
         end

data/lib/middleman-core/sitemap/store.rb

@@ -184,28 +184,10 @@ module Middleman
       # @return [String]
       def extensionless_path(file)
         path = file.dup
-
-        end_of_the_line = false
-        while !end_of_the_line
-          if !::Tilt[path].nil?
-            path = path.sub(File.extname(path), "")
-          else
-            end_of_the_line = true
-          end
-        end
+        path = remove_templating_extensions(path)
 
         # If there is no extension, look for one
-        if File.extname(path).empty?
-          input_ext = File.extname(file)
-
-          if !input_ext.empty?
-            input_ext = input_ext.split(".").last.to_sym
-            if @app.template_extensions.has_key?(input_ext)
-              path << ".#{@app.template_extensions[input_ext]}"
-            end
-          end
-        end
-
+        path = find_extension(path, file) if File.extname(strip_away_locale(path)).empty?
         path
       end
 
@@ -242,6 +224,46 @@ module Middleman
           @_lookup_by_destination_path = {}
         }
       end
+
+      # Removes the templating extensions, while keeping the others
+      # @param [String] path
+      # @return [String]
+      def remove_templating_extensions(path)
+        # Strip templating extensions as long as Tilt knows them
+        path = path.sub(File.extname(path), "") while ::Tilt[path]
+        path
+      end
+
+      # Remove the locale token from the end of the path
+      # @param [String] path
+      # @return [String]
+      def strip_away_locale(path)
+        if app.respond_to? :langs
+          path_bits = path.split('.')
+          lang = path_bits.last
+          if app.langs.include?(lang.to_sym)
+            return path_bits[0..-1].join('.')
+          end
+        end
+
+        path
+      end
+
+      # Finds an extension for path according to file's extension
+      # @param [String] path without extension
+      # @param [String] file path with original extensions
+      def find_extension(path, file)
+        input_ext = File.extname(file)
+
+        if !input_ext.empty?
+          input_ext = input_ext.split(".").last.to_sym
+          if @app.template_extensions.has_key?(input_ext)
+            path << ".#{@app.template_extensions[input_ext]}"
+          end
+        end
+
+        path
+      end
     end
   end
 end

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

@@ -24,10 +24,9 @@
 #   page "/admin/*"
 # end
 
-# Proxy (fake) files
-# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
-#   @which_fake_page = "Rendering a fake page with a variable"
-# end
+# Proxy pages (http://middlemanapp.com/dynamic-pages/)
+# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
+#  :which_fake_page => "Rendering a fake page with a local variable" }
 
 ###
 # Helpers
@@ -36,6 +35,9 @@
 # Automatic image dimensions on image_tag helper
 # activate :automatic_image_sizes
 
+# Reload the browser automatically whenever files change
+# activate :livereload
+
 # Methods defined in the helpers block are available in templates
 # helpers do
 #   def some_helper
@@ -73,11 +75,11 @@ configure :build do
   # activate :minify_javascript
 
   # Enable cache buster
-  # activate :cache_buster
+  # activate :asset_hash
 
   # Use relative URLs
   # activate :relative_assets
 
   # Or use a different image path
   # set :http_path, "/Content/images/"
-end
+end

data/lib/middleman-core/version.rb

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

data/middleman-core.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rack-test", ["~> 0.6.1"])
   
   # CLI
-  s.add_dependency("thor", ["~> 0.17.0"])
+  s.add_dependency("thor", ["~> 0.15.2"])
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.6"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta.2
+  version: 3.1.0.beta.3
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +219,7 @@ files:
 - fixtures/data-app/source/index.html.erb
 - fixtures/data-app/source/layout.erb
 - fixtures/different-engine-layout/config.rb
-- fixtures/different-engine-layout/source/index.html.str
+- fixtures/different-engine-layout/source/index.haml
 - fixtures/different-engine-layout/source/layout.erb
 - fixtures/dynamic-pages-app/config.rb
 - fixtures/dynamic-pages-app/source/real.html
@@ -739,7 +739,7 @@ test_files:
 - fixtures/data-app/source/index.html.erb
 - fixtures/data-app/source/layout.erb
 - fixtures/different-engine-layout/config.rb
-- fixtures/different-engine-layout/source/index.html.str
+- fixtures/different-engine-layout/source/index.haml
 - fixtures/different-engine-layout/source/layout.erb
 - fixtures/dynamic-pages-app/config.rb
 - fixtures/dynamic-pages-app/source/real.html

data/fixtures/different-engine-layout/source/index.html.str

@@ -1 +0,0 @@
-<h1>Welcome</h1>