hobo 1.1.0.pre0 → 1.1.0.pre2

data/CHANGES.txt

@@ -14,6 +14,32 @@ likely to cause conflicts, so it is highly recommended that you have
 your code backed up and in a change control system such as git or
 subversion.
 
+=== Hobo 1.0.2 ===
+
+This release is almost identical to 1.0.1 except that it updates the
+version requirements to exclude Rails3.  Hobo does not currently work
+with Rails3, although we are working on it.
+
+This release silences some warnings produced when running with Rails
+2.3.10.
+
+This release contains preliminary support for Ruby 1.9.2, although you
+may encounter problems if you use Single Type Inheritance (STI)
+models.
+
+A few very minor bug fixes have also been included.  See the [github
+log](https://github.com/tablatom/hobo/compare/v1.0.1...v1.0.2) for
+more details.
+
+=== Hobo 1.0.1 ===
+
+This version contains two speedups: one fix that reduces the number of
+database accesses by Matt Jones and one that speeds up compilation of
+DRYML by Petteri Räty.
+
+This version also contains several bug fixes.  See the [github
+log](http://github.com/tablatom/hobo/tree/v1.0.1) for more details.
+
 === Hobo 1.0.0 ===
 
 Drumm-roll! Trumpets! Fanfare! 

data/Rakefile

@@ -59,8 +59,8 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.executables  = ['hobo']
   gemspec.default_executable = 'hobo'
   gemspec.rubyforge_project = "hobo"
-  gemspec.add_dependency("rails", [">= 2.2.2"])
-  gemspec.add_dependency("will_paginate", [">= 2.3.11"])
+  gemspec.add_dependency("rails", [">= 2.2.2", "< 3.0.0"])
+  gemspec.add_dependency("will_paginate", [">= 2.3.11", "~> 2"])
   gemspec.add_dependency("hobosupport", ["= #{Hobo::VERSION}"])
   gemspec.add_dependency("hobofields", ["= #{Hobo::VERSION}"])
   gemspec.add_dependency("dryml", ["= #{Hobo::VERSION}"])

data/doctest/model.rdoctest

@@ -34,6 +34,7 @@ Contents
     >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobofields/lib')
     >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobosupport/lib')
     >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobo/lib')
+    >> gem 'will_paginate', '~> 2'
     >> require 'will_paginate'
     >> require 'will_paginate/finder'
     >> require 'hobosupport'

data/doctest/multi_model_forms.rdoctest

@@ -31,6 +31,7 @@ Contents
     >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobofields/lib')
     >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobosupport/lib')
     >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobo/lib')
+    >> gem 'will_paginate', '~> 2'
     >> require 'will_paginate'
     >> require 'will_paginate/finder'
     >> require 'hobosupport'

data/doctest/scopes.rdoctest

@@ -74,6 +74,7 @@ Some load path manipulation:
 And we'll require hobo:
 {.hidden}
 
+    >> gem 'will_paginate', '~> 2'
     >> require 'will_paginate'
     >> require 'will_paginate/finder'
     >> require 'hobosupport'

data/lib/hobo.rb

@@ -2,12 +2,18 @@
 require 'hobosupport'
 require 'hobofields'
 begin
+  gem 'will_paginate', '~> 2'
   require 'will_paginate'
+  require 'will_paginate/finder'
 rescue MissingSourceFile
   # OK, Hobo won't do pagination then
 end
 
-ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__)]
+if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
+  ActiveSupport::Dependencies.autoload_paths |= [ File.dirname(__FILE__)]
+else
+  ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__)]
+end
 
 # Hobo can be installed in /vendor/hobo, /vendor/plugins/hobo, vendor/plugins/hobo/hobo, etc.
 ::HOBO_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
@@ -16,7 +22,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "1.1.0.pre0"
+  VERSION = "1.1.0.pre2"
   
   class PermissionDeniedError < RuntimeError; end
 
@@ -115,7 +121,11 @@ module Hobo
 
       HoboFields.never_wrap(Hobo::Undefined) if defined? HoboFields
 
-      ActiveSupport::Dependencies.load_paths |= [ "#{RAILS_ROOT}/app/viewhints" ]
+      if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
+        ActiveSupport::Dependencies.autoload_paths |= [ "#{RAILS_ROOT}/app/viewhints" ]
+      else
+        ActiveSupport::Dependencies.load_paths |= [ "#{RAILS_ROOT}/app/viewhints" ]
+      end
     end
 
   end

data/lib/hobo/accessible_associations.rb

@@ -9,7 +9,11 @@ module Hobo
 
       array = params_hash_to_array(array_or_hash)
       array.map! do |record_hash_or_string|
-        finder = association.member_class.scoped :conditions => association.conditions
+        if association.conditions.nil?
+          finder = association.member_class
+        else
+          finder = association.member_class.scoped :conditions => association.conditions
+        end
         find_or_create_and_update(owner, association_name, finder, record_hash_or_string) do |id|
           # The block is required to either locate find an existing record in the collection, or build a new one
           if id

data/lib/hobo/lifecycles/lifecycle.rb

@@ -24,45 +24,36 @@ module Hobo
 
       def self.def_state(name, on_enter)
         name = name.to_sym
-        returning(Lifecycles::State.new(name, on_enter)) do |s|
-          states[name] = s
-          class_eval "def #{name}_state?; state_name == :#{name} end"
-        end
+        class_eval "def #{name}_state?; state_name == :#{name} end"
+        states[name] = Lifecycles::State.new(name, on_enter)
       end
 
 
       def self.def_creator(name, on_create, options)
-        name = name.to_sym
-        returning(Creator.new(self, name, on_create, options)) do |creator|
-
-          class_eval %{
-                       def self.#{name}(user, attributes=nil)
-                         create(:#{name}, user, attributes)
-                       end
-                       def self.can_#{name}?(user, attributes=nil)
-                         can_create?(:#{name}, user)
-                       end
-                      }
-
-       end
+        class_eval %{
+                     def self.#{name}(user, attributes=nil)
+                       create(:#{name}, user, attributes)
+                     end
+                     def self.can_#{name}?(user, attributes=nil)
+                       can_create?(:#{name}, user)
+                     end
+                    }
+        Creator.new(self, name.to_s, on_create, options)
       end
 
       def self.def_transition(name, start_state, end_states, on_transition, options)
-        returning(Transition.new(self, name.to_s, start_state, end_states, on_transition, options)) do |t|
-
-          class_eval %{
-                       def #{name}!(user, attributes=nil)
-                         transition(:#{name}, user, attributes)
-                       end
-                       def can_#{name}?(user, attributes=nil)
-                         can_transition?(:#{name}, user)
-                       end
-                       def valid_for_#{name}?
-                         valid_for_transition?(:#{name})
-                       end
-                      }
-
-        end
+        class_eval %{
+                     def #{name}!(user, attributes=nil)
+                       transition(:#{name}, user, attributes)
+                     end
+                     def can_#{name}?(user, attributes=nil)
+                       can_transition?(:#{name}, user)
+                     end
+                     def valid_for_#{name}?
+                       valid_for_transition?(:#{name})
+                     end
+                    }
+        Transition.new(self, name.to_s, start_state, end_states, on_transition, options)
       end
 
       def self.state_names

data/lib/hobo/model.rb

@@ -14,8 +14,6 @@ module Hobo
 
       register_model(base)
 
-      patch_will_paginate
-
       base.class_eval do
         inheriting_cattr_reader :default_order
         alias_method_chain :attributes=, :hobo_type_conversion
@@ -42,7 +40,9 @@ module Hobo
           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
 
       included_in_class_callbacks(base)
@@ -57,11 +57,11 @@ module Hobo
 
         WillPaginate::Finder::ClassMethods.class_eval do
           def paginate_with_hobo_metadata(*args, &block)
-            returning paginate_without_hobo_metadata(*args, &block) do |collection|
-              collection.member_class     = self
-              collection.origin           = try.proxy_owner
-              collection.origin_attribute = try.proxy_reflection._?.name
-            end
+            collection = paginate_without_hobo_metadata(*args, &block)
+            collection.member_class     = self
+            collection.origin           = try.proxy_owner
+            collection.origin_attribute = try.proxy_reflection._?.name
+            collection
           end
           alias_method_chain :paginate, :hobo_metadata
 
@@ -78,7 +78,7 @@ module Hobo
 
 
     def self.all_models
-      # Load every controller in app/controllers...
+      # Load every model in app/models...
       unless @models_loaded
         Dir.entries("#{RAILS_ROOT}/app/models/").each do |f|
           f =~ /^[a-zA-Z_][a-zA-Z0-9_]*\.rb$/ and f.sub(/.rb$/, '').camelize.constantize
@@ -132,6 +132,8 @@ module Hobo
         
         Hobo::Permissions.enable
       end
+
+      patch_will_paginate
     end
 
 

data/lib/hobo/scopes/automatic_scopes.rb

@@ -268,7 +268,7 @@ module Hobo
               type = klass.attr_type(field)
               if type.nil? #a virtual attribute from an SQL alias, e.g., 'total' from 'COUNT(*) AS total'
                 colspec = "#{field}" # don't prepend the table name 
-              elsif type.respond_to?(:table_name) && (name = type.name_attribute)
+              elsif type.respond_to?(:name_attribute) && (name = type.name_attribute)
                 include = field
                 colspec = "#{type.table_name}.#{name}"
               else

data/lib/hobo/scopes/named_scope_extensions.rb

@@ -13,7 +13,7 @@ module ActiveRecord
       private
       
       def method_missing(method, *args, &block)
-        if respond_to?(method) && scopes.include?(method)
+        if scopes.include?(method)
           scopes[method].call(self, *args)
         else
           with_scope :find => proxy_options do

data/lib/hobo/user_controller.rb

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

data/lib/hobo/view_hints.rb

@@ -3,7 +3,11 @@ module Hobo
   class ViewHints
     
     def self.enable
-      ActiveSupport::Dependencies.load_paths |= ["#{RAILS_ROOT}/app/viewhints"]
+      if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
+        ActiveSupport::Dependencies.autoload_paths |= [ "#{RAILS_ROOT}/app/viewhints" ]
+      else
+        ActiveSupport::Dependencies.load_paths |= [ "#{RAILS_ROOT}/app/viewhints" ]
+      end
     end
   
     def self.setter(name, default=nil, &block)

data/taglibs/rapid_core.dryml

@@ -1,4 +1,3 @@
-<!-- Core Rapid tags and tags that don't belong anywhere else. -->
 
 <!-- Renders a table with one row per field, where each row contains a `<th>` with the field name, and a `<td>` with (by default)
      a `<view>` of the field.
@@ -415,7 +414,7 @@ Assuming the context is a blog post...
         <view:created_at no-wrapper/> -> June 09, 2008 15:36
 -->
 <def tag="view" attrs="inline, block, if-blank, no-wrapper, truncate"><%=
-  raise HoboError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless
+  raise Hobo::PermissionDeniedError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless
     can_view?
    
   res = if this.nil? && if_blank.nil?

data/taglibs/rapid_forms.dryml

@@ -102,8 +102,6 @@ AJAX based submission can be enabled by simply adding an `update` attribute. e.g
         <div part="comments"><collection:comments/></div>
         <form with="&Comment.new" update="comments"/>
 
-`<form>` support all of the standard ajax attributes.
-
 ### Additional Notes
 
 - Hobo automatically inserts an `auth_token` hidden field if forgery protection is enabled
@@ -112,6 +110,19 @@ AJAX based submission can be enabled by simply adding an `update` attribute. e.g
   validation error occurs.
 
 - `<form>` supports all of the standrd ajax attributes - (see the main taglib docs for Rapid Forms)
+
+- `<form>` resets `last_if` if it does not have permission to display the form.   The `<else>` clause may be used to display alternate content.   For example:
+
+    <form>...</form>
+    <else>You do not have permission to edit this form</else>
+
+or on a standard generated page using a default form:
+
+    <some-page>
+      <after-form:>
+        <else>You do not have permission to edit this form</else>
+      </after-form:>
+    </some-page>
   
 ### Attributes
 
@@ -640,7 +651,7 @@ For situations where there are too many target records to practically include in
 
   -->
 <def tag="select-one" attrs="include-none, blank-message, options, sort, limit, text-method"><%
-  raise HoboError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit? 
+  raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit? 
 
   blank_message ||= ht("#{this_type.name.underscore}.message.no", :default=>"(No #{this_type.view_hints.model_name})")
   limit ||= 100
@@ -1008,8 +1019,8 @@ end
       <input type="hidden" class="empty-input" id="#{underize param_name_for_this}" name="#{param_name_for_this}" value="" disabled="&(!this.empty? || minimum>0)" />
       <fake-field-context fake-field="-1" context="&template">
         <div param="empty-message">
-          <ht key="#{this.class.class_name.tableize}.collection.empty_message">          
-            No <%= this.class.class_name.titleize.downcase.pluralize %>.
+          <ht key="#{this.class.name.tableize}.collection.empty_message">          
+            No <%= this.class.name.titleize.downcase.pluralize %>.
           </ht>
         </div>
         <div class="buttons">

data/taglibs/rapid_plus.dryml

@@ -21,6 +21,15 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
         </form>
       </div>
     </div>
+    <%
+      page_path = if (request.post? || request.put?) && params[:page_path]
+                    params[:page_path]
+                  else
+                    view_name.sub(Dryml::EMPTY_PAGE, params[:action] || '')
+                  end
+      controller, action = page_path.split('/')
+    %>
+
 
     <table merge-attrs="&attributes & (attrs_for(:table) + attrs_for(:with_fields))" empty merge-params>
       <field-heading-row:>
@@ -28,7 +37,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
           <% col = sort_columns[scope.field_path] || scope.field_path
              sort = sort_field == col && sort_direction == 'asc' ?
                       "-#{col}" : col
-             sort_url = url_for(params.merge(:sort => sort) - [:page])
+             sort_url = url_for(params.merge(:sort => sort, :controller => controller, :action => action) - [:page])
              col_heading_name = this.member_class.try.view_hints.try.field_name(scope.field_name) || scope.field_name.titleize %>
                           
           <th param="#{scope.field-name}-heading">
@@ -46,7 +55,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
     <do param="empty-message" if="empty?"><ht key="hobo.table_plus.empty" model="#{name.downcase}">No <collection-name lowercase/> to display</ht></do>
 
    
-    <page-nav param if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
+    <page-nav param params="&{:action=>action, :controller=>controller}" if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
   </div>
 </def>
 

data/taglibs/rapid_summary.dryml

@@ -281,7 +281,7 @@
 <!-- given a column in the context and the model as an attribute, returns the comment for the column.  It returns the SQL comment if that is available (using the activerecord-comments plugin).  If that is not available, it returns the HoboFields comment.  -->
 
 <def tag="model-column-comment" attrs="model">
-  <%= this.try.comment || model.try.field_specs.try.get(this.name).try.comment -%>
+  <%= this.try.comment || model.try.field_specs.try.get(this.name).try.first.try.comment -%>
 </def>
 
 <!-- given a model, repeats on the associations -->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1876988165
+  hash: -1876988167
   prerelease: true
   segments: 
   - 1
   - 1
   - 0
-  - pre0
-  version: 1.1.0.pre0
+  - pre2
+  version: 1.1.0.pre2
 platform: ruby
 authors: 
 - Tom Locke
@@ -33,6 +33,14 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -49,6 +57,12 @@ dependencies:
         - 3
         - 11
         version: 2.3.11
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,13 +73,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1876988165
+        hash: -1876988167
         segments: 
         - 1
         - 1
         - 0
-        - pre0
-        version: 1.1.0.pre0
+        - pre2
+        version: 1.1.0.pre2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +90,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1876988165
+        hash: -1876988167
         segments: 
         - 1
         - 1
         - 0
-        - pre0
-        version: 1.1.0.pre0
+        - pre2
+        version: 1.1.0.pre2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +107,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1876988165
+        hash: -1876988167
         segments: 
         - 1
         - 1
         - 0
-        - pre0
-        version: 1.1.0.pre0
+        - pre2
+        version: 1.1.0.pre2
   type: :runtime
   version_requirements: *id005
 description: