qalam_merit 4.5.11 → 4.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deec567df823559e660d23204391e9552705a649f57201eb79d30e21d5be727f
-  data.tar.gz: 7e1bb67952c7ec3cc5f00e8649b59b1526a5099590b22d51240af7af54f21652
+  metadata.gz: bebc2893139c8f3842d8c2f48de029fb2fef9c4323725e237c3ef31eb7452d9b
+  data.tar.gz: aab590590e4ac73b91dd1abc8f6b6bfa3284cc92515001128fcb73d4f3a1b98b
 SHA512:
-  metadata.gz: f6a50d73f6e1cad5dbfd5658874fa1412f41abf2543aec1659ea0aaf5a67627935601abd5a9726544545402222d074d857f9b162c19a8efc333dce60079442de
-  data.tar.gz: 3758d8266ea7dea46c9a7282e314569f4cdbb7421486255ad26a0f245be880a4acef9eb66d04c4f6b311c3e60a353b0af70e5198005683c8cc41bf78b895e83a
+  metadata.gz: 31b5e8af9870057622b6f84feaf3816a34971e8af03b0f15b8307a9d68716def3168971400c535030a4eb95c8a84c134362a255508df7c2d091ed1d11700e82c
+  data.tar.gz: 3aef2ce1fe1a809077daedf6341672b353542f5dce166d714bf6abf6882c30278f5d982da75f52fc6d636db45446d13399752f539aa65c0b0b542ffdf5736431

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

@@ -15,8 +15,8 @@ module Merit
           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', dependent: :destroy\n")
-          inject_into_class(course_path, "Course", "  has_many :score_points, class_name: 'Merit::QalamScore::Point', dependent: :destroy\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

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,9 +23,7 @@ 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'
+      belongs_to :context, :polymorphic => true
     end
   end
 end

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,8 +19,8 @@ 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
@@ -41,7 +41,7 @@ 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
+      point.context = options[:context]
       scores
       .where(category: options[:category] || 'default')
       .first_or_create

data/qalam_merit.gemspec

@@ -6,7 +6,7 @@ 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.11'
+  s.version     = '4.5.12'
   s.authors     = ["Ahmed Abdelhamid", "Zeyad Saleh"]
   s.email       = ['a.hamid@nezam.io', 'zeyad.saleh@nezam.io']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_merit
 version: !ruby/object:Gem::Version
-  version: 4.5.11
+  version: 4.5.12
 platform: ruby
 authors:
 - Ahmed Abdelhamid
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -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