Some new rubocop checks.

app/models/application_model/assets.rb

@@ -31,12 +31,11 @@ returns
 
     return data if !self['created_by_id'] && !self['updated_by_id']
     ['created_by_id', 'updated_by_id'].each {|item|
-      if self[ item ]
+      next if !self[ item ]
       if !data[ User.to_app_model ] || !data[ User.to_app_model ][ self[ item ] ]
         user = User.lookup( id: self[ item ] )
         data = user.assets( data )
       end
-      end
     }
     data
   end

app/models/locale.rb

@@ -16,7 +16,6 @@ class Locale < ApplicationModel
     raise "Can't load locales from #{url}: #{result.error}" if !result.success?
 
     result.data.each {|locale|
-      puts locale.inspect
       exists = Locale.where(locale: locale['locale']).first
       if exists
         exists.update(locale.symbolize_keys!)

app/models/organization/assets.rb

@@ -40,12 +40,11 @@ returns
       end
     end
     ['created_by_id', 'updated_by_id'].each {|item|
-      if self[ item ]
+      next if !self[ item ]
       if !data[ User.to_app_model ][ self[ item ] ]
         user = User.lookup( id: self[ item ] )
         data = user.assets( data )
       end
-      end
     }
     data
   end

app/models/ticket/activity_stream_log.rb

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

app/models/ticket/article.rb

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

app/models/ticket/article/activity_stream_log.rb

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

app/models/ticket/article/assets.rb

@@ -1,6 +1,8 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-module Ticket::Article::Assets
+class Ticket
+  class Article
+    module Assets
 
 =begin
 
@@ -42,14 +44,14 @@ returns
         end
 
         ['created_by_id', 'updated_by_id'].each {|item|
-      if self[ item ]
+          next if !self[ item ]
           if !data[ User.to_app_model ] || !data[ User.to_app_model ][ self[ item ] ]
             user = User.lookup( id: self[ item ] )
             data = user.assets( data )
           end
-      end
         }
         data
       end
-
+    end
+  end
 end

app/models/ticket/article/history_log.rb

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

app/models/ticket/assets.rb

@@ -1,6 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-module Ticket::Assets
+class Ticket
+  module Assets
 
 =begin
 
@@ -30,14 +31,13 @@ returns
         data[ Ticket.to_app_model ][ self.id ] = self.attributes_with_associations
       end
       ['created_by_id', 'updated_by_id', 'owner_id', 'customer_id'].each {|item|
-      if self[ item ]
+        next if !self[ item ]
         if !data[ User.to_app_model ] || !data[ User.to_app_model ][ self[ item ] ]
           user = User.lookup( id: self[ item ] )
           data = user.assets( data )
         end
-      end
       }
       data
     end
-
+  end
 end

app/models/ticket/counter.rb

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

app/models/ticket/escalation.rb

@@ -1,6 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-module Ticket::Escalation
+class Ticket
+  module Escalation
 
 =begin
 
@@ -259,10 +260,10 @@ returns
 
         diff = escalation_time_diff( last_state_change, history_item['created_at'], sla_selected )
         if counted
-#        puts "Diff count #{history_item['value_from']} -> #{history_item['value_to']} / #{last_state_change} -> #{history_item['created_at']}"
+          # puts "Diff count #{history_item['value_from']} -> #{history_item['value_to']} / #{last_state_change} -> #{history_item['created_at']}"
           total_time_without_pending = total_time_without_pending + diff
         else
-#        puts "Diff not count #{history_item['value_from']} -> #{history_item['value_to']} / #{last_state_change} -> #{history_item['created_at']}"
+        # puts "Diff not count #{history_item['value_from']} -> #{history_item['value_to']} / #{last_state_change} -> #{history_item['created_at']}"
         end
         total_time = total_time + diff
 
@@ -280,7 +281,7 @@ returns
       # if last state isnt pending, count rest
       if !last_state_is_pending && last_state_change && last_state_change < end_time
         diff = escalation_time_diff( last_state_change, end_time, sla_selected )
-#      puts "Diff count last state was not pending #{diff.to_s} - #{last_state_change} - #{end_time}"
+        # puts "Diff count last state was not pending #{diff.to_s} - #{last_state_change} - #{end_time}"
         total_time_without_pending = total_time_without_pending + diff
         total_time = total_time + diff
       end
@@ -288,7 +289,7 @@ returns
       # if we have not had any state change
       if !last_state_change
         diff = escalation_time_diff( start_time, end_time, sla_selected )
-#      puts 'Diff state has not changed ' + diff.to_s
+        # puts 'Diff state has not changed ' + diff.to_s
         total_time_without_pending = total_time_without_pending + diff
         total_time = total_time + diff
       end
@@ -320,4 +321,5 @@ returns
       return check_time if escalation_time > check_time
       return escalation_time
     end
+  end
 end

app/models/ticket/flag.rb

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

app/models/ticket/history_log.rb

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

app/models/ticket/number.rb

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

app/models/ticket/number/date.rb

@@ -1,6 +1,8 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-module Ticket::Number::Date
+class Ticket
+  class Number
+    module Date
       extend self
 
       def generate
@@ -8,7 +10,7 @@ module Ticket::Number::Date
         # get config
         config = Setting.get('ticket_number_date')
 
-    t = Time.now
+        t = Time.zone.now
         date = t.strftime('%Y-%m-%d')
 
         # read counter
@@ -64,6 +66,7 @@ module Ticket::Number::Date
         end
         number
       end
+
       def check(string)
 
         # get config
@@ -73,11 +76,13 @@ module Ticket::Number::Date
         ticket              = nil
 
         # probe format
-    if string =~ /#{ticket_hook}#{ticket_hook_divider}(#{system_id}\d{2,50})/i then
+        if string =~ /#{ticket_hook}#{ticket_hook_divider}(#{system_id}\d{2,50})/i
           ticket = Ticket.where( number: $1 ).first
-    elsif string =~ /#{ticket_hook}\s{0,2}(#{system_id}\d{2,50})/i then
+        elsif string =~ /#{ticket_hook}\s{0,2}(#{system_id}\d{2,50})/i
           ticket = Ticket.where( number: $1 ).first
         end
         ticket
       end
+    end
+  end
 end

app/models/ticket/number/increment.rb

@@ -1,6 +1,8 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-module Ticket::Number::Increment
+class Ticket
+  class Number
+    module Increment
       extend self
 
       def generate
@@ -77,11 +79,13 @@ module Ticket::Number::Increment
         ticket              = nil
 
         # probe format
-    if string =~ /#{ticket_hook}#{ticket_hook_divider}(#{system_id}\d{2,48})/i then
+        if string =~ /#{ticket_hook}#{ticket_hook_divider}(#{system_id}\d{2,48})/i
           ticket = Ticket.where( number: $1 ).first
-    elsif string =~ /#{ticket_hook}\s{0,2}(#{system_id}\d{2,48})/i then
+        elsif string =~ /#{ticket_hook}\s{0,2}(#{system_id}\d{2,48})/i
           ticket = Ticket.where( number: $1 ).first
         end
         ticket
       end
+    end
+  end
 end

app/models/ticket/overviews.rb

@@ -1,6 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-module Ticket::Overviews
+class Ticket
+  module Overviews
 
 =begin
 
@@ -189,6 +190,7 @@ returns
     end
 
     private
+
     def self._condition(condition)
       sql  = ''
       bind = [nil]
@@ -247,4 +249,5 @@ returns
       bind[0] = sql
       bind
     end
+  end
 end

app/models/ticket/permission.rb

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

app/models/ticket/priority.rb

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

app/models/ticket/screen_options.rb

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

app/models/ticket/search.rb

@@ -1,6 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-module Ticket::Search
+class Ticket
+  module Search
 
 =begin
 
@@ -63,9 +64,9 @@ returns
         query_extention['bool']['must'] = []
 
         if current_user.is_role('Agent')
-        groups = Group.joins(:users).
+          groups = Group.joins(:users)
-        where( 'groups_users.user_id = ?', current_user.id ).
+                   .where( 'groups_users.user_id = ?', current_user.id )
-        where( 'groups.active = ?', true )
+                   .where( 'groups.active = ?', true )
           group_condition = []
           groups.each {|group|
             group_condition.push group.name
@@ -113,18 +114,18 @@ returns
       # - stip out * we already search for *query* -
       if query
         query.gsub! '*', ''
-      tickets_all = Ticket.select('DISTINCT(tickets.id)').
+        tickets_all = Ticket.select('DISTINCT(tickets.id)')
-      where(access_condition).
+                      .where(access_condition)
-      where( '( `tickets`.`title` LIKE ? OR `tickets`.`number` LIKE ? OR `ticket_articles`.`body` LIKE ? OR `ticket_articles`.`from` LIKE ? OR `ticket_articles`.`to` LIKE ? OR `ticket_articles`.`subject` LIKE ?)', "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%" ).
+                      .where( '( `tickets`.`title` LIKE ? OR `tickets`.`number` LIKE ? OR `ticket_articles`.`body` LIKE ? OR `ticket_articles`.`from` LIKE ? OR `ticket_articles`.`to` LIKE ? OR `ticket_articles`.`subject` LIKE ?)', "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%" )
-      joins(:articles).
+                      .joins(:articles)
-      order('`tickets`.`created_at` DESC').
+                      .order('`tickets`.`created_at` DESC')
-      limit(limit)
+                      .limit(limit)
       else
-      tickets_all = Ticket.select('DISTINCT(tickets.id)').
+        tickets_all = Ticket.select('DISTINCT(tickets.id)')
-      where(access_condition).
+                      .where(access_condition)
-      where(params[:condition]).
+                      .where(params[:condition])
-      order('`tickets`.`created_at` DESC').
+                      .order('`tickets`.`created_at` DESC')
-      limit(limit)
+                      .limit(limit)
       end
 
       # build result list
@@ -142,5 +143,5 @@ returns
       }
       tickets
     end
-
+  end
 end

app/models/ticket/search_index.rb

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

app/models/ticket/state.rb

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

app/models/ticket/state_type.rb

@@ -1,7 +1,9 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-class Ticket::StateType < ApplicationModel
+class Ticket
+  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,6 +1,7 @@
 # Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
 
-module Ticket::Subject
+class Ticket
+  module Subject
 
 =begin
 
@@ -75,4 +76,5 @@ returns
 
       subject
     end
+  end
 end

app/models/user/assets.rb

@@ -75,12 +75,11 @@ returns
         end
       end
       ['created_by_id', 'updated_by_id'].each {|item|
-        if self[ item ]
+        next if !self[ item ]
         if !data[ User.to_app_model ][ self[ item ] ]
           user = User.lookup( id: self[ item ] )
           data = user.assets( data )
         end
-        end
       }
       data
     end