active_recall 1.5.0 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37b52862b045e1e9c7a189acd1a611e84b5bd260ff1149472ed5b724530a0943
-  data.tar.gz: 7dbacf4db26d857144e91a68a4b4a5ea5c6012ec9579079d4b649c7fc7f8e388
+  metadata.gz: 2e993b98e9627ec06e8eae73c3fba15a6ed761b66dbb1092b1355140cb2bd366
+  data.tar.gz: 5402a3ae205e52b20587ab73a5d819eaf7102dea5d52cf983e4be5beddf5279d
 SHA512:
-  metadata.gz: 10d110f43d6e845f1f3bc8269e7bf053a94ebb13bb1b9355d9915dd6e515b94492a7f4421d2e83978f24d45c471de4c881ea5d84f919f6eb9511cdec055dfacd
-  data.tar.gz: 0a3ef619b273e692bb1ef325971a3baa79562bc013ac3fc999eaa87ca4e4c2ff29607c3491f22d2ad419d79cd44f41cb1a5fb2ba41cba01357784f15e14ca3cc
+  metadata.gz: aba48fb3870fd48fba35a371b48ceeaad4fb306acef718175f67451ee25111ec6389faaf0c52d9424ad1b87da94faf1c24b66f32f920392fa4b7e68ebbb27699
+  data.tar.gz: 2c9c4651bd1e4ac541ffb4c258e899bf311cd84ec6cc4490b643ef1a27bc236c9820e5e30b5af22ee4673413dfad5e0bacbdbcd7344494c9df2059e3472fee17

data/.github/workflows/tests.yml

@@ -28,7 +28,7 @@ jobs:
         include:
           - os: ubuntu
             ruby: ruby-head
-            allow_failures: true
+            allow_failures: false
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
       ALLOW_FAILURES: "${{ matrix.allow_failures }}"

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    active_recall (1.5.0)
-      activerecord (>= 5.2.3, <= 6.1)
-      activesupport (>= 5.2.3, <= 6.1)
+    active_recall (1.6.3)
+      activerecord (>= 5.2.3, <= 6.2)
+      activesupport (>= 5.2.3, <= 6.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.0)
-      activesupport (= 6.1.0)
-    activerecord (6.1.0)
-      activemodel (= 6.1.0)
-      activesupport (= 6.1.0)
-    activesupport (6.1.0)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.3)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     rake (12.3.3)
     rdoc (6.2.0)
     rspec (3.8.0)
@@ -49,9 +49,9 @@ PLATFORMS
 
 DEPENDENCIES
   active_recall!
-  rake (~> 12.0)
+  rake (>= 12.0)
   rdoc
-  rspec (~> 3.0)
+  rspec (>= 3.0)
   sqlite3
 
 BUNDLED WITH

data/README.md

@@ -2,7 +2,7 @@
 
 **ActiveRecall** is a spaced-repetition system that allows you to treat arbitrary [ActiveRecord](https://github.com/rails/rails/tree/master/activerecord) models as if they were flashcards to be learned and reviewed.
 It it based on, and is intended to be backwards compatible with, the [okubo](https://github.com/rgravina/okubo) gem.
-The primary differentiating features are that it lets the user specify the scheduling algorithm and is fully compatible with Rails 6.0 and Ruby 3.0.
+The primary differentiating features are that it lets the user specify the scheduling algorithm and is fully compatible with Rails 6.0 (and 6.1) and Ruby 3.0.
 
 ## Installation
 
@@ -116,9 +116,12 @@ user.words.next #=> nil
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
+Then, run `rake spec` to run the tests.
+You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/active_recall.gemspec

@@ -32,10 +32,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '>= 12.0'
   spec.add_development_dependency 'rdoc'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec', '>= 3.0'
   spec.add_development_dependency 'sqlite3'
-  spec.add_runtime_dependency 'activerecord', '>= 5.2.3', '<= 6.1'
-  spec.add_runtime_dependency 'activesupport', '>= 5.2.3', '<= 6.1'
+  spec.add_runtime_dependency 'activerecord', '>= 5.2.3', '<= 6.2'
+  spec.add_runtime_dependency 'activesupport', '>= 5.2.3', '<= 6.2'
 end

data/lib/active_recall/algorithms/fibonacci_sequence.rb

@@ -51,9 +51,11 @@ module ActiveRecall
 
     attr_reader :box, :current_time, :times_right, :times_wrong
 
+    SEQUENCE = [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987, 1597, 2584, 4181, 6765].freeze
+
     def fibonacci_number_at(index)
-      if (0..1).cover?(index)
-        index
+      if (0...SEQUENCE.length).cover?(index)
+        SEQUENCE[index]
       else
         fibonacci_number_at(index - 1) + fibonacci_number_at(index - 2)
       end

data/lib/active_recall/deck_methods.rb

@@ -3,10 +3,10 @@
 module ActiveRecall
   module DeckMethods
     def deck
-      d = ActiveRecall::Deck.where(user_id: id, user_type: self.class.name).first_or_create
+      d = ActiveRecall::Deck.find_or_create_by(user_id: id, user_type: self.class.name)
       d.source_class.module_eval do
         def stats
-          ActiveRecall::Item.where(source_id: id, source_type: self.class.name).first
+          ActiveRecall::Item.find_by(source_id: id, source_type: self.class.name)
         end
       end
       d

data/lib/active_recall/item_methods.rb

@@ -3,15 +3,11 @@
 module ActiveRecall
   module ItemMethods
     def right_answer_for!(item)
-      i = deck.items.find_by(source_id: item.id)
-      i.right!
-      i.save!
+      deck.items.find_by(source_id: item.id).right!
     end
 
     def wrong_answer_for!(item)
-      i = deck.items.find_by(source_id: item.id)
-      i.wrong!
-      i.save!
+      deck.items.find_by(source_id: item.id).wrong!
     end
   end
 end

data/lib/active_recall/models/deck.rb

@@ -37,16 +37,19 @@ module ActiveRecall
     end
 
     def delete(source)
-      item = ActiveRecall::Item.new(deck: self, source_id: source.id, source_type: source.class.name)
-      item.destroy
+      ActiveRecall::Item
+        .find_by(deck: self, source_id: source.id, source_type: source.class.name)
+        .destroy
     end
 
+    # OPTIMIZE: Attempt in active record, rather than array of Ruby records
     def review
       %i[untested failed expired].inject([]) do |words, s|
         words += items.send(s).order(random_order_function).map(&:source)
       end
     end
 
+    # OPTIMIZE: Use optimized #review and build only the record to be returned
     def next
       word = nil
       %i[untested failed expired].each do |category|

data/lib/active_recall/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecall
-  VERSION = '1.5.0'
+  VERSION = '1.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_recall
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.3
 platform: ruby
 authors:
 - Robert Gravina
@@ -9,20 +9,20 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
@@ -43,14 +43,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -76,7 +76,7 @@ dependencies:
         version: 5.2.3
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
         version: 5.2.3
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: 5.2.3
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
         version: 5.2.3
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 description: A spaced-repetition system to be used with ActiveRecord models
 email:
 - robert.gravina@gmail.com