lib/belajar/solution.rb in belajar-0.1.1 vs lib/belajar/solution.rb in belajar-1.0.0

@@ -1,53 +1,61 @@
 module Belajar
   class Solution
+    FILE_SUFFIX = '_solution.rb'.freeze
 
-    FILE_SUFFIX = '_solution.rb'
-
     attr_reader :code, :path, :errors
 
     def initialize(unit_path)
       @unit_path = unit_path
-      @path = solution_path(unit_path)
-      @code = File.read(@path).strip if File.file?(@path)
-      @verified = get_store_state
+      @path      = solution_path(unit_path)
+      @code      = load_code(@path)
+      @verified  = store_state
     end
 
     def verify!
-      result = Belajar::Test.new(@unit_path).run(self.code)
-      set_store_state(result.passed?)
+      @code = load_code(@path)
+      result = Belajar::Test.new(@unit_path).run(@code)
+      self.store_state = result.passed?
       result
     end
 
     def verified?
       !!@verified
     end
 
     def store_key
       unless @store_key
-        part_path = path.split('/')[-3..-1].join('/').gsub(FILE_SUFFIX, '')
+        part_path  = path.split('/')[-3..-1].join('/').gsub(FILE_SUFFIX, '')
         @store_key = Storeable.key(part_path, prefix: 'verified')
       end
 
       @store_key
     end
 
     private
 
+    def load_code(path)
+      File.read(path).strip if File.file?(path)
+    end
+
     def solution_path(path)
-      local_path = Belajar.config.solutions_path
-      sub_dirs = Storeable.key(path.split('/')[-3..-2].join('/').gsub(FILE_SUFFIX, ''))
-      file = Storeable.key(File.basename(path)) + FILE_SUFFIX
+      local_path    = Belajar.config.solutions_path
+      sub_directory = Storeable.key(directory_from(path))
+      file          = Storeable.key(File.basename(path)) + FILE_SUFFIX
 
-      File.join(local_path, sub_dirs, file)
+      File.join(local_path, sub_directory, file)
     end
 
-    def set_store_state(verified)
+    def directory_from(path)
+      path.split('/')[-3..-2].join('/').gsub(FILE_SUFFIX, '')
+    end
+
+    def store_state=(verified)
       @verified = verified
       QuickStore.store.set(store_key, verified?)
     end
 
-    def get_store_state
+    def store_state
       QuickStore.store.get(store_key)
     end
   end
-end
\ No newline at end of file
+end