qalam_merit 4.5.00 → 4.5.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab565f1556eaadc0a27bae07268086f9fa1b12eb22a3d4c632e6012007273be
-  data.tar.gz: b552bf47e0e58f023d1ff914ab8510fd8096667b7642715da40c57c88830048e
+  metadata.gz: 36dd98bb62a667ae5b42ca9edb1a6aa9d547a139d268f9da523476937d61d077
+  data.tar.gz: 3d36fe5887fc5844b4e13f342e73216d7fc8ab1f6d70e1a458437c9b86fd247e
 SHA512:
-  metadata.gz: 36ba58be649f037433f84febc55d172cecbc5ac9eb86a829105c5314f74891c4205f79d876710a62ffe0a9f8f9e0c49b296a1b9fb72371845ffcf778b4d1b850
-  data.tar.gz: 9a4367ae89c7680fbe09dfef4255e2a0abc50e19dae684980458fa715829d5e58a46bb2e2689df7300f6a01960fd6fbd9689aac0db80884cee685aceead4f8c7
+  metadata.gz: b797616130749f3f74ad7b2737dc32461866896547f32f9039d56474f309d20a07113a42f0fa3dd0af105450b511455ff4b769a517d5656885cdfc56194c6780
+  data.tar.gz: 26bc8ce7e1adcee901aaa6f929a0e89d73d22b7088c30cc5321c1369ca4528593417a48336ff6e31b5c03d94505adc6df3701a92bd9f825e1828db0da6d3638b

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::QalamSash'\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/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::Score'
+    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::Score::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::Score::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::Score.create
+        scores << Merit::QalamScore.create
       end
     end
   end

data/lib/merit/models/sash_concern.rb

@@ -31,7 +31,7 @@ module Merit::Models
     end
 
     def add_points(num_points, options = {})
-      point = Merit::Score::Point.new
+      point = Merit::QalamScore::Point.new
       point.num_points = num_points
       scores
         .where(category: options[:category] || 'default')
@@ -47,7 +47,7 @@ module Merit::Models
     private
 
     def create_scores
-      scores << Merit::Score.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.00'
+  s.version     = '4.5.05'
   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::Score::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::Score::Point.count
+    assert_equal 2, Merit::QalamScore::Point.count
 
     # Tenth comment with errors doesn't change reputation
     badges = user.reload.badges

data/test/unit/{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::Score.new
+    score = Merit::QalamScore.new
     score.sash_id = 33
 
-    point = Merit::Score::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::Score.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::Score::Point.count", 1) do
+      assert_difference("Merit::QalamScore::Point.count", 1) do
         @sash.add_points 5
       end
-      score = Merit::Score.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::Score.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::Score::Point.count", 1) do
+      assert_difference("Merit::QalamScore::Point.count", 1) do
         @sash.subtract_points 5
       end
-      score = Merit::Score.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.00
+  version: 4.5.05
 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,8 +158,8 @@ 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/qalam_score.rb
 - lib/merit/models/active_record/sash.rb
-- lib/merit/models/active_record/score.rb
 - lib/merit/models/badges_sash_concern.rb
 - lib/merit/models/base/badges_sash.rb
 - lib/merit/models/base/sash.rb
@@ -247,11 +247,11 @@ files:
 - test/unit/action_test.rb
 - test/unit/base_target_finder_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
 - test/unit/sash_test.rb
-- test/unit/score_test.rb
 - test/unit/target_finder_test.rb
 homepage: https://github.com/merit-gem/merit
 licenses:
@@ -352,9 +352,9 @@ test_files:
 - test/unit/action_test.rb
 - test/unit/base_target_finder_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
 - test/unit/sash_test.rb
-- test/unit/score_test.rb
 - test/unit/target_finder_test.rb

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

@@ -1,25 +0,0 @@
-module Merit::Models::ActiveRecord
-  class Score < ActiveRecord::Base
-    self.table_name = :merit_scores
-    belongs_to :sash
-    has_many :score_points,
-             dependent: :destroy,
-             class_name: 'Merit::Score::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::Score < Merit::Models::ActiveRecord::Score; end
-class Merit::Score::Point < Merit::Models::ActiveRecord::Score::Point; end