qalam_merit 4.0.35 → 4.5.00

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1129dc2d896557cf6d10ff44b69774fba8c6f665463a11dff9e03700d01122
-  data.tar.gz: 96b5f59cf1ad71cfe5f1aadee19b81442b9787a5972c01f0ae9d273e0eac8901
+  metadata.gz: 4ab565f1556eaadc0a27bae07268086f9fa1b12eb22a3d4c632e6012007273be
+  data.tar.gz: b552bf47e0e58f023d1ff914ab8510fd8096667b7642715da40c57c88830048e
 SHA512:
-  metadata.gz: a4766494fb1d6fbb73b559648bde642f9216871148bcde5493413aefa9b664e992bd679ae0a943d05ce2e2b1488c0063074a91dc993a1cc0bc94bdb5a3f3abf6
-  data.tar.gz: 1f6cd67f0fa33b5ea14c64ec2b5b98ffa153a3fb05324ba6cc11b954ed40981c1509667e9f8fe99c6d3e0ee69aae956f1b860cdc667fcb95315b4379b65ceb54
+  metadata.gz: 36ba58be649f037433f84febc55d172cecbc5ac9eb86a829105c5314f74891c4205f79d876710a62ffe0a9f8f9e0c49b296a1b9fb72371845ffcf778b4d1b850
+  data.tar.gz: 9a4367ae89c7680fbe09dfef4255e2a0abc50e19dae684980458fa715829d5e58a46bb2e2689df7300f6a01960fd6fbd9689aac0db80884cee685aceead4f8c7

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/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::Sash'\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_merit\n")
           inject_into_class(model_path, class_name, "  ### QALAM_MERIT ###\n")
         end

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/sash.rb

@@ -7,8 +7,10 @@ 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 :badges, through: :badges_sashes, source: :badge
     has_many :scores, dependent: :destroy, class_name: 'Merit::Score'
 
     after_create :create_scores

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.00'
   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.0.35
+  version: 4.5.00
 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-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -147,12 +147,12 @@ 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