submit_once 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66254eab2313acf844dac9e2dda16ea53da054c2
-  data.tar.gz: d18f21b31b329036568d4a5b6c4e4ac4bb817995
+  metadata.gz: 0699f5b129f7ef7a53754ec4214fd04886ed43a7
+  data.tar.gz: f788579f9e6c37f105ce360600c1fa85ee28d7a5
 SHA512:
-  metadata.gz: f9b8e03bd2d1d1b8a3654faecd7b532b027332f93a076734298cf5312d3c4c19ec2067edfc52bbe9deeee47e33415a2cc8fca061a2dbcede79c8dc370ba8ba85
-  data.tar.gz: a7bdb465ac018b679af4789aa1a909cf043f2a891ee6bed8dbe91b4beea1b1c5ad30ad71630db058505755affc79feb6a55edd4cc80a907b97163b288ed1071f
+  metadata.gz: d7e7d582c3a318ba52a827f06e67ad4956b6c7b0e1081120309854a98310428ab3df5f61468d72e40c1e7eb1eb710c8c37eca61becaa28ddc95fdf1aea36380d
+  data.tar.gz: bb22687489ea60b15770652a25c6350c0d0a0bae2b60958335ce33a7dc30a2073a85988062b9d5210c161a7fd95c94002f26ce8f374ee99eb5906891e98f70c2

data/.gitignore

@@ -8,6 +8,7 @@
 /spec/reports/
 /tmp/
 /.idea
+/.byebug_history
 /bin
 /spec/dummy/tmp
 /spec/dummy/db/*.sqlite3

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
 rvm:
   - 2.2.3
-before_install: gem install bundler -v 1.11.2
+before_install:
+  - gem install bundler -v 1.11.2
+script:
+  - RAILS_ENV=test bundle exec rake db:create db:migrate --trace
+  - bundle exec rspec spec

data/README.md

@@ -1,4 +1,4 @@
-# SubmitOnce
+# SubmitOnce [![Build Status](https://travis-ci.org/bastengao/submit_once.svg?branch=master)](https://travis-ci.org/bastengao/submit_once)
 
 Prevent from submitting form twice for Rails.
 
@@ -34,8 +34,8 @@ posts_controller.rb
 class PostsController < ApplicationController
   # return to root_url when form submit again
   before_action :check_form_token!, only: [:create]
-  
-  # OR custom before action 
+
+  # OR custom before action
   # before_action :custom_check_form_token
 
   def index
@@ -47,7 +47,7 @@ class PostsController < ApplicationController
   def create
     ...
   end
-  
+
   private
   def custom_check_form_token
     # using `check_form_token`

data/Rakefile

@@ -14,6 +14,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/lib/submit_once/controller_helper.rb

@@ -12,8 +12,14 @@ module SubmitOnce
 
     # TODO: force or no
     def check_form_token
-      if session[TOKEN_KEY] == params[TOKEN_KEY]
-        session[TOKEN_KEY] = nil
+      # TODO: 顺便做超时 token 清理工作
+      clean_expired_token
+
+      return false if params[TOKEN_KEY].blank?
+
+      form_token_key = params[TOKEN_KEY]
+      if session[form_token_key] == params[TOKEN_VALUE]
+        session.delete(form_token_key)
         true
       else
         false
@@ -28,8 +34,21 @@ module SubmitOnce
     end
 
     def gen_form_token
+      clean_expired_token
+      
+      @__form_token_key ||= "#{TOKEN_KEY}#{Time.now.to_i}"
       @__form_token ||=
-      (session[TOKEN_KEY] = Digest::SHA1.hexdigest((Time.now.to_i + rand(0xffffff)).to_s)[0..39])
+        (session[@__form_token_key] = Digest::SHA1.hexdigest((Time.now.to_i + rand(0xffffff)).to_s)[0..39])
+      [@__form_token_key, @__form_token]
+    end
+
+    def clean_expired_token
+      session.each do |key, value|
+        if key.start_with? TOKEN_KEY
+          timestamp = Time.zone.at key.sub(TOKEN_KEY, '').to_i
+          session.delete(key) if timestamp < 30.minutes.ago
+        end
+      end
     end
   end
 end

data/lib/submit_once/version.rb

@@ -1,3 +1,3 @@
 module SubmitOnce
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/submit_once/view_helper.rb

@@ -2,7 +2,8 @@ module SubmitOnce
   module ViewHelper
 
     def form_token_tag
-      hidden_field_tag(TOKEN_KEY, gen_form_token)
+      key, token = gen_form_token
+      "#{hidden_field_tag(TOKEN_KEY, key)}#{hidden_field_tag(TOKEN_VALUE, token)}"
     end
   end
 end

data/lib/submit_once.rb

@@ -1,4 +1,5 @@
-TOKEN_KEY = :__form_token
+TOKEN_KEY = '__ft_k'.freeze
+TOKEN_VALUE = '__ft_v'.freeze
 
 require "submit_once/version"
 require 'submit_once/railtie' if defined?(Rails)

data/submit_once.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'rails', '>= 3.2', '< 5'
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'timecop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: submit_once
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - bastengao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Prevent from submitting form twice for rails.
 email:
 - bastengao@gmail.com