dryml 1.3.0.pre15 → 1.3.0.pre16

data/VERSION

@@ -1 +1 @@
-1.3.0.pre15
+1.3.0.pre16

data/lib/dryml.rb

@@ -97,20 +97,6 @@ module Dryml
     end
   end
 
-  def get_field(object, field)
-    return nil if object.nil?
-    field_str = field.to_s
-    begin
-      return object.send(field_str)
-    rescue NoMethodError => ex
-      if field_str =~ /^\d+$/
-        return object[field.to_i]
-      else
-        return object[field]
-      end
-    end
-  end
-
   def get_field(object, field)
     return nil if object.nil?
     field_str = field.to_s
@@ -193,25 +179,26 @@ module Dryml
 private
 
   def taglibs_for(controller_path)
-    ([APPLICATION_TAGLIB] +
-    application_taglibs() +
-    [subsite_taglib(controller_path)] +
-    (controller_path.camelize+"Controller").constantize.try.included_taglibs||[]).compact
-  end
-
-  def application_taglibs
-    Dir.chdir(Rails.root) do
-      Dir["app/views/taglibs/application/**/*.dryml"].map{|f| File.basename f, '.dryml'}.map do |n|
-        { :src => "taglibs/application/#{n}" }
-      end
-    end
+    ( taglibs_in_dir('application').unshift(APPLICATION_TAGLIB) +
+      subsite_taglibs(controller_path) +
+      (controller_path.camelize+"Controller").constantize.try.included_taglibs||[]
+    ).compact
   end
 
-  def subsite_taglib(controller_path)
+  def subsite_taglibs(controller_path)
     parts = controller_path.split("/")
     subsite = parts.length >= 2 ? parts[0..-2].join('_') : "front"
     src = "taglibs/#{subsite}_site"
-    { :src => src } if Object.const_defined?(:Rails) && File.exists?("#{Rails.root}/app/views/#{src}.dryml")
+    Object.const_defined?(:Rails) && File.exists?("#{Rails.root}/app/views/#{src}.dryml") ?
+      taglibs_in_dir("#{subsite}_site").unshift({ :src => src }) : []
+  end
+
+  def taglibs_in_dir(dir_name)
+    Dir.chdir(Rails.root) do
+      Dir["app/views/taglibs/#{dir_name}/**/*.dryml"].map{|f| File.basename f, '.dryml'}.map do |n|
+        { :src => "taglibs/#{dir_name}/#{n}" }
+      end
+    end
   end
 
   # create and compile a renderer class (AKA Dryml::Template::Environment)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dryml
 version: !ruby/object:Gem::Version 
-  hash: -1637175966
+  hash: -1637175965
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre15
-  version: 1.3.0.pre15
+  - pre16
+  version: 1.3.0.pre16
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -04:00
+date: 2010-11-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,13 +43,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175966
+        hash: -1637175965
         segments: 
         - 1
         - 3
         - 0
-        - pre15
-        version: 1.3.0.pre15
+        - pre16
+        version: 1.3.0.pre16
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency