active_record_samplooper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35dfea447fa08cfc82b123c5bc06d6ad2caf5c38
-  data.tar.gz: ea450c35639d51348a2cc0a781951f1be61917ed
+  metadata.gz: 1f6520d84d931e0a006a6f52cb97f6891c098396
+  data.tar.gz: 78970ac41e0551eb96cb6837ab614c009f51b691
 SHA512:
-  metadata.gz: 609e7bb9a16eeb8f42106f4da8696a3074dfdf3cb52b4ec7dcb6c962294534fc3b731c498258f52630dfffee45fdf8a26ef76996f941edc7724adf1dd5b1000a
-  data.tar.gz: 8cd1c674c0a696da9437e7383892ae6a4659d10086acefb406e509dd77e9270131f223a0f83d040f5a11824b356b6f55a40e148074fa7791495fdfd50e4d15cf
+  metadata.gz: c5522057491651ba49888a06e112af13b16006761e9fad23ef885a6ecef71efbbb324c5576ef204e430c81ca63730ee9cf72115439b0f41b94df0bfcf12b0f4e
+  data.tar.gz: a37ea8835a03a14ba6926f5cc3962ecff77354a58a654a0c8a7cd7196eea5eb8c77a113769e8a89ca61d7b9c7c661e6b64fefcb905b6add294836205ce1c7cbe

data/lib/active_record_samplooper.rb

@@ -17,28 +17,43 @@ module ActiveRecordSamplooper
 
     def initialize(klass)
       self.klass = klass
-      reset!
+      init!
     end
 
 
-    def sample
-      return if rest.blank?
-      klass.find(id = rest.shift)
+    def find(id)
+      klass.find(id)
     rescue ActiveRecord::RecordNotFound => e
       raise Gone, id
     end
 
 
+    def sample
+      find(id_store.sample)
+    end
+
+
+    def pick
+      return if rest.blank?
+      find(rest.shift)
+    end
+
+
     def loop
       reset! if rest.blank?
       sample
     end
 
 
-    def reset!
+    def init!
       self.id_store = klass.pluck(:id).shuffle!
       self.rest = id_store.dup
     end
+
+
+    def reset!
+      self.rest = id_store.dup
+    end
   end
 
   class Gone < StandardError

data/lib/active_record_samplooper/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSamplooper
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/models/sample_model_spec.rb

@@ -20,12 +20,19 @@ RSpec.describe SampleModel, type: :model do
       end
     end
 
-    describe 'sampler sample' do
+
+    describe 'from sampler' do
       let(:sampler) { SampleModel.sampler }
 
+      describe 'sampler pick' do
+        it 'any times, get SampleModel instance' do
+          36.times { expect(sampler.sample).to be_a(SampleModel) }
+        end
+      end
+
       it 'sample get once each' do
-        10.times { expect(sampler.sample).to be_a(SampleModel) }
-        expect(sampler.sample).to be_nil
+        10.times { expect(sampler.pick).to be_a(SampleModel) }
+        expect(sampler.pick).to be_nil
       end
 
       it 'loop get any times each' do
@@ -41,7 +48,7 @@ RSpec.describe SampleModel, type: :model do
         SampleModel.first.destroy
         SampleModel.first.destroy
         expect {
-          10.times { sampler.sample }
+          10.times { sampler.pick }
         }.to raise_exception(ActiveRecordSamplooper::Gone)
       end
 
@@ -53,9 +60,17 @@ RSpec.describe SampleModel, type: :model do
           10.times { sampler.loop }
         }.to raise_exception(ActiveRecordSamplooper::Gone)
       end
+
+      it 'sampler not include new instance' do
+        sampler
+        new_id = create(:sample_model).id
+        1000.times { expect(sampler.sample.id).not_to eq(new_id) }
+        SampleModel.destroy(new_id)
+      end
     end
   end
 
+
   describe 'no record' do
     it 'direct sample get nil' do
       expect(SampleModel.sample).to be_nil
@@ -64,11 +79,11 @@ RSpec.describe SampleModel, type: :model do
     let(:sampler) { SampleModel.sampler }
 
     it 'sampler sample get nil' do
-      expect(sampler.sample).to be_nil
+      expect(sampler.pick).to be_nil
     end
 
     it 'sampler loop get nil' do
-      expect(sampler.sample).to be_nil
+      expect(sampler.pick).to be_nil
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_samplooper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - mmmpa