qalam_merit 4.5.01 → 4.5.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a062b61ba12835e8cc9ea7eeed4eb6b94eccaa7fdd4323cdc8efd226e5331aa7
-  data.tar.gz: b91428baa833ca06913fe27c2c54623db498e5a0a051c368fc3b3cb509e18971
+  metadata.gz: d32a4d56924a23f24741b8aa276cd54f32767ad51d8c04df8d138f4c82d2c427
+  data.tar.gz: 5202cdc4c9c90323f07dffe90eb1db4a6690df92dce156fb7466f30526482bf5
 SHA512:
-  metadata.gz: 2a3e6f2eceff7d5971e4e8ebfc71a71d7cc553e76ca7bb07c5c51e071bbeeefe782fe7d6be7c27ccab85fb514a7de83a2cf1246bd081246d6ddda5c79ab0e79a
-  data.tar.gz: dff4b30e28a4f91bbc49f661fbc55aee612ab8ae849e429f545089690b582e533c993b39f3b01ef0f9a2d41283c290660007ffb383feb0f94f1d39f62b52377b
+  metadata.gz: 3a64775d9aa10271625631b8bbad64482a3fc09c1776652a7fba52bdafb3a78da0a87ea5c1a7b3fd6d8f4c20dace827087c2c4790578fcd4eeb1d2634608e031
+  data.tar.gz: 73a2d727db358c669dccdf8e9f73212410c563ce50262e20052ab6b8cd73111f932cfb09aa1ae8fdc00edeaa68018278d0a99baaf9421d62492b5a8fa26679f4

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 rm_badge
+      methods = %w(badge_ids badges points add_badge add_qalam_badge rm_badge
                    add_points subtract_points score_points)
       methods.each { |method| delegate method, to: :_sash }
     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/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

@@ -0,0 +1,31 @@
+module Merit::Models::ActiveRecord
+  class QalamScore < ActiveRecord::Base
+    self.table_name = :merit_scores
+    belongs_to :sash,
+              foreign_key: "sash_id", 
+              class_name: 'Merit::Sash'
+    has_many :score_points,
+              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
+      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
+      delegate :sash_id, to: :score
+    end
+  end
+end
+
+class Merit::QalamScore < Merit::Models::ActiveRecord::QalamScore; end
+class Merit::QalamScore::Point < Merit::Models::ActiveRecord::QalamScore::Point; end

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

@@ -11,7 +11,7 @@ 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::MeritScore'
+    has_many :scores, dependent: :destroy, class_name: 'Merit::QalamScore'
 
     after_create :create_scores
 
@@ -20,7 +20,7 @@ module Merit::Models::ActiveRecord
     # @param category [String] The category
     # @return [ActiveRecord::Relation] containing the points
     def score_points(options = {})
-      scope = Merit::MeritScore::Point
+      scope = Merit::QalamScore::Point
                 .joins(:score)
                 .where('merit_scores.sash_id = ?', id)
       if (category = options[:category])

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

@@ -32,7 +32,7 @@ module Merit
       end
 
       def add_points(num_points, options = {})
-        point = Merit::MeritScore::Point.new
+        point = Merit::QalamScore::Point.new
         point.num_points = num_points
         scores
           .where(category: options[:category] || 'default')
@@ -48,7 +48,7 @@ module Merit
       private
 
       def create_scores
-        scores << Merit::MeritScore.create
+        scores << Merit::QalamScore.create
       end
     end
   end

data/lib/merit/models/sash_concern.rb

@@ -8,16 +8,27 @@ 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)
     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
@@ -31,7 +42,7 @@ module Merit::Models
     end
 
     def add_points(num_points, options = {})
-      point = Merit::MeritScore::Point.new
+      point = Merit::QalamScore::Point.new
       point.num_points = num_points
       scores
         .where(category: options[:category] || 'default')
@@ -47,7 +58,7 @@ module Merit::Models
     private
 
     def create_scores
-      scores << Merit::MeritScore.create
+      scores << Merit::QalamScore.create
     end
   end
 end

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.01'
+  s.version     = '4.5.06'
   s.authors     = ["Tute Costa", "Ahmed Abdelhamid"]
   s.email       = ['tutecosta@gmail.com', 'a.hamid@nezam.io']
 

data/test/integration/navigation_test.rb

@@ -107,12 +107,12 @@ class NavigationTest < ActionDispatch::IntegrationTest
     assert user.badges.empty?, 'Should not have badges'
 
     assert_equal 0, user.points
-    assert_equal 0, Merit::MeritScore::Point.count
+    assert_equal 0, Merit::QalamScore::Point.count
     user.add_points 15
     assert_equal 15, user.points
     user.subtract_points 15
     assert_equal 0, user.points
-    assert_equal 2, Merit::MeritScore::Point.count
+    assert_equal 2, Merit::QalamScore::Point.count
 
     # Tenth comment with errors doesn't change reputation
     badges = user.reload.badges

data/test/unit/{merit_score_test.rb → qalam_score_test.rb}

@@ -1,11 +1,11 @@
 require 'test_helper'
 
-describe Merit::Score do
+describe Merit::QalamScore do
   it 'Point#sash_id delegates to Score' do
-    score = Merit::MeritScore.new
+    score = Merit::QalamScore.new
     score.sash_id = 33
 
-    point = Merit::MeritScore::Point.new
+    point = Merit::QalamScore::Point.new
     point.score = score
 
     _(point.sash_id).must_be :==, score.sash_id

data/test/unit/sash_test.rb

@@ -10,7 +10,7 @@ class SashTest < ActiveSupport::TestCase
     describe "when category specified" do
       it "should create a new Point with specified category" do
         @sash.add_points 5, category: @custom_category
-        score = Merit::MeritScore.last
+        score = Merit::QalamScore.last
         point = score.score_points.last
 
         assert_equal point.num_points, 5
@@ -19,10 +19,10 @@ class SashTest < ActiveSupport::TestCase
     end
 
     it "should create a new Point in category default with specified number of points" do
-      assert_difference("Merit::MeritScore::Point.count", 1) do
+      assert_difference("Merit::QalamScore::Point.count", 1) do
         @sash.add_points 5
       end
-      score = Merit::MeritScore.last
+      score = Merit::QalamScore.last
       point = score.score_points.last
 
       assert_equal point.num_points, 5
@@ -34,7 +34,7 @@ class SashTest < ActiveSupport::TestCase
     describe "when category specified" do
       it "should create a new Point with specified category" do
         @sash.subtract_points 5, category: @custom_category
-        score = Merit::MeritScore.last
+        score = Merit::QalamScore.last
         point = score.score_points.last
 
         assert_equal point.num_points, -5
@@ -43,10 +43,10 @@ class SashTest < ActiveSupport::TestCase
     end
 
     it "should create a new Point in category default with inverse of specified number of points" do
-      assert_difference("Merit::MeritScore::Point.count", 1) do
+      assert_difference("Merit::QalamScore::Point.count", 1) do
         @sash.subtract_points 5
       end
-      score = Merit::MeritScore.last
+      score = Merit::QalamScore.last
       point = score.score_points.last
 
       assert_equal point.num_points, -5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_merit
 version: !ruby/object:Gem::Version
-  version: 4.5.01
+  version: 4.5.06
 platform: ruby
 authors:
 - Tute Costa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -158,7 +158,7 @@ files:
 - lib/merit/models/active_record/action.rb
 - lib/merit/models/active_record/activity_log.rb
 - lib/merit/models/active_record/badges_sash.rb
-- lib/merit/models/active_record/merit_score.rb
+- lib/merit/models/active_record/qalam_score.rb
 - lib/merit/models/active_record/sash.rb
 - lib/merit/models/badges_sash_concern.rb
 - lib/merit/models/base/badges_sash.rb
@@ -246,8 +246,8 @@ files:
 - test/test_helper.rb
 - test/unit/action_test.rb
 - test/unit/base_target_finder_test.rb
-- test/unit/merit_score_test.rb
 - test/unit/merit_unit_test.rb
+- test/unit/qalam_score_test.rb
 - test/unit/rule_unit_test.rb
 - test/unit/rules_matcher_test.rb
 - test/unit/sash_finder_test.rb
@@ -351,8 +351,8 @@ test_files:
 - test/test_helper.rb
 - test/unit/action_test.rb
 - test/unit/base_target_finder_test.rb
-- test/unit/merit_score_test.rb
 - test/unit/merit_unit_test.rb
+- test/unit/qalam_score_test.rb
 - test/unit/rule_unit_test.rb
 - test/unit/rules_matcher_test.rb
 - test/unit/sash_finder_test.rb

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

@@ -1,25 +0,0 @@
-module Merit::Models::ActiveRecord
-  class MeritScore < ActiveRecord::Base
-    self.table_name = :merit_scores
-    belongs_to :sash
-    has_many :score_points,
-             dependent: :destroy,
-             class_name: 'Merit::MeritScore::Point'
-
-    def points
-      score_points.group(:score_id).sum(:num_points).values.first || 0
-    end
-
-    class Point < ActiveRecord::Base
-      belongs_to :score, class_name: 'Merit::Score'
-      has_one :sash, through: :score
-      has_many :activity_logs,
-               class_name: 'Merit::ActivityLog',
-               as: :related_change
-      delegate :sash_id, to: :score
-    end
-  end
-end
-
-class Merit::MeritScore < Merit::Models::ActiveRecord::Score; end
-class Merit::MeritScore::Point < Merit::Models::ActiveRecord::Score::Point; end