dryml 1.3.0.pre14 → 1.3.0.pre15

data/VERSION

@@ -1 +1 @@
-1.3.0.pre14
+1.3.0.pre15

data/lib/dryml/helper.rb

@@ -31,7 +31,7 @@ module Dryml::Helper
       end
       res
     end
-    
+
     def first_item?
       if scope.repeat_collection.respond_to? :each_pair
         this == scope.repeat_collection.first.try.last
@@ -39,8 +39,8 @@ module Dryml::Helper
         this == scope.repeat_collection.first
       end
     end
-    
-    
+
+
     def last_item?
       if scope.repeat_collection.respond_to? :each_pair
         this == scope.repeat_collection.last.try.last
@@ -49,7 +49,7 @@ module Dryml::Helper
       end
     end
 
-        def param_name_for(path)
+    def param_name_for(path)
       field_path = field_path.to_s.split(".") if field_path.is_one_of?(String, Symbol)
       attrs = path.rest.map{|part| "[#{part.to_s.sub /\?$/, ''}]"}.join
       "#{path.first}#{attrs}"

data/lib/dryml.rb

@@ -4,19 +4,16 @@
 # Copyright:: Copyright (c) 2008
 # License::   Distributes under the same terms as Ruby
 
-
-
-# gem dependencies
 require 'hobo_support'
 require 'action_pack'
 
-ActiveSupport::Dependencies.autoload_paths |= [ File.dirname(__FILE__)]
+ActiveSupport::Dependencies.autoload_paths |= [File.dirname(__FILE__)]
 
 # The Don't Repeat Yourself Markup Language
 module Dryml
 
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
-  @@root = Pathname.new File.expand_path(File.dirname(__FILE__) + "/..")
+  @@root = Pathname.new File.expand_path('../..', __FILE__)
   def self.root; @@root; end
 
   class DrymlSyntaxError < RuntimeError; end
@@ -32,22 +29,15 @@ module Dryml
   end
 
   TagDef = Struct.new "TagDef", :name, :attrs, :proc
-
   RESERVED_WORDS = %w{if for while do class else elsif unless case when module in}
-
   ID_SEPARATOR = '; dryml-tag: '
   APPLICATION_TAGLIB = { :src => "taglibs/application" }
   CORE_TAGLIB        = { :src => "core", :plugin => "dryml" }
-
   DEFAULT_IMPORTS = defined?(ApplicationHelper) ? [ApplicationHelper] : []
-
   @cache = {}
-
   extend self
-
   attr_accessor :last_if
 
-
   def precompile_taglibs
     Dir.chdir(Rails.root) do
       Dir["app/views/taglibs/**/*.dryml"].each do |f|
@@ -56,7 +46,6 @@ module Dryml
     end
   end
 
-
   def clear_cache
     @cache = {}
   end
@@ -66,7 +55,6 @@ module Dryml
     renderer.render_tag(tag, options)
   end
 
-
   def empty_page_renderer(view)
     page_renderer(view, page_tag_identifier(view.controller.controller_path))
   end
@@ -87,10 +75,8 @@ module Dryml
     end
   end
 
-
   def page_renderer(view, identifier, local_names=[], controller_path=nil)
     controller_path ||= view.controller.controller_path
-  #  prepare_view!(view)
     if identifier =~ /#{ID_SEPARATOR}/
       identifier = identifier.split(ID_SEPARATOR).first
       @cache[identifier] ||=  make_renderer_class("", "", local_names, taglibs_for(controller_path))
@@ -111,7 +97,6 @@ module Dryml
     end
   end
 
-
   def get_field(object, field)
     return nil if object.nil?
     field_str = field.to_s
@@ -126,14 +111,21 @@ module Dryml
     end
   end
 
+  def get_field(object, field)
+    return nil if object.nil?
+    field_str = field.to_s
+    case
+    when object.respond_to?(field_str)
+      object.send(field_str)
+    when field_str =~ /^\d+$/
+      object[field.to_i]
+    else
+      object[field]
+    end
+  end
 
   def get_field_path(object, path)
-    path = if path.is_a? String
-             path.split('.')
-           else
-             Array(path)
-           end
-
+    path = path.is_a?(String) ? path.split('.') : Array(path)
     parent = nil
     path.each do |field|
       return nil if object.nil?
@@ -143,18 +135,12 @@ module Dryml
     [parent, path.last, object]
   end
 
-
-
   def unreserve(word)
     word = word.to_s
-    if RESERVED_WORDS.include?(word)
-      word + "_"
-    else
-      word
-    end
+    word += '_' if RESERVED_WORDS.include?(word)
+    word
   end
 
-
   def static_tags
     @static_tags ||= begin
                        path = if Object.const_defined?(:Rails) && FileTest.exists?("#{Rails.root}/config/dryml_static_tags.txt")
@@ -228,20 +214,6 @@ private
     { :src => src } if Object.const_defined?(:Rails) && File.exists?("#{Rails.root}/app/views/#{src}.dryml")
   end
 
-  def prepare_view!(view)
-    # Not sure why this isn't done for me...
-    # There's probably a button to press round here somewhere
-    for var in %w(@flash @cookies @action_name @_session @_request @request_origin
-                  @request @ignore_missing_templates @_headers @variables_added
-                  @_flash @response @template_class
-                  @_cookies @before_filter_chain_aborted @url
-                  @_response @template_root @headers @_params @params @session)
-      unless @view.instance_variables.include?(var)
-        view.instance_variable_set(var, view.controller.instance_variable_get(var))
-      end
-    end
-  end
-
   # create and compile a renderer class (AKA Dryml::Template::Environment)
   #
   # template_src:: the DRYML source
@@ -261,7 +233,6 @@ private
     renderer_class
   end
 
-
   def compile_renderer_class(renderer_class, template_src, template_path, locals, taglibs=[])
     template = Dryml::Template.new(template_src, renderer_class, template_path)
     DEFAULT_IMPORTS.each {|m| template.import_module(m)}
@@ -272,7 +243,6 @@ private
     template.compile(all_local_names, [CORE_TAGLIB]+taglibs)
   end
 
-
 end
 
 require 'dryml/railtie' if Object.const_defined?(:Rails)

metadata

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