qalam_merit 4.5.07 → 4.5.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ab3c2aa42a726a285563b7bb673735df7b5a6b1018b797e8f0a17278c038fd
-  data.tar.gz: c188b2ceb645906ab83c32aaef4722e0c3d73ac5e4771a7a0561b412acaff8e1
+  metadata.gz: 3d1f73f153930fdd73e1ba773d40feb481ab847a7d6857623779de05eacb8817
+  data.tar.gz: 62ddf64eecbb98665f47c841476fc1d5045813ff97db1bcf9c8fe8347c026f57
 SHA512:
-  metadata.gz: 75dae6966612454a115ff99146709ff7aab85f7b10467ea5e8a259e2a54426f78b12a1ebc034a28e6d7c9396894d54479c785a61bfd5f7ca111d51f22ec4c556
-  data.tar.gz: 5460dcaf5db6bf795547af04f8eb8fea07c51a4a05fcaea8141f2d41178c873d4999f993530d890116d15c96f81bdc5ca328b33698f03ece4a2504dec2a754a5
+  metadata.gz: 8e1b99abd43904c894b2e75d590c0d901ab090a24a5f5d83fdd16af6c0307301a74ee93752e5c30f52a3281e763bb8132bb0a4ae14195ec546b29613c3cb6cb5
+  data.tar.gz: e976e63ad65c74580397199ea05e8f413a17a51834226066774b83c24517f8feb62cff128be39bb1e6c7e3ceccb338f15d21bfcd1e6121bc38ca94e183abb292

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

@@ -9,7 +9,6 @@ class CreateMeritBadges < ActiveRecord::Migration<%= migration_version %>
       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

data/lib/merit/generators/templates/badge.erb

@@ -1,6 +1,9 @@
 ### QALAM_MERIT ###
 class Merit::Badge < ActiveRecord::Base
+  # include Workflow
+  # include Context
   self.table_name = "merit_badges"
+  @valid_images = ["image/jpeg", "image/png", "image/bmp", "image/jpg"]
 
   before_validation :strip_whitespace
   def strip_whitespace
@@ -8,19 +11,27 @@ class Merit::Badge < ActiveRecord::Base
     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 :name, presence: true, length: { minimum: 3, maximum: 20 }
   validates :points, presence: true, numericality: true, :inclusion => 1..100
-  validates :description, presence: false, length: { maximum: 50 }
+  validates :description, presence: true, length: { minimum: 3, 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::QalamBadgeSash'
-  has_many :sashes, through: :badges_sashes, source: :sash
 
   def image_url
-    # self.image.public_url if self.image
+    if self.image
+      return self.image.public_url
+    else
+      return '/images/apple-touch-icon.png' 
+    end
+  end
+
+  def self.valid_images
+    @valid_images
+  end
+
+  def badges_sashes
+    Merit::BadgesSash.where(badge_id: self.id)
   end
 
   class << self
@@ -47,9 +58,6 @@ class Merit::Badge < ActiveRecord::Base
       badge
     end
 
-    # Defines Badge#meritable_models method, to get related
-    # entries with certain badge. For instance, Badge.find(3).users
-    # orm-specified
     def _define_related_entries_method(meritable_class_name)
       define_method(:"#{meritable_class_name.underscore.pluralize}") do
         sashes = Merit::QalamBadgeSash.where(badge_id: id).pluck(:sash_id)
@@ -58,11 +66,19 @@ class Merit::Badge < ActiveRecord::Base
     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
+      return true if ((attachment.nil? || attachment.to_s == "null") || account.nil? || badge.nil?)
+      if attachment.content_type && @valid_images.include?(attachment.content_type)
+        account.shard.activate do
+          att = Attachment.create_data_attachment(badge, attachment)
+          badge.image = att
+          badge.save!
+          badge
+        end
+        return true
+      else
+        badge.errors.add(:image, :invalid_format, message: 'invalid image format')
+        badge.destroy if badge.id
+        return false
       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.07'
+  s.version     = '4.5.08'
   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.07
+  version: 4.5.08
 platform: ruby
 authors:
 - Tute Costa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk