hobo 0.8.5 → 0.8.6

data/lib/hobo/model.rb

@@ -6,7 +6,7 @@ module Hobo
 
     NAME_FIELD_GUESS      = %w(name title)
     PRIMARY_CONTENT_GUESS = %w(description body content profile)
-    SEARCH_COLUMNS_GUESS  = %w(name title body content profile)
+    SEARCH_COLUMNS_GUESS  = %w(name title body description content profile)
 
 
     def self.included(base)
@@ -86,7 +86,9 @@ module Hobo
       end
 
       # ...but only return the ones that registered themselves
-      @model_names.*.constantize
+      @model_names.map do |name|
+        name.safe_constantize || (@model_names.delete name; nil)
+      end.compact
     end
     
     
@@ -133,9 +135,6 @@ module Hobo
 
     module ClassMethods
 
-      # include methods also shared by CompositeModel
-      #include ModelSupport::ClassMethods
-
       attr_accessor :creator_attribute
       attr_writer :name_attribute, :primary_content_attribute
 
@@ -204,7 +203,7 @@ module Hobo
         if options[:polymorphic]
           class_eval %{
             def #{name}_is?(target)
-              target.id == self.#{refl.primary_key_name} && target.class.name == self.#{refl.options[:foreign_type]}
+              target.class.name == self.#{refl.options[:foreign_type]} && target.id == self.#{refl.primary_key_name}
             end
             def #{name}_changed?
               #{refl.primary_key_name}_changed? || #{refl.options[:foreign_type]}_changed?
@@ -213,7 +212,7 @@ module Hobo
         else
           class_eval %{
             def #{name}_is?(target)
-              target.id == self.#{refl.primary_key_name}
+              target.class == ::#{refl.klass.name} && target.id == self.#{refl.primary_key_name}
             end
             def #{name}_changed?
               #{refl.primary_key_name}_changed?
@@ -359,10 +358,7 @@ module Hobo
 
       def method_missing(name, *args, &block)
         name = name.to_s
-        if name =~ /\./
-          # FIXME: Do we need this now?
-          call_method_chain(name, args, &block)
-        elsif create_automatic_scope(name)
+        if create_automatic_scope(name)
           send(name.to_sym, *args, &block)
         else
           super(name.to_sym, *args, &block)
@@ -375,13 +371,6 @@ module Hobo
       end
 
 
-      def call_method_chain(chain, args, &block)
-        parts = chain.split(".")
-        s = parts[0..-2].inject(self) { |m, scope| m.send(scope) }
-        s.send(parts.last, *args)
-      end
-
-
       def to_url_path
         "#{name.underscore.pluralize}"
       end
@@ -412,7 +401,7 @@ module Hobo
     def to_param
       name_attr = self.class.name_attribute and name = send(name_attr)
       if name_attr && !name.blank? && id.is_a?(Fixnum)
-        readable = name.to_s.downcase.gsub(/[^a-z0-9]+/, '-').gsub(/-+$/, '').gsub(/^-+/, '').split('-')[0..5].join('-')
+        readable = name.to_s.downcase.gsub(/[^a-z0-9]+/, '-').remove(/-+$/).remove(/^-+/).split('-')[0..5].join('-')
         @to_param ||= "#{id}-#{readable}"
       else
         id.to_s
@@ -431,6 +420,9 @@ module Hobo
     end
 
 
+    # We deliberately give these three methods unconventional (java-esque) names to avoid
+    # polluting the application namespace
+
     def set_creator(user)
       set_creator!(user) unless get_creator
     end
@@ -452,53 +444,11 @@ module Hobo
     end
 
 
-    # We deliberately give this method an unconventional name to avoid
-    # polluting the application namespace too badly
     def get_creator
       self.class.creator_attribute && send(self.class.creator_attribute)
     end
 
 
-    def duplicate
-      copy = self.class.new
-      copy.copy_instance_variables_from(self, ["@attributes_cache"])
-      copy.instance_variable_set("@attributes", @attributes.dup)
-      copy.instance_variable_set("@new_record", nil) unless new_record?
-
-      # Shallow copy of belongs_to associations
-      for refl in self.class.reflections.values
-        if refl.macro == :belongs_to and (target = self.send(refl.name))
-          bta = ActiveRecord::Associations::BelongsToAssociation.new(copy, refl)
-          bta.replace(target)
-          copy.instance_variable_set("@#{refl.name}", bta)
-        end
-      end
-      copy
-    end
-
-
-    def same_fields?(other, *fields)
-      return true if other.nil?
-
-      fields = fields.flatten
-      fields.all?{|f| self.send(f) == other.send(f)}
-    end
-
-
-    def only_changed_fields?(other, *changed_fields)
-      return true if other.nil?
-
-      changed_fields = changed_fields.flatten.*.to_s
-      all_cols = self.class.columns.*.name - []
-      all_cols.all?{|c| c.in?(changed_fields) || self.send(c) == other.send(c) }
-    end
-
-
-    def compose_with(object, use=nil)
-      CompositeModel.new_for([self, object])
-    end
-
-
     def typed_id
       "#{self.class.name.underscore}:#{self.id}" if id
     end

data/lib/hobo/model_controller.rb

@@ -4,10 +4,9 @@ module Hobo
 
     include Hobo::Controller
 
-    VIEWLIB_DIR = "taglibs"
-
     DONT_PAGINATE_FORMATS = [ Mime::CSV, Mime::YAML, Mime::JSON, Mime::XML, Mime::ATOM, Mime::RSS ]
-    WILL_PAGINATE_OPTIONS = [ :page, :per_page, :total_entries, :count, :finder]
+
+    WILL_PAGINATE_OPTIONS = [ :page, :per_page, :total_entries, :count, :finder ]
 
     READ_ONLY_ACTIONS  = [:index, :show]
     WRITE_ONLY_ACTIONS = [:create, :update, :destroy]
@@ -27,7 +26,6 @@ module Hobo
 
           helper_method :model, :current_user
           before_filter :set_no_cache_headers
-          after_filter  :remember_page_path
 
           rescue_from ActiveRecord::RecordNotFound, :with => :not_found
 
@@ -35,7 +33,7 @@ module Hobo
           rescue_from Hobo::Lifecycles::LifecycleKeyError, :with => :permission_denied
 
           alias_method_chain :render, :hobo_model
-
+          
         end
         register_controller(base)
 
@@ -97,7 +95,7 @@ module Hobo
           index_action "complete_#{name}", &block
         else
           index_action "complete_#{name}" do
-            hobo_completions name, model, options
+            hobo_completions field, model, options
           end
         end
       end
@@ -109,8 +107,8 @@ module Hobo
         got_block = block_given?
         define_method web_name do
           # Make sure we have a copy of the options - it is being mutated somewhere
-          opts = {}.merge(options)
-          self.this = find_instance(opts) unless opts[:no_find]
+          opts = options.dup
+          self.this = find_instance(opts)
           raise Hobo::PermissionDeniedError unless @this.method_callable_by?(current_user, method)
           if got_block
             instance_eval(&block)
@@ -118,7 +116,7 @@ module Hobo
             @this.send(method)
           end
 
-          hobo_ajax_response || render(:nothing => true) unless performed?
+          hobo_ajax_response unless performed?
         end
       end
 
@@ -370,7 +368,7 @@ module Hobo
       after_submit = params[:after_submit]
 
       # The after_submit post parameter takes priority
-      (after_submit == "stay-here" ? previous_page_path : after_submit) ||
+      (after_submit == "stay-here" ? url_for_page_path : after_submit) ||
 
         # Then try the record's show page
         (!destroyed && object_url(@this)) ||
@@ -385,6 +383,11 @@ module Hobo
         home_page
     end
     
+    
+    def url_for_page_path
+      controller, view = Controller.controller_and_view_for(params[:page_path])
+      url_for :controller => controller, :action => view
+    end
 
     # TODO: Get rid of this joke of an idea that fails miserably if you open another browser window.
     def previous_page_path
@@ -410,10 +413,12 @@ module Hobo
 
     def response_block(&b)
       if b
-        if b.arity == 1
-          respond_to {|wants| yield(wants) }
-        else
-          yield
+        respond_to do |format|
+          if b.arity == 1
+            yield format
+          else
+            format.html { yield }
+          end
         end
         performed?
       end
@@ -421,7 +426,7 @@ module Hobo
 
 
     def request_requires_pagination?
-      request.format.not_in?(DONT_PAGINATE_FORMATS)
+      request.format.not_in?(DONT_PAGINATE_FORMATS) && model.view_hints.paginate?
     end
 
 
@@ -442,7 +447,7 @@ module Hobo
     def find_owner_and_association(owner_association)
       refl = model.reflections[owner_association]
       klass = refl.klass
-      id = params["#{klass.name.underscore}_id"]
+      id = params["#{owner_association}_id"]
       owner = klass.find(id)
       instance_variable_set("@#{owner_association}", owner)
       [owner, owner.send(model.reverse_reflection(owner_association).name)]
@@ -470,7 +475,7 @@ module Hobo
 
     def hobo_show(*args, &b)
       options = args.extract_options!
-      self.this = find_instance(options)
+      self.this ||= find_instance(options)
       response_block(&b)
     end
 
@@ -490,7 +495,7 @@ module Hobo
 
     def hobo_create(*args, &b)
       options = args.extract_options!
-      self.this = args.first || new_for_create
+      self.this ||= args.first || new_for_create
       this.user_update_attributes(current_user, options[:attributes] || attribute_parameters || {})
       create_response(:new, &b)
     end
@@ -499,7 +504,7 @@ module Hobo
     def hobo_create_for(owner, *args, &b)
       options = args.extract_options!
       owner, association = find_owner_and_association(owner)
-      self.this = args.first || association.new
+      self.this ||= args.first || association.new
       this.user_update_attributes(current_user, options[:attributes] || attribute_parameters || {})
       create_response(:"new_for_#{owner}", &b)    
     end
@@ -547,7 +552,7 @@ module Hobo
     def hobo_update(*args, &b)
       options = args.extract_options!
 
-      self.this = args.first || find_instance
+      self.this ||= args.first || find_instance
       changes = options[:attributes] || attribute_parameters or raise RuntimeError, "No update specified in params"
       this.user_update_attributes(current_user, changes)
 
@@ -594,7 +599,7 @@ module Hobo
 
     def hobo_destroy(*args, &b)
       options = args.extract_options!
-      self.this = args.first || find_instance
+      self.this ||= args.first || find_instance
       this.user_destroy(current_user)
       flash[:notice] = "The #{model.name.titleize.downcase} was deleted" unless request.xhr?
       destroy_response(&b)
@@ -671,7 +676,7 @@ module Hobo
       options = options.reverse_merge(:limit => 10, :param => :query, :query_scope => "#{attribute}_contains")
       finder = finder.limit(options[:limit]) unless finder.send(:scope, :find, :limit)
       finder = finder.send(options[:query_scope], params[options[:param]])
-      items = finder.find(:all)
+      items = finder.find(:all).select { |r| r.viewable_by?(current_user) }
       render :text => "<ul>\n" + items.map {|i| "<li>#{i.send(attribute)}</li>\n"}.join + "</ul>"
     end
 
@@ -694,6 +699,7 @@ module Hobo
 
     def permission_denied(error)
       self.this = true # Otherwise this gets sent user_view
+      @permission_error = error
       if "permission_denied".in?(self.class.superclass.instance_methods)
         super
       else
@@ -762,13 +768,6 @@ module Hobo
       headers["Expires"] ='0'
     end
 
-    def remember_page_path
-      if request.method == :get
-        session[:previous_page_path] = request.path
-        session[:previous_page_path] += "?#{request.query_string}" unless request.query_string.blank?
-      end
-    end
-
     # --- end filters --- #
 
     public

data/lib/hobo/model_router.rb

@@ -73,20 +73,23 @@ module Hobo
           return
         end
 
-        require "#{RAILS_ROOT}/app/controllers/application" unless Object.const_defined? :ApplicationController
-
+        begin
+          require "#{RAILS_ROOT}/app/controllers/application" unless Object.const_defined? :ApplicationController
+        rescue MissingSourceFile => ex
+          # must be on Rails 2.3.  Yay!
+        end
+        
         # Add non-subsite, and all subsite routes
         [nil, *Hobo.subsites].each { |subsite| add_routes_for(map, subsite) }
 
         add_developer_routes(map) if Hobo.developer_features?
 
-        # Run the DRYML generators
-        # TODO: This needs a proper home 
-        Hobo::Dryml::DrymlGenerator.run unless caller[-1] =~ /[\/\\]rake:\d+$/
       rescue ActiveRecord::StatementInvalid => e
         # Database problem? Just continue without routes
-        ActiveRecord::Base.logger.warn "!! Database exception during Hobo routing -- continuing without routes"
-        ActiveRecord::Base.logger.warn "!! #{e.to_s}"
+        if ActiveRecord::Base.logger
+          ActiveRecord::Base.logger.warn "!! Database exception during Hobo routing -- continuing without routes"
+          ActiveRecord::Base.logger.warn "!! #{e.to_s}"
+        end
       end
 
 
@@ -132,11 +135,7 @@ module Hobo
 
 
     def add_routes
-      # Simple support for composite models, we might later need a CompositeModelController
-      if model < Hobo::CompositeModel
-        map.connect "#{plural}/:id", :controller => plural, :action => 'show', :requirements => ID_REQUIREMENT
-
-      elsif controller < Hobo::ModelController
+      if controller < Hobo::ModelController
         # index routes need to be first so the index names don't get
         # taken as IDs
         index_action_routes
@@ -181,7 +180,7 @@ module Hobo
 
         owner = owner.to_s.singularize if model.reflections[owner].macro == :has_many
 
-        collection_path = "#{owner_class.pluralize}/:#{owner_class}_id/#{collection}"
+        collection_path = "#{owner_class.pluralize}/:#{owner}_id/#{collection}"
 
         actions.each do |action|
           case action

data/lib/hobo/permissions.rb

@@ -319,68 +319,78 @@ module Hobo
       
     # By default, attempt to derive edit permission from create/update permission
     def edit_permitted?(attribute)
-      if attribute
-        with_attribute_or_belongs_to_keys(attribute) do |attr, ftype|
-          unknownify_attribute(self, attr)
-          unknownify_attribute(self, ftype) if ftype
-        end
-      end
+      unknownify_attribute(attribute) if attribute
       new_record? ? create_permitted? : update_permitted?
     rescue Hobo::UndefinedAccessError
       # The permission is dependent on the unknown value
       # so this attribute is not editable
       false
     ensure
-      if attribute
-        with_attribute_or_belongs_to_keys(attribute) do |attr, ftype|
-          deunknownify_attribute(self, attr)
-          deunknownify_attribute(self, ftype) if ftype
-        end
-      end
+      deunknownify_attribute(attribute) if attribute
     end
   
   
     # Add some singleton methods to +record+ so give the effect that +attribute+ is unknown. That is,
     # attempts to access the attribute will result in a Hobo::UndefinedAccessError
-    def unknownify_attribute(record, attr)
-      record.metaclass.class_eval do
-        
+    def unknownify_attribute(attr)
+      metaclass.class_eval do
         define_method attr do
           raise Hobo::UndefinedAccessError
         end
+      end
+      
+      if (refl = self.class.reflections[attr.to_sym]) && refl.macro == :belongs_to
+        # A belongs_to -- also unknownify the underlying fields
+        unknownify_attribute refl.primary_key_name
+        unknownify_attribute refl.options[:foreign_type] if refl.options[:polymorphic]
+      else
+        # A regular field -- hack the dirty tracking methods
         
-        define_method "#{attr}_change" do
-          raise Hobo::UndefinedAccessError
-        end
+        metaclass.class_eval do
         
-        define_method "#{attr}_was" do
-          read_attribute attr
-        end
+          define_method "#{attr}_change" do
+            raise Hobo::UndefinedAccessError
+          end
         
-        define_method "#{attr}_changed?" do
-          true
-        end
+          define_method "#{attr}_was" do
+            read_attribute attr
+          end
+        
+          define_method "#{attr}_changed?" do
+            true
+          end
 
-        def changed?
-          true
-        end
+          def changed?
+            true
+          end
       
-        define_method :changed do
-          changed_attributes.keys | [attr]
-        end
+          define_method :changed do
+            changed_attributes.keys | [attr.to_s]
+          end
       
-        def changes
-          raise Hobo::UndefinedAccessError
-        end
+          def changes
+            raise Hobo::UndefinedAccessError
+          end
         
+        end
       end
-      
     end
     
     # Best. Name. Ever
-    def deunknownify_attribute(record, attr)
-      [attr, "#{attr}_change", "#{attr}_was", "#{attr}_changed?", :changed?, :changed, :changes].each do |m|
-        record.metaclass.send :remove_method, m.to_sym
+    def deunknownify_attribute(attr)
+      attr = attr.to_sym
+      
+      metaclass.send :remove_method, attr
+      
+      if (refl = self.class.reflections[attr]) && refl.macro == :belongs_to
+        # A belongs_to -- restore the underlying fields
+        deunknownify_attribute refl.primary_key_name
+        deunknownify_attribute refl.options[:foreign_type] if refl.options[:polymorphic]
+      else
+        # A regular field -- restore the dirty tracking methods
+        ["#{attr}_change", "#{attr}_was", "#{attr}_changed?", :changed?, :changed, :changes].each do |m|
+          metaclass.send :remove_method, m.to_sym
+        end
       end
     end
   end