curricula 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535c26d72e09f06da00b2d9681a32b8d9682681a
-  data.tar.gz: 99bdd3c672f529fa7d1e8727c116c28167304c0e
+  metadata.gz: 232b1d7fd959f48ed2923c81a67bf0adede85fed
+  data.tar.gz: 55e09181ed74124ab5839d3cd54e53164026d6e5
 SHA512:
-  metadata.gz: bc3b1188949dd8ece80157e47817a5d19d53f4617f425d5183a440b7f13431f1925c98bf8e2ab61e905d59efca34f27753b2c9b2123bd890729c37ffc6bd0aee
-  data.tar.gz: 741724f95920ef73e5b0232f215f5c1749057b8b80907c3fb1746a67473ae4047428550f6242f3937a7f87bceb15cd86fddfd0926e727fe9aaa1e435c42c15c8
+  metadata.gz: 952cf6b5ca4596d6a3796745ed9927c971c94177f3833f72010959546d6fddc2f5eed3dfc1376f14977860c6ccf8c1cae877d77773fd63ca750b9b67e8e670bf
+  data.tar.gz: ce280ca40dfd635f5dd794833883bb1fae92682bfb4c2994bfaf227d7bd5e0ef17e153648869c9e8ad781eedd2234d6b509894de108281e58cc5d1235fcf42c4

data/lib/curricula/version.rb

@@ -1,3 +1,3 @@
 module Curricula
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/curricula.rb

@@ -16,7 +16,7 @@ module Curricula
     end
 
     def graph_edges
-      prereqs.map{ |prereq| { source: prereq.name, destination: name } }
+      prereqs.map{ |prereq| { source: prereq, destination: name } }
     end
   
   end
@@ -68,18 +68,18 @@ module Curricula
     def build_courses
       Spreadsheet.open(@spreadsheet).worksheets.first.each do |row|
         if row[1]
-          @courses[row.last].prereqs << @courses[row.first]
+          @courses[row.last].prereqs << row.first
           increase_cruciality row.first, row.last
         else
           @courses[row.first] = Course.new row.first, row.last
         end
-      end rescue error :format
+      end #rescue error :format
     end
   
     def course_hours course, visited = []
-      error :circular if visited.include? course
-      visited << course
-      course.hours + course.prereqs.map{ |prereq| course_hours(prereq, visited).to_i }.reduce(:+).to_i
+      error :circular if visited.include? course.name
+      visited << course.name
+      course.hours + course.prereqs.map{ |prereq| course_hours(@courses[prereq], visited).to_i }.reduce(:+).to_i
     end
 
     def increase_cruciality prerequisite, course

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curricula
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ricardo Piro-Rael