lib/the_comments.rb in the_comments-2.2.2 vs lib/the_comments.rb in the_comments-2.3.1

@@ -1,19 +1,38 @@
 require 'state_machine'
+require 'state_machine/version'
+
+require 'the_simple_sort'
 require 'the_sortable_tree'
 
 require 'the_comments/config'
 require 'the_comments/version'
 
-_root_ = File.expand_path('../../',  __FILE__)
-
 module TheComments
-  class Engine < Rails::Engine; end
+  COMMENTS_COOKIES_TOKEN = 'JustTheCommentsCookies'
+
+  class Engine < Rails::Engine
+    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns/**/"]
+    config.autoload_paths += Dir["#{config.root}/app/models/concerns/**/"]
+  end
 end
 
 # Loading of concerns
+_root_ = File.expand_path('../../',  __FILE__)
 require "#{_root_}/config/routes.rb"
-require "#{_root_}/app/controllers/concerns/controller.rb"
 
-%w[ comment_states comment user commentable ].each do |concern|
-  require "#{_root_}/app/models/concerns/#{concern}.rb"
-end
\ No newline at end of file
+if StateMachine::VERSION.to_f <= 1.2
+  puts '~' * 50
+  puts 'TheComments'
+  puts '~' * 50
+  puts 'WARNING!'
+  puts 'StateMachine patch for Rails4 will be applied'
+  puts
+  puts '> private method *around_validation* from StateMachine::Integrations::ActiveModel will be public'
+  puts
+  puts 'https://github.com/pluginaweek/state_machine/issues/295'
+  puts 'https://github.com/pluginaweek/state_machine/issues/251'
+  puts '~' * 50
+  module StateMachine::Integrations::ActiveModel
+    public :around_validation
+  end
+end