qalam_merit 4.5.05 → 4.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36dd98bb62a667ae5b42ca9edb1a6aa9d547a139d268f9da523476937d61d077
-  data.tar.gz: 3d36fe5887fc5844b4e13f342e73216d7fc8ab1f6d70e1a458437c9b86fd247e
+  metadata.gz: a4171f388d1deb5ba55ac7d6c2da00ff1612b6b11ab9006131231097315dbb71
+  data.tar.gz: 11fa7b017b5bb9762a292b6bb6250895cbe2a98dd8c88e675260ebc68439a63c
 SHA512:
-  metadata.gz: b797616130749f3f74ad7b2737dc32461866896547f32f9039d56474f309d20a07113a42f0fa3dd0af105450b511455ff4b769a517d5656885cdfc56194c6780
-  data.tar.gz: 26bc8ce7e1adcee901aaa6f929a0e89d73d22b7088c30cc5321c1369ca4528593417a48336ff6e31b5c03d94505adc6df3701a92bd9f825e1828db0da6d3638b
+  metadata.gz: 98f2e9d35284ebcd1d0b43afc46082407ec04aa1f8645e4de50f45d17f6f0ba278e01b3f0fcc58853b848e507c2b087e7b6bd3ab29a78dd9be08c7a2dde5a634
+  data.tar.gz: d9b4e7bda1c8dda2c012b2cda57e2d7f9408c02dec0a4b51fc97cd626971e6d1046889c34e5ee6ac5f0d8e9a70c638feb2d6ba783117588d7f2acd3194a448c0

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

@@ -9,7 +9,6 @@ class CreateMeritBadges < ActiveRecord::Migration<%= migration_version %>
       t.string :difficulty
       t.boolean :active, default: true
       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/templates/badge.erb

@@ -1,6 +1,9 @@
 ### QALAM_MERIT ###
 class Merit::Badge < ActiveRecord::Base
+  # include Workflow
+  # include Context
   self.table_name = "merit_badges"
+  @valid_images = ["image/jpeg", "image/png", "image/bmp", "image/jpg"]
 
   before_validation :strip_whitespace
   def strip_whitespace
@@ -8,19 +11,27 @@ class Merit::Badge < ActiveRecord::Base
     self.description = self.description.strip unless self.description.nil?
   end
 
-  validates :root_account_id, presence: true
-  validates :name, presence: true, length: { minimum: 3, maximum: 10 }
+  validates :name, presence: true, length: { minimum: 1, maximum: 20 }
   validates :points, presence: true, numericality: true, :inclusion => 1..100
-  validates :description, presence: false, length: { 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 :root_account, foreign_key: "root_account_id", class_name: 'Account'
   belongs_to :created_by, foreign_key: "user_id", class_name: 'User'
-  has_many :badges_sashes, class_name: 'Merit::QalamBadgeSash'
-  has_many :sashes, through: :badges_sashes, source: :sash
 
   def image_url
-    # self.image.public_url if self.image
+    if self.image
+      return self.image.public_url
+    else
+      return '/images/apple-touch-icon.png' 
+    end
+  end
+
+  def self.valid_images
+    @valid_images
+  end
+
+  def badges_sashes
+    Merit::BadgesSash.where(badge_id: self.id)
   end
 
   class << self
@@ -47,9 +58,6 @@ class Merit::Badge < ActiveRecord::Base
       badge
     end
 
-    # Defines Badge#meritable_models method, to get related
-    # entries with certain badge. For instance, Badge.find(3).users
-    # orm-specified
     def _define_related_entries_method(meritable_class_name)
       define_method(:"#{meritable_class_name.underscore.pluralize}") do
         sashes = Merit::QalamBadgeSash.where(badge_id: id).pluck(:sash_id)
@@ -58,11 +66,24 @@ class Merit::Badge < ActiveRecord::Base
     end
 
     def create_with_attachment(account, badge, attachment)
-      account.shard.activate do
-        att = Attachment.create_data_attachment(badge, attachment)
-        badge.image = att
-        badge.save!
-        badge
+      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)
+          badge.image = att
+          badge.save!
+          badge
+        end
+        return true
+      else
+        badge.errors.add(:image, :invalid_format, message: 'invalid image format')
+        badge.destroy if badge.id
+        return false
       end
     end
   end

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

@@ -6,6 +6,7 @@ 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'
 
     validates_presence_of :badge_id, :sash
   end

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

@@ -23,6 +23,9 @@ module Merit::Models::ActiveRecord
                class_name: 'Merit::ActivityLog',
                as: :related_change
       delegate :sash_id, to: :score
+      belongs_to :course, 
+                  foreign_key: "course_id", 
+                  class_name: 'Course'
     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

@@ -8,14 +8,22 @@ module Merit::Models
       badges_sashes.map(&:badge_id)
     end
 
-    def add_badge(badge_id)
-      bs = Merit::BadgesSash.new(badge_id: badge_id.to_i)
-      badges_sashes << bs
-      bs
+    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)
+      else
+        bs = Merit::BadgesSash.new(badge_id: badge_id.to_i)
+      end
+        badges_sashes << bs
+        bs
     end
 
-    def rm_badge(badge_id)
-      badges_sashes.where(badge_id: badge_id.to_i).first.try(:destroy)
+    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)
+      else
+        badges_sashes.where(badge_id: badge_id.to_i).first.try(:destroy)
+      end
     end
 
     # Retrieve the number of points from a category
@@ -33,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.05'
-  s.authors     = ["Tute Costa", "Ahmed Abdelhamid"]
-  s.email       = ['tutecosta@gmail.com', 'a.hamid@nezam.io']
+  s.version     = '4.5.10'
+  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.05
+  version: 4.5.10
 platform: ruby
 authors:
-- Tute Costa
 - Ahmed Abdelhamid
+- Zeyad Saleh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-10 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: []