daigaku 0.0.2 → 0.1.0

data/spec/daigaku/views/chapters_menu_spec.rb

@@ -2,7 +2,5 @@ require 'spec_helper'
 
 describe Daigaku::Views::ChaptersMenu, type: :view do
 
-  it { is_expected.to respond_to :enter_chapters_menu }
-  it { is_expected.to respond_to :reenter_chapters_menu }
-
+  it { is_expected.to be_a Daigaku::Views::Menu }
 end

data/spec/daigaku/views/courses_menu_spec.rb

@@ -2,7 +2,5 @@ require 'spec_helper'
 
 describe Daigaku::Views::CoursesMenu, type: :view do
 
-  it { is_expected.to respond_to :enter }
-  it { is_expected.to respond_to :reenter_courses_menu }
-
+  it { is_expected.to be_a Daigaku::Views::Menu }
 end

data/spec/daigaku/views/menu_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Daigaku::Views::Menu do
+
+  it { is_expected.to respond_to :enter }
+  it { is_expected.to respond_to :reenter }
+
+  [
+    :show,
+    :draw,
+    :interact_with,
+    :models,
+    :items
+  ].each do |method|
+    it "has a protected method ##{method}" do
+      expect(subject.protected_methods).to include(method)
+    end
+  end
+end

data/spec/daigaku/views/task_view_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe Daigaku::Views::TaskView, type: :view do
 
-  it { is_expected.to respond_to :enter_task_view }
+  it { is_expected.to respond_to :enter }
 
 end

data/spec/daigaku/views/units_menu_spec.rb

@@ -2,7 +2,5 @@ require 'spec_helper'
 
 describe Daigaku::Views::UnitsMenu, type: :view do
 
-  it { is_expected.to respond_to :enter_units_menu }
-  it { is_expected.to respond_to :reenter_units_menu }
-
+  it { is_expected.to be_a Daigaku::Views::Menu }
 end

data/spec/daigaku/views_spec.rb

@@ -12,8 +12,6 @@ describe Daigaku::Views do
 
   [
     :default_window,
-    :top_bar,
-    :main_panel,
     :sub_window_below_top_bar
   ].each do |method|
     it "has a private method ::#{method}" do

data/spec/daigaku_spec.rb

@@ -48,10 +48,4 @@ describe "Daigaku module" do
       expect(Daigaku.config.solutions_path).to eq courses_basepath
     end
   end
-
-  describe "::database" do
-    it "returns a Diagaku::Database instance" do
-      expect(Daigaku.database).to be_a Daigaku::Database
-    end
-  end
 end

data/spec/support/macros/content_helpers.rb

@@ -87,7 +87,7 @@ module ContentHelpers
       }
     #
 
-  TEST_PASSED_MESSAGE = "Your code passed all tests. Congratulations!"
+  TEST_PASSED_MESSAGE = "Your code passed all tests."
   EXAMPLE_PASSED_MESSAGE = "Your code passed this requirement."
 
   def task_file_content

data/spec/support/macros/mock_helpers.rb

@@ -7,7 +7,12 @@ module MockHelpers
   def use_test_storage_file
     Daigaku::Configuration.send(:new)
     Daigaku.config.instance_variable_set(:@storage_file, local_storage_file)
-    Daigaku::Database.send(:new)
+
+    QuickStore.configure do |config|
+      config.file_path = Daigaku.config.storage_file
+    end
+
+    QuickStore.store.send(:new)
   end
 
   def suppress_print_out

data/spec/support/macros/path_helpers.rb

@@ -5,8 +5,8 @@ module PathHelpers
   SOLUTIONS = 'solutions'
   TEMP_PATH = File.expand_path("../../../../tmp/", __FILE__)
   COURSE_DIR_NAMES = ['Course_A', 'Course_B']
-  CHAPTER_DIR_NAMES = ['Chapter-1', 'Chapter-2']
-  UNIT_DIR_NAMES = ['unit-1', 'unit-2']
+  CHAPTER_DIR_NAMES = ['1_Chapter-A', '2_Chapter-B']
+  UNIT_DIR_NAMES = ['1_unit-a', '2_unit-b']
   TASK_NAME = 'task.md'
   REFERENCE_SOLUTION_NAME = 'solution.rb'
   TEST_NAME = 'solution_spec.rb'
@@ -45,7 +45,7 @@ module PathHelpers
   end
 
   def courses_basepath
-    File.join(test_basepath, COURSES)
+    File.join(test_basepath, LOCAL_DIR, COURSES)
   end
 
   def solutions_basepath
@@ -86,11 +86,17 @@ module PathHelpers
 
   def all_solution_file_paths
     all_unit_dirs.map do |unit_dir|
-      underscored_unit_dir =  File.basename(unit_dir).gsub(/(\_+|\-+|\.+)/, '_')
-      file_name = underscored_unit_dir + Daigaku::Generator::SOLUTION_SUFFIX
+      underscored_unit_dir =  File.basename(unit_dir).gsub(/[\_\-\.]+/, '_')
+      file_name = underscored_unit_dir + Daigaku::Solution::FILE_SUFFIX
+
       unit_path = File.join(solutions_basepath, unit_dir.split('/')[-3..-1])
+      parts = File.join(File.dirname(unit_path), file_name).split('/')
+
+      course_parts = parts[-3..-1].map do |part|
+        part.gsub(/^[\d]+\_/, '').gsub(/[\_\-]+/, '_').downcase
+      end
 
-      File.join(File.dirname(unit_path), file_name)
+      [*parts[0...-3], *course_parts].join('/')
     end
   end
 

data/spec/support/macros/resource_helpers.rb

@@ -33,7 +33,9 @@ module ResourceHelpers
 
     Zip::File.open(zip_file_path, Zip::File::CREATE) do |zip_file|
       Dir[File.join(directory, '**', '**')].each do |file|
-        zip_file.add(file.sub(directory, '')[1..-1], file) { true }
+        if file.match(course_dir_names.first)
+          zip_file.add(file.sub(directory, '')[1..-1], file) { true }
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daigaku
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Paul Götze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -152,6 +152,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: quick_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +223,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.5.0
 description: Daigaku is the Japanese word for university. With Daigaku you can interactively
-  learn the Ruby Programming language using the command line.
+  learn the Ruby programming language using the command line.
 email:
 - paul.christoph.goetze@gmail.com
 executables:
@@ -218,6 +232,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - README.md
@@ -227,16 +242,18 @@ files:
 - lib/daigaku.rb
 - lib/daigaku/chapter.rb
 - lib/daigaku/configuration.rb
+- lib/daigaku/congratulator.rb
 - lib/daigaku/course.rb
-- lib/daigaku/database.rb
 - lib/daigaku/exceptions.rb
 - lib/daigaku/generator.rb
+- lib/daigaku/github_client.rb
 - lib/daigaku/loadable.rb
 - lib/daigaku/loading/chapters.rb
 - lib/daigaku/loading/courses.rb
 - lib/daigaku/loading/units.rb
 - lib/daigaku/reference_solution.rb
 - lib/daigaku/solution.rb
+- lib/daigaku/storeable.rb
 - lib/daigaku/task.rb
 - lib/daigaku/terminal.rb
 - lib/daigaku/terminal/cli.rb
@@ -245,6 +262,7 @@ files:
 - lib/daigaku/terminal/setup.rb
 - lib/daigaku/terminal/solutions.rb
 - lib/daigaku/terminal/texts/about.txt
+- lib/daigaku/terminal/texts/congratulations.txt
 - lib/daigaku/terminal/texts/courses_empty.txt
 - lib/daigaku/terminal/texts/hint_course_download.txt
 - lib/daigaku/terminal/texts/welcome.txt
@@ -257,6 +275,7 @@ files:
 - lib/daigaku/views/chapters_menu.rb
 - lib/daigaku/views/courses_menu.rb
 - lib/daigaku/views/main_menu.rb
+- lib/daigaku/views/menu.rb
 - lib/daigaku/views/splash.rb
 - lib/daigaku/views/task_view.rb
 - lib/daigaku/views/top_bar.rb
@@ -264,14 +283,16 @@ files:
 - lib/daigaku/window.rb
 - spec/daigaku/chapter_spec.rb
 - spec/daigaku/configuration_spec.rb
+- spec/daigaku/congratulator_spec.rb
 - spec/daigaku/course_spec.rb
-- spec/daigaku/database_spec.rb
 - spec/daigaku/generator_spec.rb
+- spec/daigaku/github_client_spec.rb
 - spec/daigaku/loading/chapters_spec.rb
 - spec/daigaku/loading/courses_spec.rb
 - spec/daigaku/loading/units_spec.rb
 - spec/daigaku/reference_solution_spec.rb
 - spec/daigaku/solution_spec.rb
+- spec/daigaku/storeable_spec.rb
 - spec/daigaku/task_spec.rb
 - spec/daigaku/terminal/cli_spec.rb
 - spec/daigaku/terminal/courses_spec.rb
@@ -286,6 +307,7 @@ files:
 - spec/daigaku/unit_spec.rb
 - spec/daigaku/views/chapters_menu_spec.rb
 - spec/daigaku/views/courses_menu_spec.rb
+- spec/daigaku/views/menu_spec.rb
 - spec/daigaku/views/task_view_spec.rb
 - spec/daigaku/views/units_menu_spec.rb
 - spec/daigaku/views_spec.rb
@@ -308,9 +330,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -325,14 +347,16 @@ summary: Learning Ruby on the command line.
 test_files:
 - spec/daigaku/chapter_spec.rb
 - spec/daigaku/configuration_spec.rb
+- spec/daigaku/congratulator_spec.rb
 - spec/daigaku/course_spec.rb
-- spec/daigaku/database_spec.rb
 - spec/daigaku/generator_spec.rb
+- spec/daigaku/github_client_spec.rb
 - spec/daigaku/loading/chapters_spec.rb
 - spec/daigaku/loading/courses_spec.rb
 - spec/daigaku/loading/units_spec.rb
 - spec/daigaku/reference_solution_spec.rb
 - spec/daigaku/solution_spec.rb
+- spec/daigaku/storeable_spec.rb
 - spec/daigaku/task_spec.rb
 - spec/daigaku/terminal/cli_spec.rb
 - spec/daigaku/terminal/courses_spec.rb
@@ -347,6 +371,7 @@ test_files:
 - spec/daigaku/unit_spec.rb
 - spec/daigaku/views/chapters_menu_spec.rb
 - spec/daigaku/views/courses_menu_spec.rb
+- spec/daigaku/views/menu_spec.rb
 - spec/daigaku/views/task_view_spec.rb
 - spec/daigaku/views/units_menu_spec.rb
 - spec/daigaku/views_spec.rb

data/lib/daigaku/database.rb

@@ -1,64 +0,0 @@
-require 'yaml/store'
-require 'fileutils'
-
-module Daigaku
-
-  class Database
-    include Singleton
-
-    attr_reader :file
-
-    def initialize
-      @file = Daigaku.config.storage_file
-      directory = File.dirname(@file)
-      FileUtils.makedirs(directory) unless Dir.exist?(directory)
-
-      @db = YAML::Store.new(@file)
-    end
-
-    def set(key, value)
-      @db.transaction { @db[key.to_s] = value }
-    end
-
-    def get(key)
-      @db.transaction { @db[key.to_s] }
-    end
-
-    def self.get(key)
-      instance.get(key)
-    end
-
-    def self.set(key, value)
-      instance.set(key, value)
-    end
-
-    def self.file
-      instance.file
-    end
-
-    # Defines getter and setter methods for arbitrarily named methods.
-    # @xample
-    #   Diagaku::Database.answer = 42
-    #   => saves 'answer: 42' to database
-    #
-    #   Daigaku::Database.answer
-    #   => 42
-    def self.method_missing(method, *args, &block)
-      if method =~ /.*=$/
-        if singleton_methods.include?(method.to_s.chop.to_sym)
-          raise "There is a \"#{method.to_s.chop}\" instance method already " +
-            "defined. This will lead to problems while getting values " +
-            "from the database. Please use another key than " +
-            "#{singleton_methods.map(&:to_s)}."
-        end
-
-        instance.set(method.to_s.gsub(/=$/, ''), args[0])
-      elsif args.count == 0
-        instance.get(method)
-      else
-        super
-      end
-    end
-  end
-
-end

data/spec/daigaku/database_spec.rb

@@ -1,79 +0,0 @@
-require 'spec_helper'
-
-describe Daigaku::Database do
-
-  subject { Daigaku::Database.send(:new) }
-
-  before do
-    Daigaku::Configuration.send(:new)
-
-    allow_any_instance_of(Daigaku::Configuration).to \
-      receive(:storage_file) { local_storage_file }
-  end
-
-  it { is_expected.to respond_to :get }
-  it { is_expected.to respond_to :set }
-  it { is_expected.to respond_to :file }
-
-  it "creates the database file(s) in the .daigaku directory on access" do
-    Daigaku::Database.call_an_arbitrary_method
-    expect(File.exist?(local_storage_file)).to be_truthy
-  end
-
-  it "allows setting arbitrary keys by setter methods" do
-    expect { Daigaku::Database.brownie = "brownie" }
-      .not_to raise_error
-  end
-
-  it "allows getting subsequently set keys" do
-    Daigaku::Database.carrots = "carrots"
-    expect(Daigaku::Database.carrots).to eq "carrots"
-  end
-
-  it "returns nil for not set keys" do
-    expect(Daigaku::Database.hamburger).to be_nil
-  end
-
-  it "raises an method missing errror for non getter/setter methods" do
-    expect { Daigaku::Database.arbitrary_method(1, 2) }
-      .to raise_error NoMethodError
-  end
-
-  it "responds to ::get" do
-    expect(Daigaku::Database).to respond_to :get
-  end
-
-  it "responds to ::set" do
-    expect(Daigaku::Database).to respond_to :set
-  end
-
-  it "responds to ::file" do
-    expect(Daigaku::Database).to respond_to :file
-  end
-
-  describe "::get" do
-    it "returns the value of the given key" do
-      toast = 'toast'
-      Daigaku::Database.toast = toast
-      expect(Daigaku::Database.get :toast).to eq toast
-    end
-  end
-
-  describe "::set" do
-    it "sets the value for the given key" do
-      juice = 'orange juice'
-      Daigaku::Database.set :juice, juice
-      expect(Daigaku::Database.juice).to eq juice
-    end
-  end
-
-  describe "::file" do
-    it "returns the storage file path" do
-      expect(Daigaku::Database.file).to eq Daigaku.config.storage_file
-    end
-  end
-
-  it "raises an error if the related getter for a setter is already defined" do
-    expect { Daigaku::Database.clone = 'defined' }.to raise_error
-  end
-end