rabl 0.1.5 → 0.1.6

data/lib/rabl/builder.rb

@@ -16,6 +16,10 @@ module Rabl
     # Returns a hash representation of the data object
     # to_hash(:root => true)
     def to_hash(options={})
+      # Extends
+      @options[:extends].each do |settings|
+        extends(settings[:file], settings[:options], &settings[:block])
+      end if @options.has_key?(:extends)
       # Attributes
       @options[:attributes].each_pair do |attribute, name|
         attribute(attribute, :as => name)
@@ -32,10 +36,6 @@ module Rabl
       @options[:glue].each do |settings|
         glue(settings[:data], &settings[:block])
       end if @options.has_key?(:glue)
-      # Extends
-      @options[:extends].each do |settings|
-        extends(settings[:file], settings[:options], &settings[:block])
-      end if @options.has_key?(:extends)
       # Return Hash
       @_root_name ||= data_name(@_data)
       (@options[:root] || options[:root]) && @_root_name ? { @_root_name => @_result } : @_result

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -07:00
+date: 2011-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rabl
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: General ruby templating for json or xml