rango 0.1.1.2.4 → 0.1.1.2.5

data/lib/rango.rb

@@ -78,6 +78,12 @@ module Rango
       self.bootloaders[name] = block
     end
 
+    # Rango.loaded?("environments.rb")
+    def loaded?(relative_path) # would work just with Kernel#require, not with Kernel#load, I know that the name may be misleading, but better than required?
+      full_path = File.expand_path(File.join(File.dirname(__FILE__), relative_path))
+      $LOADED_FEATURES.any? { |file| file == full_path }
+    end
+
     # Start IRB interactive session
     # @since 0.0.1
     def interactive

data/lib/rango/settings.rb

@@ -20,7 +20,8 @@ module Rango
       # @return [Hash] Hash of settings attributes.
       # TODO: maybe it should returns Rango::Settings?
       def merge(another)
-        self.hattributes.merge(another.hattributes)
+        hattributes = another.is_a?(Hash) ? another : another.hattributes
+        self.hattributes.merge(hattributes)
       end
 
       # @since 0.0.1

data/lib/rango/settings/haml.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require "rango" # Rango.loaded?
 require "rango/settings"
 
 module Rango
@@ -11,7 +12,7 @@ module Rango
 
       # @since 0.0.2
       # Sets whether or not to escape HTML-sensitive characters in script. If this is true, = behaves like &=; otherwise, it behaves like !=. Note that if this is set, != should be used for yielding to subtemplates and rendering partials. Defaults to false.
-      hattribute :escape_html, lambda { Project.settings.autoescape }
+      hattribute :escape_html, false
 
       # @since 0.0.2
       # Whether or not attribute hashes and Ruby scripts designated by =  or ~ should be evaluated. If this is true, said scripts are rendered as empty strings. Defaults to false.
@@ -35,7 +36,7 @@ module Rango
 
       # @since 0.0.7
       # Haml now has an :ugly option, thanks to Wincent Colaiuta. This option forgoes pretty output formatting in favor of speed increases, which show up in particular when rendering deeply nested partials
-      hattribute :ugly, lambda { not Rango.development?  }
+      hattribute :ugly, lambda { Rango.loaded?("environments.rb") ? !Rango.development? : false  }
 
       # @since 0.1.1
       # You don't have to explicitly specify attributes which are same for all the tags of same

data/lib/rango/templates/template.rb

@@ -30,7 +30,7 @@ module Rango
       # @since 0.0.2
       def fullpath
         @fullpath ||= begin
-          if self.path.match(/^\//)
+          if self.path.match(/^(\/|\.)/) # /foo or ./foo
             Dir[self.path, "#{self.path}.*"].first
           else
             self.find_in_template_dirs

data/lib/rango/version.rb

@@ -3,5 +3,5 @@
 # NOTE: Do not edit this file manually, this
 # file is regenerated by task rake version:increase
 module Rango
-  VERSION ||= "0.1.1.2.4"
+  VERSION ||= "0.1.1.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rango
 version: !ruby/object:Gem::Version 
-  version: 0.1.1.2.4
+  version: 0.1.1.2.5
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"