lib/avromatic/model_registry.rb in avromatic-0.9.0.rc2 vs lib/avromatic/model_registry.rb in avromatic-0.9.0.rc3

@@ -16,24 +16,24 @@
     end
 
     def register(model)
       raise 'models with a key schema are not supported' if model.key_avro_schema
       name = model.avro_schema.fullname
-      name = remove_prefix(name) if @prefix
+      name = remove_prefix(name)
       @hash[name] = model
     end
 
     def registered?(fullname)
       @hash.key?(fullname)
     end
 
-    private
-
     def remove_prefix(name)
+      return name if @prefix.nil?
+
       value =
         case @prefix
         when String
-          name.from(@prefix.length) if name.start_with?(@prefix)
+          name.start_with?(@prefix) ? name.from(@prefix.length) : name
         when Regexp
           name.sub(@prefix, '')
         else
           raise "unsupported `remove_namespace_prefix` value: #{@prefix}"
         end