qalam_merit 4.5.04 → 4.5.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 140a8d032105ba04f4aa8437a96c11a3dfb16d8a0f69f0d8f35ffba23fed32cc
-  data.tar.gz: 19c14cbe7e3bd1b43ad3a40bd708fb1c4b987200ec6644286b069cc3d69c7384
+  metadata.gz: 54fd36c8d0594e5288774e2caf5b4bca4b642e63fefd50d564b80ce5abdbaae0
+  data.tar.gz: 7bf97cb6b288354c70bf82f2573d37db6b363230309243848ed7335240282e30
 SHA512:
-  metadata.gz: 4980b0106912407b27bb599417109b8b8d43da16f97015fbb82fd6ea71be7eef7a740c73ef773bc95dbd7e0a5d168ecbfdc2d9798210f92d90fb61e42a1119e1
-  data.tar.gz: a851a6488e8b3ae6ab62d431c01f3c1b28f1f138c210a22b8daaab84ac8174654da0378057c91c8fdb2b9d37aa9bd7fa75c84b2ff8abdb808bb5dbdfaddbc86f
+  metadata.gz: 0ecdd00a696088ac97a9ed78671f3c3f8a98da81a89d1d722306c4b6c46cd86f3cc8c9262eb09408afaee973a62891ead6f2260b0b2de775c3eacef09c8ea3f8
+  data.tar.gz: f04638fd6694a4f0af6aae82d5db77b30263d494f3267530247b161a31f07454275cf6abfa994b783c40ee58370cb0b7f90a691ee4f61981168ae9af937b0b85

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

@@ -8,8 +8,10 @@ module Merit
       def inject_merit_content
         if model_exists?
           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'\n")
-          inject_into_class(model_path, class_name, "  belongs_to :sash, foreign_key: 'sash_id', class_name: 'Merit::Sash'\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")
         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

@@ -1,18 +1,24 @@
 module Merit::Models::ActiveRecord
   class QalamScore < ActiveRecord::Base
     self.table_name = :merit_scores
-    belongs_to :sash
+    belongs_to :sash,
+              foreign_key: "sash_id", 
+              class_name: 'Merit::Sash'
     has_many :score_points,
-             dependent: :destroy,
-             class_name: 'Merit::QalamScore::Point'
+              dependent: :destroy,
+              foreign_key: "score_id",
+              class_name: 'Merit::QalamScore::Point'
 
     def points
       score_points.group(:score_id).sum(:num_points).values.first || 0
     end
 
     class Point < ActiveRecord::Base
-      belongs_to :score, foreign_key: "score_id", class_name: 'Merit::QalamScore'
-      has_one :sash, through: :score
+      self.table_name = :merit_score_points
+      belongs_to :score, 
+                  foreign_key: "score_id", 
+                  class_name: 'Merit::QalamScore'
+      has_one :sash, through: :score, source: :sash
       has_many :activity_logs,
                class_name: 'Merit::ActivityLog',
                as: :related_change

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.04'
-  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.04
+  version: 4.5.09
 platform: ruby
 authors:
-- Tute Costa
 - Ahmed Abdelhamid
+- Zeyad Saleh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 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: []