Moved back to compact module/class definition to prevent "superclass mismatch for class Ticket (TypeError)".

app/models/ticket/activity_stream_log.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::ActivityStreamLog
-  module ActivityStreamLog
 
 =begin
 
@@ -36,5 +35,4 @@ returns
       created_by_id: user_id,
     )
   end
-  end
 end

app/models/ticket/article.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+class Ticket::Article < ApplicationModel
-  class Article < ApplicationModel
   load 'ticket/article/assets.rb'
   include Ticket::Article::Assets
   load 'ticket/article/history_log.rb'
@@ -48,5 +47,4 @@ class Ticket
     validates   :name, presence: true
     latest_change_support
   end
-  end
 end

app/models/ticket/article/activity_stream_log.rb

@@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::Article::ActivityStreamLog
-  class Article
-    module ActivityStreamLog
 
 =begin
 
@@ -38,6 +36,4 @@ returns
       created_by_id: user_id,
     )
   end
-    end
-  end
 end

app/models/ticket/article/assets.rb

@@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-class Ticket
+module Ticket::Article::Assets
-  class Article
-    module Assets
 
 =begin
 
@@ -52,6 +50,4 @@ returns
     }
     data
   end
-    end
-  end
 end

app/models/ticket/article/history_log.rb

@@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-class Ticket
+module Ticket::Article::HistoryLog
-  class Article
-    module HistoryLog
 
 =begin
 
@@ -29,6 +27,4 @@ returns
     data[:created_by_id]          = user_id
     History.add(data)
   end
-    end
-  end
 end

app/models/ticket/assets.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::Assets
-  module Assets
 
 =begin
 
@@ -39,5 +38,4 @@ returns
     }
     data
   end
-  end
 end

app/models/ticket/counter.rb

@@ -1,6 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+class Ticket::Counter < ApplicationModel
-  class Counter < ApplicationModel
-  end
 end

app/models/ticket/escalation.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::Escalation
-  module Escalation
 
 =begin
 
@@ -321,5 +320,4 @@ returns
     return check_time if escalation_time > check_time
     escalation_time
   end
-  end
 end

app/models/ticket/flag.rb

@@ -1,6 +1,4 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-class Ticket
+class Ticket::Flag < ApplicationModel
-  class Flag < ApplicationModel
-  end
 end

app/models/ticket/history_log.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::HistoryLog
-  module HistoryLog
 
 =begin
 
@@ -78,5 +77,4 @@ returns
       assets: assets,
     }
   end
-  end
 end

app/models/ticket/number.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-class Ticket
+class Ticket::Number
-  class Number
   include ApplicationLib
 
 =begin
@@ -56,5 +55,4 @@ returns
     end
     adapter
   end
-  end
 end

app/models/ticket/number/date.rb

@@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::Number::Date
-  class Number
-    module Date
   extend self
 
   def generate
@@ -83,6 +81,4 @@ class Ticket
     end
     ticket
   end
-    end
-  end
 end

app/models/ticket/number/increment.rb

@@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-class Ticket
+module Ticket::Number::Increment
-  class Number
-    module Increment
   extend self
 
   def generate
@@ -86,6 +84,4 @@ class Ticket
     end
     ticket
   end
-    end
-  end
 end

app/models/ticket/overviews.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::Overviews
-  module Overviews
 
 =begin
 
@@ -249,5 +248,4 @@ returns
     bind[0] = sql
     bind
   end
-  end
 end

app/models/ticket/permission.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::Permission
-  module Permission
 
 =begin
 
@@ -44,5 +43,4 @@ returns
     }
     false
   end
-  end
 end

app/models/ticket/priority.rb

@@ -1,8 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+class Ticket::Priority < ApplicationModel
-  class Priority < ApplicationModel
   self.table_name = 'ticket_priorities'
   validates     :name, presence: true
-  end
 end

app/models/ticket/screen_options.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::ScreenOptions
-  module ScreenOptions
 
 =begin
 
@@ -174,5 +173,4 @@ returns
       assets: assets,
     }
   end
-  end
 end

app/models/ticket/search.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::Search
-  module Search
 
 =begin
 
@@ -143,5 +142,4 @@ returns
     }
     tickets
   end
-  end
 end

app/models/ticket/search_index.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::SearchIndex
-  module SearchIndex
 
 =begin
 
@@ -106,5 +105,4 @@ returns
     return if !attributes
     SearchIndexBackend.add(self.class.to_s, attributes)
   end
-  end
 end

app/models/ticket/state.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+class Ticket::State < ApplicationModel
-  class State < ApplicationModel
   belongs_to    :state_type,        class_name: 'Ticket::StateType'
   validates     :name, presence: true
 
@@ -51,5 +50,4 @@ returns:
     return true if ignore_escalation.include?( self.name )
     false
   end
-  end
 end

app/models/ticket/state_type.rb

@@ -1,9 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+class Ticket::StateType < ApplicationModel
-  class StateType < ApplicationModel
   has_many      :states,            class_name: 'Ticket::State'
   validates     :name, presence: true
   latest_change_support
-  end
 end

app/models/ticket/subject.rb

@@ -1,7 +1,6 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
-
+# rubocop:disable ClassAndModuleChildren
-class Ticket
+module Ticket::Subject
-  module Subject
 
 =begin
 
@@ -76,5 +75,4 @@ returns
 
     subject
   end
-  end
 end