qalam_merit 4.0.4 → 4.5.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d18cb74d9ddf61a7a7d053c66cde90d8595a2b1a4aa707bfe7ab463e8d083e4
-  data.tar.gz: 39f3ccf60a27aebbfed60abee1647143ca4b8cb63aab4b92942d1040e4558458
+  metadata.gz: 386d3c62bf3b26c03ad135cb78787e94dcba50aa9ff8e00901fff50f1970816a
+  data.tar.gz: 16d3cf72df7b2a8418577409d475ed76feeb01fb262f2652c83072ddda0c05e0
 SHA512:
-  metadata.gz: 27abe76d15dacfe849056f2fa47a435a4699f8d19bebb990866ec2f7f8f2357f136f130f573ce905ca52f9c9412fce42a039b877dc7ba86253f9f7d846d0f7b8
-  data.tar.gz: 6eaa19dbcb7d43c1e182bc18444420f6bc8bfdce6430a28a85453704e6c8bee391ac34ad3f5e257906868fc9a1565b9125689602eb283ee78f7fd27e81d11a8d
+  metadata.gz: aab0e7d069c2e76f8cf494cf066b912526ffbab7a85a460db9b0c4b1217a9040ca0285435905ed50626eb8c7036c73aa4fe8a65f2eca3ee23957bcd2563a7f0c
+  data.tar.gz: c65518af9ab3c4beee883147a93a50edcd2884d65f27d1d939245c8e13895a2508f899f65f281e5efc8f4a2059cfc0b451a5922fbc8c80f939b90dac4c211bbb

data/lib/merit/generators/install_generator.rb

@@ -9,12 +9,12 @@ module Merit
       def copy_migrations_and_model
         template 'merit.erb', 'config/initializers/merit.rb'
         sleep 1.1
-        template 'qalam_sash.erb', 'app/models/merit/qalam_sash.rb'
-        sleep 1.1
+        # template 'qalam_sash.erb', 'app/models/merit/qalam_sash.rb'
+        # sleep 1.1
         template 'badge.erb', 'app/models/merit/badge.rb'
         sleep 1.1
-        template 'qalam_badge_sash.erb', 'app/models/merit/qalam_badge_sash.rb'
-        sleep 1.1
+        # template 'qalam_badge_sash.erb', 'app/models/merit/qalam_badge_sash.rb'
+        # sleep 1.1
         template 'merit_badge_rules.erb', 'app/models/merit/badge_rules.rb'
         sleep 1.1
         template 'merit_point_rules.erb', 'app/models/merit/point_rules.rb'

data/lib/merit/generators/merit_generator.rb

@@ -9,7 +9,7 @@ module Merit
         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, "  belongs_to :sash, foreign_key: 'sash_id', class_name: 'Merit::Sash'\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

@@ -1,7 +1,8 @@
 module Merit::Models::ActiveRecord
   class BadgesSash < ActiveRecord::Base
     include Merit::Models::BadgesSashConcern
-
+    belongs_to :badge, foreign_key: "badge_id", class_name: 'Merit::Badge'
+    belongs_to :sash, foreign_key: "sash_id", class_name: 'Merit::Sash'
     has_many :activity_logs,
              class_name: 'Merit::ActivityLog',
              as: :related_change

data/lib/merit/models/active_record/{score.rb → qalam_score.rb}

@@ -1,17 +1,17 @@
 module Merit::Models::ActiveRecord
-  class Score < ActiveRecord::Base
+  class QalamScore < ActiveRecord::Base
     self.table_name = :merit_scores
     belongs_to :sash
     has_many :score_points,
              dependent: :destroy,
-             class_name: 'Merit::Score::Point'
+             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, class_name: 'Merit::Score'
+      belongs_to :score, class_name: 'Merit::QalamScore'
       has_one :sash, through: :score
       has_many :activity_logs,
                class_name: 'Merit::ActivityLog',
@@ -21,5 +21,5 @@ module Merit::Models::ActiveRecord
   end
 end
 
-class Merit::Score < Merit::Models::ActiveRecord::Score; end
-class Merit::Score::Point < Merit::Models::ActiveRecord::Score::Point; 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

@@ -7,9 +7,11 @@ module Merit::Models::ActiveRecord
   # unnecessary. It should be transparent at the application.
   class Sash < ActiveRecord::Base
     include Merit::Models::SashConcern
+    self.table_name = "sashes"
 
     has_many :badges_sashes, dependent: :destroy
-    has_many :scores, dependent: :destroy, class_name: 'Merit::Score'
+    has_many :badges, through: :badges_sashes, source: :badge
+    has_many :scores, dependent: :destroy, class_name: 'Merit::QalamScore'
 
     after_create :create_scores
 
@@ -18,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.0.4'
+  s.version     = '4.5.03'
   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.0.4
+  version: 4.5.03
 platform: ruby
 authors:
 - Tute Costa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-02-28 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