active_recall 1.8.6 → 2.0.1

data/lib/active_recall/algorithms/sm2.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module ActiveRecall
+  class SM2
+    MIN_EASINESS_FACTOR = 1.3
+
+    def self.required_attributes
+      REQUIRED_ATTRIBUTES
+    end
+
+    def self.score(box:, easiness_factor:, times_right:, times_wrong:, grade:, current_time: Time.current)
+      new(
+        box: box,
+        easiness_factor: easiness_factor,
+        times_right: times_right,
+        times_wrong: times_wrong,
+        grade: grade,
+        current_time: current_time
+      ).score
+    end
+
+    def self.type
+      :gradable
+    end
+
+    def initialize(box:, easiness_factor:, times_right:, times_wrong:, grade:, current_time: Time.current)
+      @box = box
+      @easiness_factor = easiness_factor || 2.5
+      @times_right = times_right
+      @times_wrong = times_wrong
+      @grade = grade
+      @current_time = current_time
+      @interval = [1, box].max
+    end
+
+    def score
+      raise "Grade must be between 0-5!" unless GRADES.include?(@grade)
+      update_easiness_factor
+      update_repetition_and_interval
+
+      {
+        box: @box,
+        easiness_factor: @easiness_factor,
+        times_right: @times_right,
+        times_wrong: @times_wrong,
+        last_reviewed: @current_time,
+        next_review: next_review
+      }
+    end
+
+    private
+
+    GRADES = [
+      5, # Perfect response. The learner recalls the information without hesitation.
+      4, # Correct response after a hesitation. The learner recalls the information but with some difficulty.
+      3, # Correct response recalled with serious difficulty. The learner struggles but eventually recalls the information.
+      2, # Incorrect response, but the learner was very close to the correct answer. This might involve recalling some of the information correctly but not all of it.
+      1, # Incorrect response, but the learner feels they should have remembered it. This is typically used when the learner has a sense of familiarity with the material but fails to recall it correctly.
+      0 # Complete blackout. The learner does not recall the information at all.
+    ].freeze
+    REQUIRED_ATTRIBUTES = [
+      :box,
+      :easiness_factor,
+      :grade,
+      :times_right,
+      :times_wrong
+    ].freeze
+
+    def update_easiness_factor
+      @easiness_factor += (0.1 - (5 - @grade) * (0.08 + (5 - @grade) * 0.02))
+      @easiness_factor = [@easiness_factor, MIN_EASINESS_FACTOR].max
+    end
+
+    def update_repetition_and_interval
+      if @grade >= 3
+        @box += 1
+        @times_right += 1
+        @interval = case @box
+        when 1
+          1
+        when 2
+          6
+        else
+          (@interval || 1) * @easiness_factor
+        end
+      else
+        @box = 0
+        @times_wrong += 1
+        @interval = 1
+      end
+    end
+
+    def next_review
+      @current_time + @interval.days
+    end
+  end
+end

data/lib/active_recall/algorithms/soft_leitner_system.rb

@@ -2,7 +2,9 @@
 
 module ActiveRecall
   class SoftLeitnerSystem
-    DELAYS = [3, 7, 14, 30, 60, 120, 240].freeze
+    def self.required_attributes
+      REQUIRED_ATTRIBUTES
+    end
 
     def self.right(box:, times_right:, times_wrong:, current_time: Time.current)
       new(
@@ -13,6 +15,10 @@ module ActiveRecall
       ).right
     end
 
+    def self.type
+      :binary
+    end
+
     def self.wrong(box:, times_right:, times_wrong:, current_time: Time.current)
       new(
         box: box,
@@ -55,6 +61,9 @@ module ActiveRecall
 
     private
 
+    DELAYS = [3, 7, 14, 30, 60, 120, 240].freeze
+    REQUIRED_ATTRIBUTES = [:box, :times_right, :times_wrong].freeze
+
     attr_accessor :box
     attr_reader :current_time, :times_right, :times_wrong
 

data/lib/active_recall/item_methods.rb

@@ -9,5 +9,9 @@ module ActiveRecall
     def wrong_answer_for!(item)
       deck.items.find_by(source_id: item.id).wrong!
     end
+
+    def score!(grade, item)
+      deck.items.find_by(source_id: item.id).score!(grade)
+    end
   end
 end

data/lib/active_recall/models/item.rb

@@ -17,16 +17,34 @@ module ActiveRecall
       where(["box > ? and next_review > ?", 0, current_time])
     end
 
+    def score!(grade)
+      if algorithm_class.type == :gradable
+        update!(
+          algorithm_class.score(**scoring_attributes.merge(grade: grade))
+        ).score
+      else
+        raise IncompatibleAlgorithmError, "#{algorithm_class.name} is a not an gradable algorithm, so is not compatible with the #score! method"
+      end
+    end
+
     def source
       source_type.constantize.find(source_id)
     end
 
     def right!
-      update!(algorithm_class.right(**scoring_attributes))
+      if algorithm_class.type == :binary
+        update!(algorithm_class.right(**scoring_attributes))
+      else
+        raise IncompatibleAlgorithmError, "#{algorithm_class.name} is not a binary algorithm, so is not compatible with the #right! method"
+      end
     end
 
     def wrong!
-      update!(algorithm_class.wrong(**scoring_attributes))
+      if algorithm_class.type == :binary
+        update!(algorithm_class.wrong(**scoring_attributes))
+      else
+        raise IncompatibleAlgorithmError, "#{algorithm_class.name} is not a binary algorithm, so is not compatible with the #wrong! method"
+      end
     end
 
     private
@@ -36,7 +54,9 @@ module ActiveRecall
     end
 
     def scoring_attributes
-      attributes.symbolize_keys.slice(:box, :times_right, :times_wrong)
+      attributes
+        .symbolize_keys
+        .slice(*algorithm_class.required_attributes)
     end
   end
 end

data/lib/active_recall/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecall
-  VERSION = "1.8.6"
+  VERSION = "2.0.1"
 end

data/lib/active_recall.rb

@@ -6,6 +6,7 @@ require "active_recall/item_methods"
 require "active_recall/algorithms/fibonacci_sequence"
 require "active_recall/algorithms/leitner_system"
 require "active_recall/algorithms/soft_leitner_system"
+require "active_recall/algorithms/sm2"
 require "active_recall/configuration"
 require "active_recall/models/deck"
 require "active_recall/models/item"
@@ -29,4 +30,6 @@ module ActiveRecall
   def self.reset
     @configuration = Configuration.new
   end
+
+  class IncompatibleAlgorithmError < StandardError; end
 end

data/lib/generators/active_recall/active_recall_generator.rb

@@ -20,6 +20,7 @@ class ActiveRecallGenerator < Rails::Generators::Base
   def create_migration_files
     create_migration_file_if_not_exist "create_active_recall_tables"
     create_migration_file_if_not_exist "add_active_recall_item_answer_counts"
+    create_migration_file_if_not_exist "add_active_recall_item_easiness_factor"
     create_migration_file_if_not_exist "migrate_okubo_to_active_recall" if options["migrate_data"]
   end
 

data/lib/generators/active_recall/templates/add_active_recall_item_easiness_factor.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddActiveRecallItemEasinessFactor < ActiveRecord::Migration[5.2]
+  def self.up
+    add_column :active_recall_items, :easiness_factor, :float, default: 2.5
+  end
+
+  def self.down
+    remove_column :active_recall_items, :easiness_factor
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_recall
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 2.0.1
 platform: ruby
 authors:
 - Robert Gravina
@@ -9,8 +9,42 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '7.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,40 +107,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '6.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 description: A spaced-repetition system to be used with ActiveRecord models
 email:
 - robert.gravina@gmail.com
@@ -119,6 +153,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".tool-versions"
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -127,9 +162,19 @@ files:
 - active_recall.gemspec
 - bin/console
 - bin/setup
+- bin/spec
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_0.gemfile.lock
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_6_1.gemfile.lock
+- gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_0.gemfile.lock
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_1.gemfile.lock
 - lib/active_recall.rb
 - lib/active_recall/algorithms/fibonacci_sequence.rb
 - lib/active_recall/algorithms/leitner_system.rb
+- lib/active_recall/algorithms/sm2.rb
 - lib/active_recall/algorithms/soft_leitner_system.rb
 - lib/active_recall/base.rb
 - lib/active_recall/configuration.rb
@@ -140,6 +185,7 @@ files:
 - lib/active_recall/version.rb
 - lib/generators/active_recall/active_recall_generator.rb
 - lib/generators/active_recall/templates/add_active_recall_item_answer_counts.rb
+- lib/generators/active_recall/templates/add_active_recall_item_easiness_factor.rb
 - lib/generators/active_recall/templates/create_active_recall_tables.rb
 - lib/generators/active_recall/templates/migrate_okubo_to_active_recall.rb
 homepage: https://github.com/jaysonvirissimo/active_recall
@@ -155,14 +201,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A spaced-repetition system