ketsuban 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b5d89bebcec14b8490d3f391c948adcbd00da23ca714b083d510cffec5581555
-  data.tar.gz: c1dd1c10919e0f6d669075edc9cccaae301ee3058eb749bd2a0c0203502de8df
+SHA1:
+  metadata.gz: 4f7c4a677493a4b2a693280d0db1107aec0932ba
+  data.tar.gz: 2c44b0a66a5bf05bd135a89da19a8597f2591e37
 SHA512:
-  metadata.gz: ec071ff04dfe02ae6bca961621041a577fa960825daef6f80383ec8f5352ccfc25aa7ea5346fcc1402689290c71cc7467d4d7bd7f96e0bcefb016048f3f31339
-  data.tar.gz: 801b5cb07dd669688936fb471d04faf0166fe06e029a7a055be3a3b5c5ba8e81e0c7fc5567e3b9fc13b68a59702f0c811499ba4647e2238161f063c755c6e15e
+  metadata.gz: d49afbf4e5288f84b0eb6a20bd36c452b24b9608843f8995dfcbdf36b06e7dcdf38c753e473aa966f670a1f5fe9adf32b67ec06a7b24b5d1fa12439e90351d0e
+  data.tar.gz: 4f1802118a2ee05cebfe50c68adb4c94a2aa410180ad772908ad927ebeb41101b2d699d837ff6bd99562a07844203347944a1e428e2f678b8f35c8188f0c8c7b

data/README.md

@@ -1,3 +1,6 @@
+[![https://badge.fury.io/rb/ketsuban.svg](https://badge.fury.io/rb/ketsuban.svg)](https://rubygems.org/gems/ketsuban)
+[![Build Status](https://travis-ci.org/oieioi/ketsuban.svg?branch=master)](https://travis-ci.org/oieioi/ketsuban)
+
 # Ketsuban
 
 Skip unlucky numbers for ActiveRecord surrogate key.
@@ -7,18 +10,30 @@ Skip unlucky numbers for ActiveRecord surrogate key.
 ```ruby
 class User < ApplicationRecord
   include Ketsuban
-  unlucky_numbers [4, 13]
+  unlucky_numbers [4, 5]
 end
+
+5.times.map { User.create.id }
+# => [1, 2, 3, 6, 7]
 ```
 
+or
+
 ```ruby
-13.times.map { User.create.id }
-# => 1,2,3,5,6,7,8,9,10,11,12,14,15
+class User < ApplicationRecord
+  include Ketsuban
+  unlucky_numbers -> next_id { next_id.odd? }
+end
+
+5.times.map { User.create.id }
+# => [2, 4, 6, 8, 10]
 ```
 
+
+
 ## TODO
 
-- Support sqlite
+- Support sqlite3
 
 ## License
 

data/lib/ketsuban/adapters/abstract_adapter.rb

@@ -6,11 +6,7 @@ module Ketsuban
       end
 
       def fetch_next_id
-        maximum_id&.next || 1
-      end
-
-      def maximum_id
-        @model_class.maximum(@model_class.primary_key)
+        @model_class.maximum(@model_class.primary_key)&.next || 1
       end
 
       def generate_next_id(now_id)

data/lib/ketsuban/base.rb

@@ -1,19 +1,32 @@
 require_relative './adapter'
+require_relative './utils'
 
 module Ketsuban
   extend ActiveSupport::Concern
 
-  included do
-    class << self
-      @unlucky_numbers = [4, 13, 42, 44, 400, 404, 444, 503]
+  module ClassMethod
+    @unlucky_numbers = []
 
-      def unlucky_numbers(news = nil)
-        return @unlucky_numbers if news.nil?
+    def unlucky_numbers(news = nil)
+      return @unlucky_numbers if news.nil?
 
-        @unlucky_numbers = news.sort
+      self.unlucky_numbers = news
+    end
+
+    def unlucky_numbers=(news)
+      case news.class.to_s
+      when 'Array' then @unlucky_numbers = news.sort
+      when 'Proc' then @unlucky_numbers = Ketsuban::Utils.includenize!(news)
+      else raise "Not support #{news.class} for ketsuban args"
       end
+    end
 
-      alias_method :ketsuban, :unlucky_numbers
+    alias ketsuban unlucky_numbers
+  end
+
+  included do
+    class << self
+      include ClassMethod
     end
 
     before_create do

data/lib/ketsuban/utils.rb

@@ -0,0 +1,14 @@
+module Ketsuban
+  module Utils
+    module_function
+
+    def includenize!(func)
+      func.instance_eval do
+        def include?(next_id)
+          call(next_id)
+        end
+      end
+      func
+    end
+  end
+end

data/lib/ketsuban/version.rb

@@ -1,3 +1,3 @@
 module Ketsuban
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ketsuban
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - oieioi
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "\U0001F340 Skip unlucky numbers for ActiveRecord surrogate key"
+description: Skip unlucky numbers for ActiveRecord surrogate key
 email:
 - atsuinatsu.samuifuyu@gmail.com
 executables: []
@@ -111,6 +111,7 @@ files:
 - lib/ketsuban/adapters/postgresql_adapter.rb
 - lib/ketsuban/base.rb
 - lib/ketsuban/railtie.rb
+- lib/ketsuban/utils.rb
 - lib/ketsuban/version.rb
 - lib/tasks/ketsuban_tasks.rake
 homepage: https://github.com/oieioi/ketsuban
@@ -125,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -133,8 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: "\U0001F340 Skip unlucky numbers for ActiveRecord surrogate key"
+summary: Skip unlucky numbers for ActiveRecord surrogate key
 test_files: []