devision 0.0.2.9 → 0.0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c1c77b71327aec36fa2df6c7dd64f7c019c1c38
-  data.tar.gz: 5554a5ae0c2aa22c2f3de805e905f14c2a3dba8b
+  metadata.gz: f06d18b5d5046d3909518b72ac9ba7b0dd330ee3
+  data.tar.gz: 904a96ccfba3ceacab4d1d54418ab98b8b7203b4
 SHA512:
-  metadata.gz: 0f434934bd9af6e2c2870f72e44776d6c7e56a4e3ef965f4a27e5a90703e3cd5f4d736739849e51462254ebd8cedcb42fa23451371fd4abb70adda0269f92e03
-  data.tar.gz: 439b127e29cce9af2e590318e48ab9771340f930b2395c1d1dda9a0004891c5fbae1a22a32da7c7353292be06a7fdc351f0ded45078d5621f9332d3e6e631051
+  metadata.gz: b9cd8ec92036b4d24a4d4d90c72d87e785c59dbd920420ea797fd91831008b069d92e7d90444abb8141663972e0657317f9086bcb44784a25cc8066e60a4499d
+  data.tar.gz: e9b63cc0a1b998b590240fe10c3bf5e17a2357b9571d05c606bd2c9f53160836b2a53978b8feae4f2215507fa5e732a405876b62faf794d2be08c158485b1ae6

data/.envrc

@@ -0,0 +1 @@
+export PATH=$PWD/bin:$PATH

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--warnings
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.1.0
+  - ruby-head
+  - jruby-19mode
+  - rbx-2.2.9
+  - jruby-head

data/POST_INSTALL_MESSAGE

@@ -0,0 +1 @@
+Thanks for installing Devision!

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/devision.gemspec

@@ -1,29 +1,33 @@
 # encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$:.unshift(lib) unless $:.include?(lib)
+$:.unshift File.expand_path('../lib', __FILE__) 
 require 'devision/version'
 
 Gem::Specification.new do |spec|
+
+  # metadata 
   spec.name          = 'devision'
   spec.version       = Devision::VERSION::STRING
   spec.authors       = ['John Faucett']
   spec.email         = ['jwaterfaucett@gmail.com']
   spec.summary       = 'Devise on a Diet'
   spec.license       = 'MIT'
+  spec.require_paths = ['lib']
+  spec.platform      = Gem::Platform::RUBY
+  spec.post_install_message = File.read('./POST_INSTALL_MESSAGE')
 
+  # files
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  # dependencies
+  spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake'
-
   spec.add_development_dependency 'rspec', '~> 3.0.0'
-
-  spec.add_dependency 'railties', '>= 3.2.6', '< 5'
-  spec.add_dependency 'orm_adapter', '~> 0.5'
-  spec.add_dependency 'bcrypt', '~> 3.1'
-  spec.add_dependency 'thread_safe', '~> 0.3'
+  spec.add_runtime_dependency 'railties', '>= 3.2.6', '< 5'
+  spec.add_runtime_dependency 'orm_adapter', '~> 0.5'
+  spec.add_runtime_dependency 'bcrypt', '~> 3.1'
+  spec.add_runtime_dependency 'thread_safe', '~> 0.3'
 
 end

data/lib/devision/configuration_options.rb

@@ -20,7 +20,7 @@ module Devision
   mattr_accessor :reset_password_within
   @@reset_password_within = 6.hours
 
-  
+
   # Email regex used to validate email formats. It simply asserts that
   # an one (and only one) @ exists in the given string. This is mainly
   # to give user feedback and not to assert the e-mail validity.
@@ -28,16 +28,13 @@ module Devision
   @@email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
 
   # Range validation for password length
-  mattr_accessor :password_length
-  @@password_length = 6..128
+  mattr_accessor :password_range
+  @@password_range = 6..128
 
   # ======================
   # REMEMBERABLE OPTIONS
   # ======================
 
-  # Custom domain or key for cookies. Not set by default
-  # mattr_accessor :rememberable_options
-  # @@rememberable_options = {}
 
   # The time the user will be remembered without asking for credentials again.
   mattr_accessor :remember_for

data/lib/devision/models/validatable.rb

@@ -3,44 +3,58 @@ module Devision
 
     module Validatable
 
-      def self.required_fields(klass)
-        []
-      end
-
-      def self.included(base)
-        base.extend(ClassMethods)
-        base.class_eval do
+      module Email
+        def self.required_fields(klass)
+          [:email]
+        end
 
-          if base.instance_methods.include?(:email)
+        def self.included(base)
+          base.extend(ClassMethods)
+          base.class_eval do
             validates_presence_of :email, if: :email_required?
             validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
             validates_format_of :email, with: email_regexp, allow_blank: true, if: :email_changed?
           end
 
-          if base.instance_methods.include?(:password)
-            validates_presence_of :password, if: :password_required?
-            validates_confirmation_of :password, if: :password_required?
-            validates_length_of :password, within: password_length, allow_blank: true
+          def email_required?
+            true
           end
         end
+
+        module ClassMethods
+          Devision::Models::Config.add_options(self, :email_regexp)
+        end
       end
 
-      protected
+      module Password
+        def self.required_fields(klass)
+          [:password]
+        end
+
+        def self.included(base)
+
+          base.extend(ClassMethods)
+          base.class_eval do
+            validates_presence_of :password, if: :password_required?
+            validates_confirmation_of :password, if: :password_required?
+            validates_length_of :password, within: password_range, allow_blank: true
+          end
+        end
 
         # Password/Confirmation combo is required for:
         # new records
         # whenever either password or password_confirmation is set
-        def password_required?
-          !persisted? || !password.nil? || !password_confirmation.nil?
-        end
-
-        def email_required?
-          true
-        end
+        private
+          def password_required?
+            !persisted? || !password.nil? || !password_confirmation.nil?
+          end
 
         module ClassMethods
-          Devision::Models::Config.add_options(self, :email_regexp, :password_length)
+          Devision::Models::Config.add_options(self, :password_range)
         end
+      end
+
+
     end
   end
 end

data/lib/devision/version.rb

@@ -7,9 +7,17 @@ module Devision
 
     MAJOR = 0
     MINOR = 0
-    PATCH = 2
-    PRE   = 9
+    PATCH = 3
+    PRE   = 0
 
-    STRING = [MAJOR,MINOR,PATCH,PRE].compact.join('.').freeze
+    STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze
+  end
+
+  def self.gem_version
+    VERSION.gem_version
+  end
+
+  def self.version
+    VERSION::STRING
   end
 end

data/spec/devision_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Devision do
+  
+  describe '#nice_token' do
+    
+    it 'should generate a token 20 chars long without O0lI' do
+      100.times do
+        tkn = Devision.nice_token
+        expect(tkn.length).to eq(20)
+        'O0lI'.each_char do |ch|
+          expect(tkn.index(ch)).to be(nil)
+        end
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'devision'
+
+RSpec.configure do |config|
+  
+  # files
+  config.pattern = 'spec/**/*_spec.rb'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devision
 version: !ruby/object:Gem::Version
-  version: 0.0.2.9
+  version: 0.0.3.0
 platform: ruby
 authors:
 - John Faucett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -117,15 +117,21 @@ dependencies:
 description: 
 email:
 - jwaterfaucett@gmail.com
-executables: []
+executables:
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
+- .envrc
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
+- POST_INSTALL_MESSAGE
 - README.md
 - Rakefile
+- bin/rspec
 - devision.gemspec
 - lib/devision.rb
 - lib/devision/configuration_options.rb
@@ -140,11 +146,14 @@ files:
 - lib/devision/models/validatable.rb
 - lib/devision/token_generator.rb
 - lib/devision/version.rb
+- spec/devision_spec.rb
+- spec/spec_helper.rb
 homepage: 
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  Thanks for installing Devision!
 rdoc_options: []
 require_paths:
 - lib
@@ -164,4 +173,6 @@ rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Devise on a Diet
-test_files: []
+test_files:
+- spec/devision_spec.rb
+- spec/spec_helper.rb