hobo 1.0.1 → 1.0.2

data/CHANGES.txt

@@ -14,6 +14,23 @@ 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

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.files.include %w(tasks/environments.rake tasks/hobo_tasks.rake)

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,17 @@
 require 'hobosupport'
 require 'hobofields'
 begin
+  gem 'will_paginate', '~> 2'
   require 'will_paginate'
 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 +21,7 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
   
   class PermissionDeniedError < RuntimeError; end
 
@@ -161,7 +166,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/dryml/dryml_generator.rb

@@ -117,7 +117,7 @@ module Hobo
       
       
       def digest(s)
-        OpenSSL::Digest::Digest.digest('sha1', s)
+        OpenSSL::Digest::SHA1.hexdigest(s)
       end
       
       

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

@@ -57,7 +57,6 @@ module Hobo
 
         WillPaginate::Finder::ClassMethods.class_eval do
           def paginate_with_hobo_metadata(*args, &block)
-            # using 'returning' here triggers a full load
             collection = paginate_without_hobo_metadata(*args, &block)
             collection.member_class     = self
             collection.origin           = try.proxy_owner

data/lib/hobo/model_controller.rb

@@ -564,7 +564,7 @@ module Hobo
 
 
     def create_response(new_action, options={}, &b)
-      flash_notice (ht( :"#{@this.class.name.pluralize.underscore}.messages.create.success", :default=>["The #{@this.class.name.titleize.downcase} was created successfully"])) if valid?
+      flash_notice (ht( :"#{@this.class.name.pluralize.underscore}.messages.create.success", :default=>["The #{@this.class.view_hints.model_name.downcase} was created successfully"])) if valid?
 
       response_block(&b) or
         if valid?
@@ -602,7 +602,7 @@ module Hobo
 
     def update_response(in_place_edit_field=nil, options={}, &b)
       
-      flash_notice (ht(:"#{@this.class.name.pluralize.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.name.titleize.downcase} were saved"])) if valid?
+      flash_notice (ht(:"#{@this.class.name.pluralize.underscore}.messages.update.success", :default=>["Changes to the #{@this.class.view_hints.model_name.downcase} were saved"])) if valid?
 
       response_block(&b) or
         if valid?

data/lib/hobo/scopes/automatic_scopes.rb

@@ -255,7 +255,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/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_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
 
@@ -992,8 +1003,8 @@ end
       <input type="hidden" class="empty-input" id="#{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_navigation.dryml

@@ -36,7 +36,26 @@ Then in your pages you can call the tag like this
 </def>
 
 
-<!-- Renders a single item in a `<navigation>` menu. See [`<navigation`>](/api_tag_defs/navigation). -->
+<!-- Renders a single item in a [`<navigation>`](/api_tag_defs/navigation).
+
+`<nav-item>` is basically an [`<a>`](/api_tag_defs/a) tag wrapped in an `<li>` tag.  The attributes for [`<a>`](/api_tag_defs/a) may all be used on this tag, and work the same way.
+
+Example 1: explicit links.  Note that we're using explicit routes for clarity.  Named routes are better.
+
+    <navigation current="home">
+      <nav-item href="/">Home</nav-item>
+      <nav-item href="/logout">Logout</nav-item>
+    </navigation>
+
+Example 2: navigation based on a collection of items.  Each item will be transformed into a link as described in [`<a>`](/api_tag_defs/a).
+
+    <navigation with="&links">
+      <repeat>
+        <nav-item/>
+      </repeat>
+    </navigation>
+
+-->
 <def tag="nav-item" attrs="name">
   <% body = parameters.default 
      body = h(this.to_s) if body.blank?

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Tom Locke
@@ -14,63 +15,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +01:00
+date: 2010-11-12 00:00:00 -05:00
 default_executable: hobo
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 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 
   name: will_paginate
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 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 
   name: hobosupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hobofields
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id004
 description: 
@@ -79,9 +102,8 @@ executables:
 - hobo
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README
+extra_rdoc_files: []
+
 files: 
 - CHANGES.txt
 - LICENSE.txt
@@ -270,23 +292,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The web app builder for Rails