hobo 1.3.0.pre26 → 1.3.0.pre27

data/VERSION

@@ -1 +1 @@
-1.3.0.pre26
+1.3.0.pre27

data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb

@@ -113,7 +113,7 @@ NOTE: You might want to sign up as the administrator before adding this!
       end
       inject_into_file 'app/controllers/application_controller.rb', <<EOI, :after => "protect_from_forgery\n" if private_site
   include Hobo::Controller::AuthenticationSupport
-  before_filter :except => [:login, :forgot_password] do
+  before_filter :except => [:login, :forgot_password, :accept_invitation, :do_accept_invitation] do
      login_required unless #{@user_resource_name.camelize}.count == 0
   end
 EOI

data/lib/generators/hobo/test_framework/test_framework_generator.rb

@@ -63,7 +63,7 @@ private
       block = "\n  config.generators do |g|"
       block << "\n      g.test_framework :#{n}, :fixtures => #{options[:fixtures].inspect}" if !options[:fixtures] || name != 'test_unit'
       block << "\n      g.fallbacks[:#{n}] = :test_unit" unless name == 'test_unit'
-      block << "\n      g.fixture_replacement => :#{options[:fixture_replacement]}" unless options[:fixture_replacement].blank?
+      block << "\n      g.fixture_replacement = :#{options[:fixture_replacement]}" unless options[:fixture_replacement].blank?
       block << "\n    end\n"
       environment block
     end

data/lib/hobo/controller.rb

@@ -27,7 +27,7 @@ module Hobo
           end
           before_filter :set_mailer_default_url_options
           @included_taglibs = []
-          rescue_from ActionController::RoutingError, :with => :not_found
+          rescue_from ActionController::RoutingError, :with => :not_found unless Rails.env.development?
         end
         Hobo::Helper.add_to_controller(klass)
       end
@@ -77,7 +77,7 @@ module Hobo
       renderer = Dryml.page_renderer(view_context, identifier, [], controller)
 
       render :update do |page|
-        page << options[:preamble] || "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"
+        page << (options[:preamble] || "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;")
         for spec in render_specs
           function = spec[:function] || "_update"
           dom_id = spec[:id]

data/lib/hobo/controller/model.rb

@@ -27,7 +27,7 @@ module Hobo
           helper_method :model, :current_user
           before_filter :set_no_cache_headers
 
-          rescue_from ActiveRecord::RecordNotFound, :with => :not_found
+          rescue_from ActiveRecord::RecordNotFound, :with => :not_found unless Rails.env.development?
 
           rescue_from Hobo::PermissionDeniedError,         :with => :permission_denied
           rescue_from Hobo::Model::Lifecycles::LifecycleKeyError, :with => :permission_denied

data/lib/hobo/engine.rb

@@ -33,11 +33,15 @@ module Hobo
       require 'hobo/extensions/active_record/relation_with_origin'
       require 'hobo/extensions/active_model/name'
       require 'hobo/extensions/active_model/translation'
+      # added legacy namespace for backward compatibility
+      # TODO: remove the following line if Hobo::VERSION > 1.3.x
+      Hobo::ViewHints = Hobo::Model::ViewHints
     end
 
     ActiveSupport.on_load(:action_view) do
       require 'hobo/extensions/action_view/tag_helper'
       require 'hobo/extensions/action_view/translation_helper'
+      include Hobo::Helper::Translations::Normalizer
     end
 
     ActiveSupport.on_load(:before_initialize) do

data/lib/hobo/extensions/action_view/translation_helper.rb

@@ -1,7 +1,5 @@
 ActionView::Helpers::TranslationHelper.module_eval do
 
-  include Hobo::Helper::Translations::Normalizer
-
   # simple wrapper around the translate helper
   # it implements a dryml <translate> and a <t> tag
   # Improved security: interpolated variables are escaped

data/lib/hobo/helper.rb

@@ -127,7 +127,7 @@ module Hobo
 
 
     def recognize_page_path
-      Rails.application.routes.recognize_path(params[:page_path])
+      Rails.application.routes.recognize_path(params[:page_path]||request.fullpath)
     end
 
     def url_for_page_path(options={})

data/lib/hobo/model/lifecycles.rb

@@ -34,7 +34,7 @@ module Hobo
 
             module_eval "class ::#{name}::LifecycleStateField < HoboFields::Types::LifecycleState; end"
             state_field_class = self::LifecycleStateField
-            state_field_class.table_name = name.tableize
+            state_field_class.model_name = name
           end
 
           dsl = Hobo::Model::Lifecycles::DeclarationDSL.new(lifecycle)

data/lib/hobo/model/view_hints.rb

@@ -2,62 +2,82 @@ module Hobo
   module Model
     class ViewHints
 
-      def self.setter(name, default=nil, &block)
-        ivname = name.to_s.remove(/\?$/)
-        metaclass.send :define_method, name do |*args|
-          if args.empty?
-            val = instance_variable_get("@#{ivname}")
-            if val.nil?
-              val = default.is_a?(Proc) ? instance_eval(&default) : default
-              instance_variable_set("@#{ivname}", val)
+      class << self
+
+        # allows delayed set of children in order to avoid circular references
+        # triggered by declaring children in the model
+        def children(*args)
+          if args.empty? # reader
+            if @children_args.nil? # value already set
+              @children ||= []
+            else # set
+              child_model = model.reflect_on_association(@children_args.first).klass
+              if child_model.view_hints.parent.nil? and !child_model.view_hints.parent_defined
+                parent = model.reverse_reflection(@children_args.first)
+                child_model.view_hints.parent(parent.name, :undefined => true) if parent
+              end
+              @children = @children_args
+              @children_args = nil
+              @children
             end
-            val
-          else
-            arg = if block
-                    instance_exec(*args, &block)
-                  else
-                    args.first
-                  end
-            instance_variable_set("@#{ivname}", arg)
+          else # writer (only stores the args for delayed setting)
+            @children_args = args
           end
         end
-      end
 
-      setter :children,    [] do |*args|
-        # Setting children also gives a default parent using the reverse association
-        child_model = model.reflect_on_association(args.first).klass
-        if child_model.view_hints.parent.nil? and !child_model.view_hints.parent_defined
-          parent = model.reverse_reflection(args.first)
-          child_model.view_hints.parent(parent.name, :undefined => true) if parent
+        def inline_booleans(*args)
+          if args.empty? # reader
+            if @inline_booleans_args.nil?
+              @inline_booleans ||= []
+            else
+              @inline_booleans = if @inline_booleans_args.first == true
+                                   model.columns.select { |c| c.type == :boolean }.*.name
+                                 else
+                                   @inline_booleans_args.*.to_s
+                                 end
+              @inline_booleans_args = nil
+              @inline_booleans
+            end
+          else # writer
+            @inline_booleans_args = args
+          end
         end
-        args
-      end
-
-      setter :parent,         nil do |*args|
-        options = args.extract_options!
-        parent_defined(true) unless options[:undefined]
-        args.first
-      end
 
-      setter :parent_defined, nil
-
-      setter :paginate?,    proc { !sortable? }
-
-      setter :sortable?,    proc { defined?(ActiveRecord::Acts::List::InstanceMethods) &&
-                                   model < ActiveRecord::Acts::List::InstanceMethods &&
-                                   model.new.try.scope_condition == "1 = 1" }
+        def parent(*args)
+          if args.empty? #reader
+            @parent
+          else # writer
+            options = args.extract_options!
+            parent_defined(true) unless options[:undefined]
+            @parent = args.first
+          end
+        end
 
-      setter :inline_booleans, [] do |*args|
-       if args[0] == true
-         model.columns.select { |c| c.type == :boolean }.*.name
-       else
-         args.*.to_s
-       end
-      end
+        def parent_defined(arg=nil)
+          if arg.nil?
+            @parent_defined
+          else
+            @parent_defined = arg
+          end
+        end
 
-      # Accessors
+        def paginate?(arg=nil)
+          if arg.nil?
+            @paginate ||= !sortable?
+          else
+            @paginate = arg
+          end
+        end
 
-      class << self
+        def sortable?(arg=nil)
+          if arg.nil?
+            @sortable ||= defined?(ActiveRecord::Acts::List::InstanceMethods) &&
+                          model < ActiveRecord::Acts::List::InstanceMethods &&
+                          model.new.try.scope_condition == "1 = 1"
+          else
+            @sortable = arg
+          end
+        end
 
         def _name
           @_name ||= name.sub(/Hints$/, '')

data/lib/hobo/rapid/generators/rapid/forms.dryml.erb

@@ -37,7 +37,7 @@ model_key = model.to_s.underscore
     <input type="hidden" name="key" value="&this.lifecycle.provided_key" if="&this.lifecycle.provided_key"/>
     <field-list fields="<%= transition.parameters * ', ' %>" param/>
     <div param="actions">
-      <submit label="#{ht '<%= model_key %>.actions.<%= transition.name.to_s %>', :default=>['<%= transition.name.to_s.titleize %>']}" param/><or-cancel param="cancel"/>
+      <submit label="#{t 'activerecord.attributes.<%= model_key %>.lifecycle.transitions.<%= transition.name.to_s %>', :default=>['<%= transition.name.to_s.titleize %>']}" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>

data/lib/hobo/rapid/taglibs/rapid_pages.dryml

@@ -104,7 +104,7 @@ The easiest way to see what this tag does is to look at the source.
 
   -->
 <def tag="not-found-page" attrs="message">
-  <% message ||= "The page you were looking for could not be found" %>
+  <% message ||= t("hobo.messages.not_found", :default=>["The page you requested cannot be found."]) %>
   <page merge>
     <body: class="not-found"/>
     <content: param>

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637108448
-  prerelease: true
-  segments: 
-  - 1
-  - 3
-  - 0
-  - pre26
-  version: 1.3.0.pre26
+  prerelease: 6
+  version: 1.3.0.pre27
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 -04:00
+date: 2011-02-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -43,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 961915916
-        segments: 
-        - 3
-        - 0
-        - pre
         version: 3.0.pre
   type: :runtime
   version_requirements: *id002
@@ -59,13 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108448
-        segments: 
-        - 1
-        - 3
-        - 0
-        - pre26
-        version: 1.3.0.pre26
+        version: 1.3.0.pre27
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +54,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108448
-        segments: 
-        - 1
-        - 3
-        - 0
-        - pre26
-        version: 1.3.0.pre26
+        version: 1.3.0.pre27
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +65,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637108448
-        segments: 
-        - 1
-        - 3
-        - 0
-        - pre26
-        version: 1.3.0.pre26
+        version: 1.3.0.pre27
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -110,9 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -124,9 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -138,11 +98,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
         version: 0.7.5
   type: :development
   version_requirements: *id008
@@ -365,25 +320,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: The web app builder for Rails