Camerontaylor rails5

dryml/dryml.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "The Don't Repeat Yourself Markup Language"
   s.description = "The Don't Repeat Yourself Markup Language"
 
-  s.add_runtime_dependency('actionpack')
+  s.add_runtime_dependency('actionpack', '~> 5')
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   # s.add_development_dependency('rubydoctest', [">= 1.1.3"])
   s.add_development_dependency('cucumber', '~> 1.1.0')

dryml/lib/dryml/extensions/action_controller/dryml_methods.rb

@@ -1,6 +1,6 @@
 ActionController::Base.class_eval do
 
-  before_filter do
+  before_action do
     append_view_path Dryml::Railtie::PageTagResolver.new(self)
   end
 

hobo/app/helpers/hobo_helper_base.rb

@@ -2,7 +2,6 @@ module HoboHelperBase
 
     def add_to_controller(controller)
       controller.send(:include, self)
-      controller.hide_action(self.instance_methods)
     end
 
 end

hobo/lib/generators/hobo/admin_subsite/templates/controller.rb.erb

@@ -2,7 +2,7 @@ class <%= subsite_name %>::<%= subsite_name %>SiteController < ApplicationContro
 
   hobo_controller
 
-  before_filter :admin_required
+  before_action :admin_required
 
   private
 

hobo/lib/generators/hobo/routes/routes_generator.rb

@@ -6,6 +6,7 @@ class RoutesGenerator < Rails::Generators::Base
 
     include Generators::HoboSupport::EvalTemplate
 
+
     def self.banner
       "rails generate hobo:routes #{self.arguments.map(&:usage).join(' ')} [options]"
     end

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

@@ -3,6 +3,17 @@
 # which will override the routes in this file.
 
 <%= Rails.application.class.name %>.routes.draw do
+  begin
+  <%=
+    begin
+      ::GearsModel.emit_custom_routes
+    rescue => e
+      ''
+    end
+  %>
+    rescue ScriptError, StandardError => e
+      DT.p "Error in custom routes output, review hobo_routes.rb", e.message
+    end
 <% for subsite in subsites -%>
   <%- if subsite -%>
 

hobo/lib/hobo/controller.rb

@@ -16,7 +16,7 @@ def included(base)
       def included_in_class(klass)
         klass.extend(ClassMethods)
         klass.class_eval do
-          before_filter :login_from_cookie
+          before_action :login_from_cookie
           alias_method_chain :redirect_to, :object_url
           private
           def set_mailer_default_url_options
@@ -25,7 +25,7 @@ def set_mailer_default_url_options
               Rails.application.config.action_mailer.default_url_options[:port] = request.port unless request.port == 80
             end
           end
-          before_filter :set_mailer_default_url_options
+          before_action :set_mailer_default_url_options
           @included_taglibs = []
           rescue_from ActionController::RoutingError, :with => :not_found unless Rails.env.development?
         end

hobo/lib/hobo/controller/model.rb

@@ -4,7 +4,7 @@ module Model
 
     include Hobo::Controller
 
-    DONT_PAGINATE_FORMATS = [ Mime::CSV, Mime::YAML, Mime::JSON, Mime::XML, Mime::ATOM, Mime::RSS ]
+    DONT_PAGINATE_FORMATS = [ Mime[:csv], Mime[:yaml], Mime[:json], Mime[:xml], Mime[:atom], Mime[:rss] ]
 
     WILL_PAGINATE_OPTIONS = [ :page, :per_page, :total_entries, :count, :finder ]
 
@@ -25,7 +25,7 @@ def included(base)
 
 
           helper_method :model, :current_user
-          before_filter :set_no_cache_headers
+          before_action :set_no_cache_headers
 
           rescue_from ActiveRecord::RecordNotFound, :with => :not_found unless Rails.env.development?
 

hobo/lib/hobo/controller/user_base.rb

@@ -12,7 +12,7 @@ class << self
             alias_method_chain :def_auto_actions, :user_actions
           end
 
-          skip_before_filter :login_required, :only => [:login, :signup, :do_signup, :forgot_password, :reset_password, :do_reset_password,
+          skip_before_action :login_required, :only => [:login, :signup, :do_signup, :forgot_password, :reset_password, :do_reset_password,
                                                         :accept_invitation, :do_accept_invitation]
 
           alias_method_chain :hobo_update, :account_flash

hobo/lib/hobo/model.rb

@@ -156,7 +156,9 @@ def belongs_to_with_test_methods(name, *args, &block)
         end
         belongs_to_without_test_methods(name, *args, &block)
         refl = reflections[name.to_s]
-        id_method = refl.options[:primary_key] || refl.klass.primary_key
+        id_method = refl.options[:primary_key]
+        id_method = refl.klass.primary_key if id_method.blank?
+        id_method = :id if id_method.blank?
         if options[:polymorphic]
           # TODO: the class lookup in _is? below is incomplete; a polymorphic association to an STI base class
           #       will fail to match an object of a derived type
@@ -185,7 +187,6 @@ def #{name}_changed?
         end
       end
 
-
       def attr_accessor_with_creator_metadata(*args)
         options = args.extract_options!
         if options.delete(:creator)
@@ -199,24 +200,20 @@ def attr_accessor_with_creator_metadata(*args)
         attr_accessor_without_creator_metadata(*args)
       end
 
-
       def has_one_with_new_method(name, options={}, &block)
         has_one_without_new_method(name, options, &block)
         class_eval "def new_#{name}(attributes={}); build_#{name}(attributes, false); end"
       end
 
-
       def set_default_order(order)
         @default_order = order
       end
 
-
       def never_show(*fields)
         @hobo_never_show ||= []
         @hobo_never_show.concat(fields.*.to_sym)
       end
 
-
       def set_search_columns(*columns)
         class_eval %{
           def self.search_columns
@@ -225,39 +222,32 @@ def self.search_columns
         }
       end
 
-
       public
 
-
       def never_show?(field)
         (@hobo_never_show && field.to_sym.in?(@hobo_never_show)) || (superclass < Hobo::Model && superclass.never_show?(field))
       end
 
-
       def find(*args)
         result = super
         result.member_class = self if result.is_a?(Array)
         result
       end
 
-
       def find_by_sql(*args)
         result = super
         result
       end
 
-
       def creator_type
         attr_type(creator_attribute)
       end
 
-
       def search_columns
         column_names = columns.*.name
         SEARCH_COLUMNS_GUESS.select{|c| c.in?(column_names) }
       end
 
-
       def reverse_reflection(association_name)
         refl = reflections[association_name.to_s] or raise "No reverse reflection for #{name}.#{association_name}"
         return nil if refl.options[:conditions] || refl.options[:polymorphic]
@@ -377,7 +367,6 @@ def set_creator(user)
       set_creator!(user) unless get_creator
     end
 
-
     def set_creator!(user)
       attr = self.class.creator_attribute
       return unless attr
@@ -397,17 +386,14 @@ def set_creator!(user)
       end
     end
 
-
     def get_creator
       self.class.creator_attribute && send(self.class.creator_attribute)
     end
 
-
     def typed_id
       "#{self.class.name.underscore}:#{self.id}" if id
     end
 
-
     def to_s
       if self.class.name_attribute
         send self.class.name_attribute

hobo/lib/hobo/model/accessible_associations.rb

@@ -185,7 +185,7 @@ def #{name}_with_finder=(record_or_string)
 
 
       # Add :accessible to the valid options so AR doesn't complain
-      ::ActiveRecord::Associations::Builder::Association.valid_options << :accessible
+      ::ActiveRecord::Associations::Builder::Association::VALID_OPTIONS << :accessible
 
     end
   end

hobo/lib/hobo/model/scopes.rb

@@ -2,7 +2,7 @@ module Hobo
   module Model
     module Scopes
 
-      ::ActiveRecord::Associations::Builder::Association.valid_options << :scope
+      ::ActiveRecord::Associations::Builder::Association::VALID_OPTIONS << :scope
 
       def self.included_in_class(klass)
         klass.class_eval do