hobo 0.8.5 → 0.8.6

data/init.rb

@@ -1,9 +1,2 @@
 require File.dirname(__FILE__) + "/lib/hobo"
 require 'rails_generator'
-
-# 'orrible but 'reative 'ack to allow generators to be in symlinked plugins
-Rails::Generator::PathSource.class_eval do
-  def path
-    @path.gsub('**', '*/**')
-  end
-end

data/lib/active_record/association_collection.rb

@@ -13,6 +13,15 @@ module ActiveRecord
       def new_candidate(attributes = {})
         record = new
         @target.delete record
+        set_reverse_association(record) if hobo_association_collection?
+        record
+      end
+
+
+      def user_new_candidate(user, attributes = {})
+        record = user_new(user, attributes)
+        @target.delete record
+        set_reverse_association(record) if hobo_association_collection?
         record
       end
 

data/lib/hobo.rb

@@ -16,7 +16,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
   
   class PermissionDeniedError < RuntimeError; end
 
@@ -41,10 +41,6 @@ module Hobo
     end
 
 
-    def typed_id(obj, attr=nil)
-      attr ? "#{obj.typed_id}:#{attr}" : obj.typed_id
-    end
-
     def find_by_search(query, search_targets=nil)
       search_targets ||=
         begin
@@ -90,10 +86,14 @@ module Hobo
     def get_field(object, field)
       return nil if object.nil?
       field_str = field.to_s
-      if field_str =~ /^\d+$/
-        object[field.to_i]
-      else
-        object.send(field)
+      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
 
@@ -159,9 +159,7 @@ module Hobo
 
       ActionController::Base.send(:include, Hobo::ControllerExtensions)
 
-      if defined? HoboFields
-        HoboFields.never_wrap(Hobo::Undefined)
-      end      
+      HoboFields.never_wrap(Hobo::Undefined) if defined? HoboFields
 
       ActiveSupport::Dependencies.load_paths |= [ "#{RAILS_ROOT}/app/viewhints" ]
     end
@@ -189,7 +187,6 @@ module Hobo
   # Empty class to represent the boolean type.
   class Boolean; end
 
-
 end
 
 
@@ -212,11 +209,13 @@ end
 
 module ::Enumerable
   def group_by_with_metadata(&block)
-    group_by_without_metadata(&block).each do |k,v|
+    r=group_by_without_metadata(&block)
+    r.each do |k,v|
       v.origin = origin
       v.origin_attribute = origin_attribute
       v.member_class = member_class
     end
+    r
   end
   alias_method_chain :group_by, :metadata
 end

data/lib/hobo/accessible_associations.rb

@@ -53,6 +53,13 @@ module Hobo
     def params_hash_to_array(array_or_hash)
       if array_or_hash.is_a?(Hash)
         array = array_or_hash.get(*array_or_hash.keys.sort_by(&:to_i))
+      elsif array_or_hash.is_a?(String)
+        # Due to the way that rails works, there's no good way to tell
+        # the difference between an empty array and a params hash that
+        # just isn't making any updates to the array.  So we're
+        # hacking this in: if you pash an empty string where an array
+        # is expected, we assume you wanted an empty array.
+        []
       else
         array_or_hash
       end
@@ -67,7 +74,13 @@ module Hobo
         finder.named(id_or_name)
       end
     end
-  
+
+    def finder_for_belongs_to(record, name)
+      refl = record.class.reflections[name]
+      conditions = ActiveRecord::Associations::BelongsToAssociation.new(record, refl).conditions
+      finder = refl.klass.scoped(:conditions => conditions)
+    end
+
   end
   
   classy_module(AccessibleAssociations) do
@@ -103,22 +116,34 @@ module Hobo
       if options[:accessible]
         class_eval %{
           def #{name}_with_accessible=(record_hash_or_string)
-            refl = self.class.reflections[:#{name}]
-            conditions = ActiveRecord::Associations::BelongsToAssociation.new(self, refl).conditions
-            finder = refl.klass.scoped(:conditions => conditions)
+            finder = Hobo::AccessibleAssociations.finder_for_belongs_to(self, :#{name})
             record = Hobo::AccessibleAssociations.find_or_create_and_update(self, :#{name}, finder, record_hash_or_string) do |id|
               if id
                 raise ArgumentError, "attempted to update the wrong record in belongs_to association #{self}##{name}" unless 
-                  #{name} && id == self.#{name}.id
+                  #{name} && id.to_s == self.#{name}.id.to_s
                 #{name}
               else
-                refl.klass.new
+                finder.new
               end
             end
             self.#{name}_without_accessible = record
           end
-        }, __FILE__, __LINE__ - 5
+        }, __FILE__, __LINE__ - 15
         alias_method_chain :"#{name}=", :accessible
+      else
+        # Not accessible - but finding by name and ID is still supported
+        class_eval %{
+          def #{name}_with_finder=(record_or_string)
+            record = if record_or_string.is_a?(String)
+                       finder = Hobo::AccessibleAssociations.finder_for_belongs_to(self, :#{name})
+                       Hobo::AccessibleAssociations.find_by_name_or_id(finder, record_or_string)
+                     else # it is a record
+                       record_or_string
+                     end
+            self.#{name}_without_finder = record
+          end
+        }, __FILE__, __LINE__ - 12
+        alias_method_chain :"#{name}=", :finder
       end
     end
     metaclass.alias_method_chain :belongs_to, :accessible

data/lib/hobo/authentication_support.rb

@@ -102,7 +102,7 @@ module Hobo
       !logged_in? and
           cookie = cookies[:auth_token] and
           (token, model_name = cookie.split) and
-          user_model = model_name.constantize rescue nil and
+          user_model = model_name._?.safe_constantize and
           user = user_model.find_by_remember_token(token) and
           user.remember_token? and
           user

data/lib/hobo/controller.rb

@@ -18,27 +18,25 @@ module Hobo
           before_filter :login_from_cookie 
           alias_method_chain :redirect_to, :object_url
           around_filter do |controller, action|
-            Thread.current['Hobo::current_controller'] = controller
+            Thread.current['Hobo.current_controller'] = controller
             action.call
-            Thread.current['Hobo::current_controller'] = nil  # should avoid memory-leakage
+            Thread.current['Hobo.current_controller'] = nil  # should avoid memory-leakage
           end
           @included_taglibs = []
         end
         Hobo::HoboHelper.add_to_controller(klass)
       end
 
-      attr_writer :request_host, :app_name # DEPRECIATED AFTER 0.9 - setting them should not be needed
-
       def controller_and_view_for(page_path)
         page_path.match(/(.*)\/([^\/]+)/)[1..2]
       end
 
       def request_host
-        @request_host || Thread.current['Hobo::current_controller'].request.host_with_port
+        Thread.current['Hobo.current_controller'].request.host_with_port
       end
 
       def app_name
-        @app_name || Thread.current['Hobo::current_controller'].send(:call_tag, :app_name)
+        Thread.current['Hobo.current_controller'].send(:call_tag, :app_name)
       end
 
     end
@@ -57,7 +55,7 @@ module Hobo
     protected
 
     def redirect_to_with_object_url(destination, *args)
-      if destination.is_a?(String, Hash, Symbol)
+      if destination.is_one_of?(String, Hash, Symbol)
         redirect_to_without_object_url(destination)
       else
         redirect_to_without_object_url(object_url(destination, *args))

data/lib/hobo/dryml.rb

@@ -38,6 +38,7 @@ module Hobo
     
     def enable
       ActionView::Template.register_template_handler("dryml", Hobo::Dryml::TemplateHandler)
+      DrymlGenerator.enable
     end
     
 
@@ -78,8 +79,14 @@ module Hobo
         @tag_page_renderer_classes[controller_class.name] ||=
           make_renderer_class("", page, local_names, DEFAULT_IMPORTS, included_taglibs)
         @tag_page_renderer_classes[controller_class.name].new(page, view)
-      else
-        filename ||= view._pick_template(page + ".dryml").filename
+      else        
+        filename ||= if view.view_paths.respond_to? :find_template
+                       # Rails 2.3
+                       view.view_paths.find_template(page + ".dryml").filename
+                     else
+                       # Rails 2.2
+                       view._pick_template(page + ".dryml").filename
+                     end
         mtime = File.mtime(filename)
         renderer_class = @renderer_classes[page]
 

data/lib/hobo/dryml/dryml_builder.rb

@@ -54,21 +54,20 @@ module Hobo::Dryml
       ("def render_page(__page_this__, __local_assigns__); " +
             "#{locals} new_object_context(__page_this__) do " +
             src +
-           "; _erbout; end; end")
+           "; output_buffer; end; end")
     end
 
 
-    def erb_process(erb_src)
-      # Strip off "_erbout = ''" from the beginning and "; _erbout"
-      # from the end, because we do things differently around
-      # here. (_erbout is defined as a method)
-      trim_mode = if defined?(ActionView::TemplateHandlers::ERB.erb_trim_mode)
-                    ActionView::TemplateHandlers::ERB.erb_trim_mode
-                  else
-                    ActionView::Base.erb_trim_mode
-                  end
+    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)]
       
-      ERB.new(erb_src, nil, trim_mode).src[("_erbout = '';").length..-("; _erbout".length)]
+      if method_def
+        src.sub /^\s*def.*?\(.*?\)/, '\0 __in_erb_template=true; '
+      else
+        "__in_erb_template=true; " + src
+      end
     end
 
 
@@ -83,7 +82,7 @@ module Hobo::Dryml
           @environment.class_eval(instruction[:src], template_path, instruction[:line_num])
 
         when :def
-          src = erb_process(instruction[:src])
+          src = erb_process(instruction[:src], true)
           @environment.class_eval(src, template_path, instruction[:line_num])
 
         when :render_page

data/lib/hobo/dryml/dryml_doc.rb

@@ -13,10 +13,27 @@ module Hobo
         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
+
+        %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 = filename.sub(/.dryml$/, '')[home.length+1..-1]
+        def initialize(home, filename, name=nil)
+          @name = name || filename.sub(/.dryml$/, '')[home.length+1..-1]
           @doc = Hobo::Dryml::Parser::Document.new(File.read(filename), filename)
           parse_tag_defs
         end
@@ -28,10 +45,7 @@ module Hobo
           doc.restore_erb_scriptlets(first_node.to_s.strip) if first_node.is_a?(REXML::Comment)
         end
         
-        def comment_html
-          Maruku.new(comment).to_html
-        end
-        
+        include CommentMethods
            
         private   
              
@@ -78,23 +92,7 @@ module Hobo
           end
         end
         
-        
-        def comment_intro
-          comment && comment =~ /(.*?)^#/m ? $1 : comment
-        end
-
-        
-        def comment_rest
-          comment && comment[comment_intro.length..-1]
-        end
-
-        %w(comment comment_intro comment_rest).each do |m|
-          class_eval "def #{m}_html; Maruku.new(#{m}).to_html.gsub(/&/, '&'); end"
-        end
-        
-        def comment_html
-          
-        end
+        include CommentMethods
         
         def no_doc?
           comment =~ /^nodoc\b/
@@ -158,4 +156,4 @@ module Hobo
     
   end
   
-end
+end

data/lib/hobo/dryml/dryml_generator.rb

@@ -1,6 +1,9 @@
+# -*- coding: utf-8 -*-
 require 'set'
 require 'fileutils'
 
+require 'action_controller/dispatcher'
+
 module Hobo
   
   module Dryml
@@ -12,8 +15,37 @@ module Hobo
       
       HEADER = "<!-- AUTOMATICALLY GENERATED FILE - DO NOT EDIT -->\n\n"
       
+      class << self
+        attr_accessor :run_on_every_request
+      end
+      
+      def self.enable
+        
+        # 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 Hobo::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 Hobo::Dryml::DrymlGenerator.run_on_every_request == false || Rails.env.production?
+            end
+            alias_method_chain :reload_application, :dryml_generators
+          end
+        end
+      end
+      
       def self.run
-        return if RAILS_ENV == "production"
         @generator ||= DrymlGenerator.new
         @generator.run
       end
@@ -124,7 +156,7 @@ module Hobo
       
       
       def model_name(*options)
-        name = model.name
+        name = model.view_hints.model_name
         name = name.pluralize                                 if :plural.in?(options)
         name = name.titleize                                  if :title.in?(options)
         name = name.titleize.downcase                         if :lowercase.in?(options)
@@ -136,6 +168,11 @@ module Hobo
       def model_class
         model_name(:dashed)
       end
+      
+      
+      def view_hints
+        model.view_hints
+      end
 
       
       def through_collection_names(klass=model)
@@ -170,7 +207,7 @@ module Hobo
         end
       end
       
-      
+            
       def standard_fields(*args)
         klass = args.first.is_a?(Class) ? args.shift : model
         extras = args
@@ -183,7 +220,7 @@ module Hobo
         hm = extras.include?(:has_many)
         klass.reflections.values.sort_by { |refl| refl.name.to_s }.map do |refl|
           fields << refl.name.to_s if bt && refl.macro == :belongs_to
-          fields << refl.name.to_s if hm && refl.macro == :has_many
+          fields << refl.name.to_s if hm && refl.macro == :has_many && refl.options[:accessible]
         end
 
         fields.reject! { |f| model.never_show? f }

data/lib/hobo/dryml/part_context.rb

@@ -77,8 +77,10 @@ module Hobo
         
         part_name, this_id, locals, form_field_path = context
 
-        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_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
+        end
         
         self.part_name             = part_name
         self.this_id               = this_id
@@ -91,7 +93,7 @@ module Hobo
 
       # Generate the HMAC keyed message digest. Uses SHA1 by default.
       def generate_digest(data, session)
-        secret = self.class.secret || ActionController::Base.cached_session_options.first[:secret]
+        secret = self.class.secret || ActionController::Base.session_options[:secret] || ActionController::Base.cached_session_options.first[:secret]
         key = secret.respond_to?(:call) ? secret.call(session) : secret
         OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(self.class.digest), key, data)
       end