has_token_id 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2434c3ca123b2c8cf8d6f8c41e91e16f4675ac52
-  data.tar.gz: 84d2fbcd1af6be0913ead86d16cd8b91ce5494f4
+  metadata.gz: 4315d7366da0c89f4949bd497cca7684d9241cfb
+  data.tar.gz: 867530c0a3ce60f9e4e5fbb05fba4b2f3ac03958
 SHA512:
-  metadata.gz: 386d303806fc383c46d3a187eb2bd47af5ebdc37e85d4ebd5ccd6cee1303f70c293e015323fcd9475f84ed07542bc764f2722f00ca62cd731ae47970c81046d5
-  data.tar.gz: 7cdf6aae79b897a4ace1cf90460dda57f3235740f75f402ce1830149a112014275af72d2952052ee35fc8f6d88c9ae293a7f3be62df8c19b1c18e6cd662bc34d
+  metadata.gz: fb22d7f9a1c1cb0274659ed9f9d8c37a0367f9616e2f975b28dd347f7a0518f27579a395cd94794930eb6bc8be1871e36c6d0798671a71df3a517a5c8094aa96
+  data.tar.gz: 37b180a8ede2b1dbf6723c6ad86acac554cd56608621375896139d2904487c1c0274e20388291a44919d0a2d75cc116c75d77def0712b97ba86504d334a5e2d9

data/.travis.yml

@@ -7,4 +7,3 @@ rvm:
   - 2.1.3
   - 2.2.3
   - 2.3.1
-  - rbx

data/README.md

@@ -10,7 +10,7 @@ Installation
 Add has_token_id to your Gemfile like so:
 
 ```ruby
-gem 'has_token_id', '~> 0.4.0'
+gem 'has_token_id', '~> 0.5.0'
 ```
 
 Now run `bundle install` and you're good to go!
@@ -55,7 +55,7 @@ That's basically it! Your Items will now know to use their token as their identi
 Try it out in your `rails console`
 
 ```ruby
-@item = Item.create(:name => "Tokenz!")
+@item = Item.create(name: "Tokenz!")
 #<Item id: 1, token: "Iccfa4bb1613e80097ba9495", name: "Tokenz!", created_at: "2012-01-26 20:17:13", updated_at: "2012-01-26 20:17:13">
 @item.to_param
 # Iccfa4bb1613e80097ba9495
@@ -73,11 +73,13 @@ Options
 You can customize has_token_id by setting a few options. Here's the defaults:
 
 ```ruby
-:prefix             => nil, # if nil use first letter of class name
-:length             => 24,
-:short_token_length => 8,
-:param_name         => 'token',
-:case_sensitive     => false
+{
+  prefix:             nil, # if nil use first letter of class name
+  length:             24,
+  short_token_length: 8,
+  param_name:         'token',
+  case_sensitive:     false
+}
 ```
 
 
@@ -91,8 +93,8 @@ HasTokenId.default_token_options[:prefix] = "OMG"
 
 # for multiple options
 HasTokenId.default_token_options.merge!(
-  :case_sensitive => true,
-  :length         => 8
+  case_sensitive: true,
+  length:         8
 )
 ```
 
@@ -101,11 +103,11 @@ Options can also be set on a per-class level:
 
 ```ruby
 class List < ActiveRecord::Base
-  has_token_id :prefix => "LI", :length => 10
+  has_token_id prefix: "LI", length: 10
 end
 
 class Item < ActiveRecord::Base
-  has_token_id :prefix => "ITM"
+  has_token_id prefix: "ITM"
 end
 ```
 
@@ -154,4 +156,4 @@ bundle exec rake
 License
 ------------------------------------------------------------------------------
 
-Copyright (c) 2011 - 2016 Spencer Steffen and Citrus, released under the New BSD License All rights reserved.
+Copyright (c) 2011 - 2018 Spencer Steffen and Citrus, released under the New BSD License All rights reserved.

data/has_token_id.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('activerecord',  '~> 3')
-  s.add_dependency('activesupport', '~> 3')
+  s.add_dependency('activerecord',  '>= 4')
+  s.add_dependency('activesupport', '>= 4')
 
-  s.add_development_dependency('rails',           '~> 3')
+  s.add_development_dependency('rails',           '>= 4')
   s.add_development_dependency('dummier',         '~> 0.3')
-  s.add_development_dependency('minitest',        '~> 2.0')
+  s.add_development_dependency('minitest',        '~> 4.2')
   s.add_development_dependency('minitest_should', '~> 0.3')
   s.add_development_dependency('sqlite3',         '~> 1.3')
 

data/lib/has_token_id/concern.rb

@@ -5,8 +5,8 @@ module HasTokenId
       base.send(:extend,  ClassMethods)
       base.send(:include, InstanceMethods)
       base.class_eval do
-        validates :token, :presence => true, :uniqueness => true
-        before_validation :generate_token, :on => :create, :if => proc{|record| record.token.nil? }
+        validates :token, presence: true, uniqueness: true
+        before_validation :generate_token, on: :create, if: proc{|record| record.token.nil? }
       end
     end
 
@@ -14,10 +14,11 @@ module HasTokenId
 
       # Default options as well as an overwrite point so you can assign different defaults to different models
       def default_token_options
-        return @default_token_options if @default_token_options
-        @default_token_options = HasTokenId.default_token_options
-        @default_token_options[:prefix] ||= self.name[0, 1]
-        @default_token_options
+        @default_token_options ||= begin
+          options = HasTokenId.default_token_options
+          options[:prefix] ||= self.name[0, 1]
+          options
+        end
       end
 
       # Generates a unique token based on the options

data/lib/has_token_id/table_definition.rb

@@ -2,12 +2,13 @@ require 'active_record/connection_adapters/abstract/schema_definitions'
 
 module HasTokenId
   module TableDefinition
-    
+
     def token(*args)
-      options = { :length => HasTokenId.default_token_options[:length] }.merge(args.extract_options!)
-      column(:token, :string, options.merge(:nil => false))
+      options = { length: HasTokenId.default_token_options[:length] }.merge(args.extract_options!)
+      puts "opeiont: #{options}"
+      column(:token, :string, options.merge(nil: false))
     end
-  
+
   end
 end
 

data/lib/has_token_id/version.rb

@@ -1,3 +1,3 @@
 module HasTokenId
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/test/dummy_hooks/before_migrate.rb

@@ -4,7 +4,7 @@ run "rails g scaffold item name:string"
 # Add has_token_id to our Item model
 gsub_file "app/models/item.rb", "end", %(
   has_token_id
-  
+
 end)
 
 # Replace the delete link with a button since we won't have js in the demo

data/test/unit/table_definition_test.rb

@@ -1,26 +1,25 @@
 require "test_helper"
 
 class TableDefinitionTest < MiniTest::Should::TestCase
-  
+
   setup do
-    @migration = ActiveRecord::Migration.new
-    @definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(@migration)  
+    @definition = ActiveRecord::ConnectionAdapters::TableDefinition.new({}, "items", false, {})
   end
-  
+
   should "include token as a migration table definition" do
     assert @definition.respond_to?(:token)
   end
-  
+
   should "token definition should be the same as a string column named token" do
     capture(:stdout) {
       assert_equal @definition.column(:token, :string), @definition.token
     }
   end
-  
+
   should "token definition should include custom options" do
     capture(:stdout) {
-      assert_equal @definition.column(:token, :string, :length => 8), @definition.token(:length => 8)
+      assert_equal @definition.column(:token, :string, length: 8), @definition.token(length: 8)
     }
   end
-  
+
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: has_token_id
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Spencer Steffen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: dummier
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: minitest_should
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Identifies your active records with a random token.