mongoid_token 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95df94f73a8a62ab1a0b2e44ad4d3f15aed0f515
-  data.tar.gz: 77fbcee3249573fa0404a035d9a14fc049b21be7
+  metadata.gz: 70068b3941cfb6ef389bf2b25f371702ef34d911
+  data.tar.gz: 8cb79b51d9b94fb6c93da485a8c3c488f327a9ca
 SHA512:
-  metadata.gz: fde956f76b7cdaadef645ac97187ce77d09aa730beba12f34ef003a8c86142b4310f6d74cba6636ef7397a543f1ee3523b2a93fd45ec1a7e02f24dffc8e7244e
-  data.tar.gz: c0eb2774d8cdbbffc606ed4a29bea8cd40462c6b9c42fe8681e6d06ecd0fbef907061f04f29e05d9fe4252ab3aab9c42b78e3249894d72c175a7f8cecf2c56dd
+  metadata.gz: 9627f4505f3fbd85b499b16b04a5c2a578e480dd9033107e36549c7746a128eb6963bdc51af1eb93aaa7b2fa067d0901b2b20d7ebd0eb3343c9d788456bb063b
+  data.tar.gz: 3c7707128f42056c1feb7b8bd1ba88a731954106a67e273e93043cefa07177c8db97deb9f0cfdbfa202c16644a9891c6791a35aadb3e719ed9375af72ea15955

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Nicholas Bruning
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -24,7 +24,7 @@ In your gemfile, add:
 
 Then update your bundle
 
-    $ bundle update
+    $ bundle install
 
 In your Mongoid documents, just add `include Mongoid::Token` and the
 `token` method will take care of all the setup, like so:
@@ -50,6 +50,13 @@ automatically creating a unique index on your documents using the token
 field. In order to take advantage of this feature (and ensure that your
 documents always have unique tokens) remember to create your indexes.
 
+## Using without Rails
+
+If you're using Mongoid without Rails, remember to:
+
+    require 'mongoid_token'
+
+in your app
 
 ## Finders
 
@@ -110,6 +117,9 @@ as numbers
 * `:fixed_numeric` - integer, but will always be of length `:length`
 * `:fixed_numeric_no_leading_zeros` - same as `:fixed_numeric`, but will
 never start with zeros
+* `:fixed_hex_numeric` - hex integer, but will always be of length `:length`
+* `:fixed_hex_numeric_no_leading_zeros` - same as `:fixed_hex_numeric`, but will
+never start with zeros
 
 __Examples:__
 ```ruby

data/lib/mongoid/token/finders.rb

@@ -2,8 +2,12 @@ module Mongoid
   module Token
     module Finders
       def self.define_custom_token_finder_for(klass, field_name = :token)
-        klass.define_singleton_method(:"find_by_#{field_name.to_s}") do |token|
-          self.find_by(field_name.to_sym => token)
+        klass.define_singleton_method(:"find_by_#{field_name}") do |token|
+          if token.is_a?(Array)
+            self.in field_name.to_sym => token
+          else
+            self.find_by field_name.to_sym => token
+          end
         end
 
         klass.define_singleton_method :"find_with_#{field_name}" do |*args| # this is going to be painful if tokens happen to look like legal object ids

data/lib/mongoid/token/generator.rb

@@ -12,7 +12,7 @@
 module Mongoid
   module Token
     module Generator
-      REPLACE_PATTERN = /%((?<character>[cCdDpsw]{1})(?<length>\d+(,\d+)?)?)/
+      REPLACE_PATTERN = /%((?<character>[cCdDhHpsw]{1})(?<length>\d+(,\d+)?)?)/
 
       def self.generate(pattern)
         pattern.gsub REPLACE_PATTERN do |match|
@@ -29,6 +29,10 @@ module Mongoid
             digits(length)
           when 'D'
             integer(length)
+          when 'h'
+            digits(length, 16)
+          when 'H'
+            integer(length, 16)
           when 's'
             alphanumeric(length)
           when 'w'
@@ -52,12 +56,12 @@ module Mongoid
         self.rand_string_from_chars ('A'..'Z').to_a, length
       end
 
-      def self.integer(length = 1)
-        (rand(10**length - 10**(length-1)) + 10**(length-1)).to_s
+      def self.integer(length = 1, base = 10)
+        (rand(base**length - base**(length-1)) + base**(length-1)).to_s(base)
       end
 
-      def self.digits(length = 1)
-        rand(10**length).to_s.rjust(length, "0")
+      def self.digits(length = 1, base = 10)
+        rand(base**length).to_s(base).rjust(length, "0")
       end
 
       def self.alpha(length = 1)

data/lib/mongoid/token/options.rb

@@ -43,6 +43,10 @@ class Mongoid::Token::Options
       "%d#{@options[:length]}"
     when :fixed_numeric_no_leading_zeros
       "%D#{@options[:length]}"
+    when :fixed_hex_numeric
+      "%h#{@options[:length]}"
+    when :fixed_hex_numeric_no_leading_zeros
+      "%H#{@options[:length]}"
     end
   end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module MongoidToken
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/mongoid_token.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Nicholas Bruning"]
   s.email       = ["nicholas@bruning.com.au"]
   s.homepage    = "http://github.com/thetron/mongoid_token"
+  s.licenses    = ['MIT']
   s.summary     = %q{A little random, unique token generator for Mongoid documents.}
   s.description = %q{Mongoid token is a gem for creating random, unique tokens for mongoid documents. Highly configurable and great for making URLs a little more compact.}
 

data/spec/mongoid/token/finders_spec.rb

@@ -1,9 +1,11 @@
 require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 
 describe Mongoid::Token::Finders do
-  before :each do
+  after do
+    Object.send(:remove_const, :Document) if Object.constants.include?(:Document)
+    Object.send(:remove_const, :AnotherDocument) if Object.constants.include?(:AnotherDocument)
   end
-
+  
   it "define a finder based on a field_name" do
     klass = Class.new
     field = :another_token
@@ -32,10 +34,26 @@ describe Mongoid::Token::Finders do
     Document.find_by_token("1234").should == document
   end
 
+  it 'retrieves multiple documents using the dynamic finder' do
+    class Document; include Mongoid::Document; field :token; end
+    document = Document.create!(:token => "1234")
+    document2 = Document.create!(:token => "5678")
+    Mongoid::Token::Finders.define_custom_token_finder_for(Document)
+    Document.find_by_token(["1234", "5678"]).should == [document, document2]
+  end
+
   it "retrieve a document using the `find` method" do
     class AnotherDocument; include Mongoid::Document; field :token; end
     document = AnotherDocument.create! :token => "1234"
     Mongoid::Token::Finders.define_custom_token_finder_for(AnotherDocument)
     AnotherDocument.find("1234").should == document
   end
+
+  it 'retrieves multiple documents using the `find` method' do
+    class AnotherDocument; include Mongoid::Document; field :token; end
+    document = AnotherDocument.create! :token => "1234"
+    document2 = AnotherDocument.create! :token => "5678"
+    Mongoid::Token::Finders.define_custom_token_finder_for(AnotherDocument)
+    AnotherDocument.find(["1234", "5678"]).should == [document, document2]
+  end
 end

data/spec/mongoid/token/generator_spec.rb

@@ -18,6 +18,14 @@ describe Mongoid::Token::Generator do
       100.times{ Mongoid::Token::Generator.generate("%D").should =~ /[1-9]/ }
     end
 
+    it "generates hexdigits" do
+      100.times{ Mongoid::Token::Generator.generate("%h").should =~ /[0-9a-f]/ }
+    end
+
+    it "generates non-zero hexdigits" do
+      100.times{ Mongoid::Token::Generator.generate("%H").should =~ /[1-9a-f]/ }
+    end
+
     it "generates alphanumeric characters" do
       100.times{ Mongoid::Token::Generator.generate("%s").should =~ /[A-Za-z0-9]/ }
     end

data/spec/mongoid/token_spec.rb

@@ -1,8 +1,12 @@
 require File.join(File.dirname(__FILE__), %w[.. spec_helper])
 
 describe Mongoid::Token do
+  after do
+    Object.send(:remove_const, :Document) if Object.constants.include?(:Document)
+    Object.send(:remove_const, :AnotherDocument) if Object.constants.include?(:AnotherDocument)
+  end
+
   let(:document_class) do
-    Object.send(:remove_const, :Document)
     class Document
       include Mongoid::Document
       include Mongoid::Token

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_token
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Nicholas Bruning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -37,6 +37,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - benchmarks/benchmark.rb
@@ -58,7 +59,8 @@ files:
 - spec/mongoid/token_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/thetron/mongoid_token
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -76,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid_token
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A little random, unique token generator for Mongoid documents.