hobo 0.8.8 → 0.8.9

data/lib/hobo/accessible_associations.rb

@@ -95,10 +95,10 @@ module Hobo
       if options[:accessible]
         class_eval %{
           def #{name}_with_accessible=(array_or_hash)
-            items = Hobo::AccessibleAssociations.prepare_has_many_assignment(#{name}, :#{name}, array_or_hash)
-            self.#{name}_without_accessible = items
+            __items = Hobo::AccessibleAssociations.prepare_has_many_assignment(#{name}, :#{name}, array_or_hash)
+            self.#{name}_without_accessible = __items
             # ensure the loaded array contains any changed records
-            self.#{name}.proxy_target[0..-1] = items
+            self.#{name}.proxy_target[0..-1] = __items
           end
         }, __FILE__, __LINE__ - 7
         alias_method_chain :"#{name}=", :accessible

data/lib/hobo/authentication_support.rb

@@ -67,7 +67,7 @@ module Hobo
         accepts.xml do
           headers["Status"]           = "Unauthorized"
           headers["WWW-Authenticate"] = %(Basic realm="Web Password")
-          render :text => "Could't authenticate you", :status => '401 Unauthorized'
+          render :text => "Couldn't authenticate you", :status => '401 Unauthorized'
         end
       end
       false

data/lib/hobo/dryml.rb

@@ -41,6 +41,16 @@ module Hobo
       DrymlGenerator.enable
     end
     
+    
+    def precompile_taglibs
+      Dir.chdir(RAILS_ROOT) do
+        taglibs = Dir["vendor/plugins/**/taglibs/**/*.dryml"] + Dir["app/views/taglibs/**/*.dryml"]
+        taglibs.each do |f|
+          Hobo::Dryml::Taglib.get(:template_dir => File.dirname(f), :src => File.basename(f).remove(".dryml"))
+        end
+      end
+    end
+    
 
     def clear_cache
       @renderer_classes = {}

data/lib/hobo/dryml/taglib.rb

@@ -9,16 +9,14 @@ module Hobo
       class << self
 
         def get(options)
-          cache_key = options.inspect
-          taglib = @cache[cache_key]
+          src_file = taglib_filename(options)
+          taglib = @cache[src_file]
           if taglib
             taglib.reload
           else
-            src_file = taglib_filename(options)
             bundle = options[:bundle] && Bundle.bundles[options[:bundle]]
-
             taglib = Taglib.new(src_file, bundle)
-            @cache[cache_key] = taglib
+            @cache[src_file] = taglib
           end
           taglib
         end

data/lib/hobo/hobo_helper.rb

@@ -162,9 +162,10 @@ module Hobo
       # TODO: Calls to respond_to? in here can cause the full collection hiding behind a scoped collection to get loaded
       res = []
       empty = true
-      scope.new_scope(:repeat_collection => enum, :even_odd => 'odd') do
+      scope.new_scope(:repeat_collection => enum, :even_odd => 'odd', :repeat_item => nil) do
         if enum.respond_to?(:each_pair)
           enum.each_pair do |key, value|
+            scope.repeat_item = value
             empty = false;
             self.this_key = key;
             new_object_context(value) { res << yield }
@@ -173,6 +174,7 @@ module Hobo
         else
           index = 0
           enum.each do |e|
+            scope.repeat_item = e
             empty = false;
             if enum == this
               new_field_context(index, e) { res << yield }

data/lib/hobo/include_in_save.rb

@@ -16,6 +16,7 @@ module Hobo
     def validate_included_in_save
       if included_in_save
         included_in_save._?.each_pair do |association, records|
+          next if self.class.reflections[association].options[:validate]==false
           added = false
           records.each do |record|
             # we want to call valid? on each one, but only add the error to self once

data/lib/hobo/lifecycles/actions.rb

@@ -1,5 +1,5 @@
 # We need to be able to eval an expression outside of the Hobo module
-# so that, e.g. "Userd" doesn't eval to "Hobo::User"
+# so that, e.g. "User" doesn't eval to "Hobo::User"
 # (Ruby determines this constant lookup scope lexically)
 def __top_level_eval__(obj, expr)
   obj.instance_eval(expr)
@@ -124,7 +124,11 @@ module Hobo
       def get_state(record, state)
         case state
         when Proc
-          state.call(record)
+          if state.arity == 1
+            state.call(record)
+          else
+            record.instance_eval(&state)
+          end
         when String
           eval(state, record.instance_eval { binding })
         else

data/lib/hobo/model.rb

@@ -490,7 +490,7 @@ module Hobo
           if parts[0..2].include?(0)
             nil
           else
-            Time.local(*parts)
+            Time.zone ? Time.zone.local(*parts) : Time.local(*parts)
           end
         else
           value

data/lib/hobo/model_controller.rb

@@ -111,7 +111,7 @@ module Hobo
           self.this = find_instance(opts)
           raise Hobo::PermissionDeniedError unless @this.method_callable_by?(current_user, method)
           if got_block
-            instance_eval(&block)
+            this.with_acting_user(current_user) { instance_eval(&block) }
           else
             @this.send(method)
           end
@@ -355,9 +355,18 @@ module Hobo
 
     def re_render_form(default_action=nil)
       if params[:page_path]
+        @invalid_record = this        
         controller, view = Controller.controller_and_view_for(params[:page_path])
         view = default_action if view == Dryml::EMPTY_PAGE
-        render :template => "#{controller}/#{view}"
+
+        # Hack fix for Bug 477.  See also bug 489.
+        if self.class.name == "#{controller.camelize}Controller" && view == "index"
+          params['action'] = 'index'
+          self.action_name = 'index'
+          index
+        else
+          render :template => "#{controller}/#{view}"
+        end
       else
         render :action => default_action
       end
@@ -499,7 +508,7 @@ module Hobo
       options = args.extract_options!
       self.this ||= args.first || new_for_create
       this.user_update_attributes(current_user, options[:attributes] || attribute_parameters || {})
-      create_response(:new, &b)
+      create_response(:new, options, &b)
     end
     
     
@@ -508,7 +517,7 @@ module Hobo
       owner, association = find_owner_and_association(owner)
       self.this ||= args.first || association.new
       this.user_update_attributes(current_user, options[:attributes] || attribute_parameters || {})
-      create_response(:"new_for_#{owner}", &b)    
+      create_response(:"new_for_#{owner}", options, &b)    
     end
 
 
@@ -529,10 +538,13 @@ module Hobo
         t
     end
     
+    def flash_notice(message)
+      flash[:notice] = message unless request.xhr?
+    end
 
 
     def create_response(new_action, options={}, &b)
-      flash[:notice] = "The #{@this.class.name.titleize.downcase} was created successfully" if !request.xhr? && valid?
+      flash_notice "The #{@this.class.name.titleize.downcase} was created successfully" if valid?
 
       response_block(&b) or
         if valid?
@@ -567,7 +579,7 @@ module Hobo
 
 
     def update_response(in_place_edit_field=nil, options={}, &b)
-      flash[:notice] = "Changes to the #{@this.class.name.titleize.downcase} were saved" if !request.xhr? && valid?
+      flash_notice "Changes to the #{@this.class.name.titleize.downcase} were saved" if valid?
 
       response_block(&b) or
         if valid?
@@ -603,8 +615,8 @@ module Hobo
       options = args.extract_options!
       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)
+      flash_notice "The #{model.name.titleize.downcase} was deleted"
+      destroy_response(options, &b)
     end
 
 
@@ -619,8 +631,8 @@ module Hobo
 
     # --- Lifecycle Actions --- #
 
-    def creator_page_action(name, &b)
-      self.this = model.new
+    def creator_page_action(name, options={}, &b)
+      self.this ||= model.new
       this.exempt_from_edit_checks = true
       @creator = model::Lifecycle.creator(name)
       raise Hobo::PermissionDeniedError unless @creator.allowed?(current_user)
@@ -693,8 +705,17 @@ module Hobo
     def hobo_completions(attribute, finder, options={})
       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).select { |r| r.viewable_by?(current_user) }
+
+      begin
+        finder = finder.send(options[:query_scope], params[options[:param]])
+        items = finder.find(:all).select { |r| r.viewable_by?(current_user) }
+      rescue TypeError  # must be a list of methods instead
+        items = []
+        options[:query_scope].each do |qscope|
+          finder2 = finder.send(qscope, params[options[:param]])
+          items += finder2.find(:all).select { |r| r.viewable_by?(current_user) }
+        end
+      end       
       render :text => "<ul>\n" + items.map {|i| "<li>#{i.send(attribute)}</li>\n"}.join + "</ul>"
     end
 
@@ -717,6 +738,7 @@ module Hobo
 
     def permission_denied(error)
       self.this = true # Otherwise this gets sent user_view
+      logger.info "Hobo: Permission Denied!"
       @permission_error = error
       if "permission_denied".in?(self.class.superclass.instance_methods)
         super

data/lib/hobo/permissions.rb

@@ -330,7 +330,7 @@ module Hobo
     end
   
   
-    # Add some singleton methods to +record+ so give the effect that +attribute+ is unknown. That is,
+    # Add some singleton methods to +record+ to give the effect that +attribute+ is unknown. That is,
     # attempts to access the attribute will result in a Hobo::UndefinedAccessError
     def unknownify_attribute(attr)
       metaclass.class_eval do

data/lib/hobo/rapid_helper.rb

@@ -146,4 +146,7 @@ module Hobo::RapidHelper
     fields
   end
 
+  def current_time
+    Time.zone ? Time.zone.now : Time.now
+  end
 end

data/lib/hobo/scopes/association_proxy_extensions.rb

@@ -7,9 +7,15 @@ module Hobo
     AssociationProxyExtensions = classy_module do
 
       def scope_conditions(reflection)
-        scope_name = reflection.options[:scope] and
-          target_class = reflection.klass and
+        scope_name = reflection.options[:scope]
+        return nil if scope_name.nil?
+        target_class = reflection.klass
+        return nil if target_class.nil?
+        if scope_name.respond_to? :map
+          combine_conditions(*(scope_name.map {|scope| target_class.send(*scope).scope(:find)[:conditions]}))
+        else
           target_class.send(scope_name).scope(:find)[:conditions]
+        end
       end
 
 

data/lib/hobo/scopes/automatic_scopes.rb

@@ -178,21 +178,21 @@ module Hobo
           def_scope :conditions => ["#{column_sql(col)} <> ?", true]
 
         # published_before(time)
-        elsif name =~ /^(.*)_before$/ && (col = column("#{$1}_at")) && col.type.in?([:date, :datetime, :time, :timestamp])
+        elsif name =~ /^(.*)_before$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
 
           def_scope do |time|
             { :conditions => ["#{column_sql(col)} < ?", time] }
           end
 
         # published_after(time)
-        elsif name =~ /^(.*)_after$/ && (col = column("#{$1}_at")) && col.type.in?([:date, :datetime, :time, :timestamp])
+        elsif name =~ /^(.*)_after$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
 
           def_scope do |time|
             { :conditions => ["#{column_sql(col)} > ?", time] }
           end
 
         # published_between(time1, time2)
-        elsif name =~ /^(.*)_between$/ && (col = column("#{$1}_at")) && col.type.in?([:date, :datetime, :time, :timestamp])
+        elsif name =~ /^(.*)_between$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
 
           def_scope do |time1, time2|
             { :conditions => ["#{column_sql(col)} >= ? AND #{column_sql(col)} <= ?", time1, time2] }

data/lib/hobo/user_controller.rb

@@ -13,7 +13,8 @@ module Hobo
           end
           
           filter_parameter_logging "password"
-          skip_before_filter :login_required, :only => [:login, :signup, :forgot_password, :reset_password_page, :reset_password]
+          skip_before_filter :login_required, :only => [:login, :signup, :forgot_password, :reset_password, :do_reset_password,
+                                                        :accept_invitation, :do_accept_invitation]
 
           include_taglib "rapid_user_pages", :plugin => "hobo"
 

data/rails_generators/hobo/hobo_generator.rb

@@ -26,7 +26,7 @@ class HoboGenerator < Rails::Generator::Base
       m.file "initializer.rb",        File.join("config/initializers/hobo.rb")
     end
   end
-
+  
   protected
     def banner
       "Usage: #{$0} #{spec.name} [--add-routes] [--add-gem]"

data/rails_generators/hobo/templates/application.dryml

@@ -1,3 +1 @@
 <def tag="app-name"><%= File.basename(Dir.chdir(RAILS_ROOT) { Dir.getwd }).strip.titleize %></def>
-
-

data/rails_generators/hobo_admin_site/hobo_admin_site_generator.rb

@@ -0,0 +1,45 @@
+require 'fileutils'
+
+class HoboAdminSiteGenerator < HoboSubsiteGenerator
+  
+  default_options :rapid => true
+  
+  def manifest
+    m = super
+    
+    m.template "admin.css", File.join('public/stylesheets/admin.css') 
+    if invite_only?
+      m.dependency "hobo_model_controller", ["admin/user"]
+      m.template "users_index.dryml", "app/views/admin/users/index.dryml"
+    end
+    m
+  end
+  
+  def invite_only?
+    options[:invite_only]
+  end
+
+  protected
+
+    def banner
+      "Usage: #{$0} #{spec.name} [--make-front-site | --no-front-site] [--invite-only]"
+    end
+
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--make-front-site", "rename application.dryml to front_site.dryml") do |v|
+        options[:make_front_site] = true
+      end
+      opt.on("--no-front-site", "do not rename application.dryml to front_site.dryml ") do |v|
+        options[:make_front_site] = false
+      end
+      opt.on("--no-rapid", "don't include Rapid features in the subsite taglib") do |v|
+        options[:rapid] = false
+      end
+      opt.on("--invite-only", "Add features for an invite only website") do |v|
+        options[:invite_only] = true
+      end
+    end
+
+end

data/rails_generators/hobo_admin_site/templates/admin.css

@@ -0,0 +1,2 @@
+html, body { background: #333;}
+.page-header { background: #555; }

data/rails_generators/hobo_admin_site/templates/application.dryml

@@ -0,0 +1 @@
+<!-- Global taglib - these tags are shared across all subsites -->

data/rails_generators/hobo_admin_site/templates/controller.rb

@@ -0,0 +1,13 @@
+class <%= subsite_name %>::<%= subsite_name %>SiteController < ApplicationController
+
+  hobo_controller
+  
+  before_filter :admin_required
+  
+  private
+  
+  def admin_required
+    redirect_to home_page unless current_user.administrator?
+  end  
+  
+end

data/rails_generators/hobo_admin_site/templates/site_taglib.dryml

@@ -0,0 +1,32 @@
+<!-- Tag definitions for the <%= subsite_name %> subsite -->
+  
+<% if options[:rapid] -%>
+<include src="rapid" plugin="hobo"/>
+
+<include src="taglibs/auto/<%= file_name %>/rapid/cards"/>
+<include src="taglibs/auto/<%= file_name %>/rapid/pages"/>
+<include src="taglibs/auto/<%= file_name %>/rapid/forms"/>
+
+<set-theme name="clean"/>
+<% end -%>
+
+<def tag="app-name"><%= app_name %></def>
+
+<extend tag="page">
+  <old-page merge>
+    <append-stylesheets:>
+      <stylesheet name="admin"/>
+    </append-stylesheets:>
+    <footer:>
+      <a href="#{base_url}/">View Site</a>
+    </footer:>
+  </old-page>
+</extend>
+<% if invite_only? -%>
+
+<extend tag="card" for="User">
+  <old-card merge>
+    <append-header:><%%= h this.state.titleize %></append-header:>
+  </old-card>
+</extend>
+<% end -%>

data/rails_generators/hobo_admin_site/templates/users_index.dryml

@@ -0,0 +1,5 @@
+<index-page>
+  <after-count:>
+    <a with="&User" action="invite">Invite a new user</a>
+  </after-count:>
+</index-page>

data/rails_generators/hobo_front_controller/hobo_front_controller_generator.rb

@@ -62,10 +62,14 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
     return unless File.exists?(index_path)
     File.unlink(index_path)
   end
+  
+  def invite_only?
+    options[:invite_only]
+  end
 
   protected
     def banner
-      "Usage: #{$0} #{spec.name} <controller-name> [--add-routes] [--delete-index]"
+      "Usage: #{$0} #{spec.name} <controller-name> [--add-routes] [--delete-index] [--invite-only]"
     end
 
     def add_options!(opt)
@@ -75,6 +79,8 @@ class HoboFrontControllerGenerator < Rails::Generator::NamedBase
              "Modify config/routes.rb to support the front controller") { |v| options[:add_routes] = true }
       opt.on("--delete-index",
              "Delete public/index.html") { |v| options[:delete_index] = true }
+      opt.on("--invite-only",
+             "Add features for an invite only website") { |v| options[:invite_only] = true }
     end
 
 end