dryml 1.1.0 → 1.3.0.RC

data/Rakefile

@@ -2,26 +2,17 @@ require 'rake'
 require 'rake/rdoctask'
 require 'rake/testtask'
 
-$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/lib')
-$:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobosupport/lib')
-require 'dryml' # to get VERSION
-
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
-if defined?(Bundler)
-  RUBYDOCTEST = 'bundle exec rubydoctest'
-else
-  RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
-end
-
-desc "Default Task"
-task :default => [ :test ]
+RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 
 # --- Testing --- #
 
-desc "Run all tests"
-task :test do |t|
-  files=Dir['test/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
-  exit(1) if !system("#{RUBYDOCTEST} #{files}")
+namespace "test" do
+  desc "Run the doctests"
+  task :doctest do |t|
+    files=Dir['test/**/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
+    exit(1) if !system("#{RUBYDOCTEST} #{files}")
+  end
 end
 
 # --- RDOC --- #
@@ -30,19 +21,3 @@ require 'yard'
 YARD::Rake::YardocTask.new do |t|
   t.files = ['lib/**/*.rb', 'README', 'LICENSE.txt', 'CHANGES.txt']
 end
-
-# --- Packaging and Rubyforge & gemcutter & github--- #
-
-require 'jeweler'
-Jeweler::Tasks.new do |gemspec|
-  gemspec.version      = Dryml::VERSION
-  gemspec.name         = "dryml"
-  gemspec.email        = "tom@tomlocke.com"
-  gemspec.summary      = "The web app builder for Rails"
-  gemspec.homepage     = "http://hobocentral.net/"
-  gemspec.authors      = ["Tom Locke"]
-  gemspec.rubyforge_project = "hobo"
-  gemspec.add_dependency("hobosupport", ["= #{Dryml::VERSION}"])
-  gemspec.add_dependency("actionpack", [">= 2.2.2", "< 3.0.0"])
-end
-Jeweler::GemcutterTasks.new

data/VERSION

@@ -0,0 +1 @@
+1.3.0.RC

data/dryml.gemspec

@@ -1,72 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+name = File.basename( __FILE__, '.gemspec' )
+version = File.read(File.expand_path('../VERSION', __FILE__)).strip
+require 'date'
 
 Gem::Specification.new do |s|
-  s.name = %q{dryml}
-  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tom Locke"]
-  s.date = %q{2011-11-15}
-  s.email = %q{tom@tomlocke.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    "CHANGES.txt",
-     "LICENSE.txt",
-     "README",
-     "Rakefile",
-     "TODO.txt",
-     "dryml.gemspec",
-     "lib/dryml.rb",
-     "lib/dryml/dryml_builder.rb",
-     "lib/dryml/dryml_doc.rb",
-     "lib/dryml/dryml_generator.rb",
-     "lib/dryml/dryml_support_controller.rb",
-     "lib/dryml/helper.rb",
-     "lib/dryml/parser.rb",
-     "lib/dryml/parser/attribute.rb",
-     "lib/dryml/parser/base_parser.rb",
-     "lib/dryml/parser/document.rb",
-     "lib/dryml/parser/element.rb",
-     "lib/dryml/parser/elements.rb",
-     "lib/dryml/parser/source.rb",
-     "lib/dryml/parser/text.rb",
-     "lib/dryml/parser/tree_parser.rb",
-     "lib/dryml/part_context.rb",
-     "lib/dryml/scoped_variables.rb",
-     "lib/dryml/static_tags",
-     "lib/dryml/tag_parameters.rb",
-     "lib/dryml/taglib.rb",
-     "lib/dryml/template.rb",
-     "lib/dryml/template_environment.rb",
-     "lib/dryml/template_handler.rb",
-     "taglibs/core.dryml",
-     "test/dryml.rdoctest"
-  ]
-  s.homepage = %q{http://hobocentral.net/}
+  s.authors = ['Tom Locke']
+  s.email = 'tom@tomlocke.com'
+  s.homepage = 'http://hobocentral.net'
+  s.rubyforge_project = 'hobo'
+  s.summary = "The Don't Repeat Yourself Markup Language"
+  s.description = "The Don't Repeat Yourself Markup Language"
+
+  s.add_runtime_dependency('actionpack', ["~> 3.0.0"])
+  s.add_runtime_dependency('hobo_support', ["= #{version}"])
+  s.add_development_dependency('rubydoctest', [">= 0"])
+
+  s.files = `git ls-files -x #{name}/* -z`.split("\0")
+
+  s.name = File.basename( __FILE__, '.gemspec' )
+  s.version = version
+  s.date = Date.today.to_s
+
+  s.required_rubygems_version = ">= 1.3.6"
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{hobo}
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{The web app builder for Rails}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hobosupport>, ["= 1.1.0"])
-      s.add_runtime_dependency(%q<actionpack>, [">= 2.2.2", "< 3.0.0"])
-    else
-      s.add_dependency(%q<hobosupport>, ["= 1.1.0"])
-      s.add_dependency(%q<actionpack>, [">= 2.2.2", "< 3.0.0"])
-    end
-  else
-    s.add_dependency(%q<hobosupport>, ["= 1.1.0"])
-    s.add_dependency(%q<actionpack>, [">= 2.2.2", "< 3.0.0"])
-  end
 end
-

data/lib/dryml/dryml_builder.rb

@@ -58,19 +58,16 @@ module Dryml
     end
 
 
-    def erb_process(erb_src, method_def=false)
+    def erb_process(erb_src)
       trim_mode = ActionView::TemplateHandlers::ERB.erb_trim_mode
       erb = ERB.new(erb_src, nil, trim_mode, "output_buffer")
-      src = erb.src.split(';')[1..-2].join(';')
-      
-      if method_def
-        src.sub /^\s*def.*?\(.*?\)/, '\0 __in_erb_template=true; '
-      else
-        "__in_erb_template=true; " + src
+      res = erb.src.split(';')[1..-2].join(';')
+      if res.respond_to? :force_encoding
+        res.force_encoding(erb_src.encoding)
       end
+      res
     end
 
-
     def build(local_names, auto_taglibs, src_mtime)
 
       auto_taglibs.each { |t| import_taglib(t) }
@@ -82,7 +79,7 @@ module Dryml
           @environment.class_eval(instruction[:src], template_path, instruction[:line_num])
 
         when :def
-          src = erb_process(instruction[:src], true)
+          src = erb_process(instruction[:src])
           @environment.class_eval(src, template_path, instruction[:line_num])
 
         when :render_page
@@ -138,3 +135,4 @@ module Dryml
     end
   end
 end
+

data/lib/dryml/dryml_doc.rb

@@ -4,20 +4,20 @@ require 'rexml/xpath'
 
     # DrymlDoc provides the facility to parse a directory tree of DRYML taglibs, building a collection of objects that provide metadata
     module DrymlDoc
-      
+
       def self.load_taglibs(directory, taglib_class=DrymlDoc::Taglib)
         dryml_files = Dir["#{directory}/**/*.dryml"]
 
         dryml_files.map { |f| taglib_class.new(directory, f) }
       end
-      
+
       CommentMethods = classy_module do
-        
+
         def comment_intro
           comment && comment =~ /(.*?)^#/m ? $1 : comment
         end
 
-        
+
         def comment_rest
           comment && comment[comment_intro.length..-1]
         end
@@ -25,20 +25,20 @@ require 'rexml/xpath'
         %w(comment comment_intro comment_rest).each do |m|
           class_eval "def #{m}_html; Maruku.new(#{m}).to_html.gsub(/&/, '&'); end"
         end
-        
+
       end
-      
+
       class Taglib
-        
+
         def initialize(home, filename, name=nil)
           @name = name || filename.sub(/.dryml$/, '')[home.length+1..-1]
           @source = File.read(filename)
           @doc = Dryml::Parser::Document.new(File.read(filename), filename)
           parse_tag_defs
         end
-        
+
         attr_reader :name, :doc, :tag_defs, :source
-        
+
         def comment
           first_node = doc[0][0]
           if first_node.is_a?(REXML::Comment)
@@ -48,41 +48,41 @@ require 'rexml/xpath'
             text.match(/<%#(.*?)%>/m)[1] rescue nil
           end
         end
-        
+
         include CommentMethods
-           
-        private   
-             
+
+        private
+
         def tagdef_class
           self.class.parent.const_get('TagDef')
         end
-        
+
         def parse_tag_defs
           @tag_defs = []
           REXML::XPath.match(doc, '/*/*[@tag]').each { |node| @tag_defs << tagdef_class.new(self, node) }
         end
-        
+
       end
-      
+
       class TagDef
-        
+
         def initialize(taglib, node)
           @taglib = taglib
           @node = node
         end
-        
+
         attr_reader :taglib, :node
         delegate :doc, :to => :taglib
-        
-        
+
+
         def name
           node.attributes['tag']
         end
-        
+
         def source
           doc.restore_erb_scriptlets(node.to_s).strip
         end
-        
+
         # The contents of the XML or ERB comment, if any, immediately above the tag definition
         def comment
           @comment ||= begin
@@ -98,19 +98,19 @@ require 'rexml/xpath'
             end
           end
         end
-        
+
         include CommentMethods
-        
+
         def no_doc?
           comment =~ /^nodoc\b/
         end
-        
+
         # An array of the arrtibute names defined by this tag
         def attributes
           (node.attributes['attrs'] || "").split(/\s*,\s*/).where_not.blank?
         end
-        
-        
+
+
         # Returns a recursive array srtucture, where each item in the array is a pair: [parameter_name, sub_parameters]
         # (sub-parameters is the same kind of structure)
         def parameters(element=node)
@@ -125,40 +125,40 @@ require 'rexml/xpath'
           end
           result
         end
-        
-        
+
+
         # Is this the base definition of a polymorphic tag
         def polymorphic?
           node.attributes['polymorphic'].present?
         end
-        
+
         # Is this an <extend>?
         def extension?
           node.name == "extend"
         end
-        
-        
+
+
         # The definition's 'for' attribute
         def for_type
           node.attributes['for']
         end
-        
+
 
         # The name of the tag, if any, that this definition merges its parameters into
         # That is, the tag with 'merge' or 'merge-params' declared
         def merge_params
           REXML::XPath.first(node, ".//*[@merge|@merge-params]")._?.name
         end
-        
+
         # The name of the tag, if any, that this definition merges its attributes into
-        # That is, the tag with 'merge' or 'merge-attrs' declared        
+        # That is, the tag with 'merge' or 'merge-attrs' declared
         def merge_attrs
           REXML::XPath.first(node, ".//*[@merge|@merge-attrs]")._?.name
         end
-        
+
       end
-      
-      
+
+
     end
-    
+
   end

data/lib/dryml/dryml_generator.rb

@@ -2,82 +2,56 @@
 require 'set'
 require 'fileutils'
 
-require 'action_controller/dispatcher'
-
   module Dryml
-    
+
     class DrymlGenerator
-      
+
       HEADER = "<!-- AUTOMATICALLY GENERATED FILE - DO NOT EDIT -->\n\n"
-      
+
       class << self
-        attr_accessor :run_on_every_request
         attr_accessor :output_directory
       end
-      
+
       def self.enable(generator_directories = [], output_directory = nil)
         @output_directory = output_directory
-        @output_directory ||= "#{RAILS_ROOT}/app/views/taglibs/auto" if defined? :RAILS_ROOT
+        @output_directory ||= "#{Rails.root}/app/views/taglibs/auto" if Object.const_defined?(:Rails)
         @generator_directories = generator_directories
-
-        # Unfortunately the dispatcher callbacks don't give us the hook we need (after routes are reloaded) 
-        # so we have to alias_method_chain
-        ActionController::Dispatcher.class_eval do
-
-          if respond_to? :reload_application
-            #Rails 2.3
-            class << self
-              def reload_application_with_dryml_generators
-                reload_application_without_dryml_generators
-                DrymlGenerator.run unless Dryml::DrymlGenerator.run_on_every_request == false || Rails.env.production?
-              end
-              alias_method_chain :reload_application, :dryml_generators
-            end
-          else            
-            #Rails <= 2.2
-            def reload_application_with_dryml_generators
-              reload_application_without_dryml_generators
-              DrymlGenerator.run unless Dryml::DrymlGenerator.run_on_every_request == false || Rails.env.production?
-            end
-            alias_method_chain :reload_application, :dryml_generators
-          end
-        end
       end
-      
+
       def self.run(generator_directories=nil, output_directory=nil)
         @generator_directories ||= generator_directories
         @output_directory ||= output_directory
-        @generator ||= DrymlGenerator.new(generator_directories || @generator_directories)
+        @generator ||= new(generator_directories || @generator_directories)
         @generator.run
       end
-      
-      
+
+
       def initialize(generator_directories=nil)
         @templates = {}
         @digests   = {}
         generator_directories ||= Dryml::DrymlGenerator.generator_directories
         load_templates(generator_directories)
       end
-      
+
       attr_accessor :subsite
-      
-      
+
+
       def load_templates(generator_directories)
-        generator_directories.each do |dir|
-          Dir["#{dir}/**/*.dryml.erb"].each do |f|
+        generator_directories.each do |path|
+          dir = path.to_s
+          Dir.glob("#{dir}/**/*.dryml.erb").each do |f|
             name = f[dir.length + 1..-11]
             erb = File.read(f)
             @templates[name] = ERB.new(erb, nil, '-').src
-            
             # Create output directories and parents as required
-            [nil, *Hobo.subsites].each do |s| 
+            [nil, *Hobo.subsites].each do |s|
               FileUtils.mkdir_p(File.dirname("#{output_dir s}/#{name}"))
             end
           end
         end
       end
-      
-      
+
+
       def run
         # FIXME
         # Ensure all view hints loaded before running
@@ -89,21 +63,21 @@ require 'action_controller/dispatcher'
 
         subsites.each { |s| run_for_subsite(s) }
       end
-      
-      
+
+
       def run_for_subsite(subsite)
         self.subsite = subsite
         @templates.each_pair do |name, src|
           run_one(name, src)
-        end        
+        end
       end
-      
-      
+
+
       def output_dir(s=subsite)
         s ? "#{Dryml::DrymlGenerator.output_directory}/#{s}" : Dryml::DrymlGenerator.output_directory
       end
-      
-      
+
+
       def run_one(name, src)
         dryml = instance_eval(src, name)
         if dryml_changed?(name, dryml)
@@ -111,8 +85,8 @@ require 'action_controller/dispatcher'
           File.open("#{output_dir}/#{name}.dryml", 'w') { |f| f.write(out) }
         end
       end
-      
-      
+
+
       def dryml_changed?(name, dryml)
         key = "#{subsite}/#{name}"
         d = digest dryml
@@ -123,27 +97,27 @@ require 'action_controller/dispatcher'
           false
         end
       end
-      
-      
+
+
       def digest(s)
         OpenSSL::Digest::SHA1.hexdigest(s)
       end
-      
-      
+
+
       # --- Helper methods for the templates --- #
-      
+
       attr_reader :controller
-      
-      
+
+
       def controllers
-        Hobo::ModelController.all_controllers(subsite).sort_by &:name
+        Hobo::Controller::Model.all_controllers(subsite).sort_by &:name
       end
-      
-      
-      def models 
+
+
+      def models
         Hobo::Model.all_models.sort_by &:name
       end
-      
+
       def each_controller
         controllers.each do |controller|
           @controller = controller
@@ -151,8 +125,8 @@ require 'action_controller/dispatcher'
         end
         @controller = nil
       end
-      
-      
+
+
       def each_model
         models.each do |model|
           @model = model
@@ -160,15 +134,17 @@ require 'action_controller/dispatcher'
         end
         @model = nil
       end
-      
-      
+
+
       def model
         @model || @controller.model
       end
-      
-      
+
+      # This method is used only to generate static default Model names in english only
+      # it does not provide any translation
+      # Localized apps will override the defaults by setting the specific keys in their locale files
       def model_name(*options)
-        name = :plural.in?(options) ? model.view_hints.model_name_plural : model.view_hints.model_name
+        name = :plural.in?(options) ? model.model_name.human(:count=>2, :locale=>:en) : model.model_name.human(:locale=>:en)
         name = name.titleize.downcase                         if :lowercase.in?(options)
         name = name.camelize                                  if :camel.in?(options)
         name
@@ -179,18 +155,18 @@ require 'action_controller/dispatcher'
       def sq_escape(s)
         s.gsub(/[\\]/, "\\\\\\\\").gsub(/'/, "\\\\'")
       end
-      
-      
+
+
       def model_class
         model.name.underscore.gsub('_', '-').gsub('/', '--')
       end
-      
-      
+
+
       def view_hints
         model.view_hints
       end
 
-      
+
       def through_collection_names(klass=model)
         klass.reflections.values.select do |refl|
           refl.macro == :has_many && refl.options[:through]
@@ -206,8 +182,8 @@ require 'action_controller/dispatcher'
                         else
                           args
                         end
-        Hobo::ModelRouter.linkable?(klass, action, options)
-      end  
+        Hobo::Routes.linkable?(klass, action, options)
+      end
 
 
       def sortable_collection?(collection, model=self.model)
@@ -218,20 +194,21 @@ require 'action_controller/dispatcher'
         if defined? ActiveRecord::Acts::List::InstanceMethods
           refl = model.reflections[collection]
           klass = refl.klass
-          klass < ActiveRecord::Acts::List::InstanceMethods && 
+          klass < ActiveRecord::Acts::List::InstanceMethods &&
+            klass.table_exists? &&
             klass.new.position_column == refl.options[:order].to_s
         end
       end
-      
-            
+
+
       def standard_fields(*args)
         klass = args.first.is_a?(Class) ? args.shift : model
         extras = args
-        
-        fields = klass.attr_order.*.to_s & klass.content_columns.*.name
+
+        fields = klass.attr_order.*.to_s & (klass.table_exists? ? klass.content_columns.*.name : [])
 
         fields -= %w{created_at updated_at created_on updated_on deleted_at} unless extras.include?(:include_timestamps)
-        
+
         bt = extras.include?(:belongs_to)
         hm = extras.include?(:has_many)
         klass.reflections.values.sort_by { |refl| refl.name.to_s }.map do |refl|
@@ -242,30 +219,30 @@ require 'action_controller/dispatcher'
         fields.reject! { |f| model.never_show? f }
         fields
       end
-      
-      
+
+
       def creators
         defined?(model::Lifecycle) ? model::Lifecycle.publishable_creators : []
       end
-      
+
       def transitions
         defined?(model::Lifecycle) ? model::Lifecycle.publishable_transitions : []
       end
-            
+
       def creator_names
         creators.map { |c| c.name.to_s }
       end
-      
+
       def transition_names
         transitions.map { |t| t.name.to_s }.uniq
       end
-      
-      
+
+
       def a_or_an(word)
         (word =~ /^[aeiou]/i ? "an " : "a ") + word
       end
-            
+
     end
-    
+
   end