hobo 1.1.0 → 1.3.0.RC

data/lib/hobo/extensions/active_record/relation_with_origin.rb

@@ -0,0 +1,28 @@
+module ActiveRecord
+
+  class Relation
+    attr_accessor :origin, :origin_attribute
+  end
+
+  module Associations
+    class AssociationCollection
+
+      def scoped_with_origin
+        relation = scoped_without_origin.clone
+        relation.origin = @owner
+        relation.origin_attribute = @reflection.name
+        relation
+      end
+      alias_method_chain :scoped, :origin
+
+      def method_missing_with_origin(method, *args, &block)
+        res = method_missing_without_origin(method, *args, &block)
+        res.origin = @owner if res.respond_to?(:origin)
+        res.origin_attribute = @reflection.name if res.respond_to?(:origin_attribute)
+        res
+      end
+      alias_method_chain :method_missing, :origin
+
+    end
+  end
+end

data/lib/hobo/extensions/array.rb

@@ -0,0 +1,27 @@
+# Add support for type metadata to arrays
+
+require 'will_paginate/array'
+
+class Array
+
+  attr_accessor :member_class, :origin, :origin_attribute
+
+  def to_url_path
+    base_path = origin.try.to_url_path
+    "#{base_path}/#{origin_attribute}" unless base_path.blank?
+  end
+
+  def typed_id
+    origin and origin_id = origin.try.typed_id and "#{origin_id}:#{origin_attribute}"
+  end
+
+  def paginate_with_hobo_metadata(*args, &block)
+    collection = paginate_without_hobo_metadata(*args, &block)
+    collection.member_class     = member_class
+    collection.origin           = try.proxy_owner
+    collection.origin_attribute = try.proxy_reflection._?.name
+    collection
+  end
+  alias_method_chain :paginate, :hobo_metadata
+
+end

data/lib/hobo/extensions/enumerable.rb

@@ -0,0 +1,12 @@
+module Enumerable
+  def group_by_with_metadata(&block)
+    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/extensions/i18n.rb

@@ -0,0 +1,17 @@
+I18n.module_eval do
+  class << self
+
+    def translate_with_show_keys(key, options = {})
+      translation = translate_without_show_keys(key, options)
+      return translation unless translation.is_a?(String)
+      keys = normalize_keys(locale, key, options[:scope]).join('.')
+      "[#{keys}]" + translation
+    end
+    alias_method_chain :translate, :show_keys
+
+    alias_method :t_without_show_keys, :t
+    alias_method :t, :translate_with_show_keys
+
+  end
+end
+

data/lib/hobo/{hobo_helper.rb → helper.rb}

@@ -1,6 +1,6 @@
 module Hobo
 
-  module HoboHelper
+  module Helper
 
     def self.add_to_controller(controller)
       controller.send(:include, self)
@@ -31,7 +31,7 @@ module Hobo
 
 
     def base_url
-      ActionController::Base.relative_url_root || ""
+      "#{Rails.application.config.action_controller.relative_url_root}"
     end
 
 
@@ -58,9 +58,9 @@ module Hobo
       options[:subsite] ||= self.subsite
       subsite, method = options.get :subsite, :method
 
-      if obj.respond_to?(:member_class) && obj.respond_to?(:origin)
+      if obj.respond_to?(:member_class) && obj.respond_to?(:origin) && obj.origin
         # Asking for URL of a collection, e.g. category/1/adverts or category/1/adverts/new
-        
+
         refl = obj.origin.class.reverse_reflection(obj.origin_attribute)
         owner_name = refl.name.to_s
         owner_name = owner_name.singularize if refl.macro == :has_many
@@ -89,7 +89,7 @@ module Hobo
           # Asking for url to post new record to
           obj = obj.class
         end
-        
+
         klass = if obj.is_a?(Class)
                   obj
                 elsif obj.respond_to?(:member_class)
@@ -99,7 +99,7 @@ module Hobo
                 end
       end
 
-      if Hobo::ModelRouter.linkable?(klass, action, options)
+      if Hobo::Routes.linkable?(klass, action, options)
 
         url = base_url_for(obj, subsite, action)
         url += "/#{action_path || action}" unless action.in?(IMPLICIT_ACTIONS)
@@ -110,12 +110,34 @@ module Hobo
     end
 
 
+    def app_name(add_subsite=true)
+      an = Rails.application.config.hobo.app_name
+      if add_subsite && subsite
+        subsite_name = t 'hobo.admin.subsite_name', :default => subsite.titleize
+        an = an + " - #{subsite_name}"
+      end
+      an
+    end
+
+
     def base_url_for(object, subsite, action)
-      path = object.to_url_path or HoboError.new("cannot create url for #{object.inspect} (#{object.class})")
+      path = object.to_url_path or Hobo::Error.new("cannot create url for #{object.inspect} (#{object.class})")
       "#{base_url}#{'/' + subsite unless subsite.blank?}/#{path}"
     end
 
 
+    def recognize_page_path
+      Rails.application.routes.recognize_path(params[:page_path]||request.fullpath)
+    end
+
+    def url_for_page_path(options={})
+      url_for recognize_page_path.merge(options)
+    end
+
+    def controller_action_from_page_path
+      recognize_page_path.values_at(:controller,:action)
+    end
+
     def _as_params(name, obj)
       if obj.is_a? Array
         obj.map {|x| _as_params("#{name}[]", x)}.join("&")
@@ -183,7 +205,7 @@ module Hobo
                           [this, nil]
                         elsif this_parent && this_field
                           [this_parent, this_field]
-                        else 
+                        else
                           [this, nil]
                         end
                       elsif args.length == 2
@@ -198,14 +220,14 @@ module Hobo
 
       object.editable_by?(current_user, field)
     end
-    
+
 
     def can_delete?(object=this)
       object.destroyable_by?(current_user)
     end
 
 
-    
+
     def can_call?(*args)
       method = args.last
       object = args.length == 2 ? args.first : this
@@ -213,7 +235,7 @@ module Hobo
       object.method_callable_by?(current_user, method)
     end
 
-    
+
     # can_view? has special behaviour if it's passed a class or an
     # association-proxy -- it instantiates the class, or creates a new
     # instance "in" the association, and tests the permission of this
@@ -224,7 +246,7 @@ module Hobo
     # belongs_to the proxy owner.
     def can_view?(*args)
       # TODO: Man does this need a big cleanup!
-      
+
       if args.empty?
         if this_parent && this_field
           object = this_parent
@@ -238,7 +260,7 @@ module Hobo
       else
         object, field = args
       end
-      
+
       if field
         # Field can be a dot separated path
         if field.is_a?(String) && (path = field.split(".")).length > 1
@@ -248,7 +270,7 @@ module Hobo
       elsif (origin = object.try.origin)
         object, field = origin, object.origin_attribute
       end
-      
+
       @can_view_cache ||= {}
       @can_view_cache[ [object, field] ] ||=
         if !object.respond_to?(:viewable_by?)
@@ -264,7 +286,7 @@ module Hobo
           false
         end
     end
-    
+
 
     def select_viewable(collection=this)
       collection.select {|x| can_view?(x)}
@@ -321,19 +343,19 @@ module Hobo
 
 
     # Login url for a given user record or user class
-    def forgot_password_url(user_class=Hobo::User.default_user_model)
+    def forgot_password_url(user_class=Hobo::Model::UserBase.default_user_model)
       send("#{user_class.name.underscore}_forgot_password_url") rescue nil
     end
 
 
     # Login url for a given user record or user class
-    def login_url(user_class=Hobo::User.default_user_model)
+    def login_url(user_class=Hobo::Model::UserBase.default_user_model)
       send("#{user_class.name.underscore}_login_url") rescue nil
     end
 
 
     # Sign-up url for a given user record or user class
-    def signup_url(user_class=Hobo::User.default_user_model)
+    def signup_url(user_class=Hobo::Model::UserBase.default_user_model)
       send("#{user_class.name.underscore}_signup_url") rescue nil
     end
 
@@ -352,12 +374,12 @@ module Hobo
 
 
     def current_page_url
-      request.request_uri.match(/^([^?]*)/)._?[1]
+      request.fullpath.match(/^([^?]*)/)._?[1]
     end
 
     def query_params
-      query = request.request_uri =~ /\?([^?]+)/ && $1
-      result = HashWithIndifferentAccess.new 
+      query = request.fullpath =~ /\?([^?]+)/ && $1
+      result = HashWithIndifferentAccess.new
       if query
         query.gsub!('+', ' ')
         query.split('&').each do |param|
@@ -373,6 +395,7 @@ module Hobo
       options = args.extract_options!
       target = args.empty? || args.first.is_a?(Symbol) ? this : args.shift
       action = args.first
+      return false if action.nil? && target.try.new_record?
 
       if target.respond_to?(:member_class) && (origin = target.try.origin)
         klass = origin.class
@@ -389,28 +412,32 @@ module Hobo
         action ||= :show
       end
 
-      Hobo::ModelRouter.linkable?(klass, action, options.reverse_merge(:subsite => subsite))
+      Hobo::Routes.linkable?(klass, action, options.reverse_merge(:subsite => subsite))
     end
-    
-    
+
+
     def css_data(name, *args)
       "#{name.to_s.dasherize}::#{args * '::'}"
     end
-        
+
 
     # --- ViewHint Helpers --- #
-    
+
     def this_field_name
-      this_parent.class.try.view_hints.try.field_name(this_field) || this_field
+      this_parent.class.try.human_attribute_name(this_field) || this_field
     end
 
     def this_field_help
-      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] || ""
-      Hobo::Translations.ht(key, :default=>default)
+      this_parent.class.try.attribute_help(this_field.to_sym) || ""
     end
 
 
+    # --- default Helpers --- #
+
+    def your_default
+      this == current_user ? "Your" : (this.name.ends_with?('s') ? "#{this.name}'" : "#{this.name}'s")
+    end
+
     # --- Debugging Helpers ---- #
 
     def abort_with(*args)
@@ -424,7 +451,7 @@ module Hobo
       logger.debug("DRYML THIS = #{this.typed_id rescue this.inspect}")
       logger.debug("###################\n")
       args.first unless args.empty?
-    end    
+    end
 
   end
 

data/lib/hobo/helper/translations.rb

@@ -0,0 +1,54 @@
+module Hobo
+  module Helper
+    module Translations
+
+      include Normalizer
+
+=begin
+
+hobo_translate / ht
+
+Wrapper around the Rails :translate helper with hobo added features.
+
+It can be used as a regular helper or as a dryml tag.
+
+Hobo Added Features
+
+The first part of the key must be a model name (e.g.: user.index.title -> user). This method will add a "model" interpolation variable set to the translated and pluralized Model.model_name.human. Besides, it will add a default 'hobo.' fallback, (e.g.: hobo.index.title) at the beginning of the fallback chain.
+
+You can also pass any other :translate option like for example :count.
+
+Example:
+
+<%= ht :key=>'user.index.title', :default=>'Index'  %>
+<ht key="user.index.title">Index</ht>
+#=> "Index" # if "user.index.title" or "hobo.index.title" is not found
+#=> "User Index" # with the below en.yml file
+
+=== en.yml ===
+en:
+  hobo:
+    index:
+      title: %{model} Index
+
+=end
+
+      def hobo_translate(*args)
+        key, options = normalize_args(*args)
+        keys = key.to_s.split(".")
+        model_name = keys.shift
+        model_class = begin model_name.camelize.constantize; rescue; end
+        unless model_class && model_class < ActiveRecord::Base
+          raise Hobo::I18nError, %(wrong model name: "#{model_name}" (extracted from translation key: "#{key}"). You might want to use the translate/t tag/method instead.)
+        end
+        options[:default].unshift("hobo.#{keys.join(".")}".to_sym)
+        options[:model] = model_class.model_name.human(:count=>options[:count]||1)
+        translate key.to_sym, options
+      end
+      alias_method :ht, :hobo_translate
+
+
+
+    end
+  end
+end

data/lib/hobo/helper/translations/normalizer.rb

@@ -0,0 +1,39 @@
+require 'active_support/core_ext/string/output_safety'
+module Hobo
+  module Helper
+    module Translations
+      module Normalizer
+
+        private
+
+        def normalize_args(key, options={})
+          if (key.class == Hash) # called as a tag
+            if key.has_key?(:default) && !key[:default].blank?
+              Rails.logger.warn "hobo-i18n: 'default' should not be used as an attribute on *translate tags. 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]
+            options = key
+            key = options.delete(:key)
+            # Set options[:default] to complete the tag-argument-conversion process.
+            options[:default] = defaults.call(options) if defaults.class == Proc
+          end
+          escape_options(options)
+          options[:default] = Array.wrap options[:default]
+          [key, options]
+        end
+
+        def escape_options(options)
+          options.each_pair do |k,v|
+            options[k] = case v
+                         when Array
+                            v.map {|i| i.respond_to?(:html_safe) ? ERB::Util.html_escape(i) : i}
+                         else
+                           v.respond_to?(:html_safe) ? ERB::Util.html_escape(v) : v
+                         end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/hobo/model.rb

@@ -14,15 +14,17 @@ module Hobo
 
       register_model(base)
 
+      patch_will_paginate
+
       base.class_eval do
         inheriting_cattr_reader :default_order
         alias_method_chain :attributes=, :hobo_type_conversion
 
-        include Hobo::Permissions
-        include Hobo::Lifecycles::ModelExtensions
-        include Hobo::FindFor
-        include Hobo::AccessibleAssociations
-        include Hobo::Translations
+        include Permissions
+        include Lifecycles::ModelExtensions
+        include FindFor
+        include AccessibleAssociations
+        include IncludeInSave
       end
 
       class << base
@@ -33,21 +35,18 @@ module Hobo
         alias_method_chain :has_one, :new_method
 
         # eval avoids the ruby 1.9.2 "super from singleton method ..." error
-        # see LH#840
         eval %(
-          def inherited(klass)
-            super
-            fields(false) do
-              Hobo.register_model(klass)
-              field(klass.inheritance_column, :string)
-            end
+        def inherited(klass)
+          super
+          fields(false) do
+            Hobo.register_model(klass)
+            field(klass.inheritance_column, :string)
           end
+        end
         )
       end
 
-      # https://hobo.lighthouseapp.com/projects/8324/tickets/762-hobo_model-outside-a-full-rails-env-can-lead-to-stack-level-too-deep
-      raise HoboError, "HoboFields.enable has not been called" unless base.respond_to?(:fields)
-      base.fields(false) # force hobofields to load
+      base.fields(false) # force hobo_fields to load
 
       included_in_class_callbacks(base)
     end
@@ -59,10 +58,10 @@ module Hobo
           attr_accessor :member_class, :origin, :origin_attribute
         end
 
-        WillPaginate::Finder::ClassMethods.class_eval do
+        WillPaginate::Finders::Base.class_eval do
           def paginate_with_hobo_metadata(*args, &block)
             collection = paginate_without_hobo_metadata(*args, &block)
-            collection.member_class     = self
+            collection.member_class     = self.is_a?(ActiveRecord::Relation) ? member_class : self
             collection.origin           = try.proxy_owner
             collection.origin_attribute = try.proxy_reflection._?.name
             collection
@@ -73,8 +72,8 @@ module Hobo
 
       end
     end
-    
-    
+
+
     def self.register_model(model)
       @model_names ||= Set.new
       @model_names << model.name
@@ -84,7 +83,7 @@ module Hobo
     def self.all_models
       # Load every model in app/models...
       unless @models_loaded
-        Dir.entries("#{RAILS_ROOT}/app/models/").each do |f|
+        Dir.entries("#{Rails.root}/app/models/").each do |f|
           f =~ /^[a-zA-Z_][a-zA-Z0-9_]*\.rb$/ and f.sub(/.rb$/, '').camelize.constantize
         end
         @models_loaded = true
@@ -96,8 +95,8 @@ module Hobo
         name.safe_constantize || (@model_names.delete name; nil)
       end.compact
     end
-    
-    
+
+
     def self.find_by_typed_id(typed_id)
       return nil if typed_id == 'nil'
 
@@ -118,47 +117,16 @@ module Hobo
     end
 
 
-    def self.enable
-      require 'active_record/association_collection'
-      require 'active_record/association_proxy'
-      require 'active_record/association_reflection'
-
-      ActiveRecord::Base.class_eval do
-        def self.hobo_model
-          if self.ancestors.include?(Hobo::Model)
-            Rails.logger.error "#{self}: Do not call hobo_model in derived classes."
-          else
-            include Hobo::Model
-            fields(false) # force hobofields to load
-          end
-        end
-        def self.hobo_user_model
-          include Hobo::Model
-          include Hobo::User
-        end
-        alias_method :has_hobo_method?, :respond_to_without_attributes?
-        
-        Hobo::Permissions.enable
-      end
-
-      patch_will_paginate
-    end
-
-
     module ClassMethods
-      require 'active_record/viewhints_validations_interceptor'
-      include Hobo::ViewHintsValidationsInterceptor
 
       # TODO: should this be an inheriting_cattr_accessor as well? Probably.
       attr_accessor :creator_attribute
       inheriting_cattr_accessor :name_attribute => Proc.new { |c|
-        names = c.columns.*.name + c.public_instance_methods.*.to_s
-        NAME_FIELD_GUESS.detect {|f| f.in? names }
+        NAME_FIELD_GUESS.detect {|f| f.in? c.send(:attrib_names) }
       }
 
       inheriting_cattr_accessor :primary_content_attribute => Proc.new { |c|
-        names = c.columns.*.name + c.public_instance_methods.*.to_s
-        PRIMARY_CONTENT_GUESS.detect {|f| f.in? names }
+        PRIMARY_CONTENT_GUESS.detect {|f| f.in? c.send(:attrib_names) }
       }
 
 
@@ -174,13 +142,17 @@ module Hobo
         self.creator_attribute         = name.to_sym if options.delete(:creator)
         validate = options.delete(:validate) {true}
 
-        #FIXME - this should be in Hobo::User
+        #FIXME - this should be in Hobo::Model::UserBase
         send(:login_attribute=, name.to_sym, validate) if options.delete(:login) && respond_to?(:login_attribute=)
       end
 
-
       private
 
+      def attrib_names
+        names = []
+        names += table_exists? ? content_columns.*.name : field_specs.keys
+        names += public_instance_methods.*.to_s
+      end
 
       def belongs_to_with_creator_metadata(name, options={}, &block)
         self.creator_attribute = name.to_sym if options.delete(:creator)
@@ -263,29 +235,13 @@ module Hobo
       end
 
 
-      def find(*args, &b)
-        options = args.extract_options!
-        if options[:order] == :default || (options[:order].blank? && !scoped?(:find, :order))
-          # TODO: decide if this is correct. AR is no help, as passing :order to a scoped proxy
-          #       MERGES the order, but nesting two scopes with :order completely ignores the 
-          #       first scope's order.
-          #       Are we more like default_scope, or more like passing :order => model.default_order?
-          options = if default_order.blank?
-                      options.except :order
-                    else
-                      options.merge(:order => if default_order[/(\.|\(|,| )/]
-                                                default_order
-                                              else
-                                                "#{quoted_table_name}.#{default_order}"
-                                              end)
-                    end
-        end
-        result = super(*args + [options])
+      def find(*args)
+        result = super
         result.member_class = self if result.is_a?(Array)
         result
       end
-      
-      
+
+
       def find_by_sql(*args)
         result = super
         result.member_class = self # find_by_sql always returns array
@@ -307,21 +263,21 @@ module Hobo
       def reverse_reflection(association_name)
         refl = reflections[association_name.to_sym] or raise "No reverse reflection for #{name}.#{association_name}"
         return nil if refl.options[:conditions] || refl.options[:polymorphic]
-        
+
         if refl.macro == :has_many && (self_to_join = refl.through_reflection)
           # Find the reverse of a has_many :through (another has_many :through)
-          
+
           join_to_self  = reverse_reflection(self_to_join.name)
           join_to_other = refl.source_reflection
           other_to_join = self_to_join.klass.reverse_reflection(join_to_other.name)
-          
+
           return nil if self_to_join.options[:conditions] || join_to_other.options[:conditions]
-          
+
           refl.klass.reflections.values.find do |r|
             r.macro == :has_many &&
               !r.options[:conditions] &&
               !r.options[:scope] &&
-              r.through_reflection == other_to_join && 
+              r.through_reflection == other_to_join &&
               r.source_reflection  == join_to_self
           end
         else
@@ -333,7 +289,7 @@ module Hobo
                            when :belongs_to
                              [:has_many, :has_one]
                            end
-          
+
           refl.klass.reflections.values.find do |r|
             r.macro.in?(reverse_macros) &&
               r.klass >= self &&
@@ -361,7 +317,7 @@ module Hobo
 
 
       def respond_to?(method, include_private=false)
-        super || create_automatic_scope(method)
+        super || create_automatic_scope(method, true)
       end
 
 
@@ -373,11 +329,24 @@ module Hobo
       def typed_id
         HoboFields.to_name(self) || name.underscore.gsub("/", "__")
       end
-      
-      
+
+
       def view_hints
         class_name = "#{name}Hints"
-        class_name.safe_constantize or Object.class_eval("class #{class_name} < Hobo::ViewHints; end; #{class_name}")
+        class_name.safe_constantize or Object.class_eval("class #{class_name} < Hobo::Model::ViewHints; end; #{class_name}")
+      end
+
+      def children(*args)
+        view_hints.children *args
+      end
+
+      def inline_booleans(*args)
+        view_hints.inline_booleans *args
+      end
+
+      def table_exists?
+        @table_exists_cache = super if @table_exists_cache.nil?
+        @table_exists_cache
       end
 
 
@@ -388,10 +357,10 @@ module Hobo
 
 
     def to_url_path
-      "#{self.class.to_url_path}/#{to_param}" unless new_record?
+      "#{self.class.to_url_path}/#{to_param}"
     end
-    
-    
+
+
     def to_param
       name_attr = self.class.name_attribute and name = send(name_attr)
       if name_attr && !name.blank? && id.is_a?(Fixnum)
@@ -451,7 +420,7 @@ module Hobo
       if self.class.name_attribute
         send self.class.name_attribute
       else
-        "#{self.class.name.titleize} #{id}"
+        "#{self.class.model_name.human} #{id}"
       end
     end
 
@@ -481,7 +450,7 @@ module Hobo
           if parts[0..2].include?(0)
             nil
           else
-            Time.zone ? Time.zone.local(*parts) : Time.local(*parts)
+            field_type <= Time ? Time.utc(*parts) : Time.zone.local(*parts)
           end
         else
           value
@@ -500,6 +469,3 @@ module Hobo
   end
 
 end
-
-
-Hobo::Model.enable if defined? ActiveRecord