moodle2cc 0.2.25 → 0.2.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmZiYjA4YzA2YWQ5ODI3NTA4NWYxMjg5NGFmNzMxZGYzN2Q1YzBiOA==
+    YjBmYzFhMDg1ODIyM2ExMWFkN2NhZjg5MDYxNzY2OTY0MWQ0MmM3Ng==
   data.tar.gz: !binary |-
-    OTk1Zjk2MzQ3YTVhMmY1NmMzYWRjNTIyODg3ODIxZTU2YjgyMjE4Ng==
+    NmZlYzczODI0NjE5OWNjNmFkZjExNDhiYTEyOTlmMGFlMWMwOGQ3Mw==
 SHA512:
   metadata.gz: !binary |-
-    N2M2YzMwOTEzMmFkMzdiNjYyM2NmMjYzOTIzYjlmOGRiZjcwNzBmOWY5YzAx
-    MzdhYzZmYTFlNDU2N2ExODAyZWEyZmNkYmZkOWZhZmZkYzZhMTI3M2RlNTU2
-    NmY3ZWY2YzYwMDhhYzU4Y2U2MDE0Mzk1NzE4MDAxMWE0ODg4OGM=
+    YWUxNGFmMmQ0NjNhZGQ5ZjE4NzZmMGZmNzJkZTM2ZGMzMDllMTFmZWQxZGUz
+    NTYzNDgzOTk2MGU5MTBkY2E0NGYyODQyZTYyYzkxMWMwMTZjNGE4MmI3MWU1
+    OWExMWE5NzFhYzFkMjEzNjdiOTEzMGFmYTgyMWE5NWMwYmJiOWY=
   data.tar.gz: !binary |-
-    MTZmMTRiN2NhZmU4ZjM4YzNkYWZiNjExOWMxMDMwMzA3ZDU3NjJmOTJmN2M3
-    MGYzOWI1YWFiZDBhMzFmNzU3YmQwZGUwYzIyNGQ2NjliNTMxODdmMDRiMGMw
-    ZGEzNjk4OTUwYTQ5ZjMyYzgzNDk0M2RmZmY2ZDFhYjk5MzJkZTY=
+    MzY5OGU4MjM4NzI4OTFjYTMwNjNlNTM1NTg5MTVlY2FjZTNjNzViZTA0ZTAz
+    ODk2MjljMTQ1ZDMxZDBkNDRhNTkwYTI2MDZhNjlkZmQwNjIzYmI0ZmEwOWEz
+    ZDI5NTQwZjRmZDMyNjAyMGE0NjgwZWU0NDhjNTMzZTEyMTA4ZWQ=

data/Changelog

@@ -1,3 +1,6 @@
+2015-09-23 Version 0.2.26
+  * Handles duplicated ids better in Moodle 2 packages
+
 2015-08-04 Version 0.2.25
   * Changes happymapper dependency
 

data/lib/moodle2cc/moodle2converter/converter_helper.rb

@@ -57,7 +57,20 @@ module Moodle2CC
     end
 
     def generate_unique_identifier_for(id, suffix = nil)
-      "m2#{Digest::MD5.hexdigest(id.to_s)}#{suffix}"
+      unique_id = "m2#{Digest::MD5.hexdigest(id.to_s)}#{suffix}"
+      @@ids ||= Set.new
+      if @@ids.include?(unique_id)
+        # i was under the impression that moodle ids would be unique themselves
+        # but i have been apparently misinformed
+        original_id = unique_id
+        index = 0
+        while @@ids.include?(unique_id)
+          index += 1
+          unique_id = "#{original_id}#{index}"
+        end
+      end
+      @@ids << unique_id
+      unique_id
     end
 
     def activity_content_type(activity)

data/lib/moodle2cc/version.rb

@@ -1,3 +1,3 @@
 module Moodle2CC
-  VERSION = "0.2.25"
+  VERSION = "0.2.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moodle2cc
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Christopher Durtschi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip