qalam_merit 4.5.04 → 4.5.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 140a8d032105ba04f4aa8437a96c11a3dfb16d8a0f69f0d8f35ffba23fed32cc
-  data.tar.gz: 19c14cbe7e3bd1b43ad3a40bd708fb1c4b987200ec6644286b069cc3d69c7384
+  metadata.gz: 36dd98bb62a667ae5b42ca9edb1a6aa9d547a139d268f9da523476937d61d077
+  data.tar.gz: 3d36fe5887fc5844b4e13f342e73216d7fc8ab1f6d70e1a458437c9b86fd247e
 SHA512:
-  metadata.gz: 4980b0106912407b27bb599417109b8b8d43da16f97015fbb82fd6ea71be7eef7a740c73ef773bc95dbd7e0a5d168ecbfdc2d9798210f92d90fb61e42a1119e1
-  data.tar.gz: a851a6488e8b3ae6ab62d431c01f3c1b28f1f138c210a22b8daaab84ac8174654da0378057c91c8fdb2b9d37aa9bd7fa75c84b2ff8abdb808bb5dbdfaddbc86f
+  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::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/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/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.04'
+  s.version     = '4.5.05'
   s.authors     = ["Tute Costa", "Ahmed Abdelhamid"]
   s.email       = ['tutecosta@gmail.com', 'a.hamid@nezam.io']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qalam_merit
 version: !ruby/object:Gem::Version
-  version: 4.5.04
+  version: 4.5.05
 platform: ruby
 authors:
 - Tute Costa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk