merb-haml 1.1.0.pre → 1.1.0.rc1

data/Rakefile

@@ -14,7 +14,7 @@ begin
 
   Jeweler::Tasks.new do |gemspec|
 
-    gemspec.version     = Merb::Haml::VERSION
+    gemspec.version     = Merb::Haml::VERSION.dup
 
     gemspec.name        = "merb-haml"
     gemspec.description = "Merb plugin for HAML support"

data/lib/merb-haml.rb

@@ -1,39 +1,38 @@
-# make sure we're running inside Merb
-if defined?(Merb)  
-  require "haml"
-  require "merb-haml/template"
-  Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks"))
-  
-  Merb::Plugins.config[:sass] ||= {}
-
-  Merb::BootLoader.after_app_loads do
-    
-    template_locations = []
-    template_locations << Merb.dir_for(:stylesheet) / "sass"
-    
-    # extract template locations list from sass config
-    config_location = Merb::Plugins.config[:sass][:template_location]
-    if config_location.is_a? Hash
-      template_locations += config_location.keys
-    elsif config_location
-      template_locations << config_location.to_s
-    end
-    
-    # setup sass if any template paths match
-    if template_locations.any?{|location| File.directory?(location) }
-      require "sass"
-      if Merb::Config[:sass]
-        Merb.logger.info("Please define your sass settings in Merb::Plugins.config[:sass] not Merb::Config")
-        Sass::Plugin.options = Merb::Config[:sass]
-      else
-        Sass::Plugin.options = Merb::Plugins.config[:sass]
-      end
+require "merb-core"
+
+require "haml"
+require "merb-haml/template"
+Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "merb-haml" / "merbtasks"))
+
+Merb::Plugins.config[:sass] ||= {}
+
+Merb::BootLoader.after_app_loads do
+
+  template_locations = []
+  template_locations << Merb.dir_for(:stylesheet) / "sass"
+
+  # extract template locations list from sass config
+  config_location = Merb::Plugins.config[:sass][:template_location]
+  if config_location.is_a? Hash
+    template_locations += config_location.keys
+  elsif config_location
+    template_locations << config_location.to_s
+  end
+
+  # setup sass if any template paths match
+  if template_locations.any?{|location| File.directory?(location) }
+    require "sass"
+    if Merb::Config[:sass]
+      Merb.logger.info("Please define your sass settings in Merb::Plugins.config[:sass] not Merb::Config")
+      Sass::Plugin.options = Merb::Config[:sass]
+    else
+      Sass::Plugin.options = Merb::Plugins.config[:sass]
     end
-    
   end
-  
-  generators = File.join(File.dirname(__FILE__), 'generators')
-  Merb.add_generators generators / "resource_controller"
-  Merb.add_generators generators / "controller"
-  Merb.add_generators generators / "layout"
+
 end
+
+generators = File.join(File.dirname(__FILE__), 'generators')
+Merb.add_generators generators / "resource_controller"
+Merb.add_generators generators / "controller"
+Merb.add_generators generators / "layout"

data/lib/merb-haml/version.rb

@@ -1,5 +1,5 @@
 module Merb
   module Haml
-    VERSION = '1.1.0.pre'.freeze
+    VERSION = '1.1.0.rc1'.freeze
   end
-end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb-haml
 version: !ruby/object:Gem::Version 
-  version: 1.1.0.pre
+  prerelease: true
+  segments: 
+  - 1
+  - 1
+  - 0
+  - rc1
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,39 +15,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 +00:00
+date: 2010-03-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.pre
-    version: 
+        segments: 
+        - 1
+        - 1
+        - 0
+        - rc1
+        version: 1.1.0.rc1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 3
         version: 2.0.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Merb plugin for HAML support
 email: ykatz@engineyard.com
 executables: []
@@ -108,18 +127,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Merb plugin that provides support for writing view template with HAML