sunrise-cms 1.0.3 → 1.1.1

data/lib/generators/sunrise/templates/models/active_record/avatar.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Avatar < Asset
-  sunrise_uploader AvatarUploader  
-  
-	validates :data_content_type, :inclusion => {:in => Sunrise::Utils::IMAGE_TYPES }
-	validates_integrity_of :data
-	validates_filesize_of :data, :maximum => 1.megabytes.to_i
+  sunrise_uploader AvatarUploader
+
+  validates :data_content_type, inclusion: { in: Sunrise::Utils::IMAGE_TYPES }
+  validates_integrity_of :data
+  validates_filesize_of :data, maximum: 1.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/active_record/picture.rb

@@ -1,7 +1,9 @@
-class Picture < Asset		
+# frozen_string_literal: true
+
+class Picture < Asset
   sunrise_uploader PictureUploader
 
-	validates :data_content_type, :inclusion => {:in => Sunrise::Utils::IMAGE_TYPES }
-	validates_integrity_of :data
-	validates_filesize_of :data, :maximum => 2.megabytes.to_i
+  validates :data_content_type, inclusion: { in: Sunrise::Utils::IMAGE_TYPES }
+  validates_integrity_of :data
+  validates_filesize_of :data, maximum: 2.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/active_record/position_type.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class PositionType < Sunrise::Models::PositionType
   define_enum do |builder|
-    builder.member :default,  :object => new("default")
-    builder.member :menu,     :object => new("menu")
-    builder.member :bottom,   :object => new("bottom")
+    builder.member :default,  object: new('default')
+    builder.member :menu,     object: new('menu')
+    builder.member :bottom,   object: new('bottom')
   end
 end

data/lib/generators/sunrise/templates/models/active_record/role_type.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class RoleType < Sunrise::Models::RoleType
   define_enum do |builder|
-    builder.member :default,   :object => new("default")
-    builder.member :redactor,  :object => new("redactor")
-    builder.member :moderator, :object => new("moderator")
-    builder.member :admin,     :object => new("admin")
+    builder.member :default,   object: new('default')
+    builder.member :redactor,  object: new('redactor')
+    builder.member :moderator, object: new('moderator')
+    builder.member :admin,     object: new('admin')
   end
 end

data/lib/generators/sunrise/templates/models/active_record/settings.rb

@@ -1,13 +1,15 @@
-require "rails-settings-cached"
+# frozen_string_literal: true
+
+require 'rails-settings-cached'
 
 class Settings < RailsSettings::CachedSettings
   include PublicActivity::Model
 
-  tracked owner: ->(controller, model) { controller.try(:current_user) }
+  tracked owner: ->(controller, _model) { controller.try(:current_user) }
 
   def self.update_attributes(attributes)
     attributes.each do |key, value|
       self[key] = value
     end
   end
-end 
+end

data/lib/generators/sunrise/templates/models/active_record/structure.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class Structure < ActiveRecord::Base
   include Sunrise::Models::Structure
   include PageParts::Extension
   include MetaManager::Taggable
   include PublicActivity::Model
 
-  tracked owner: ->(controller, model) { controller.try(:current_user) }
+  tracked owner: ->(controller, _model) { controller.try(:current_user) }
   page_parts :content
 end

data/lib/generators/sunrise/templates/models/active_record/structure_type.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class StructureType < Sunrise::Models::StructureType
   define_enum do |builder|
-    builder.member :page,     :object => new("page")
-    builder.member :posts,    :object => new("posts")
-    builder.member :main,     :object => new("main")
-    builder.member :redirect, :object => new("redirect")
-    builder.member :group,    :object => new("group")
+    builder.member :page,     object: new('page')
+    builder.member :posts,    object: new('posts')
+    builder.member :main,     object: new('main')
+    builder.member :redirect, object: new('redirect')
+    builder.member :group,    object: new('group')
   end
 end

data/lib/generators/sunrise/templates/models/active_record/user.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   include Sunrise::Models::User
   include PublicActivity::Model
-  
+
   # Include default devise modules.
   devise :database_authenticatable, :confirmable, :lockable, :timeoutable,
          :recoverable, :rememberable, :trackable, :validatable
 
   fileuploads :avatar
-  
-  tracked owner: ->(controller, model) { controller.try(:current_user) }
+
+  tracked owner: ->(controller, _model) { controller.try(:current_user) }
 end

data/lib/generators/sunrise/templates/models/mongoid/ability.rb

@@ -1,5 +1,6 @@
-class Ability < Sunrise::Models::Ability
+# frozen_string_literal: true
 
+class Ability < Sunrise::Models::Ability
   def guest
     # TODO
   end
@@ -7,11 +8,11 @@ class Ability < Sunrise::Models::Ability
   def default
     # TODO
   end
-  
+
   def redactor
     # TODO
   end
-  
+
   def moderator
     # TODO
   end

data/lib/generators/sunrise/templates/models/mongoid/asset.rb

@@ -1,30 +1,32 @@
+# frozen_string_literal: true
+
 require 'rails-uploader'
 
 class Asset
   include Mongoid::Document
   include Mongoid::Timestamps
   include Uploader::Asset
-  
+
   include Sunrise::CarrierWave::Glue
   include Sunrise::Models::Asset
-  
+
   # Columns
-  field :data_file_name, :type => String
-  field :data_content_type, :type => String
-  field :data_file_size, :type => Integer
-  field :width, :type => Integer
-  field :height, :type => Integer
-  field :guid, :type => String
-  field :sort_order, :type => Integer, :default => 0
-  field :width, :type => Integer
-  field :height, :type => Integer
-        
-  index({:guid => 1})
-  index({:user_id => 1})
-  index({:assetable_type => 1, :assetable_id => 1, :type => 1})
+  field :data_file_name, type: String
+  field :data_content_type, type: String
+  field :data_file_size, type: Integer
+  field :width, type: Integer
+  field :height, type: Integer
+  field :guid, type: String
+  field :sort_order, type: Integer, default: 0
+  field :width, type: Integer
+  field :height, type: Integer
+
+  index(guid: 1)
+  index(user_id: 1)
+  index(assetable_type: 1, assetable_id: 1, type: 1)
 
   # Validations
   validates_presence_of :data
-  
+
   default_scope asc(:sort_order)
 end

data/lib/generators/sunrise/templates/models/mongoid/attachment_file.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class AttachmentFile < Asset
   sunrise_uploader AttachmentFileUploader
-  
-  validates_filesize_of :data, :maximum => 100.megabytes.to_i
+
+  validates_filesize_of :data, maximum: 100.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/mongoid/avatar.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Avatar < Asset
-  sunrise_uploader AvatarUploader  
-  
-	validates :data_content_type, :inclusion => {:in => Sunrise::Utils::IMAGE_TYPES }
-	validates_integrity_of :data
-	validates_filesize_of :data, :maximum => 1.megabytes.to_i
+  sunrise_uploader AvatarUploader
+
+  validates :data_content_type, inclusion: { in: Sunrise::Utils::IMAGE_TYPES }
+  validates_integrity_of :data
+  validates_filesize_of :data, maximum: 1.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/mongoid/picture.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Picture < Asset
   sunrise_uploader PictureUploader
 
-  validates :data_content_type, :inclusion => {:in => Sunrise::Utils::IMAGE_TYPES }
+  validates :data_content_type, inclusion: { in: Sunrise::Utils::IMAGE_TYPES }
   validates_integrity_of :data
-  validates_filesize_of :data, :maximum => 2.megabytes.to_i
+  validates_filesize_of :data, maximum: 2.megabytes.to_i
 end

data/lib/generators/sunrise/templates/models/mongoid/position_type.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class PositionType < Sunrise::Models::PositionType
   define_enum do |builder|
-    builder.member :default,  :object => new("default")
-    builder.member :menu,     :object => new("menu")
-    builder.member :bottom,   :object => new("bottom")
+    builder.member :default,  object: new('default')
+    builder.member :menu,     object: new('menu')
+    builder.member :bottom,   object: new('bottom')
   end
 end

data/lib/generators/sunrise/templates/models/mongoid/role_type.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class RoleType < Sunrise::Models::RoleType
   define_enum do |builder|
-    builder.member :default,   :object => new("default")
-    builder.member :redactor,  :object => new("redactor")
-    builder.member :moderator, :object => new("moderator")
-    builder.member :admin,     :object => new("admin")
+    builder.member :default,   object: new('default')
+    builder.member :redactor,  object: new('redactor')
+    builder.member :moderator, object: new('moderator')
+    builder.member :admin,     object: new('admin')
   end
 end

data/lib/generators/sunrise/templates/models/mongoid/settings.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 class Settings
   include Mongoid::Document
   include Mongoid::Timestamps
   include PublicActivity::Model
-  
+
   # Columns
-  field :var, :type => String
-  field :value, :type => String
-  
-  index({var: 1}, {unique: true})
+  field :var, type: String
+  field :value, type: String
+
+  index({ var: 1 }, unique: true)
 
-  tracked owner: ->(controller, model) { controller.try(:current_user) }
+  tracked owner: ->(controller, _model) { controller.try(:current_user) }
 
   def self.table_exists?
     true
   end
-end 
+end

data/lib/generators/sunrise/templates/models/mongoid/structure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Structure
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -7,17 +9,17 @@ class Structure
   include PublicActivity::Model
 
   # Columns
-  field :title, :type => String
-  field :slug, :type => String
-  field :structure_type_id, :type => Integer, :default => 0
-  field :position_type_id, :type => Integer, :default => 0
-  field :is_visible, :type => Boolean, :default => true
-  field :redirect_url, :type => String
+  field :title, type: String
+  field :slug, type: String
+  field :structure_type_id, type: Integer, default: 0
+  field :position_type_id, type: Integer, default: 0
+  field :is_visible, type: Boolean, default: true
+  field :redirect_url, type: String
 
-  index({:structure_type_id => 1})
-  index({:position_type_id => 1})
-  index({:parent_id => 1})
+  index(structure_type_id: 1)
+  index(position_type_id: 1)
+  index(parent_id: 1)
 
-  tracked owner: ->(controller, model) { controller.try(:current_user) }
+  tracked owner: ->(controller, _model) { controller.try(:current_user) }
   page_parts :content
 end

data/lib/generators/sunrise/templates/models/mongoid/structure_type.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class StructureType < Sunrise::Models::StructureType
   define_enum do |builder|
-    builder.member :page,     :object => new("page")
-    builder.member :posts,    :object => new("posts")
-    builder.member :main,     :object => new("main")
-    builder.member :redirect, :object => new("redirect")
-    builder.member :group,    :object => new("group")
+    builder.member :page,     object: new('page')
+    builder.member :posts,    object: new('posts')
+    builder.member :main,     object: new('main')
+    builder.member :redirect, object: new('redirect')
+    builder.member :group,    object: new('group')
   end
 end

data/lib/generators/sunrise/templates/models/mongoid/user.rb

@@ -1,56 +1,58 @@
+# frozen_string_literal: true
+
 class User
   include Mongoid::Document
   include Mongoid::Timestamps
   include Sunrise::Models::User
   include Uploader::Fileuploads
   include PublicActivity::Model
-  
+
   # Columns
-  field :name, :type => String, :default => ""
-      
-  field :email, :type => String, :default => ""
-  field :encrypted_password, :type => String, :default => ""
-  
-  field :reset_password_token, :type => String
-  field :reset_password_sent_at, :type => DateTime
-  
-  field :remember_created_at, :type => DateTime
-      
-  field :sign_in_count, :type => Integer, :default => 0
-  field :current_sign_in_at, :type => DateTime
-  field :last_sign_in_at, :type => DateTime
-  field :current_sign_in_ip, :type => String
-  field :last_sign_in_ip, :type => String
-
-  field :confirmation_token, :type => String
-  field :confirmed_at, :type => DateTime
-  field :confirmation_sent_at, :type => DateTime
+  field :name, type: String, default: ''
+
+  field :email, type: String, default: ''
+  field :encrypted_password, type: String, default: ''
+
+  field :reset_password_token, type: String
+  field :reset_password_sent_at, type: DateTime
+
+  field :remember_created_at, type: DateTime
+
+  field :sign_in_count, type: Integer, default: 0
+  field :current_sign_in_at, type: DateTime
+  field :last_sign_in_at, type: DateTime
+  field :current_sign_in_ip, type: String
+  field :last_sign_in_ip, type: String
+
+  field :confirmation_token, type: String
+  field :confirmed_at, type: DateTime
+  field :confirmation_sent_at, type: DateTime
   # field :unconfirmed_email, :type => String # Only if using reconfirmable
-  
-  field :failed_attempts, :type => Integer, :default => 0 # Only if lock strategy is :failed_attempts
-  field :unlock_token, :type => String # Only if unlock strategy is :email or :both
-  field :locked_at, :type => DateTime
-      
-  field :password_salt, :type => String
-  field :role_type_id, :type => Integer
-      
+
+  field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
+  field :unlock_token, type: String # Only if unlock strategy is :email or :both
+  field :locked_at, type: DateTime
+
+  field :password_salt, type: String
+  field :role_type_id, type: Integer
+
   # Token authenticatable
   # field :authentication_token, :type => String
 
   # Invitable
   # field :invitation_token, :type => String
 
-  index({:email => 1}, {:unique => true})
-  index({:reset_password_token => 1}, {:unique => true})
-  index({:confirmation_token => 1}, {:unique => true})
-  index({:unlock_token => 1}, {:unique => true})
-  index({:role_type_id => 1})
+  index({ email: 1 }, unique: true)
+  index({ reset_password_token: 1 }, unique: true)
+  index({ confirmation_token: 1 }, unique: true)
+  index({ unlock_token: 1 }, unique: true)
+  index(role_type_id: 1)
 
   # Include default devise modules.
   devise :database_authenticatable, :confirmable, :lockable, :timeoutable,
          :recoverable, :rememberable, :trackable, :validatable
-  
+
   fileuploads :avatar
 
-  tracked owner: ->(controller, model) { controller.try(:current_user) }
+  tracked owner: ->(controller, _model) { controller.try(:current_user) }
 end