RubyGems - dryml - Versions diffs - 1.3.3 → 1.4.0.pre2 - Mend

dryml 1.3.3 → 1.4.0.pre2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

data/Gemfile +6 -0
data/README +2 -0
data/Rakefile +2 -1
data/VERSION +1 -1
data/cucumber.yml +9 -0
data/dryml.gemspec +4 -2
data/features/cookbook/01_simple_page_templates.feature +44 -0
data/features/cookbook/02_defining_simple_tags.feature +375 -0
data/features/cookbook/03_implicit_context.feature +229 -0
data/features/cookbook/04_tag_attributes.feature +120 -0
data/features/cookbook/05_repeated_and_optional_content.feature +241 -0
data/features/cookbook/06_pseudo_parameters.feature +191 -0
data/features/cookbook/07_nested_parameters.feature +147 -0
data/features/cookbook/08_customizing_tags.feature +307 -0
data/features/cookbook/09_aliasing_tags.feature +50 -0
data/features/cookbook/10_polymorphic_tags.feature +168 -0
data/features/cookbook/11_wrapping_content.feature +57 -0
data/features/cookbook/12_local_and_scoped_variables.feature +102 -0
data/features/doctest_examples.feature +187 -0
data/features/merge_params.feature +36 -0
data/features/replace_parameters.feature +21 -0
data/features/static_tags.feature +91 -0
data/features/step_definitions/contexts.rb +25 -0
data/features/step_definitions/dom_comparison.rb +10 -0
data/features/step_definitions/rendering.rb +21 -0
data/features/support/env.rb +32 -0
data/features/support/models/author.rb +18 -0
data/features/support/models/blog_post.rb +37 -0
data/features/support/models/discussion.rb +15 -0
data/features/support/models/post.rb +12 -0
data/features/support/strip_formatter.rb +14 -0
data/lib/dryml/dryml_builder.rb +4 -14
data/lib/dryml/dryml_doc.rb +6 -1
data/lib/dryml/helper.rb +17 -1
data/lib/dryml/part_context.rb +12 -15
data/lib/dryml/railtie/template_handler.rb +1 -3
data/lib/dryml/railtie.rb +1 -0
data/lib/dryml/taglib.rb +24 -30
data/lib/dryml/template.rb +32 -86
data/lib/dryml/template_environment.rb +40 -17
data/lib/dryml.rb +22 -11
data/taglibs/core.dryml +18 -12
data/taglibs/dryml.dryml +3 -0
metadata +97 -56

data/features/step_definitions/dom_comparison.rb ADDED Viewed

@@ -0,0 +1,10 @@
+Then /^the output DOM should be:$/ do |expected_html|
+  expected_rendered = ''
+  actual_rendered = ''
+  formatter = StripFormatter.new
+  # wrap in html tag, as REXML gets grumpy if there's more than one root node
+  formatter.write(REXML::Document.new("<html>#{expected_html}</html>"), expected_rendered)
+  formatter.write(REXML::Document.new("<html>#{@rendered_dom}</html>"), actual_rendered)
+  actual_rendered.should eq(expected_rendered)
+end

data/features/step_definitions/rendering.rb ADDED Viewed

@@ -0,0 +1,21 @@
+When /^I render "([^"]*)"$/ do |file|
+  file_path = aruba_path(file)
+  file_data = File.read(file_path)
+  @locals ||= {}
+  @taglibs ||= []
+  @rendered_dom = Dryml.render(file_data, @locals, file_path, @taglibs)
+  Dryml::Template.clear_build_cache
+end
+When /^I include the taglib "([^"]*)"$/ do |file|
+  file_path = aruba_path(file+".dryml")
+  template_dir = File.dirname(file_path)
+  @taglibs ||= []
+  @taglibs << { :src => file, :absolute_template_path => template_dir }
+end
+Given /^the local variable "([^"]*)" has the value "([^"]*)"$/ do |var, value|
+  @locals ||= {}
+  @locals[var.to_sym] = value
+end

data/features/support/env.rb ADDED Viewed

@@ -0,0 +1,32 @@
+lib = File.expand_path('../../../lib', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+require 'bundler'
+Bundler.setup
+require 'aruba/cucumber'
+require 'active_support'
+require 'action_view'
+require 'action_controller'
+require 'dryml'
+require 'dryml/railtie/template_handler'
+def aruba_path(file_or_dir)
+  File.expand_path("../../../tmp/aruba/#{file_or_dir}", __FILE__)
+end
+After do
+  # muck out the caches
+  Dryml::Taglib.clear_cache
+  Dryml::Template.clear_build_cache
+  Dryml.clear_cache
+end
+# stub this
+module Hobo
+  def self.root
+    'no_such_path'
+  end
+end

data/features/support/models/author.rb ADDED Viewed

@@ -0,0 +1,18 @@
+class Author
+  attr_accessor :id
+  attr_accessor :name
+  def initialize(options={})
+    self.id = options[:id] || 1
+    self.name = options[:name] || 'Nobody'
+  end
+  # needed for field= to work
+  def [](idx)
+    send(idx)
+  end
+  def url
+    "/authors/#{id}"
+  end
+end

data/features/support/models/blog_post.rb ADDED Viewed

@@ -0,0 +1,37 @@
+class BlogPost
+  attr_accessor :id
+  attr_accessor :title
+  attr_accessor :body
+  attr_accessor :published_at
+  attr_accessor :author
+  def initialize(options = {})
+    self.id = options[:id] || 1
+    self.title = options[:title] || 'A Blog Post'
+    self.body = options[:body] || 'Some body content'
+    self.published_at = options[:published_at] || Time.utc(2011,12,30,10,25)
+    self.author = Author.new(options[:author] || {})
+  end
+  # needed for field= to work
+  def [](idx)
+    send(idx)
+  end
+  def url
+    "/blog_posts/#{id}"
+  end
+  def name
+    title
+  end
+end
+class SpecialBlogPost < BlogPost
+  def url
+    "/special_blog_posts/#{id}"
+  end
+end

data/features/support/models/discussion.rb ADDED Viewed

@@ -0,0 +1,15 @@
+class Discussion
+  attr_accessor :name
+  attr_accessor :posts
+  def initialize(options={})
+    self.name = options[:name] || 'Some Discussion'
+    self.posts = options[:posts] || []
+  end
+  # needed for field= to work
+  def [](idx)
+    send(idx)
+  end
+end

data/features/support/models/post.rb ADDED Viewed

@@ -0,0 +1,12 @@
+class Post
+  attr_accessor :title
+  def initialize(options={})
+    self.title = options[:title] || 'A Post'
+  end
+  # needed for field= to work
+  def [](idx)
+    send(idx)
+  end
+end

data/features/support/strip_formatter.rb ADDED Viewed

@@ -0,0 +1,14 @@
+require 'rexml/document'
+require 'rexml/formatters/default'
+# strip whitespace when formatting XML
+class StripFormatter < REXML::Formatters::Default
+  protected
+  def write_text(node, output)
+    output << node.to_s.strip
+  end
+end

data/lib/dryml/dryml_builder.rb CHANGED Viewed

@@ -134,9 +134,6 @@ module Dryml
         when :module
           import_module(name.constantize, instruction[:as])
-        when :set_theme
-          set_theme(name)
         when :alias_method
           @environment.send(:alias_method, instruction[:new], instruction[:old])
@@ -154,10 +151,11 @@ module Dryml
         import_module(options[:module].constantize, options[:as])
       else
         template_dir = File.dirname(template_path)
-        options = options.merge(:template_dir => template_dir)
+        options = options.merge(:template_dir => template_dir, :source_template => template_path)
-        taglib = Taglib.get(options)
-        taglib.import_into(@environment, options[:as])
+        Taglib.get(options).each do |taglib|
+          taglib.import_into(@environment, options[:as])
+        end
       end
     end
@@ -166,14 +164,6 @@ module Dryml
       raise NotImplementedError if as
       @environment.send(:include, mod)
     end
-    def set_theme(name)
-      if Hobo.current_theme.nil? or Hobo.current_theme == name
-        Hobo.current_theme = name
-        import_taglib(:src => "taglibs/themes/#{name}/#{name}")
-      end
-    end
   end
 end

data/lib/dryml/dryml_doc.rb CHANGED Viewed

@@ -32,12 +32,17 @@ require 'rexml/xpath'
         def initialize(home, filename, name=nil)
           @name = name || filename.sub(/.dryml$/, '')[home.length+1..-1]
+          @filename = filename
+          parse_file(filename)
+        end
+        def parse_file(filename)
           @source = File.read(filename)
           @doc = Dryml::Parser::Document.new(File.read(filename), filename)
           parse_tag_defs
         end
-        attr_reader :name, :doc, :tag_defs, :source
+        attr_reader :name, :doc, :tag_defs, :source, :filename
         def comment
           first_node = doc[0][0]

data/lib/dryml/helper.rb CHANGED Viewed

@@ -1,5 +1,21 @@
 # An ActionView Helper
 module Dryml::Helper
+  def create_part_id(part_name, part_locals, binding)
+    locals={}
+    part_locals.split(',').each do |local|
+      local=local.strip
+      locals[local] = eval(local, binding)
+    end
+    key2=[typed_id, locals.to_yaml]
+    @part_ids ||= {}
+    if @part_ids[part_name]
+      @part_ids[part_name][key2] ||= "#{part_name}-#{@part_ids[part_name].length.to_s}"
+    else
+      @part_ids[part_name] = {key2 => part_name}
+      part_name
+    end
+  end
   def context_map(enum = this)
       # TODO: Calls to respond_to? in here can cause the full collection hiding behind a scoped collection to get loaded
       res = []
@@ -59,7 +75,7 @@ module Dryml::Helper
     def param_name_for_this(foreign_key=false)
       return "" unless form_this
       name = if foreign_key && (refl = this_field_reflection) && refl.macro == :belongs_to
-               param_name_for(path_for_form_field[0..-2] + [refl.primary_key_name])
+               param_name_for(path_for_form_field[0..-2] + [refl.foreign_key])
              else
                param_name_for(path_for_form_field)
              end

data/lib/dryml/part_context.rb CHANGED Viewed

@@ -13,16 +13,13 @@
       self.digest = 'SHA1'
-      def self.client_side_storage(contexts, session)
-        return "" if contexts.empty?
-        contexts.map do |dom_id, context|
-          code = context.marshal(session).split("\n").map{|line| "'#{line}\\n'"}.join(" +\n    ")
-          "hoboParts['#{dom_id}'] = (#{code});\n"
-        end.join.html_safe
+      def self.client_side_storage_uncoded(contexts, session)
+        contexts.inject({}) do |h, (dom_id, context)|
+          h[dom_id] = context.marshal(session)
+          h
+        end
       end
       def self.pre_marshal(x)
         if x.is_a?(ActiveRecord::Base) && x.respond_to?(:typed_id)
           TypedId.new(x.typed_id)
@@ -75,9 +72,9 @@
         part_name, this_id, locals, form_field_path = context
-        if RAILS_DEFAULT_LOGGER
-          RAILS_DEFAULT_LOGGER.info "Call part: #{part_name}. this-id = #{this_id}, locals = #{locals.inspect}"
-          RAILS_DEFAULT_LOGGER.info "         : form_field_path = #{form_field_path.inspect}" if form_field_path
+        if Rails
+          Rails.logger.info "Call part: #{part_name}. this-id = #{this_id}, locals = #{locals.inspect}"
+          Rails.logger.info "         : form_field_path = #{form_field_path.inspect}" if form_field_path
         end
         self.part_name             = part_name
@@ -99,13 +96,13 @@
       def parse_this_id(page_this)
-        if this_id == "this"
+        if this_id.nil? || this_id =="nil"
+          nil
+        elsif this_id == "this" || this_id == page_this.typed_id
           self.this = page_this
-        elsif this_id =~ /^this:(.*)/
+        elsif this_id =~ /^this:(.*)/ || (page_this.typed_id && this_id =~ /^#{page_this.typed_id}:(.*)/)
           self.this = page_this
           self.this_field = $1
-        elsif this_id == "nil"
-          nil
         else
           parts = this_id.split(':')
           if parts.length == 3

data/lib/dryml/railtie/template_handler.rb CHANGED Viewed

@@ -1,8 +1,6 @@
 module Dryml
   class Railtie
-    class TemplateHandler < ActionView::Template::Handler
-      self.default_format = Mime::HTML
+    class TemplateHandler
       def self.call(template)
         "Dryml.call_render(self, local_assigns, '#{template.identifier}')"

data/lib/dryml/railtie.rb CHANGED Viewed

@@ -5,6 +5,7 @@ module Dryml
       require 'dryml'
       require 'dryml/template'
       require 'dryml/dryml_generator'
+      require 'dryml/railtie/page_tag_resolver'
     end
     ActiveSupport.on_load(:action_controller) do

data/lib/dryml/taglib.rb CHANGED Viewed

@@ -7,15 +7,16 @@
       class << self
         def get(options)
-          src_file = taglib_filename(options)
-          taglib = @cache[src_file]
-          if taglib
-            taglib.reload
-          else
-            taglib = Taglib.new(src_file)
-            @cache[src_file] = taglib
+          taglib_filenames(options).map do |src_file|
+            taglib = @cache[src_file]
+            if taglib
+              taglib.reload
+            else
+              taglib = Taglib.new(src_file)
+              @cache[src_file] = taglib
+            end
+            taglib
           end
-          taglib
         end
         def clear_cache
@@ -32,32 +33,25 @@
         # If the plugin defines different taglibs you must also specify the src attribute of the taglib that you want
         # to include: <include gem='gem_name' src='taglib_name'/>'
-        def taglib_filename(options)
+        def taglib_filenames(options)
           plugin       = options[:plugin]
           gem          = options[:gem]
           app_root     = Object.const_defined?(:Rails) ? Rails.root : Pathname.new(File.expand_path('.'))
-          taglibs_path = case
-                         when plugin == 'dryml'
-                           Dryml.root.join 'taglibs'
-                         when plugin == 'hobo', gem == 'hobo'
-                           Hobo.root.join 'lib/hobo/rapid/taglibs'
-                         when !plugin.blank?
-                           app_root.join 'vendor/plugins', plugin, 'taglibs'
-                         when !gem.blank?
-                           gem.tr('-','_').camelize.constantize.root.join 'taglibs'
-                         when options[:src] =~ /\//
-                           app_root.join 'app/views'
-                         when options[:template_dir] =~ /^#{Hobo.root}/
-                           Pathname.new(options[:template_dir])
-                         when options[:absolute_template_path]
-                           Pathname.new(options[:absolute_template_path])
-                         else
-                           app_root.join options[:template_dir].gsub(/^\//, '') # remove leading / if there is one
-                         end
+          search_path  = []
+          search_path << Dryml.root.join('taglibs') if plugin == 'dryml'
+          search_path << Hobo.root.join('lib/hobo/rapid/taglibs') if plugin == 'hobo' || gem == 'hobo'
+          search_path << app_root.join('vendor/plugins', plugin, 'taglibs') if !plugin.blank?
+          search_path << gem.tr('-','_').camelize.constantize.root.join('taglibs') if !gem.blank?
+          search_path << app_root.join('app/views') if options[:src] =~ /\//
+          search_path << Pathname.new(options[:absolute_template_path]) if options[:absolute_template_path]
+          search_path << Pathname.new(options[:template_dir]) if options[:template_dir] =~ /^\//
+          search_path << app_root.join(options[:template_dir].gsub(/^\//, ''))
           src          = options[:src] || gem || plugin
-          taglib_file  = taglibs_path.join "#{src}.dryml"
-          raise DrymlException, "No such taglib: #{src} #{options.inspect} #{taglib_file}" unless taglib_file.exist?
-          taglib_file.to_s
+          results = nil
+          search_path.any? {|path| !(results = Dir[path.join "#{src}.dryml"]).empty?}
+          raise DrymlException, "No such taglib: #{src} #{options.inspect}" if results.empty?
+          results - [File.expand_path(options[:source_template])]
         end
       end