middleman 1.2.1 → 1.2.2

data/features/builder.feature

@@ -10,7 +10,6 @@ Feature: Builder
     Then "services/index.html" should exist and include "Services"
     Then "stylesheets/site.css" should exist and include "html, body, div, span"
     Then "stylesheets/site_scss.css" should exist and include "html, body, div, span"
-    Then "stylesheets/test_less.css" should exist and include "666"
     Then "stylesheets/static.css" should exist and include "body"
     Then "_partial.html" should not exist
     And cleanup built test app

data/lib/middleman/features/data.rb

@@ -1,8 +1,11 @@
 require "yaml"
+require "httparty"
+require "thor"
 
 module Middleman::Features::Data
   class << self
     def registered(app)
+      app.extend ClassMethods
       app.helpers Middleman::Features::Data::Helpers
     end
     alias :included :registered
@@ -20,11 +23,57 @@ module Middleman::Features::Data
     end
     
     def method_missing(path)
+      response = nil
+      
+      @@remote_sources ||= {}
+      if @@remote_sources.has_key?(path.to_s)
+        response = HTTParty.get(@@remote_sources[path.to_s]).parsed_response
+      end
+      
       file_path = File.join(@app.class.root, "data", "#{path}.yml")      
       if File.exists? file_path
-        return YAML.load_file(file_path)
+        response = YAML.load_file(file_path)
+      end
+      
+      if response
+        recursively_enhance(response)
+      end
+    end
+    
+    def self.add_source(name, json_url)
+      @@remote_sources ||= {}
+      @@remote_sources[name.to_s] = json_url
+    end
+  
+  private
+    def recursively_enhance(data)
+      if data.is_a? Hash
+        data = Thor::CoreExt::HashWithIndifferentAccess.new(data)
+        data.each do |key, val|
+          data[key] = recursively_enhance(val)
+        end
+        data
+      elsif data.is_a? Array
+        data.each_with_index do |val, i|
+          data[i] = recursively_enhance(val)
+        end
+        data
+      else
+        data
       end
     end
   end
   
+  module ClassMethods
+    # Makes HTTP json data available in the data object
+    #
+    #     data_source :my_json, "http://my/file.json"
+    #
+    # Available in templates as:
+    #
+    #     data.my_json
+    def data_source(name, url)
+      Middleman::Features::Data::DataObject.add_source(name, url)
+    end
+  end
 end

data/lib/middleman/features/minify_javascript.rb

@@ -3,22 +3,10 @@ module Middleman::Features::MinifyJavascript
     def registered(app)
       # Only do minification on build or prod mode
       return unless [:build, :production].include? app.environment
-      
-      Middleman::Features::MinifyJavascript::Haml::Javascript.send :include, ::Haml::Filters::Base
 
       require "middleman/features/minify_javascript/rack"
       app.use Middleman::Rack::MinifyJavascript
     end
     alias :included :registered
   end
-
-  module Haml
-    module Javascript
-      def render_with_options(text, options)
-        compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
-        data = compressor.compress(text)
-        %Q{<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>}
-      end
-    end
-  end
 end

data/lib/middleman/features/minify_javascript/rack.rb

@@ -1,7 +1,7 @@
 begin
-  require "yui/compressor"
+  require 'uglifier'
 rescue LoadError
-  puts "YUI-Compressor not available. Install it with: gem install yui-compressor"
+  puts "UglifyJS not available. Install it with: gem install uglifier"
 end
   
 module Middleman
@@ -16,14 +16,14 @@ module Middleman
         status, headers, response = @app.call(env)
     
         if env["PATH_INFO"].match(/\.js$/)
-          compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
+          compressor = ::Uglifier.new
       
           if response.is_a?(::Rack::File) or response.is_a?(Sinatra::Helpers::StaticFile)
             uncompressed_source = File.read(response.path)
           else
             uncompressed_source = response.join
           end
-          minified = compressor.compress(uncompressed_source)
+          minified = compressor.compile(uncompressed_source)
           headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
           response = [minified]
         end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/middleman.gemspec

@@ -23,19 +23,19 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("kirk", ["~> 0.1.8"]) if defined?(JRUBY_VERSION)
   s.add_runtime_dependency("shotgun", ["~> 0.8.0"])
   s.add_runtime_dependency("thor", ["~> 0.14.0"])
-  s.add_runtime_dependency("tilt", ["~> 1.2.0"])
+  s.add_runtime_dependency("tilt", ["~> 1.3.0"])
   s.add_runtime_dependency("sinatra", ["~> 1.2.0"])
   s.add_runtime_dependency("padrino-core", ["~> 0.9.23"])
   s.add_runtime_dependency("padrino-helpers", ["~> 0.9.23"])
   s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
-  s.add_runtime_dependency("yui-compressor", ["~> 0.9.0"])
+  s.add_runtime_dependency("therubyracer", ["~> 0.8.0"]) unless defined?(JRUBY_VERSION)
+  s.add_runtime_dependency("therubyrhino", ["~> 1.72.0"]) if defined?(JRUBY_VERSION)
+  s.add_runtime_dependency("uglifier", ["~> 0.5.0"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.1"])
-  s.add_runtime_dependency("chunky_png", ["~> 1.1.0"])
-  s.add_runtime_dependency("oily_png", ["~> 1.0"]) unless defined?(JRUBY_VERSION)
   s.add_runtime_dependency("coffee-script", ["~> 2.1.0"])
-  s.add_runtime_dependency("less", ["~> 1.2.0"])
+  s.add_runtime_dependency("httparty", ["~> 0.7.0"])
   # s.add_runtime_dependency("fssm", ["~> 0.2.0"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])
   s.add_development_dependency("rspec", [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,12 +89,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 27
         segments: 
         - 1
-        - 2
+        - 3
         - 0
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -162,39 +162,39 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: yui-compressor
+  name: therubyracer
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 63
         segments: 
         - 0
-        - 9
+        - 8
         - 0
-        version: 0.9.0
+        version: 0.8.0
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: uglifier
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
-        - 3
-        - 1
         - 0
-        version: 3.1.0
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: sass
+  name: haml
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -210,56 +210,41 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: compass
+  name: sass
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 3
         segments: 
-        - 0
-        - 11
+        - 3
         - 1
-        version: 0.11.1
+        - 0
+        version: 3.1.0
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: chunky_png
+  name: compass
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 49
         segments: 
-        - 1
-        - 1
         - 0
-        version: 1.1.0
-  type: :runtime
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: oily_png
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
+        - 11
         - 1
-        - 0
-        version: "1.0"
+        version: 0.11.1
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -271,27 +256,27 @@ dependencies:
         - 0
         version: 2.1.0
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: less
+  name: httparty
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 3
         segments: 
-        - 1
-        - 2
         - 0
-        version: 1.2.0
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -303,11 +288,11 @@ dependencies:
         - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id018
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -317,11 +302,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id019
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -331,7 +316,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id019
 description: 
 email: 
 - tdreyno@gmail.com
@@ -360,7 +345,6 @@ files:
 - features/generator.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_page_classes.feature
-- features/less-css.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/padrino_helpers.feature
@@ -404,7 +388,6 @@ files:
 - fixtures/test-app/views/stylesheets/relative_assets.css.sass
 - fixtures/test-app/views/stylesheets/site.css.sass
 - fixtures/test-app/views/stylesheets/site_scss.css.scss
-- fixtures/test-app/views/stylesheets/test_less.css.less
 - fixtures/test-app/views/tiny_src.html.haml
 - lib/middleman.rb
 - lib/middleman/assets.rb
@@ -500,7 +483,6 @@ test_files:
 - features/generator.feature
 - features/helpers_auto_stylesheet_link_tag.feature
 - features/helpers_page_classes.feature
-- features/less-css.feature
 - features/minify_css.feature
 - features/minify_javascript.feature
 - features/padrino_helpers.feature
@@ -544,5 +526,4 @@ test_files:
 - fixtures/test-app/views/stylesheets/relative_assets.css.sass
 - fixtures/test-app/views/stylesheets/site.css.sass
 - fixtures/test-app/views/stylesheets/site_scss.css.scss
-- fixtures/test-app/views/stylesheets/test_less.css.less
 - fixtures/test-app/views/tiny_src.html.haml

data/features/less-css.feature

@@ -1,7 +0,0 @@
-Feature: Support Less CSS
- In order to offer an alternative when writing CSS
-
- Scenario: Rendering Less
-   Given the Server is running
-   When I go to "/stylesheets/test_less.css"
-   Then I should see "666"

data/fixtures/test-app/views/stylesheets/test_less.css.less

@@ -1,5 +0,0 @@
-@brand_color: #666666;
-
-#header {
-  color: @brand_color;
-}