hobo 1.0.3 → 1.1.0.pre0

data/CHANGES.txt

@@ -14,72 +14,6 @@ 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.3 ===
-
-This is a security release.  All applications that use the reset
-password functionality or are on versions of Rails prior to version
-2.3.4 should upgrade.
-
-To patch the reset password vulnerability, two changes have been made.
-
-First of all, the lifecycle key hash mechanism has been changed.
-Existing lifecycle keys will become invalid after you upgrade.
-Lifecycle keys are typically short lived, so this is unlikely to be a
-problem for most applications.
-
-Secondly, lifecycle keys are now cleared on every transition to avoid
-replay vulnerabilities.  This new behaviour may be avoided by added
-the `:keep_key => true` option to a transition.
-
-More information about the vulnerability can be viewed on the [bug
-report](https://hobo.lighthouseapp.com/projects/8324/tickets/666-user-model-secure-links-have-low-security).
-
-Other changes:
-
-The text input tag (`<textarea>`) has a security hole with versions of
-Rails prior to 2.3.4.  This release makes these old versions of Rails
-safe again, although it is highly recommended that you upgrade to
-Rails 2.3.11 because of other security vulnerabilities on earlier versions
-of Rails.
-
-The "include" automatic scope has been aliased to "includes" to
-increase future compatibility with Rails 3.  Future versions of Hobo
-will remove support for "include".
-
-This release increases compatibility with Ruby v1.9.2.
-
-Hobo 1.0.2 introduced a major problem with chained scopes.   This has
-been fixed.
-
-All code changes may viewed on the [github
-log](https://github.com/tablatom/hobo/compare/v1.0.2...v1.0.3)
-
-=== 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/README

@@ -7,3 +7,6 @@ Hobo is an Open Source extension to Ruby on Rails which helps you build full blo
     * Switchable themes. Customise and tweak your application structure and layout to meet any design goals.
     * Powerful mark-up language, DRYML, combines rapid development with ultimate design flexibility. The end of the cookie cutter blues!
 
+== RDOC Note
+
+This is also the front page to the Hobo RDOC.  RDOC is not the main documentation method for Hobo.  See [hobocentral](http://cookbook.hobocentral.net) for the Hobo documentation.

data/Rakefile

@@ -10,11 +10,7 @@ $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobosupport/
 require 'hobo'
 
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
-if defined?(Bundler)
-  RUBYDOCTEST = 'bundle exec rubydoctest'
-else
-  RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
-end
+RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 
 desc "Default Task"
 task :default => [ :test ]
@@ -63,10 +59,14 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.executables  = ['hobo']
   gemspec.default_executable = 'hobo'
   gemspec.rubyforge_project = "hobo"
-  gemspec.add_dependency("rails", [">= 2.2.2", "< 3.0.0"])
-  gemspec.add_dependency("will_paginate", [">= 2.3.11", "~> 2"])
+  gemspec.add_dependency("rails", [">= 2.2.2"])
+  gemspec.add_dependency("will_paginate", [">= 2.3.11"])
   gemspec.add_dependency("hobosupport", ["= #{Hobo::VERSION}"])
   gemspec.add_dependency("hobofields", ["= #{Hobo::VERSION}"])
+  gemspec.add_dependency("dryml", ["= #{Hobo::VERSION}"])
   gemspec.files.include %w(tasks/environments.rake tasks/hobo_tasks.rake)
 end
 Jeweler::GemcutterTasks.new
+Jeweler::RubyforgeTasks.new do |rubyforge|
+  rubyforge.doc_task = false
+end

data/doctest/model.rdoctest

@@ -34,7 +34,6 @@ 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'
@@ -45,7 +44,6 @@ Contents
     >>
      def migrate(renames={})
        up, down = HoboFields::MigrationGenerator.run(renames)
-       puts up
        ActiveRecord::Migration.class_eval(up)
        ActiveRecord::Base.send(:subclasses).each { |model| model.reset_column_information }
        [up, down]

data/doctest/multi_model_forms.rdoctest

@@ -31,7 +31,6 @@ 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'
@@ -43,7 +42,6 @@ Contents
     >>
      def migrate(renames={})
        up, down = HoboFields::MigrationGenerator.run(renames)
-       puts up
        ActiveRecord::Migration.class_eval(up)
        ActiveRecord::Base.send(:subclasses).each { |model| model.reset_column_information }
        [up, down]

data/doctest/scopes.rdoctest

@@ -74,7 +74,6 @@ Some load path manipulation:
 And we'll require hobo:
 {.hidden}
 
-    >> gem 'will_paginate', '~> 2'
     >> require 'will_paginate'
     >> require 'will_paginate/finder'
     >> require 'hobosupport'
@@ -95,7 +94,6 @@ Let's set up a few models for our testing:
          born_at :date
          code :integer
          male :boolean
-         foo :string
          timestamps
        end
 
@@ -120,19 +118,19 @@ Generate a migration and run it:
 
     >> ActiveRecord::Migration.class_eval(HoboFields::MigrationGenerator.run[0])
     >> Person.columns.*.name
-    => ["id", "name", "born_at", "code", "male", "foo", "created_at", "updated_at", "state"]
+    => ["id", "name", "born_at", "code", "male", "created_at", "updated_at", "state"]
 {.hidden}
 
 And create a couple of fixtures:
 
     >> 
      Bryan = Person.new(:name => "Bryan", :code => 17, 
-        :born_at => Date.new(1973,4,8), :male => true, :foo => "common")
+        :born_at => Date.new(1973,4,8), :male => true)
     >> Bryan.state = "active"
     >> Bryan.save!
     >> 
      Bethany = Person.new(:name => "Bethany", :code => 42, 
-        :born_at => Date.new(1975,5,13), :male => false, :foo => "common")
+        :born_at => Date.new(1975,5,13), :male => false)
     >> Bethany.state = "inactive"
     >> Bethany.save!
     >> Friendship.new(:person => Bryan, :friend => Bethany).save!
@@ -288,16 +286,12 @@ Gives the N most recent items:
     >> Person.order_by(:code).*.name
     => ["Bryan", "Bethany"]
 
-## includes
+## include
 
-Adding the includes function to your query chain has the same effect as
+Adding the include function to your query chain has the same effect as
 the `:include` option to the `find` method.  
 
-    >> Person.search("B", :name).include(:friends).*.name  # test LH#839
-    => ["Bryan", "Bethany"]
-.hidden
-
-    >> Person.includes(:friends).*.name
+    >> Person.include(:friends).*.name
     => ["Bryan", "Bethany"]
 
 ## search
@@ -323,6 +317,13 @@ You can also specify multiple records with the plural form
     >> Person.with_friends(Bethany, nil).*.name
     => ["Bryan"]
 
+## any\_of\_
+
+This works on plural associations to find a model associated with any of the arguments
+
+    >> Person.any_of_friends(Bethany, Bryan).*.name
+    => ["Bryan"]
+
 ## without\_
 
     >> Person.without_friend(Bethany).*.name
@@ -395,15 +396,6 @@ Like named scopes, Hobo scopes can be chained:
     >> Bryan.inactive_friends.inactive.*.name
     => ["Bethany"]
 
-    >> Person.scoped(:conditions => {:state => "active"}).scoped(:conditions => {:foo => "common"}).*.name
-    => ["Bryan"]
-
-    >> Person.with_friendship(Friendship.first).born_before(Date.new(1974)).*.name
-    => ["Bryan"]
-
-    >> Person.born_after(Date.new(1974)).with_friendship(Friendship.first).*.name
-    => []
-
 Clean up our test database:
 {.hidden}
 

data/lib/active_record/association_collection.rb

@@ -25,24 +25,19 @@ module ActiveRecord
         record
       end
 
-      def member_class
-        proxy_reflection.klass
-      end
-
       # DO NOT call super here - AssociationProxy's version loads the collection, and that's bad.
       # TODO: this really belongs in Rails; migrate it there ASAP
       def respond_to?(*args)
-        return super if has_one_collection?
-        proxy_respond_to?(*args) || [].respond_to?(*args)
+        proxy_respond_to?(*args) || Array.new.respond_to?(*args)
       end
 
+      # TODO: send this patch into Rails. There's no reason to load the collection just to find out it acts like an array.
       def is_a?(klass)
-        if has_one_collection?
-          load_target
-          @target.is_a?(klass)
-        else
-          [].is_a?(klass)
-        end
+        [].is_a?(klass)
+      end
+
+      def member_class
+        proxy_reflection.klass
       end
 
       private
@@ -57,10 +52,6 @@ module ActiveRecord
           end
         end
 
-        def has_one_collection?
-          proxy_reflection.macro == :has_one
-        end
-
     end
   end
 end

data/lib/hobo.rb

@@ -2,17 +2,12 @@
 require 'hobosupport'
 require 'hobofields'
 begin
-  gem 'will_paginate', '~> 2'
   require 'will_paginate'
 rescue MissingSourceFile
   # OK, Hobo won't do pagination then
 end
 
-if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
-  ActiveSupport::Dependencies.autoload_paths |= [ File.dirname(__FILE__)]
-else
-  ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__)]
-end
+ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__)]
 
 # Hobo can be installed in /vendor/hobo, /vendor/plugins/hobo, vendor/plugins/hobo/hobo, etc.
 ::HOBO_ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
@@ -21,8 +16,8 @@ class HoboError < RuntimeError; end
 
 module Hobo
 
-  VERSION = "1.0.3"
-
+  VERSION = "1.1.0.pre0"
+  
   class PermissionDeniedError < RuntimeError; end
 
   class RawJs < String; end
@@ -62,8 +57,9 @@ module Hobo
       search_targets.build_hash do |search_target|
         conditions = []
         parameters = []
+        like_operator = ActiveRecord::Base.connection.adapter_name =~ /postgres/i ? 'ILIKE' : 'LIKE'
         query_words.each do |word|
-          column_queries = search_target.search_columns.map { |column| "#{column} like ?" }
+          column_queries = search_target.search_columns.map { |column| "#{column} #{like_operator} ?" }
           conditions << "(" + column_queries.join(" or ") + ")"
           parameters.concat(["%#{word}%"] * column_queries.length)
         end
@@ -87,53 +83,6 @@ module Hobo
         (not refl.options[:conditions])
     end
 
-
-    def get_field(object, field)
-      return nil if object.nil?
-      field_str = field.to_s
-      begin
-        return object.send(field_str)
-      rescue NoMethodError => ex
-        if field_str =~ /^\d+$/
-          return object[field.to_i]
-        else
-          return object[field]
-        end
-      end
-    end
-
-
-    def get_field_path(object, path)
-      path = if path.is_a? String
-               path.split('.')
-             else
-               Array(path)
-             end
-
-      parent = nil
-      path.each do |field|
-        return nil if object.nil?
-        parent = object
-        object = get_field(parent, field)
-      end
-      [parent, path.last, object]
-    end
-
-
-    def static_tags
-      @static_tags ||= begin
-                         path = if FileTest.exists?("#{RAILS_ROOT}/config/dryml_static_tags.txt")
-                                    "#{RAILS_ROOT}/config/dryml_static_tags.txt"
-                                else
-                                    File.join(File.dirname(__FILE__), "hobo/static_tags")
-                                end
-                         File.readlines(path).*.chop
-                       end
-    end
-
-    attr_writer :static_tags
-    
-    
     def subsites
       # Any directory inside app/controllers defines a subsite
       @subsites ||= Dir["#{RAILS_ROOT}/app/controllers/*"].map { |f| File.basename(f) if File.directory?(f) }.compact
@@ -149,12 +98,12 @@ module Hobo
       require 'hobo/model_router'
       require 'hobo/undefined'
       require 'hobo/user'
-      require 'hobo/dryml'
-      require 'hobo/dryml/template'
-      require 'hobo/dryml/dryml_generator'
+      require 'dryml'
+      require 'dryml/template'
+      require 'dryml/dryml_generator'
 
       Hobo::Model.enable
-      Hobo::Dryml.enable
+      Dryml.enable(["#{HOBO_ROOT}/rapid_generators"], "#{RAILS_ROOT}/app/views/taglibs/auto")
       Hobo::Permissions.enable
       Hobo::ViewHints.enable
       
@@ -166,11 +115,7 @@ module Hobo
 
       HoboFields.never_wrap(Hobo::Undefined) if defined? HoboFields
 
-      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
+      ActiveSupport::Dependencies.load_paths |= [ "#{RAILS_ROOT}/app/viewhints" ]
     end
 
   end

data/lib/hobo/accessible_associations.rb

@@ -9,11 +9,7 @@ module Hobo
 
       array = params_hash_to_array(array_or_hash)
       array.map! do |record_hash_or_string|
-        if association.conditions.nil?
-          finder = association.member_class
-        else
-          finder = association.member_class.scoped :conditions => association.conditions
-        end
+        finder = association.member_class.scoped :conditions => association.conditions
         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/authentication_support.rb

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

data/lib/hobo/controller.rb

@@ -58,7 +58,7 @@ module Hobo
 
     def redirect_to_with_object_url(destination, *args)
       if destination.is_one_of?(String, Hash, Symbol)
-        redirect_to_without_object_url(destination, *args)
+        redirect_to_without_object_url(destination)
       else
         redirect_to_without_object_url(object_url(destination, *args))
       end
@@ -80,7 +80,7 @@ module Hobo
 
     def ajax_update_response(page_path, render_specs, results={})
       @template.send(:_evaluate_assigns_and_ivars)
-      renderer = Hobo::Dryml.page_renderer(@template, [], page_path) if page_path
+      renderer = Dryml.page_renderer(@template, [], page_path) if page_path
 
       render :update do |page|
         page << "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"
@@ -124,7 +124,7 @@ module Hobo
     def tag_renderer
       @tag_renderer ||= begin
         @template.send(:_evaluate_assigns_and_ivars)
-        Hobo::Dryml.empty_page_renderer(@template)
+        Dryml.empty_page_renderer(@template)
       end
     end    
     
@@ -157,8 +157,8 @@ module Hobo
     end
 
     def not_found(error)
-      if self.class.superclass.method_defined?("not_found_response")
-        super
+      if self.class.superclass.method_defined?(:not_found)
+        self.class.superclass.instance_method(:not_found).bind(self).call(error)
       elsif render_tag("not-found-page", {}, :status => 404)
         # cool
       else