hobo 2.0.1 → 2.1.0.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5de6d624783c705dfe7dd66c79518ebc2ec68b3f
+  data.tar.gz: 634bf9f6c3831df42e818c03fe46a45d0a8e5255
+SHA512:
+  metadata.gz: 78ea8f82e5ac95ddcc3085afd7cce6ac1f1d01f499b8b589ab3f2ab1e55111d7671b9e5c735ed8754c7755463b160982a68eceb3847e01549cb407c36205fb07
+  data.tar.gz: df53268326185eef5f0cea67c8fe7773a7dc0f9d5883e823aa0a911bf8cf78680e20221dadc1658a9ebcc7bdcd04e12697e09056ec98484b8870cc33d96d98f8

data/CHANGES-2.1.markdown

@@ -0,0 +1,57 @@
+Hobo 2.1 Changes
+{: .document-title}
+
+Documents the changes made in Hobo 2.1 and the changes required to
+migrate applications to Hobo 2.1
+
+Contents
+{: .contents-heading}
+
+- contents
+{:toc}
+
+# Updating from a Hobo 2.0 application to Hobo 2.1
+
+    Meta tags:  note for collaborators.   A meta-tag looks like this {.done}.   It's added after a paragraph with no blank spaces.   The tags that we support are:  {.ruby} {.javascript} {.dryml} and {.diff} for code highlighting.   {.todo}, {.done}, {.check}, {.part} and {.nomove} indicate documentation progress moving into the Hobo manuals.  {.check} means that it's probably done.  {.part} means that it's partly done.  {.nomove} means that this section only needs to exist in this CHANGES document.   Finally, {.hidden} is used for paragraphs like this one that shouldn't show up on the website.
+{.hidden}
+
+{.nomove}
+
+Many of the changes required in upgrading a Hobo 2.0 application are necessitated by the switch from Rails 3.2 to 4.0.  [Railscasts has a good guide to upgrading to Rails 4.0](http://railscasts.com/episodes/415-upgrading-to-rails-4).
+
+From Hobo's point of view, you shouldn't need to change almost anything :).
+
+## Gemfile
+
+Now Hobo uses "will_paginate_hobo" gem, instead of the git repository "git://github.com/Hobo/will_paginate.git". This should make it easier to install in systems without Git installed (users have reported problems with Windows and Git).
+
+You also need to add the `protected_attributes` gem to your Gemfile.
+
+
+# Internal changes
+
+In order to make Hobo compatible with Rails 4, these are the main changes that have been done:
+
+## Routing
+
+* `url_for` does not accept parameters any more
+* Remove deprecated routes system
+* `match` is no longer accepted in routes.rb, it has been replaced by "get" and "post"
+
+## ActiveRecord
+
+* `Model.find(:all)` is deprecated
+* `finder.scoped :conditions => conditions` has been replaced with `finder.where(conditions)`
+* raise_on_type_mismatch has been renamed to raise_on_type_mismatch!
+
+## Other
+* `protected_attributes` gem has been added to support the "old" way of protecting attributes
+* Domizio has made Hobo thread safe :)
+
+
+
+# Running the integration tests:
+
+The integration tests in the "agility_bootstrap" folder have been updated for Hobo 2.1 and Rails 4.
+
+see https://github.com/tablatom/hobo/integration_tests/agility_bootstrap/README

data/Gemfile

@@ -6,7 +6,7 @@ gemspec :path => "../dryml"
 gemspec :path => "../hobo_support"
 gemspec :path => "../hobo_fields"
 gemspec
-gem 'will_paginate', :git => 'git://github.com/Hobo/will_paginate.git'
+gem 'hobo_will_paginate'
 platform :ruby do
   gem 'sqlite3'
 end

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0.pre1

data/app/helpers/hobo_permissions_helper.rb

@@ -38,7 +38,7 @@ module HoboPermissionsHelper
 
     def can_edit?(*args)
       object, field = if args.empty?
-                        if this.respond_to?(:editable_by?) && !this_field_reflection
+                        if !this.respond_to?(:to_a) && this.respond_to?(:editable_by?) && !this_field_reflection
                           [this, nil]
                         elsif this_parent && this_field
                           [this_parent, this_field]

data/app/helpers/hobo_route_helper.rb

@@ -1,13 +1,8 @@
 module HoboRouteHelper
+  include Rails.application.routes.url_helpers
   extend HoboHelperBase
     def object_url(obj, *args)
       new_ = object_url_new(obj, *args)
-
-      unless Rails.configuration.hobo.dont_emit_deprecated_routes
-        old_ = object_url_old(obj, *args)
-        debugger if old_ != new_
-        Rails.logger.debug "new style url #{new_} does not match old style url #{old_}. obj: #{obj.inspect}.  args: #{args.inspect}.  backtrace: #{caller.inspect}" if old_ != new_
-      end
       new_
     end
 
@@ -31,64 +26,6 @@ module HoboRouteHelper
 
     IMPLICIT_ACTIONS = [:index, :show, :create, :update, :destroy]
 
-    def object_url_old(obj, *args)
-      params = args.extract_options!
-      action = args.first._?.to_sym
-      options, params = params.partition_hash([:subsite, :method, :format])
-      options[:subsite] ||= self.subsite
-      subsite, method = options.get :subsite, :method
-
-      if obj.respond_to?(:member_class) && obj.respond_to?(:origin) && obj.origin
-        # Asking for URL of a collection, e.g. category/1/adverts or category/1/adverts/new
-
-        refl = obj.origin.class.reverse_reflection(obj.origin_attribute)
-        owner_name = refl.name.to_s
-        owner_name = owner_name.singularize if refl.macro == :has_many
-        if action == :new
-          action_path = "#{obj.origin_attribute}/new"
-          action = :"new_for_#{owner_name}"
-        elsif action.nil?
-          action_path = obj.origin_attribute
-          if method.to_s == 'post'
-            action = :"create_for_#{owner_name}"
-          else
-            action = :"index_for_#{owner_name}"
-          end
-        end
-        klass = obj.member_class
-        obj = obj.origin
-      else
-        action ||= case options[:method].to_s
-                   when 'put';    :update
-                   when 'post';   :create
-                   when 'delete'; :destroy
-                   else; obj.is_a?(Class) ? :index : :show
-                   end
-
-        if options[:method].to_s == 'post' && obj.try.new_record?
-          # Asking for url to post new record to
-          obj = obj.class
-        end
-
-        klass = if obj.is_a?(Class)
-                  obj
-                elsif obj.respond_to?(:member_class)
-                  obj.member_class # We get here if we're passed a scoped class
-                else
-                  obj.class
-                end
-      end
-
-      if Hobo::Routes.linkable?(klass, action, options)
-
-        url = base_url_for(obj, subsite, action)
-        url += "/#{action_path || action}" unless action.in?(IMPLICIT_ACTIONS)
-
-        params = make_params(params)
-        params.blank? ? url : "#{url}?#{params}"
-      end
-    end
-
     def object_url_new(obj, *args)
       options = args.extract_options!
       action = args.first._?.to_sym
@@ -161,26 +98,20 @@ module HoboRouteHelper
       "#{base_url}#{'/' + subsite unless subsite.blank?}/#{path}"
     end
 
-
     def recognize_page_path
-      # round tripping params through the router will remove
-      # unnecessary params
       if params[:page_path]
         url = params[:page_path]
         method = "GET"
+        Rails.application.routes.recognize_path(url, :method => method)
       else
-        url = url_for(params)
-        method = request.method
-      end
-      if ENV['RAILS_RELATIVE_URL_ROOT']
-        url.gsub!(/^#{ENV['RAILS_RELATIVE_URL_ROOT']}/, "")
-        url.gsub!(/^https?:\/\/.*?#{ENV['RAILS_RELATIVE_URL_ROOT']}/, "")
+        # We used to use "url_for(params)", but with Rails 4 stopped working
+        # It seems that we can send back the params directly
+        params
       end
-      Rails.application.routes.recognize_path(url, :method => method)
     end
 
     def url_for_page_path(options={})
-      url_for recognize_page_path.merge(options)
+      url_for recognize_page_path.merge(options).merge({:only_path => true})
     end
 
     def controller_action_from_page_path
@@ -220,19 +151,19 @@ module HoboRouteHelper
 
     # Login url for a given user record or user class
     def forgot_password_url(user_class=Hobo::Model::UserBase.default_user_model)
-      send("#{user_class.name.underscore}_forgot_password_url") rescue nil
+      send("#{user_class.name.underscore}_forgot_password_path") rescue nil
     end
 
 
     # Login url for a given user record or user class
     def login_url(user_class=Hobo::Model::UserBase.default_user_model)
-      send("#{user_class.name.underscore}_login_url") rescue nil
+      send("#{user_class.name.underscore}_login_path") rescue nil
     end
 
 
     # Sign-up url for a given user record or user class
     def signup_url(user_class=Hobo::Model::UserBase.default_user_model)
-      send("signup_#{user_class.name.underscore.pluralize}_url") rescue nil
+      send("signup_#{user_class.name.underscore.pluralize}_path") rescue nil
     end
 
 
@@ -245,7 +176,7 @@ module HoboRouteHelper
           else
             user_or_class.class
           end
-      send("#{c.name.underscore}_logout_url") rescue nil
+      send("#{c.name.underscore}_logout_path") rescue nil
     end
 
     def new_for_current_user(model_or_assoc=nil)

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
 
-  match 'dryml/:action', :controller => 'dryml_support', :as => 'dryml_support'
-  match 'dev/:action', :controller => 'dev', :as => 'dev_support' if Rails.application.config.hobo.developer_features
+  get 'dryml/:action', :controller => 'dryml_support', :as => 'dryml_support'
+  get 'dev/:action', :controller => 'dev', :as => 'dev_support' if Rails.application.config.hobo.developer_features
 
 end

data/hobo.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   s.add_runtime_dependency('hobo_fields', ["= #{version}"])
   s.add_runtime_dependency('dryml', ["= #{version}"])
-  s.add_runtime_dependency('will_paginate', ["~> 3.0.0"])
+  s.add_runtime_dependency('hobo_will_paginate')
 
   s.add_development_dependency('rubydoctest', [">= 1.1.3"])
   s.add_development_dependency('shoulda', [">= 0"])

data/lib/generators/hobo/admin_subsite/admin_subsite_generator.rb

@@ -16,7 +16,9 @@ module Hobo
     end
 
     def generate_admin_user_controller
-      invoke "hobo:controller", ["#{file_name}/#{options[:user_resource_name].pluralize.underscore}"], options
+      fixed_options = {:subsite_controller_is_being_created => 1}
+      options.each{|k,v| fixed_options[k] = v}
+      invoke "hobo:controller", ["#{file_name}/#{options[:user_resource_name].pluralize.underscore}"], fixed_options
       template "users_index.dryml", "app/views/#{file_name}/#{options[:user_resource_name].pluralize.underscore}/index.dryml" if invite_only?
     end
 

data/lib/generators/hobo/controller.rb

@@ -15,7 +15,10 @@ module Generators
       def generate_controller
         if class_path.length == 1 and
           subsite = class_path.first and
-          File.exist?(File.join('app/controllers', class_path, "#{subsite}_site_controller.rb"))
+	  (
+	    options[:subsite_controller_is_being_created] or 
+            File.exist?(File.join('app/controllers', class_path, "#{subsite}_site_controller.rb"))
+          )
           @subsite = subsite.camelize
         end
         template 'controller.rb.erb', File.join('app/controllers',"#{file_path}_controller.rb")

data/lib/generators/hobo/front_controller/front_controller_generator.rb

@@ -43,15 +43,16 @@ module Hobo
 
     def add_routes
       return unless options[:add_routes]
-      route "match 'search' => '#{file_path}#search', :as => 'site_search'"
-      route "match '#{options[:user_resource_name]}s/:id/activate_from_email/:key' => '#{options[:user_resource_name]}s#activate', :as => 'activate_from_email'"
-      route "match '#{options[:user_resource_name]}s/:id/accept_invitation_from_email/:key' => '#{options[:user_resource_name]}s#accept_invitation', :as => 'accept_invitation_from_email'"
-      route "match '#{options[:user_resource_name]}s/:id/reset_password_from_email/:key' => '#{options[:user_resource_name]}s#reset_password', :as => 'reset_password_from_email'"
+      route "get 'search' => '#{file_path}#search', :as => 'site_search'"
+      route "post 'search' => '#{file_path}#search', :as => 'site_search_post'"
+      route "get '#{options[:user_resource_name]}s/:id/activate_from_email/:key' => '#{options[:user_resource_name]}s#activate', :as => 'activate_from_email'"
+      route "get '#{options[:user_resource_name]}s/:id/accept_invitation_from_email/:key' => '#{options[:user_resource_name]}s#accept_invitation', :as => 'accept_invitation_from_email'"
+      route "get '#{options[:user_resource_name]}s/:id/reset_password_from_email/:key' => '#{options[:user_resource_name]}s#reset_password', :as => 'reset_password_from_email'"
       if class_path.empty?
         route "root :to => '#{file_path}#index'"
-        route "match ENV['RAILS_RELATIVE_URL_ROOT'] => 'front#index' if ENV['RAILS_RELATIVE_URL_ROOT']"
+        route "get ENV['RAILS_RELATIVE_URL_ROOT'] => 'front#index' if ENV['RAILS_RELATIVE_URL_ROOT']"
       else
-        route "match '#{file_path}' => '#{file_path}#index', :as => '#{file_path.gsub(/\//,'_')}'"
+        route "get '#{file_path}' => '#{file_path}#index', :as => '#{file_path.gsub(/\//,'_')}'"
       end
     end
 

data/lib/generators/hobo/i18n/templates/hobo.en.yml

@@ -114,7 +114,7 @@ en:
       update:
         no_attribute_error: "No update specified in params"
         success: "Changes to the %{model} were saved"
-        error: "There was a problem with that change.\\n%{errors}"
+        error: "There was a problem with that change.\n%{errors}"
       destroy:
         success: "The %{model} was deleted"
       signup:
@@ -167,6 +167,7 @@ en:
     table_plus:
       search: "Search"
       submit_label: "Go"
+      clear_label: "Clear"
 
     live_search:
       label: "Search"

data/lib/generators/hobo/i18n/templates/hobo.es.yml

@@ -175,6 +175,7 @@ es:
     table_plus:
       search: "Buscar"
       submit_label: "Ir"
+      clear_label: "Limpiar"
 
     live_search:
       label: "Buscar"

data/lib/generators/hobo/i18n/templates/hobo.ru.yml

@@ -172,6 +172,7 @@ ru:
     table_plus:
       search: "Поиск"
       submit_label: "Искать"
+      clear_label: "Очистить"
 
     live_search:
       label: "Найти"

data/lib/generators/hobo/routes/router.rb

@@ -4,7 +4,7 @@ module Generators
       class Router
 
         # specify that an id CANNOT be null - needed to disambiguate /models from /models/[nil]
-        ID_REQUIREMENT = "{ :id => %r([^#{ActionController::Routing::SEPARATORS.join}]+) }"
+        ID_REQUIREMENT = "{ :id => %r([^#{ActionDispatch::Routing::SEPARATORS.join}]+) }"
 
         attr_reader :subsite, :controller, :model, :record, :records
 
@@ -210,9 +210,11 @@ module Generators
           return [] unless controller < ::Hobo::Controller::UserBase
           prefix = records == "users" ? "" : "#{record}_"
           [
-          link("match '#{prefix}login(.:format)' => '#{records}#login', :as => '#{record}_login'",  'login'),
+          link("post '#{prefix}login(.:format)' => '#{records}#login', :as => '#{record}_login_post'",  'login'),
+          link("get '#{prefix}login(.:format)' => '#{records}#login', :as => '#{record}_login'",  'login'),
           link("get '#{prefix}logout(.:format)' => '#{records}#logout', :as => '#{record}_logout'",  'logout'),
-          link("match '#{prefix}forgot_password(.:format)' => '#{records}#forgot_password', :as => '#{record}_forgot_password'",  'forgot_password'),
+          link("get '#{prefix}forgot_password(.:format)' => '#{records}#forgot_password', :as => '#{record}_forgot_password'",  'forgot_password'),
+          link("post '#{prefix}forgot_password(.:format)' => '#{records}#forgot_password', :as => '#{record}_forgot_password_post'",  'forgot_password'),
           ].compact
         end
 

data/lib/generators/hobo/routes/templates/hobo_routes.rb.erb

@@ -33,40 +33,4 @@
   <%- end -%>
 <%- end -%>
 
-<% unless Rails.configuration.hobo.dont_emit_deprecated_routes %>
-
-# These are the Hobo 1.3 style routes.   They've been included for backwards
-# compatibility reasons because the names of some named routes have been changed.
-# Please update your views to use the new named route names and then disable this
-# section by setting config.hobo.dont_emit_deprecated_routes = true.  blah blah
-
- <% puts "Warning: deprecated routes emitted into config/hobo_routes.rb.   These will be removed in Hobo 2.1.   Disable this warning by setting config.hobo.dont_emit_deprecated_routes = true." unless subsites.blank? %>
- <% for subsite in subsites -%>
-  <%- if subsite -%>
-
-  <%= "namespace :#{subsite} do" %>
-  <%- end -%>
-  <%- for controller in controllers_for(subsite) -%>
-    <%- router = router_for(subsite, controller)
-        groups = %w[ index_action lifecycle owner web_method show_action reorder resource ] -%>
-
-    <%- for group in groups -%>
-    <%- gr = "#{group}_routes"
-        routes = gr == 'lifecycle_routes' ? router.send(gr.to_sym, subsite) : router.send(gr.to_sym) -%>
-    <%- unless routes.empty? -%>
-
-  <%= "  " if subsite %><%= "# DEPRECATED #{gr.humanize} for controller #{controller.controller_path}" %>
-    <%- end -%>
-      <%- for route in routes -%>
-  <%= "  " if subsite %><%= route %>
-      <%- end -%>
-    <%- end -%>
-  <%- end -%>
-  <%- if subsite -%>
-
-  end
-  <%- end -%>
- <%- end -%>
-
-<%- end -%>
 end

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

@@ -146,8 +146,8 @@ EOI
     end
 
     def will_paginate
-      say "Adding will_paginate gem"
-      gem_with_comments('will_paginate', :git => "git://github.com/Hobo/will_paginate.git", :comments => "\n# Hobo's version of will_paginate is required.")
+      say "Adding hobo_will_paginate gem"
+      gem_with_comments('hobo_will_paginate', :comments => "\n# Hobo's version of will_paginate is required.")
     end
 
     def choose_test_framework

data/lib/hobo.rb

@@ -2,9 +2,9 @@ require 'hobo_support'
 require 'hobo_fields'
 require 'dryml'
 begin
-  gem 'will_paginate', "3.0.4.hobo"
+  gem 'hobo_will_paginate'
 rescue Gem::LoadError => e
-  puts "WARNING: unable to activate will_paginate 3.0.4.hobo.   Please add gem \"will_paginate\", :git => \"git://github.com/Hobo/will_paginate.git\" to your Gemfile." if File.exist?("app/views/taglibs/application.dryml")
+  puts "WARNING: unable to activate hobo_will_paginate.   Please add gem \"hobo_will_paginate\" to your Gemfile." if File.exist?("app/views/taglibs/application.dryml")
   # don't print warning if setup not complete
 end
 require 'hobo/extensions/enumerable'

data/lib/hobo/controller.rb

@@ -96,7 +96,7 @@ module Hobo
           page << "#{function}(#{dom_id.to_json}, #{part_content.to_json})\n"
         elsif spec[:result]
           result = results[spec[:result].to_sym]
-          page << "#{function}(#{dom_id.to_json}, #{result.to_json})\n"
+          page << "#{function}(#{dom_id.to_json}, #{result.to_json});\n"
         else
           page << "alert('ajax_update_response: render_spec did not provide action');\n"
         end

data/lib/hobo/controller/model.rb

@@ -341,7 +341,7 @@ module Hobo
         hash = args.extract_options!
         db_sort_field = (hash[field] || hash[field.to_sym] || (field if field.in?(args) || field.to_sym.in?(args))).to_s
 
-        if db_sort_field
+        unless db_sort_field.blank?
           if db_sort_field == field && field.match(/\./)
             fields = field.split(".", 2)
             db_sort_field = "#{fields[0].pluralize}.#{fields[1]}"
@@ -692,7 +692,7 @@ module Hobo
       if params[:render]
         hobo_ajax_response || render(:nothing => true)
       else
-        respond_with(self.this, :location => destination_after_submit(this, true, options))
+        redirect_to destination_after_submit(this, true, options)
       end
     end
 
@@ -774,12 +774,12 @@ module Hobo
 
       begin
         finder = finder.send(options[:query_scope], params[options[:param]])
-        items = finder.find(:all).select { |r| r.viewable_by?(current_user) }
+        items = finder.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) }
+          items += finder2.all.select { |r| r.viewable_by?(current_user) }
         end
       end
       if request.xhr?