active_recall 1.8.4 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38e08a2f83ec8a0b36852b6d7e10ab4798debfaa8d51f5f4f7c29f7467a1e78
-  data.tar.gz: a41ee1c1b84ea9d8d5aa4c7fe51a0151bac1a54f7baea5e1b5f655b7daba304b
+  metadata.gz: 95111c003ae9481ad46fd817553888897dcbcab55e901240bb76169dc60c56ff
+  data.tar.gz: 71c3da4109511587c2adbc2056d8ddd12f18e5c0bfa263b38c3e1516b667c8a0
 SHA512:
-  metadata.gz: e3afc2c4dbf422117dbdcaef6b38389f26553c4726513fc4785fafa7a07a3a79f9e01f7c2f0daca4564feba60098290cddf2e1d742a370b27ead1dd2b618f8be
-  data.tar.gz: 12808e551f259b31bfca025753855c764bd0a67dfe13a470122fe72e3f8544cac05a00d53d4c91a5f17aa4d4014a6e19eceb02f7c10b2e96adc6e37e7440ae8d
+  metadata.gz: 4a93d9af15d20ecaf631a7ebf9ae36568849c103f916e80b4d4bd0782563420b1280aca3fa951ad622ec30b1e6d6a509966b5ffa92ef940c75928c175a05dd46
+  data.tar.gz: dd1119b28d07cf45db8177ffba1b7486e5b623d8472c2f7decb1549391d9258c9924c6b22b5285647b3c1fecc26e1f8cc2980ca73615c9e37356cc22d6b72e37

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_recall (1.8.4)
+    active_recall (1.8.6)
       activerecord (>= 5.2.3, <= 7.1)
       activesupport (>= 5.2.3, <= 7.1)
 

data/README.md

@@ -35,6 +35,7 @@ ActiveRecall.configure do |config|
   config.algorithm_class = ActiveRecall::FibonacciSequence
 end
 ```
+Algorithms include `FibonacciSequence`, `LeitnerSystem`, and `SoftLeitnerSystem`.
 For Rails applications, try doing this from within an [initializer file](https://guides.rubyonrails.org/configuring.html#using-initializer-files).
 
 Assume you have an application allowing your users to study words in a foreign language. Using the `has_deck` method you can set up a deck of flashcards that the user will study:

data/bin/console

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "active_recall"
+
+# You can add here some code to start an interactive console or debug session.
+# `binding.pry` from the Pry gem is often used for this purpose.
+require "irb"
+IRB.start(__FILE__)

data/lib/active_recall/algorithms/soft_leitner_system.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module ActiveRecall
+  class SoftLeitnerSystem
+    DELAYS = [3, 7, 14, 30, 60, 120, 240].freeze
+
+    def self.right(box:, times_right:, times_wrong:, current_time: Time.current)
+      new(
+        box: box,
+        current_time: current_time,
+        times_right: times_right,
+        times_wrong: times_wrong
+      ).right
+    end
+
+    def self.wrong(box:, times_right:, times_wrong:, current_time: Time.current)
+      new(
+        box: box,
+        current_time: current_time,
+        times_right: times_right,
+        times_wrong: times_wrong
+      ).wrong
+    end
+
+    def initialize(box:, times_right:, times_wrong:, current_time: Time.current)
+      @box = box
+      @current_time = current_time
+      @times_right = times_right
+      @times_wrong = times_wrong
+    end
+
+    def right
+      self.box = [box + 1, DELAYS.count].min
+
+      {
+        box: box,
+        times_right: times_right + 1,
+        times_wrong: times_wrong,
+        last_reviewed: current_time,
+        next_review: next_review
+      }
+    end
+
+    def wrong
+      self.box = [box - 1, 0].max
+
+      {
+        box: box,
+        times_right: times_right,
+        times_wrong: times_wrong + 1,
+        last_reviewed: current_time,
+        next_review: next_review
+      }
+    end
+
+    private
+
+    attr_accessor :box
+    attr_reader :current_time, :times_right, :times_wrong
+
+    def next_review
+      (current_time + DELAYS[[DELAYS.count, box].min - 1].days)
+    end
+  end
+end

data/lib/active_recall/base.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "active_record"
+require "active_support/concern"
+
 module ActiveRecall
   module Base
     extend ActiveSupport::Concern

data/lib/active_recall/models/deck.rb

@@ -9,27 +9,21 @@ module ActiveRecall
     has_many :items, class_name: "ActiveRecall::Item", dependent: :destroy
 
     def each
-      _items.each do |item|
-        if block_given?
-          yield item
-        else
-          yield item
-        end
-      end
+      _items.find_each { |item| yield item }
     end
 
     def ==(other)
       _items == other
     end
 
-    def _items
-      source_class.find(items.pluck(:source_id))
-    end
-
     def <<(source)
-      raise ArgumentError, "Word already in the stack" if include?(source)
+      attributes = {deck: self, source_id: source.id, source_type: source.class.name}
 
-      items << ActiveRecall::Item.new(deck: self, source_id: source.id, source_type: source.class.name)
+      if ActiveRecall::Item.exists?(attributes)
+        raise ArgumentError, "Word already in the stack"
+      end
+
+      items << ActiveRecall::Item.new(attributes)
     end
 
     def self.add_deck(user)
@@ -71,7 +65,7 @@ module ActiveRecall
     end
 
     def box(number)
-      source_class.find(items.where(box: number).pluck(:source_id))
+      source_class.where(id: items.where(box: number).select(:source_id))
     end
 
     def source_class
@@ -80,6 +74,10 @@ module ActiveRecall
 
     private
 
+    def _items
+      source_class.where(id: items.select(:source_id))
+    end
+
     def _review
       items
         .untested

data/lib/active_recall/version.rb

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

data/lib/active_recall.rb

@@ -5,6 +5,7 @@ require "active_recall/deck_methods"
 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/configuration"
 require "active_recall/models/deck"
 require "active_recall/models/item"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_recall
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.6
 platform: ruby
 authors:
 - Robert Gravina
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,10 +125,12 @@ files:
 - README.md
 - Rakefile
 - active_recall.gemspec
+- bin/console
 - bin/setup
 - lib/active_recall.rb
 - lib/active_recall/algorithms/fibonacci_sequence.rb
 - lib/active_recall/algorithms/leitner_system.rb
+- lib/active_recall/algorithms/soft_leitner_system.rb
 - lib/active_recall/base.rb
 - lib/active_recall/configuration.rb
 - lib/active_recall/deck_methods.rb