hobo 0.9.0 → 0.9.100

data/lib/hobo.rb

@@ -16,7 +16,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "0.9.0"
+  VERSION = "0.9.100"
   
   class PermissionDeniedError < RuntimeError; end
 
@@ -105,13 +105,13 @@ module Hobo
                Array(path)
              end
 
-      field, parent = nil
+      parent = nil
       path.each do |field|
         return nil if object.nil?
         parent = object
         object = get_field(parent, field)
       end
-      [parent, field, object]
+      [parent, path.last, object]
     end
 
 

data/lib/hobo/accessible_associations.rb

@@ -42,8 +42,15 @@ module Hobo
 
         record = yield id
         record.attributes = hash
-        owner.include_in_save(association_name, record) unless owner.new_record? && record.new_record?
-        
+        if owner.new_record? && record.new_record?
+          # work around
+          # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/3510-has_many-build-does-not-set-reverse-reflection
+          # https://hobo.lighthouseapp.com/projects/8324/tickets/447-validation-problems-with-has_many-accessible-true
+          method = "#{owner.class.reverse_reflection(association_name).name}=".to_sym
+          record.send(method, owner) if record.respond_to? method
+        else
+          owner.include_in_save(association_name, record)
+        end        
       else
         # It's already a record
         record = record_hash_or_string
@@ -87,7 +94,7 @@ module Hobo
   
   classy_module(AccessibleAssociations) do
     
-    include IncludeInSave
+    include Hobo::IncludeInSave
     
     # --- has_many mass assignment support --- #
     

data/lib/hobo/controller.rb

@@ -14,6 +14,7 @@ module Hobo
 
       def included_in_class(klass)
         klass.extend(ClassMethods)
+        klass.send(:include, Hobo::Translations)
         klass.class_eval do
           before_filter :login_from_cookie 
           alias_method_chain :redirect_to, :object_url
@@ -157,7 +158,7 @@ module Hobo
     end
 
     def not_found(error)
-      if "not_found_response".in?(self.class.superclass.instance_methods)
+      if self.class.superclass.method_defined?("not_found_response")
         super
       elsif render_tag("not-found-page", {}, :status => 404)
         # cool

data/lib/hobo/dryml.rb

@@ -24,9 +24,9 @@ module Hobo
     CORE_TAGLIB        = { :src => "core", :plugin => "hobo" }
 
     DEFAULT_IMPORTS = (if defined?(ApplicationHelper)
-                         [Hobo::HoboHelper, ApplicationHelper]
+                         [Hobo::HoboHelper, Hobo::Translations, ApplicationHelper]
                        else
-                         [Hobo::HoboHelper]
+                         [Hobo::HoboHelper, Hobo::Translations]
                        end)
 
     @renderer_classes = {}
@@ -38,6 +38,11 @@ module Hobo
     
     def enable
       ActionView::Template.register_template_handler("dryml", Hobo::Dryml::TemplateHandler)
+      if ActionView::Template.respond_to? :exempt_from_layout
+        ActionView::Template.exempt_from_layout('dryml')
+      elsif
+        ActionView::Base.exempt_from_layout('dryml')
+      end
       DrymlGenerator.enable
     end
     

data/lib/hobo/dryml/dryml_builder.rb

@@ -61,7 +61,7 @@ module Hobo::Dryml
     def erb_process(erb_src, method_def=false)
       trim_mode = ActionView::TemplateHandlers::ERB.erb_trim_mode
       erb = ERB.new(erb_src, nil, trim_mode, "output_buffer")
-      src = erb.src[("output_buffer = '';").length..-("; output_buffer".length)]
+      src = erb.src.split(';')[1..-2].join(';')
       
       if method_def
         src.sub /^\s*def.*?\(.*?\)/, '\0 __in_erb_template=true; '
@@ -118,9 +118,6 @@ module Hobo::Dryml
         template_dir = File.dirname(template_path)
         options = options.merge(:template_dir => template_dir)
 
-        # Pass on the current bundle, if there is one, to the sub-taglib
-        options[:bundle] = template.bundle.name unless template.bundle.nil? || options[:bundle] || options[:plugin]
-
         taglib = Taglib.get(options)
         taglib.import_into(@environment, options[:as])
       end

data/lib/hobo/dryml/dryml_generator.rb

@@ -75,6 +75,9 @@ module Hobo
       
       
       def run
+        # Ensure all view hints loaded before running
+        Hobo::Model.all_models.*.view_hints
+        
         [nil, *Hobo.subsites].each { |s| run_for_subsite(s) }
       end
       
@@ -156,11 +159,10 @@ module Hobo
       
       
       def model_name(*options)
-        name = model.view_hints.model_name
-        name = name.pluralize                                 if :plural.in?(options)
-        name = name.titleize                                  if :title.in?(options)
+        name = :plural.in?(options) ? model.view_hints.model_name_plural : model.view_hints.model_name
         name = name.titleize.downcase                         if :lowercase.in?(options)
         name = name.underscore.gsub('_', '-').gsub('/', '--') if :dashed.in?(options)
+        name = name.camelize                                  if :camel.in?(options)
         name
       end
       

data/lib/hobo/dryml/taglib.rb

@@ -14,8 +14,7 @@ module Hobo
           if taglib
             taglib.reload
           else
-            bundle = options[:bundle] && Bundle.bundles[options[:bundle]]
-            taglib = Taglib.new(src_file, bundle)
+            taglib = Taglib.new(src_file)
             @cache[src_file] = taglib
           end
           taglib
@@ -33,9 +32,6 @@ module Hobo
                    "#{HOBO_ROOT}/taglibs"
                  elsif plugin
                    "#{RAILS_ROOT}/vendor/plugins/#{plugin}/taglibs"
-                 elsif (bundle_name = options[:bundle])
-                   bundle = Bundle.bundles[bundle_name] or raise ArgumentError, "No such bundle: #{options[:bundle]}"
-                   "#{RAILS_ROOT}/vendor/plugins/#{bundle.plugin}/taglibs"
                  elsif options[:src] =~ /\//
                    "#{RAILS_ROOT}/app/views"
                  elsif options[:template_dir] =~ /^#{HOBO_ROOT}/
@@ -52,9 +48,8 @@ module Hobo
 
       end
 
-      def initialize(src_file, bundle)
+      def initialize(src_file)
         @src_file = src_file
-        @bundle = bundle
         load
       end
 
@@ -92,7 +87,7 @@ module Hobo
           end
 
         end
-        template = Template.new(File.read(@src_file), @module, @src_file, @bundle)
+        template = Template.new(File.read(@src_file), @module, @src_file)
         template.compile([], [])
         @last_load_time = File.mtime(@src_file)
       end

data/lib/hobo/dryml/template.rb

@@ -33,11 +33,10 @@ module Hobo::Dryml
       end
     end
 
-    def initialize(src, environment, template_path, bundle=nil)
+    def initialize(src, environment, template_path)
       @src = src
       @environment = environment # a class or a module
       @template_path = template_path.sub(%r(^#{Regexp.escape(RAILS_ROOT)}/), "")
-      @bundle = bundle
 
       @builder = Template.build_cache[@template_path] || DRYMLBuilder.new(self)
       @builder.set_environment(environment)
@@ -45,7 +44,7 @@ module Hobo::Dryml
       @last_element = nil
     end
 
-    attr_reader :tags, :template_path, :bundle
+    attr_reader :tags, :template_path
 
     def compile(local_names=[], auto_taglibs=[])
       now = Time.now
@@ -178,7 +177,7 @@ module Hobo::Dryml
       require_toplevel(el)
       require_attribute(el, "as", /^#{DRYML_NAME}$/, true)
       options = {}
-      %w(src module plugin bundle as).each do |attr|
+      %w(src module plugin as).each do |attr|
         options[attr.to_sym] = el.attributes[attr] if el.attributes[attr]
       end
       @builder.add_build_instruction(:include, options)
@@ -261,8 +260,6 @@ module Hobo::Dryml
                       klass = HoboFields.to_class(for_type) or 
                         dryml_exception("No such type in polymorphic tag definition: '#{for_type}'", el)
                       klass.name
-                    elsif for_type =~ /^_.*_$/
-                      rename_class(for_type)
                     else
                       for_type
                     end.underscore.gsub('/', '__')
@@ -994,10 +991,6 @@ module Hobo::Dryml
       "#{name}_#{@gensym_counter}"
     end
 
-    def rename_class(name)
-      @bundle && name.starts_with?("_") ? @bundle.send(name) : name
-    end
-
     def include_source_metadata
       # disabled for now -- we're still getting broken rendering with this feature on
       return false

data/lib/hobo/dryml/template_handler.rb

@@ -17,7 +17,8 @@ module Hobo::Dryml
     
     def render_for_rails22(template, view, local_assigns)
       renderer = Hobo::Dryml.page_renderer_for_template(view, local_assigns.keys, template)
-      this = @view.instance_variable_set("@this", view.controller.send(:dryml_context) || local_assigns[:this])
+      this = view.controller.send(:dryml_context) || local_assigns[:this]
+      @view._?.instance_variable_set("@this", this)
       s = renderer.render_page(this, local_assigns)
 
       # Important to strip whitespace, or the browser hangs around for ages (FF2)
@@ -177,7 +178,7 @@ module ActionView
       end
     end
 
-    if instance_methods.include? "find_template"
+    if method_defined? "find_template"
       # only rails 2.3 has this function
       alias_method_chain :find_template, :dryml
     end

data/lib/hobo/hobo_helper.rb

@@ -143,7 +143,7 @@ module Hobo
 
     def type_id(type=nil)
       type ||= (this.is_a?(Class) && this) || this_type || this.class
-      HoboFields.to_name(type) || type.name.underscore.gsub("/", "__")
+      HoboFields.to_name(type) || type.name.to_s.underscore.gsub("/", "__")
     end
 
 
@@ -485,15 +485,13 @@ module Hobo
     # --- ViewHint Helpers --- #
     
     def this_field_name
-      key = "#{this_parent.class.try.name.underscore}.#{this_field.to_s}"
-      default = this_parent.class.try.view_hints.try.field_name(this_field) || this_field
-      I18n.t(key, :default => default, :scope => [:activerecord, :attributes], :count => 1)
+      this_parent.class.try.view_hints.try.field_name(this_field) || this_field
     end
 
     def this_field_help
-      key = "#{this_parent.class.try.name.pluralize.underscore}.hints.#{this_field.to_s}"
+      key = "#{this_parent.class.try.name.tableize}.hints.#{this_field.to_s}"
       default = this_parent.class.try.view_hints.try.field_help[this_field.to_sym] || ""
-      I18n.t(key,:default=>default)
+      Hobo::Translations.ht(key, :default=>default)
     end
 
 
@@ -510,83 +508,7 @@ module Hobo
       logger.debug("DRYML THIS = #{this.typed_id rescue this.inspect}")
       logger.debug("###################\n")
       args.first unless args.empty?
-    end
-    
-    # --- Translation Helper --- #
-    #
-    # Uses RoR native I18n.translate.
-    #
-    # Adds some conventions for easier hobo translation. 
-    # 1. Assumes the first part of the key to be a model name (e.g.: users.index.title -> user)
-    # 2. Tries to translate the model by lookup for: (e.g.: user-> activerecord.models.user)
-    # 3. Adds a default fallback to the beginning of the fallback chain 
-    #    by replacing the first part of the key with "hobo" and using the translated model name 
-    #    as additional attribute. This allows us to have default translations 
-    #    (e.g.: hobo.index.title: "{{model}} Index")
-    # 
-    # Is also used as a tag in the dryml-view files. The syntax is:
-    # <ht key="my.app">My Application</ht>
-    #   --> Will lookup the "my.app"-key for your locale and replaces the "My Application" content 
-    #       if found.
-    #
-    # <ht key="my" app="Program">My Application</ht>
-    #   --> Will look up both the "my"- and "app"-key for your locale, and replaces the 
-    #       "My Application" with the "my"-key contents (interpolated using the "app"-key.
-    #       sample.en.yml-file:
-    #       "no":
-    #         my: "Mitt {{app}}"
-    #       The output should be: Mitt Program
-    # 
-    # Otherwise with features as the ht method, step 1, 2 and 3 above. 
-    def ht(key, options={})
-      
-      # Check if called as a tag, i.e. like this <ht></ht>
-      if (key.class == Hash)
-        if key.has_key?(:default) && !key[:default].blank?
-          logger.warn "hobo-i18n: 'default' should not be used as an attribute on the ht-tag. If used, then you need to make sure that the tags inner-contents are not used. These are normally treated as defaults automatically, but if there is a default attribute then that inner-content will be hidden from this method - and will not be replaced with the translation found."
-        end
-        defaults = options[:default];
-        # Swap key and options, remove options[:key] 
-        options = key 
-        key = options.delete(:key) # returns value for options[:key] as well as deleting it
-        # Set options[:default] to complete the tag-argument-conversion process.
-        options[:default] = (defaults.class == Proc) ? [defaults.call(options)] : (options[:default].blank? ? [] : [options[:default]])
-      else
-        # Not called as a tag. Prepare options[:default].
-        if options[:default].blank?
-          options[:default]=[]
-        elsif options[:default].class != Array
-          options[:default] = [options[:default]]
-        end
-      end
-      
-      # assume the first part of the key to be the model
-      keys = key.to_s.split(".")
-      if keys.length > 1
-        model = keys.shift()
-        subkey = keys.join(".")
-      else
-        subkey = key
-      end
-    
-      # add :"hobo.#{key}" as the first fallback
-      options[:default].unshift("hobo.#{subkey}".to_sym)
-    
-      # translate the model
-      unless model.blank?
-        translated_model = I18n.translate( "activerecord.models.#{model.singularize.underscore}", :default=>model).titleize
-        options[:model] = translated_model
-      end
-    
-      begin   
-        key_prefix = "<span class='translation-key'>#{key}</span>" if HOBO_SHOW_LOCALE_KEYS
-      rescue
-        puts "Set HOBO_SHOW_LOCALE_KEYS=true in your environment to get all locale keys displayed"
-      end
-    
-      logger.info "..translate(#{key}, #{options.inspect}) to #{I18n.locale}"
-      I18n.translate(key.to_sym, options)+(key_prefix ? key_prefix:"")
-    end
+    end    
 
   end
 

data/lib/hobo/lifecycles.rb

@@ -30,13 +30,17 @@ module Hobo
           module_eval "class ::#{name}::Lifecycle < Hobo::Lifecycles::Lifecycle; end"
           lifecycle = self::Lifecycle
           lifecycle.init(self, options)
+
+          module_eval "class ::#{name}::LifecycleStateField < HoboFields::LifecycleState; end"
+          state_field_class = self::LifecycleStateField
+          state_field_class.table_name = name.tableize
         end
 
-        dsl = DeclarationDSL.new(lifecycle)
+        dsl = Hobo::Lifecycles::DeclarationDSL.new(lifecycle)
         dsl.instance_eval(&block)
 
         default = lifecycle.default_state ? { :default => lifecycle.default_state.name.to_s } : {}
-        declare_field(options[:state_field], :string, default)
+        declare_field(options[:state_field], state_field_class, default)
         unless options[:index] == false
           index_options = { :name => options[:index] } unless options[:index] == true
           index(options[:state_field], index_options || {})
@@ -82,15 +86,15 @@ module Hobo
 
 
       def lifecycle
-        @lifecycle ||=  if defined? self.class::Lifecycle
+        @lifecycle ||=  if self.class.const_defined?(:Lifecycle)
                           self.class::Lifecycle.new(self)
                         else
                           # search through superclasses
                           current = self.class.superclass
-                          until (defined?(current::Lifecycle) || current.nil? || !current.respond_to?(:lifecycle)) do
+                          until (current.const_defined?(:Lifecycle) || current.nil? || !current.respond_to?(:lifecycle)) do
                             current = current.superclass
                           end
-                          current.class::Lifecycle.new(self) if defined? current::Lifecycle
+                          current::Lifecycle.new(self) if current.const_defined?(:Lifecycle)
                         end
       end
 

data/lib/hobo/lifecycles/actions.rb

@@ -15,11 +15,8 @@ module Hobo
         return true if available_to.nil? # available_to not specified (these steps are not published)
         acting_user_is?(available_to, record)
       end
-      
-      
-      def acting_user_is?(who, record)
-        user = record.acting_user
 
+      def publishable_by(user, who, record)                    
         case who
         when :all
           true
@@ -32,7 +29,7 @@ module Hobo
 
         when Array
           # recursively apply the same test to every item in the array
-          who.detect { |w| acting_user_is?(w, record) }
+          who.detect { |w| publishable_by(user, w, record) }
 
         else
           refl = record.class.reflections[who]
@@ -53,6 +50,9 @@ module Hobo
         end
       end
 
+      def acting_user_is?(who, record)
+        publishable_by(record.acting_user, who, record)
+      end
 
       def run_hook(record, hook, *args)
         case hook

data/lib/hobo/lifecycles/lifecycle.rb

@@ -159,7 +159,7 @@ module Hobo
         state ? state.transitions_out : []
       end
 
-
+      # see also publishable_transitions_for
       def available_transitions_for(user, name=nil)
         name = name.to_sym if name
         matches = available_transitions
@@ -169,6 +169,10 @@ module Hobo
         end
       end
 
+      def publishable_transitions_for(user)
+        available_transitions_for(user).select {|t| t.publishable_by(user, t.available_to, record)}
+      end
+        
 
       def become(state_name, validate=true)
         state_name = state_name.to_sym
@@ -180,7 +184,7 @@ module Hobo
         else
           s = self.class.states[state_name]
           raise ArgumentError, "No such state '#{state_name}' for #{record.class.name}" unless s
-          
+
           if record.save(validate)
             s.activate! record
             self.active_step = nil # That's the end of this step