qalam_merit 4.5.08 → 4.5.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d1f73f153930fdd73e1ba773d40feb481ab847a7d6857623779de05eacb8817
-  data.tar.gz: 62ddf64eecbb98665f47c841476fc1d5045813ff97db1bcf9c8fe8347c026f57
+  metadata.gz: 54fd36c8d0594e5288774e2caf5b4bca4b642e63fefd50d564b80ce5abdbaae0
+  data.tar.gz: 7bf97cb6b288354c70bf82f2573d37db6b363230309243848ed7335240282e30
 SHA512:
-  metadata.gz: 8e1b99abd43904c894b2e75d590c0d901ab090a24a5f5d83fdd16af6c0307301a74ee93752e5c30f52a3281e763bb8132bb0a4ae14195ec546b29613c3cb6cb5
-  data.tar.gz: e976e63ad65c74580397199ea05e8f413a17a51834226066774b83c24517f8feb62cff128be39bb1e6c7e3ceccb338f15d21bfcd1e6121bc38ca94e183abb292
+  metadata.gz: 0ecdd00a696088ac97a9ed78671f3c3f8a98da81a89d1d722306c4b6c46cd86f3cc8c9262eb09408afaee973a62891ead6f2260b0b2de775c3eacef09c8ea3f8
+  data.tar.gz: f04638fd6694a4f0af6aae82d5db77b30263d494f3267530247b161a31f07454275cf6abfa994b783c40ee58370cb0b7f90a691ee4f61981168ae9af937b0b85

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/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/sash_concern.rb

@@ -26,13 +26,6 @@ module Merit::Models
       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.course_id = options[:course_id].to_i
       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.09'
+  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.09
 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-03-08 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: []