active_recall 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38e08a2f83ec8a0b36852b6d7e10ab4798debfaa8d51f5f4f7c29f7467a1e78
-  data.tar.gz: a41ee1c1b84ea9d8d5aa4c7fe51a0151bac1a54f7baea5e1b5f655b7daba304b
+  metadata.gz: 8e96531570c81f3e7457acc497a7db792708b6b765794e2294b00cce0bd0cfe2
+  data.tar.gz: 06c2f07e0438fc376beefe980dbdc579f06bb7d8bab77e692faed876b5a69629
 SHA512:
-  metadata.gz: e3afc2c4dbf422117dbdcaef6b38389f26553c4726513fc4785fafa7a07a3a79f9e01f7c2f0daca4564feba60098290cddf2e1d742a370b27ead1dd2b618f8be
-  data.tar.gz: 12808e551f259b31bfca025753855c764bd0a67dfe13a470122fe72e3f8544cac05a00d53d4c91a5f17aa4d4014a6e19eceb02f7c10b2e96adc6e37e7440ae8d
+  metadata.gz: c8c4385a5646b277f27b6a90505e6f55847eba3d5e96bb32e0694f9148a018f71846d5cb9d552078a5c215965e5d72f6661f96c64885e9199ff557e77b47b059
+  data.tar.gz: 9089edaa9ef21c0d1a8750d60b223ac4cda49c075268bee4bea25493b7951c3bd31747a129a93721f0e239efb41bb9d7db3a6f96d157d9b2f95930494f812c91

data/Gemfile.lock

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

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/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.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_recall
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 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-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,6 +125,7 @@ files:
 - README.md
 - Rakefile
 - active_recall.gemspec
+- bin/console
 - bin/setup
 - lib/active_recall.rb
 - lib/active_recall/algorithms/fibonacci_sequence.rb