qalam_merit 4.0.35 → 4.5.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1129dc2d896557cf6d10ff44b69774fba8c6f665463a11dff9e03700d01122
-  data.tar.gz: 96b5f59cf1ad71cfe5f1aadee19b81442b9787a5972c01f0ae9d273e0eac8901
+  metadata.gz: 140a8d032105ba04f4aa8437a96c11a3dfb16d8a0f69f0d8f35ffba23fed32cc
+  data.tar.gz: 19c14cbe7e3bd1b43ad3a40bd708fb1c4b987200ec6644286b069cc3d69c7384
 SHA512:
-  metadata.gz: a4766494fb1d6fbb73b559648bde642f9216871148bcde5493413aefa9b664e992bd679ae0a943d05ce2e2b1488c0063074a91dc993a1cc0bc94bdb5a3f3abf6
-  data.tar.gz: 1f6cd67f0fa33b5ea14c64ec2b5b98ffa153a3fb05324ba6cc11b954ed40981c1509667e9f8fe99c6d3e0ee69aae956f1b860cdc667fcb95315b4379b65ceb54
+  metadata.gz: 4980b0106912407b27bb599417109b8b8d43da16f97015fbb82fd6ea71be7eef7a740c73ef773bc95dbd7e0a5d168ecbfdc2d9798210f92d90fb61e42a1119e1
+  data.tar.gz: a851a6488e8b3ae6ab62d431c01f3c1b28f1f138c210a22b8daaab84ac8174654da0378057c91c8fdb2b9d37aa9bd7fa75c84b2ff8abdb808bb5dbdfaddbc86f

data/lib/merit/generators/active_record/templates/create_merit_badges.erb

@@ -7,10 +7,10 @@ class CreateMeritBadges < ActiveRecord::Migration<%= migration_version %>
       t.integer :points, default: 0
       t.text :description
       t.string :difficulty
+      t.boolean :active, default: true
       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
   end

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 'sash.erb', 'app/models/merit/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 'badge_sash.erb', 'app/models/merit/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/templates/badge.erb

@@ -1,27 +1,38 @@
 ### QALAM_MERIT ###
-class Merit::Badge < ApplicationRecord
+class Merit::Badge < ActiveRecord::Base
   self.table_name = "merit_badges"
 
-  validates :name, presence: true, length: { minimum: 3 }
-  validates :points, numericality: true, :inclusion => 1..20
+  before_validation :strip_whitespace
+  def strip_whitespace
+    self.name = self.name.strip unless self.name.nil?
+    self.description = self.description.strip unless self.description.nil?
+  end
+
+  validates :root_account_id, presence: true
+  validates :name, presence: true, length: { minimum: 3, maximum: 10 }
+  validates :points, presence: true, numericality: true, :inclusion => 1..100
   validates :description, presence: false, length: { maximum: 50 }
 
   has_one :image, :class_name => 'Attachment', :as => :context, :inverse_of => :context, :dependent => :destroy
   belongs_to :root_account, foreign_key: "root_account_id", class_name: 'Account'
   belongs_to :created_by, foreign_key: "user_id", class_name: 'User'
-  has_many :badges_sashes, class_name: 'Merit::BadgeSash'
+  has_many :badges_sashes, class_name: 'Merit::QalamBadgeSash'
   has_many :sashes, through: :badges_sashes, source: :sash
 
+  def image_url
+    # self.image.public_url if self.image
+  end
+
   class << self
     def find_by_id(ids)
       ids = Array.wrap(ids)
       find { |b| ids.include? b[:id] }
     end
-  
+
     def by_name(name)
       find { |b| b.name.to_s == name.to_s }
     end
-  
+
     def by_level(level)
       find { |b| b.level.to_s == level.to_s }
     end
@@ -41,9 +52,18 @@ class Merit::Badge < ApplicationRecord
     # orm-specified
     def _define_related_entries_method(meritable_class_name)
       define_method(:"#{meritable_class_name.underscore.pluralize}") do
-        sashes = Merit::BadgeSash.where(badge_id: id).pluck(:sash_id)
+        sashes = Merit::QalamBadgeSash.where(badge_id: id).pluck(:sash_id)
         meritable_class_name.constantize.where(sash_id: sashes)
       end
     end
+
+    def create_with_attachment(account, badge, attachment)
+      account.shard.activate do
+        att = Attachment.create_data_attachment(badge, attachment)
+        badge.image = att
+        badge.save!
+        badge
+      end
+    end
   end
 end

data/lib/merit/generators/templates/{badge_sash.erb → qalam_badge_sash.erb}

@@ -1,15 +1,15 @@
 ### QALAM_MERIT ###
-class Merit::BadgeSash < ApplicationRecord
+class Merit::QalamBadgeSash < ActiveRecord::Base
     self.table_name = "badges_sashes"
     belongs_to :badge, foreign_key: "badge_id", class_name: 'Merit::Badge'
-    belongs_to :sash, foreign_key: "sash_id", class_name: 'Merit::Sash'
+    belongs_to :sash, foreign_key: "sash_id", class_name: 'Merit::QalamSash'
     # has_many :users, through: :sash, source: :users
 
     class << self
         def user(badge_sash_id = nil)
             return [] unless badge_sash_id
 
-            return [] unless badge_sash = Merit::BadgeSash.find(badge_sash_id)
+            return [] unless badge_sash = Merit::QalamBBadgeSash.find(badge_sash_id)
             sash = badge_sash.sash
 
             return [] unless sash && sash.id && sash_id = sash.id
@@ -18,4 +18,3 @@ class Merit::BadgeSash < ApplicationRecord
         end
     end
 end
-  

data/lib/merit/generators/templates/{sash.erb → qalam_sash.erb}

@@ -1,7 +1,7 @@
 ### QALAM_MERIT ###
-class Merit::Sash < ApplicationRecord
+class Merit::QalamSash < ActiveRecord::Base
     self.table_name = "sashes"
-    has_many :badges_sashes, class_name: 'Merit::BadgeSash'
+    has_many :badges_sashes, class_name: 'Merit::QalamBadgeSash'
     has_many :badges, through: :badges_sashes, source: :badge
 
     class << self
@@ -12,4 +12,3 @@ class Merit::Sash < ApplicationRecord
         end
     end
 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, foreign_key: "score_id", 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.35'
+  s.version     = '4.5.04'
   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.35
+  version: 4.5.04
 platform: ruby
 authors:
 - Tute Costa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -147,19 +147,19 @@ files:
 - lib/merit/generators/merit_generator.rb
 - lib/merit/generators/remove_generator.rb
 - lib/merit/generators/templates/badge.erb
-- lib/merit/generators/templates/badge_sash.erb
 - lib/merit/generators/templates/merit.erb
 - lib/merit/generators/templates/merit_badge_rules.erb
 - lib/merit/generators/templates/merit_point_rules.erb
 - lib/merit/generators/templates/merit_rank_rules.erb
-- lib/merit/generators/templates/sash.erb
+- lib/merit/generators/templates/qalam_badge_sash.erb
+- lib/merit/generators/templates/qalam_sash.erb
 - lib/merit/judge.rb
 - lib/merit/models/action_concern.rb
 - 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