haml-more 0.4.0 → 0.5.0

data/README.md

@@ -1,7 +1,7 @@
 Haml::More and Sass::More
 =========================
 
-Adds more functionality to Haml and Sass.
+Adds more functionality to Haml and Sass. Haml helpers detect if called from another context, so they are usable with Erb and friends.
 
 BigBand
 -------

data/lib/haml/more.rb

@@ -1,6 +1,14 @@
 require "haml"
 require "sass/more"
-require "monkey"
+require "monkey-lib"
+
+begin
+  require 'escape_utils/html/haml'
+rescue LoadError
+  if Monkey::Engine.mri? or Monkey::Engine.rbx?
+    warn "Please run 'gem install escape_utils' to speed up Haml!"
+  end
+end
 
 module Haml
   module More
@@ -35,7 +43,7 @@ module Haml
 
     def self.included(klass)
       Haml::More::CoffeeScript.activate
-      klass.send :include, Haml::More::ContentFor
+      klass.send :include, Haml::More::ContentFor, Haml::More::Javascript
       super
     end
 

data/lib/haml/more/coffee_script.rb

@@ -1,5 +1,5 @@
 require "haml/more"
-require "monkey"
+require "monkey-lib"
 
 module Haml::More::CoffeeScript
   include Haml::Filters::Base

data/lib/haml/more/javascript.rb

@@ -0,0 +1,102 @@
+require 'haml/more'
+require 'forwardable'
+
+module Haml::More::JavaScript
+  class Pattern
+    attr_accessor :pattern, :default_version
+
+    def self.google(default_version = 1, minified = false)
+      new "http://ajax.googleapis.com/ajax/libs/%1$s/%2$s/%1$s#{'.min' if minified}.js",
+      default_version
+    end
+
+    def new(pattern, default_version = 1)
+      return super if pattern.respond_to? :to_str
+      send(pattern, default_version)
+    end
+
+    def initialize(pattern, default_version = 1)
+      @pattern, @default_version = pattern, default_version
+    end
+
+    def %(values)
+      pattern.gsub("%V", "%2$s") % [values[0], values[1] || default_version, *values[2..-1]]
+    end
+  end
+
+  module ClassMethods
+    # here is an idea: map to hash, store in haml file
+    DEFAULTS = [
+      # http://code.google.com/apis/ajaxlibs/documentation/
+      # lib,            pattern,  v,  min
+      [ :jquery,        :google,  1,  true  ],
+      [ :jqueryui,      :google,  1,  true  ],
+      [ :prototype,     :google,  1         ],
+      [ :scriptaculous, :google,  1         ],
+      [ :mootools,      :google,  1,  true  ],
+      [ :dojo,          :google,  1,  true  ],
+      [ :swfobject,     :google,  2,  true  ],
+      [ :yui,           :google,  2,  true  ], # for 3.x, see below
+      [ "ext-core",     :google,  3         ],
+      [ :webfont,       :google,  1         ],
+
+      # others
+      [ "chrome-frame",   "http://ajax.googleapis.com/ajax/libs/chrome-frame/%V/CFInstall.min.js"             ],
+      [ :modernizr,       "http://github.com/Modernizr/Modernizr/raw/v%V/modernizr.js",               '1.1'   ],
+      [ :hyphenator,      "http://hyphenator.googlecode.com/svn/tags/Version%%20%V/Hyphenator.js",    '3.0.0' ],
+      [ :yui3,            "http://yui.yahooapis.com/combo?%V/build/yui/yui-min.js",                   '3.1.1' ],
+      [ :sizzle,          "http://github.com/jeresig/sizzle/raw/master/sizzle.js"                             ],
+      [ :underscore,      "http://github.com/documentcloud/underscore/raw/%V/underscore-min.js",      '1.0.2' ],
+      [ :raphael,         "http://github.com/DmitryBaranovskiy/raphael/raw/v%V/raphael-min.js",       '1.4.3' ],
+      [ :cufon,           "http://cufon.shoqolate.com/js/cufon-yui.js"                                        ],
+      [ "coffee-script",  "http://github.com/jashkenas/coffee-script/raw/%V/extras/coffee-script.js", '0.6.2' ],
+      [ :sammy,           "http://github.com/quirkey/sammy/raw/v%V/lib/min/sammy-%V.min.js",          '0.5.4' ]
+    ]
+
+    def included(klass)
+      klass.send :include, Haml::More::JavaScript::InstanceMethods
+      super
+    end
+
+    def javascript_default_pattern
+      @javascript_default_pattern ||= Haml::More::JavaScript::Pattern.google
+    end
+
+    def javascript_guessing?
+      true
+    end
+
+    def javascript_url_for(name, version = nil, *args)
+      return javascript_url_map[name] % [name, version, *args] if javascript_url_map.includes? name
+      javascript_default_pattern % [name, version, *args] if javascript_guessing?
+    end
+
+    def set_javascript(name, *args)
+      javascript_url_map[name.to_s] = Haml::More::JavaScript::Pattern.new(*args)
+    end
+
+    def javascript_url_map
+      return @javascript_url_map if @javascript_url_map
+      @javascript_url_map = Hash.new { |h,k| h[k.to_s] unless k.respond_to? :to_str }
+      DEFAULTS.each { |args| set_javascript(*args) }
+    end
+  end
+
+  module InstanceMethods
+    include Haml::More::AbstractHelper
+
+    def javascript(*list)
+      return javascript(list) if list.size == 2 and list.last.to_s =~ /^\d[\.\d]*$/
+      haml_helper do
+        list.each do |entry|
+          entry = entry.to_a if entry.respond_to? to_a
+          haml_tag :script, :type => "text/javascript", :src => self.class.javascript_url_for(*entry)
+        end
+      end
+    end
+  end
+
+  def self.append_features(klass)
+    klass.extend ClassMethods
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml-more
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: monkey-lib
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 4
+        - 5
         - 0
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 2
         - 2
@@ -49,9 +54,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -70,6 +77,7 @@ extra_rdoc_files: []
 files: 
 - lib/haml/more/coffee_script.rb
 - lib/haml/more/content_for.rb
+- lib/haml/more/javascript.rb
 - lib/haml/more.rb
 - lib/haml-more.rb
 - lib/sass/more.rb
@@ -304,23 +312,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adds more functionality to Haml and Sass (part of BigBand).