qalam_merit 4.5.08 → 4.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d1f73f153930fdd73e1ba773d40feb481ab847a7d6857623779de05eacb8817
-  data.tar.gz: 62ddf64eecbb98665f47c841476fc1d5045813ff97db1bcf9c8fe8347c026f57
+  metadata.gz: bebc2893139c8f3842d8c2f48de029fb2fef9c4323725e237c3ef31eb7452d9b
+  data.tar.gz: aab590590e4ac73b91dd1abc8f6b6bfa3284cc92515001128fcb73d4f3a1b98b
 SHA512:
-  metadata.gz: 8e1b99abd43904c894b2e75d590c0d901ab090a24a5f5d83fdd16af6c0307301a74ee93752e5c30f52a3281e763bb8132bb0a4ae14195ec546b29613c3cb6cb5
-  data.tar.gz: e976e63ad65c74580397199ea05e8f413a17a51834226066774b83c24517f8feb62cff128be39bb1e6c7e3ceccb338f15d21bfcd1e6121bc38ca94e183abb292
+  metadata.gz: 31b5e8af9870057622b6f84feaf3816a34971e8af03b0f15b8307a9d68716def3168971400c535030a4eb95c8a84c134362a255508df7c2d091ed1d11700e82c
+  data.tar.gz: 3aef2ce1fe1a809077daedf6341672b353542f5dce166d714bf6abf6882c30278f5d982da75f52fc6d636db45446d13399752f539aa65c0b0b542ffdf5736431

data/lib/merit/class_methods.rb

@@ -16,7 +16,7 @@ module Merit
 
     # Delegate methods from meritable models to their sash
     def _merit_delegate_methods_to_sash
-      methods = %w(badge_ids badges points add_badge add_qalam_badge rm_badge
+      methods = %w(badge_ids badges points add_badge rm_badge
                    add_points subtract_points score_points)
       methods.each { |method| delegate method, to: :_sash }
     end

data/lib/merit/generators/active_record/templates/create_badges_sashes.erb

@@ -2,9 +2,12 @@
 class CreateBadgesSashes < ActiveRecord::Migration<%= migration_version %>
   def self.up
     create_table :badges_sashes do |t|
+      t.boolean :active, default: true
       t.references :badge, limit: 8, foreign_key: { to_table: 'merit_badges'}, index: true, null: true
       t.references :sash, limit: 8, foreign_key: true, index: true, null: true
-      t.datetime :created_at
+      t.integer :badge_type, default: 0
+      t.references :context, polymorphic: true
+      t.timestamps
     end
   end
 

data/lib/merit/generators/active_record/templates/create_merit_badges.erb

@@ -8,7 +8,9 @@ class CreateMeritBadges < ActiveRecord::Migration<%= migration_version %>
       t.text :description
       t.string :difficulty
       t.boolean :active, default: true
+      t.datetime :deleted_at
       t.references :user, limit: 8, foreign_key: true, index: true, null: true
+      # t.references :root_account, foreign_key: { to_table: 'accounts'}, limit: 8, null: false, index: true
 
       t.timestamps
     end

data/lib/merit/generators/active_record/templates/create_scores_and_points.erb

@@ -2,15 +2,18 @@
 class CreateScoresAndPoints < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :merit_scores do |t|
-      t.references :sash
       t.string :category, default: 'default'
+      t.boolean :active, default: true
+      t.references :sash
     end
 
     create_table :merit_score_points do |t|
-      t.references :score
       t.bigint :num_points, default: 0
       t.string :log
-      t.datetime :created_at
+      t.boolean :active, default: true
+      t.references :score
+      t.references :context, polymorphic: true
+      t.timestamps
     end
   end
 end

data/lib/merit/generators/merit_generator.rb

@@ -10,10 +10,14 @@ module Merit
           inject_into_class(model_path, class_name, "  ### END ###\n\n")
           inject_into_class(model_path, class_name, "  has_many :created_badges, class_name: 'Merit::Badge', :dependent => :destroy\n")
           inject_into_class(model_path, class_name, "  has_many :assigned_badges, through: :sash, source: :badges, :dependent => :destroy\n")
-          inject_into_class(model_path, class_name, "  has_many :badges_sashes, through: :sash, source: :badges_sashes, :dependent => :destroy\n")
           inject_into_class(model_path, class_name, "  belongs_to :sash, foreign_key: 'sash_id', class_name: 'Merit::Sash', :dependent => :destroy\n")
           inject_into_class(model_path, class_name, "  has_merit\n")
           inject_into_class(model_path, class_name, "  ### QALAM_MERIT ###\n")
+
+          inject_into_class(course_path, "Course", "  ### END ###\n\n")
+          inject_into_class(course_path, "Course", "  has_many :badges_sashes, class_name: 'Merit::BadgesSash', :as => :context, :inverse_of => :context, :dependent => :destroy\n")
+          inject_into_class(course_path, "Course", "  has_many :score_points, class_name: 'Merit::QalamScore::Point', :as => :context, :inverse_of => :context, :dependent => :destroy\n")
+          inject_into_class(course_path, "Course", "  ### QALAM_MERIT ###\n")
         end
       end
 
@@ -30,6 +34,10 @@ module Merit
       def model_path
         @model_path ||= File.join('app', 'models', "#{file_path}.rb")
       end
+
+      def course_path
+        @course_path ||= File.join('app', 'models', "course.rb")
+      end
     end
   end
 end

data/lib/merit/generators/templates/badge.erb

@@ -11,9 +11,9 @@ class Merit::Badge < ActiveRecord::Base
     self.description = self.description.strip unless self.description.nil?
   end
 
-  validates :name, presence: true, length: { minimum: 3, maximum: 20 }
+  validates :name, presence: true, length: { minimum: 1, maximum: 20 }
   validates :points, presence: true, numericality: true, :inclusion => 1..100
-  validates :description, presence: true, length: { minimum: 3, maximum: 50 }
+  validates :description, presence: true, length: { minimum: 3, maximum: 100 }
 
   has_one :image, :class_name => 'Attachment', :as => :context, :inverse_of => :context, :dependent => :destroy
   belongs_to :created_by, foreign_key: "user_id", class_name: 'User'
@@ -66,7 +66,12 @@ class Merit::Badge < ActiveRecord::Base
     end
 
     def create_with_attachment(account, badge, attachment)
-      return true if ((attachment.nil? || attachment.to_s == "null") || account.nil? || badge.nil?)
+      if ((attachment.nil? || attachment.to_s == "null") || account.nil? || badge.nil?)
+        badge.errors.add(:image, :image_required, message: 'Image Required')
+        badge.destroy if badge.id
+        return false
+      end
+      
       if attachment.content_type && @valid_images.include?(attachment.content_type)
         account.shard.activate do
           att = Attachment.create_data_attachment(badge, attachment)

data/lib/merit/models/active_record/badges_sash.rb

@@ -6,7 +6,9 @@ module Merit::Models::ActiveRecord
     has_many :activity_logs,
              class_name: 'Merit::ActivityLog',
              as: :related_change
-    belongs_to :course, foreign_key: "course_id", class_name: 'Course'
+    # belongs_to :course, foreign_key: "course_id", class_name: 'Course'
+    belongs_to :context, :polymorphic => true
+    enum badge_type: [:other, :start, :achieve, :pass, :active, :finish]
 
     validates_presence_of :badge_id, :sash
   end

data/lib/merit/models/active_record/qalam_score.rb

@@ -23,6 +23,7 @@ module Merit::Models::ActiveRecord
                class_name: 'Merit::ActivityLog',
                as: :related_change
       delegate :sash_id, to: :score
+      belongs_to :context, :polymorphic => true
     end
   end
 end

data/lib/merit/models/active_record/sash.rb

@@ -12,6 +12,8 @@ module Merit::Models::ActiveRecord
     has_many :badges_sashes, dependent: :destroy
     has_many :badges, through: :badges_sashes, source: :badge
     has_many :scores, dependent: :destroy, class_name: 'Merit::QalamScore'
+    has_many :score_points, through: :scores, source: :badge
+
 
     after_create :create_scores
 

data/lib/merit/models/sash_concern.rb

@@ -9,8 +9,8 @@ module Merit::Models
     end
 
     def add_badge(badge_id, options = {})
-      if (course_id = options[:course_id])
-        bs = Merit::BadgesSash.new(badge_id: badge_id.to_i, course_id: course_id.to_i)
+      if (context = options[:context])
+        bs = Merit::BadgesSash.new(badge_id: badge_id.to_i, context: context, badge_type: options[:badge_type])
       else
         bs = Merit::BadgesSash.new(badge_id: badge_id.to_i)
       end
@@ -19,20 +19,13 @@ module Merit::Models
     end
 
     def rm_badge(badge_id, options = {})
-      if (course_id = options[:course_id])
-        badges_sashes.where(badge_id: badge_id.to_i, course_id: course_id.to_i).first.try(:destroy)
+      if (context = options[:context])
+        badges_sashes.where(badge_id: badge_id.to_i, context: context, badge_type: options[:badge_type]).first.try(:destroy)
       else
         badges_sashes.where(badge_id: badge_id.to_i).first.try(:destroy)
       end
     end
 
-    ########################QALAM_DEV#########################
-    def add_qalam_badge(badge_id, course_id)
-      bs = Merit::BadgesSash.new(badge_id: badge_id.to_i, course_id: course_id.to_i)
-      badges_sashes << bs
-      bs
-    end
-    ########################END###################################
     # Retrieve the number of points from a category
     # By default all points are summed up
     # @param category [String] The category
@@ -48,10 +41,11 @@ module Merit::Models
     def add_points(num_points, options = {})
       point = Merit::QalamScore::Point.new
       point.num_points = num_points
+      point.context = options[:context]
       scores
-        .where(category: options[:category] || 'default')
-        .first_or_create
-        .score_points << point
+      .where(category: options[:category] || 'default')
+      .first_or_create
+      .score_points << point
       point
     end
 

data/qalam_merit.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.test_files  = `git ls-files -- test/*`.split("\n")
   s.license     = 'MIT'
-  s.version     = '4.5.08'
-  s.authors     = ["Tute Costa", "Ahmed Abdelhamid"]
-  s.email       = ['tutecosta@gmail.com', 'a.hamid@nezam.io']
+  s.version     = '4.5.12'
+  s.authors     = ["Ahmed Abdelhamid", "Zeyad Saleh"]
+  s.email       = ['a.hamid@nezam.io', 'zeyad.saleh@nezam.io']
 
   s.required_ruby_version = '>= 2.3.0'
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: qalam_merit
 version: !ruby/object:Gem::Version
-  version: 4.5.08
+  version: 4.5.12
 platform: ruby
 authors:
-- Tute Costa
 - Ahmed Abdelhamid
+- Zeyad Saleh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -111,8 +111,8 @@ dependencies:
         version: '0'
 description: Manage badges, points and rankings (reputation) in your Rails app.
 email:
-- tutecosta@gmail.com
 - a.hamid@nezam.io
+- zeyad.saleh@nezam.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Reputation engine for Rails apps