devise-neo4j 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffc34ede7035e57480328a141cc838e84219e0fb
-  data.tar.gz: 36d99219072251c85b4aa752a944d0acf6bd1708
+  metadata.gz: 1d06629713351f2ac2ccc575ec685ce42f84c6e0
+  data.tar.gz: 16f4bad9a75f8de9c7a910ead4f5d1ee2169cf45
 SHA512:
-  metadata.gz: d0220d1729e55714e5f1cdf9d4783f3e467a46562aa06a1a506827f4c1744174bfccfaa0934e84da5de2c585f0a9f30441f9ef17fe76e74da535b8ba2d94e3f7
-  data.tar.gz: a63c77b5e5b359a0e834b76f5e681364501b9e8b123132961efd3771746dd009abfe1b3a17645ff5affb6d23d615d124ef02e4004015198072dc9090d1966f97
+  metadata.gz: fe84a5eabd313d7ac532e353df0c69e0d209cb9482df3710514d8a2c79866b142d3f9dcad907758ec72e5642284268682b603ceb47e2aa417fed814de83b0608
+  data.tar.gz: b59a41c7e5892f2b841c1234172efd58da32df04f844b4d219467c9614b82e601663907a751e96deefc25bf826bc8eaec17fc5c27492dd3ca44e95108b88458e

data/.travis.yml

@@ -1,5 +1,19 @@
-script: "bundle exec rake neo4j:install['community-latest'] neo4j:start default --trace"
+before_script:
+  - "bin/rake neo4j:install[community-latest] --trace"
+  - "bin/rake neo4j:config[development,7474] --trace"
+  - "echo 'dbms.memory.pagecache.size=600m' >> ./db/neo4j/development/conf/neo4j.conf"
+  - "echo 'dbms.memory.heap.max_size=600' >> ./db/neo4j/development/conf/neo4j-wrapper.conf"
+  - "echo 'dbms.memory.heap.initial_size=600' >> ./db/neo4j/development/conf/neo4j-wrapper.conf"
+  - "bin/rake neo4j:start --trace"
+  - "sleep 20"
+script:
+  - "travis_retry bin/rake default --trace"
 language: ruby
+cache: bundler
+jdk: oraclejdk8
 sudo: false
+env:
+  global:
+    - JRUBY_OPTS="-J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF"
 rvm:
   - 2.2.3

data/CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.0] - 12-23-2016
+
+### Fixed
+
+- Various problems with the model generator with newer version of Neo4j (see #28)
+
 ## [2.0.2] - 11-29-2015
 
 ### Fixed

data/Gemfile

@@ -2,14 +2,18 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 4.2.3"
+gem "rails", ">= 4.2.3"
 gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"
 
-gem 'neo4j', '~> 5.0.0'
-gem 'neo4j-core', '~> 5.0.0'
-gem "devise", '3.5.2'
+gem 'neo4j', '>= 7.0.0'
+gem 'neo4j-core', '>= 6.0.0'
+gem "devise"
+
+group :development do
+  gem 'pry'
+end
 
 group :test do
   gem "omniauth-facebook"

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    devise-neo4j (2.0.2)
+    devise-neo4j (2.1.0)
       bcrypt (>= 3.0)
-      devise (>= 3.0)
+      devise (>= 3.5.2)
       neo4j (>= 3.0.0)
       orm_adapter (~> 0.5.0)
-      railties (>= 3.1)
+      railties (>= 4.2)
       warden (>= 1.2.1)
 
 GEM
@@ -31,9 +31,6 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_attr (0.8.5)
-      activemodel (>= 3.0.2, < 5.0)
-      activesupport (>= 3.0.2, < 5.0)
     activejob (4.2.3)
       activesupport (= 4.2.3)
       globalid (>= 0.3.0)
@@ -51,35 +48,34 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
-    bcrypt (3.1.10)
-    bcrypt (3.1.10-java)
+    bcrypt (3.1.11)
+    bcrypt (3.1.11-java)
     bson (3.2.1)
     bson_ext (1.3.1)
     builder (3.2.2)
+    coderay (1.1.1)
+    colored (1.2)
     columnize (0.9.0)
     connection_pool (2.2.0)
-    devise (3.5.2)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.2)
-      faraday (>= 0.7.4, < 0.10)
+    faraday_middleware (0.10.1)
+      faraday (>= 0.7.4, < 1.0)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
+    ffi (1.9.14-java)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     hashie (3.4.2)
-    httparty (0.13.7)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    httpclient (2.7.0.1)
+    httpclient (2.8.3)
     i18n (0.7.0)
     jruby-openssl (0.9.8-java)
     json (1.8.3)
@@ -87,14 +83,15 @@ GEM
     jwt (1.5.1)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
+    method_source (0.8.2)
     mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.8.3)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mongo (2.0.6)
@@ -108,31 +105,34 @@ GEM
       bson (~> 3.0)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    neo4j (5.0.15)
-      active_attr (~> 0.8)
-      activemodel (~> 4)
-      activesupport (~> 4)
-      neo4j-core (~> 5.0.1)
+    neo4j (8.0.0)
+      activemodel (>= 4.0, < 5.1)
+      activesupport (>= 4.0, < 5.1)
+      neo4j-core (>= 7.0.0)
       orm_adapter (~> 0.5.0)
-    neo4j-core (5.0.10)
-      activesupport
+    neo4j-core (7.0.0)
+      activesupport (>= 4.0)
       faraday (~> 0.9.0)
-      faraday_middleware (~> 0.9.1)
+      faraday_middleware (~> 0.10.0)
       faraday_middleware-multi_json
-      httparty
       httpclient
       json
       multi_json
-      net-http-persistent
+      neo4j-rake_tasks (>= 0.3.0)
+      net-http-persistent (~> 2.9.4)
+    neo4j-rake_tasks (0.7.9)
+      colored
       os
-      zip
+      rake
+      ruby-progressbar
+      rubyzip (>= 1.1.7)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-java)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.8.1-java)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -154,7 +154,16 @@ GEM
     origin (2.1.1)
     orm_adapter (0.5.0)
     os (0.9.6)
-    rack (1.6.4)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.4-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    rack (1.6.5)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
@@ -173,28 +182,33 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     railties (4.2.3)
       actionpack (= 4.2.3)
       activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (12.0.0)
     rbx-require-relative (0.0.9)
     rdoc (4.2.0)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     ruby-openid (2.7.0)
+    ruby-progressbar (1.8.1)
+    rubyzip (1.2.0)
+    slop (3.6.0)
+    spoon (0.0.6)
+      ffi
     sprockets (3.3.0)
       rack (~> 1.0)
     sprockets-rails (2.3.2)
@@ -202,18 +216,17 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    warden (1.2.3)
+    warden (1.2.6)
       rack (>= 1.0)
     webrat (0.7.2)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    zip (2.0.2)
 
 PLATFORMS
   java
@@ -221,23 +234,24 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext (~> 1.3.0)
-  devise (= 3.5.2)
+  devise
   devise-neo4j!
   jruby-openssl
   mocha
   mongo
   mongoid
-  neo4j (~> 5.0.0)
-  neo4j-core (~> 5.0.0)
+  neo4j (>= 7.0.0)
+  neo4j-core (>= 6.0.0)
   omniauth
   omniauth-facebook
   omniauth-oauth2
   omniauth-openid (~> 1.0.1)
-  rails (~> 4.2.3)
+  pry
+  rails (>= 4.2.3)
   rdoc
   ruby-debug (>= 0.10.3)
   sqlite3
   webrat (= 0.7.2)
 
 BUNDLED WITH
-   1.10.6
+   1.13.6

data/README.md

@@ -11,7 +11,7 @@ https://github.com/plataformatec/devise
 
 Add the neo4j and devise-neo4j gems to your Gemfile:
 
-    gem "neo4j", "~> 4.2.1"
+    gem "neo4j"
     gem "devise-neo4j"
 
 Run the bundle install command:
@@ -23,7 +23,7 @@ devise-neo4j model:
 
     rails g devise:install --orm=neo4j
     # Make sure the model file is created ahead of time!
-    rails g neo4j:devise MODEL
+    rails g neo4j:devise MODEL  # (Where MODEL is something like User)
     
 Add the Devise route to your config/routes.rb:
 

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' 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("rake", "rake")

data/devise-neo4j.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.add_dependency("warden", ">= 1.2.1")
   s.add_dependency("orm_adapter", "~> 0.5.0")
   s.add_dependency("bcrypt", ">= 3.0")
-  s.add_dependency("railties", ">= 3.1")
+  s.add_dependency("railties", ">= 4.2")
   s.add_dependency("neo4j", ">= 3.0.0")
-  s.add_dependency("devise", ">= 3.0")
+  s.add_dependency("devise", ">= 3.5.2")
 
 end

data/lib/devise-neo4j/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Neo4j
-    VERSION = "2.0.2"
+    VERSION = "2.1.0"
   end
 end

data/lib/generators/neo4j/devise_generator.rb

@@ -4,81 +4,86 @@ module Neo4j
   module Generators
     class DeviseGenerator < ::Rails::Generators::NamedBase
       include ::Devise::Generators::OrmHelpers
-  
+
+      def copy_devise_migration
+        create_file "db/neo4j/migrate/#{Time.now.utc.strftime('%Y%m%d%H%M%S')}_devise_create_user_constraints_and_indexes.rb", File.read(File.expand_path('./templates/migration.rb', File.dirname(__FILE__)))
+      end
+
       def generate_model
-        invoke "neo4j:model", [name] unless model_exists? && behavior == :invoke
+        invoke 'neo4j:model', [name] unless model_exists? && behavior == :invoke
       end
-    
 
       def inject_field_types
-        inject_into_file model_path, model_contents , :after => /Neo4j::ActiveNode\n/ if model_exists?
+        inject_into_file model_path, model_contents , after: /Neo4j::ActiveNode\n/ if model_exists?
       end
 
       def inject_devise_content
-        inject_into_file model_path,  migration_data , :after => /Neo4j::ActiveNode\n/ if model_exists?
+        inject_into_file model_path,  migration_data , after: /Neo4j::ActiveNode\n/ if model_exists?
       end
-      
-    
-    def migration_data
+
+      def migration_data
 <<RUBY
-    #
-    # Neo4j.rb needs to have property definitions before any validations. So, the property block needs to come before
-    # loading your devise modules.
-    #
-    # If you add another devise module (such as :lockable, :confirmable, or :token_authenticatable), be sure to
-    # uncomment the property definitions for those modules. Otherwise, the unused property definitions can be deleted.
-    #
-
-     property :username, type: String
-     property :facebook_token, type: String
-     index :facebook_token
-
-     property :created_at, type: DateTime
-     property :updated_at, type: DateTime
-
-     ## Database authenticatable
-     property :email, type: String, null: false, default: ""
-     index :email
-
-     property :encrypted_password
-
-     ## If you include devise modules, uncomment the properties below.
-
-     ## Rememberable
-     property :remember_created_at, type: DateTime
-     property :remember_token
-     index :remember_token
-
-
-     ## Recoverable
-     property :reset_password_token
-     index :reset_password_token
-     property :reset_password_sent_at, type: DateTime
-
-     ## Trackable
-     property :sign_in_count, type: Integer, default: 0
-     property :current_sign_in_at, type: DateTime
-     property :last_sign_in_at, type: DateTime
-     property :current_sign_in_ip, type:  String
-     property :last_sign_in_ip, type: String
-
-     ## Confirmable
-     # property :confirmation_token
-     # index :confirmation_token
-     # property :confirmed_at, type: DateTime
-     # property :confirmation_sent_at, type: DateTime
-
-     ## Lockable
-     #  property :failed_attempts, type: Integer, default: 0
-     # property :locked_at, type: DateTime
-     #  property :unlock_token, type: String,
-     # index :unlock_token
-
-      ## Token authenticatable
-      # property :authentication_token, type: String, null: true, index: :exact
+  #
+  # Neo4j.rb needs to have property definitions before any validations. So, the property block needs to come before
+  # loading your devise modules.
+  #
+  # If you add another devise module (such as :lockable, :confirmable, or :token_authenticatable), be sure to
+  # uncomment the property definitions for those modules. Otherwise, the unused property definitions can be deleted.
+  #
+
+  property :created_at, type: DateTime
+  property :updated_at, type: DateTime
+
+  ## Database authenticatable
+  property :email, type: String, default: ''
+  validates :email, presence: true
+
+  property :encrypted_password
+
+  ## If you include devise modules, uncomment the properties below.
+
+  ## Recoverable
+  property :reset_password_token
+  property :reset_password_sent_at, type: DateTime
+
+  ## Rememberable
+  property :remember_created_at, type: DateTime
+
+  ## Trackable
+  property :sign_in_count, type: Integer, default: 0
+  validates :sign_in_count, presence: true
+  property :current_sign_in_at, type: DateTime
+  property :last_sign_in_at, type: DateTime
+  property :current_sign_in_ip, type:  String
+  property :last_sign_in_ip, type: String
+
+  ## Confirmable
+  # property :confirmation_token
+  # property :confirmed_at, type: DateTime
+  # property :confirmation_sent_at, type: DateTime
+  # property :unconfirmed_email # Only if using reconfirmable
+
+  ## Lockable
+  # property :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
+  # validates :failed_attempts, presence: true
+  # property :unlock_token, type: String # Only if unlock strategy is :email or :both
+  # property :locked_at, type: DateTime
+
+  ## Token authenticatable
+  # property :authentication_token, type: String
 
 RUBY
       end
+
+      def rails5?
+        Rails.version.start_with? '5'
+      end
+
+      def migration_version
+        if rails5?
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
     end
   end
 end

data/lib/generators/neo4j/templates/migration.rb

@@ -0,0 +1,10 @@
+class DeviseCreateUserConstraintsAndIndexes < Neo4j::Migrations::Base
+  def change
+    add_index :<%= table_name %>, :email, force: true
+    add_index :<%= table_name %>, :remember_token, force: true
+    add_index :<%= table_name %>, :reset_password_token, force: true
+    # add_index :<%= table_name %>, :confirmation_token, force: true
+    # add_index :<%= table_name %>, :unlock_token, force: true
+    # add_index :<%= table_name %>, :authentication_token, force: true
+  end
+end

data/test/generators/neo4j/devise_generator_test.rb

@@ -12,7 +12,7 @@ class Neo4j::Generators::ModelGeneratorTest < Rails::Generators::TestCase
     assert content =~ /class #{klass}(\(.+\))?(.*?)\nend/m, "Expected to have class #{klass}"
     yield $2.strip if block_given?
   end
-  
+
   test "invoke with model name" do
     content = run_generator %w(Player)
 
@@ -22,5 +22,4 @@ class Neo4j::Generators::ModelGeneratorTest < Rails::Generators::TestCase
       end
     end
   end
-  
 end

data/test/orm/neo4j.rb

@@ -34,12 +34,17 @@ def create_session
 end
 
 def create_embedded_session
+  # TODO: Replace with new stuff
   session = Neo4j::Session.open(:impermanent_db, EMBEDDED_DB_PATH, auto_commit: true)
   session.start
 end
 
+NEO4J_ADAPTOR = Neo4j::Core::CypherSession::Adaptors::HTTP.new(ENV['NEO4J_URL'] || 'http://localhost:7474')
 def create_server_session
-  Neo4j::Session.open(:server_db, "http://localhost:7474")
+  Neo4j::ActiveBase.current_session = Neo4j::Core::CypherSession.new(NEO4J_ADAPTOR)
+  Neo4j::ActiveBase.on_establish_session do
+    Neo4j::Core::CypherSession.new(NEO4J_ADAPTOR)
+  end
 end
 
 FileUtils.rm_rf(EMBEDDED_DB_PATH)
@@ -47,12 +52,20 @@ FileUtils.rm_rf(EMBEDDED_DB_PATH)
 Dir["#{File.dirname(__FILE__)}/shared_examples/**/*.rb"].each { |f| require f }
 
 def delete_db
-  Neo4j::Session.current._query('MATCH (n) OPTIONAL MATCH (n)-[r]-() DELETE n,r')
+  Neo4j::ActiveBase.current_session.query('MATCH (n) OPTIONAL MATCH (n)-[r]-() DELETE n,r')
 end
 
 class ActiveSupport::TestCase
   setup do
-    create_session unless Neo4j::Session.current
+    create_session unless Neo4j::ActiveBase.current_session
+
+    session = Neo4j::ActiveBase.current_session
+    session.query('CREATE CONSTRAINT ON (n:User) ASSERT n.uuid IS UNIQUE')
+    session.query('CREATE CONSTRAINT ON (n:Admin) ASSERT n.uuid IS UNIQUE')
+    session.query('CREATE CONSTRAINT ON (n:UserOnMainApp) ASSERT n.uuid IS UNIQUE')
+    session.query('CREATE CONSTRAINT ON (n:UserOnEngine) ASSERT n.uuid IS UNIQUE')
+    session.query('CREATE CONSTRAINT ON (n:UserWithoutEmail) ASSERT n.uuid IS UNIQUE')
+
     delete_db
   end
 end

data/test/overrides/authenticatable_test.rb

@@ -1,13 +1,14 @@
 require 'test_helper'
+require 'integration/authenticatable_test'
 
-class AuthenticationOthersTest < ActionDispatch::IntegrationTest
+class AuthenticationOthersTest < Devise::IntegrationTest
   undef :test_sign_in_stub_in_xml_format
   test 'sign in stub in xml format' do
     get new_user_session_path(:format => 'xml')
     assert_match '<?xml version="1.0" encoding="UTF-8"?>', response.body
     assert_match /<user>.*<\/user>/m, response.body
     assert_match '<email></email>', response.body
-    # slight/lame format different in XML. 
+    # slight/lame format different in XML.
     #assert_match '<password nil="true"/></password>', response.body
     assert_match '<password nil="true"/>', response.body
   end

data/test/overrides/database_authenticatable_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 require 'digest/sha1'
+require 'models/database_authenticatable_test'
 
 class DatabaseAuthenticatableTest < ActiveSupport::TestCase
-  
   undef :test_should_run_validations_even_when_current_password_is_invalid_or_blank
   # looks like neo4j wants to run the password validation first
   test 'should run validations even when current password is invalid or blank' do
@@ -14,4 +14,4 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_match "can't be blank", user.errors[:current_password].join
   end
 
-end
+end

data/test/overrides/mapping_test.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
+require 'mapping_test'
 
 class MappingTest < ActiveSupport::TestCase
-  
   undef :test_find_scope_works_with_single_table_inheritance
-    
+
   test 'find scope works with single table inheritance' do
     assert_equal :user, Devise::Mapping.find_scope!(Class.new(User))
   end

data/test/rails_app/app/neo4j/admin.rb

@@ -4,11 +4,9 @@ class Admin
   include Neo4j::ActiveNode
   include SharedAdmin
 
-  index :email
-
   ## Database authenticatable
-  property :email, type: String, null: true
-  property :encrypted_password, type: String, null: true
+  property :email, type: String
+  property :encrypted_password, type: String
 
   ## Recoverable
   property :reset_password_token,   type: String
@@ -16,25 +14,24 @@ class Admin
 
   ## Rememberable
   property :remember_created_at, type: DateTime
-  
+
   ## Confirmable
-  property :confirmation_token, type: String, null: true, index: :exact
+  property :confirmation_token, type: String
   property :confirmed_at, type: DateTime
   property :confirmation_sent_at, type: DateTime
   property :unconfirmed_email, type: String
 
   ## Lockable
   property :locked_at, type: DateTime
-  
+
   property :active, type: Boolean, default: false
-  
+
   property :created_at, type: DateTime
   property :updated_at, type: DateTime
 
 #  def active?
 #    return self.active
 #  end
-  
 end
 
 AdminAdapter = Admin.to_adapter unless Admin.is_a?(OrmAdapter::Base)

data/test/rails_app/app/neo4j/user.rb

@@ -4,17 +4,16 @@ class User
   include Neo4j::ActiveNode
   include SharedUser
 
-
   property :username,       type: String
-  property :facebook_token, type: String, index: :exact
+  property :facebook_token, type: String
 #  property :id
 
   ## Database authenticatable
-  property :email,              type: String, default: '', null: false, index: :exact
+  property :email,              type: String, default: ''
   property :encrypted_password, type: String, default: ''
-  
+
   ## Recoverable
-  property :reset_password_token,   type: String, index: :exact
+  property :reset_password_token,   type: String
   property :reset_password_sent_at, type: DateTime
 
   ## Rememberable
@@ -28,14 +27,14 @@ class User
   property :last_sign_in_ip,    type: String
 
   ## Confirmable
-  property :confirmation_token,   type: String, index: :exact
+  property :confirmation_token,   type: String
   property :confirmed_at,         type: DateTime
   property :confirmation_sent_at, type: DateTime
 #  property :unconfirmed_email,   type: String  # Only if using reconfirmable
 
   ## Lockable
   property :failed_attempts, type: Integer, default: 0
-  property :unlock_token,    type: String, index: :exact
+  property :unlock_token,    type: String
   property :locked_at,       type: DateTime
 
   property :created_at, type: DateTime

data/test/rails_app/app/neo4j/user_on_engine.rb

@@ -2,15 +2,17 @@ require 'shared_user_without_omniauth'
 
 class UserOnEngine
   include Neo4j::ActiveNode
-#  self.table_name = 'users'
   include SharedUserWithoutOmniauth
 
+  property :username,           type: String
+  property :facebook_token,     type: String
+
   ## Database authenticatable
-  property :email,              type: String, default: '', null: false, index: :exact
+  property :email,              type: String, default: ''
   property :encrypted_password, type: String, default: ''
 
   ## Recoverable
-  property :reset_password_token,   type: String, index: :exact
+  property :reset_password_token,   type: String
   property :reset_password_sent_at, type: DateTime
 
   ## Rememberable
@@ -24,14 +26,14 @@ class UserOnEngine
   property :last_sign_in_ip,    type: String
 
   ## Confirmable
-  property :confirmation_token,   type: String, index: :exact
+  property :confirmation_token,   type: String
   property :confirmed_at,         type: DateTime
   property :confirmation_sent_at, type: DateTime
   #  property :unconfirmed_email,   type: String  # Only if using reconfirmable
 
   ## Lockable
   property :failed_attempts, type: Integer, default: 0
-  property :unlock_token,    type: String, index: :exact
+  property :unlock_token,    type: String
   property :locked_at,       type: DateTime
 
   property :created_at, type: DateTime

data/test/rails_app/app/neo4j/user_on_main_app.rb

@@ -4,12 +4,15 @@ class UserOnMainApp
   include Neo4j::ActiveNode
   include SharedUserWithoutOmniauth
 
-## Database authenticatable
-  property :email,              type: String, default: '', null: false, index: :exact
+  property :username,           type: String
+  property :facebook_token,     type: String
+
+  ## Database authenticatable
+  property :email,              type: String, default: ''
   property :encrypted_password, type: String, default: ''
 
   ## Recoverable
-  property :reset_password_token,   type: String, index: :exact
+  property :reset_password_token,   type: String
   property :reset_password_sent_at, type: DateTime
 
   ## Rememberable
@@ -23,14 +26,14 @@ class UserOnMainApp
   property :last_sign_in_ip,    type: String
 
   ## Confirmable
-  property :confirmation_token,   type: String, index: :exact
+  property :confirmation_token,   type: String
   property :confirmed_at,         type: DateTime
   property :confirmation_sent_at, type: DateTime
   #  property :unconfirmed_email,   type: String  # Only if using reconfirmable
 
   ## Lockable
   property :failed_attempts, type: Integer, default: 0
-  property :unlock_token,    type: String, index: :exact
+  property :unlock_token,    type: String
   property :locked_at,       type: DateTime
 
   property :created_at, type: DateTime

data/test/rails_app/app/neo4j/user_without_email.rb

@@ -0,0 +1,32 @@
+require "shared_user_without_email"
+
+class UserWithoutEmail
+  include Neo4j::ActiveNode
+  include SharedUserWithoutEmail
+
+  property :username, type: String
+  property :facebook_token, type: String
+
+  ## Database authenticatable
+  property :email, type: String, default: ''
+  property :encrypted_password, type: String, default: ''
+
+  ## Recoverable
+  property :reset_password_token, type: String
+  property :reset_password_sent_at, type: DateTime
+
+  ## Rememberable
+  property :remember_created_at, type: DateTime
+
+  ## Trackable
+  property :sign_in_count, type: Integer, default: 0
+  property :current_sign_in_at, type: DateTime
+  property :last_sign_in_at, type: DateTime
+  property :current_sign_in_ip, type: String
+  property :last_sign_in_ip, type: String
+
+  ## Lockable
+  property :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
+  property :unlock_token, type: String # Only if unlock strategy is :email or :both
+  property :locked_at, type: DateTime
+end

data/test/test_helper.rb

@@ -30,7 +30,9 @@ $:.unshift "#{File.dirname(__FILE__)}/support"
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # For generators
-require "rails/generators/test_case"
-require "generators/devise/install_generator"
-require "generators/devise/controllers_generator"
-require "generators/devise/views_generator"
+require 'rails/generators/test_case'
+require 'generators/devise/install_generator'
+require 'generators/devise/controllers_generator'
+require 'generators/devise/views_generator'
+require 'test_models'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-neo4j
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Jackson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: neo4j
   requirement: !ruby/object:Gem::Requirement
@@ -87,18 +87,19 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.5.2
 description: Neo4j integration with the Devise authentication framework
 email:
 - ben@lissomsolutions.com
-executables: []
+executables:
+- rake
 extensions: []
 extra_rdoc_files: []
 files:
@@ -113,6 +114,7 @@ files:
 - README.md
 - Rakefile
 - Vagrantfile
+- bin/rake
 - devise-neo4j.gemspec
 - lib/devise-neo4j.rb
 - lib/devise-neo4j/version.rb
@@ -121,6 +123,7 @@ files:
 - lib/devise/orm/neo4j/hook.rb
 - lib/devise/orm/neo4j/nil_class_converter.rb
 - lib/generators/neo4j/devise_generator.rb
+- lib/generators/neo4j/templates/migration.rb
 - provisioning/roles/common/tasks/main.yml
 - provisioning/roles/java/README.md
 - provisioning/roles/java/files/.gitkeep
@@ -148,11 +151,11 @@ files:
 - test/rails_app/app/neo4j/user.rb
 - test/rails_app/app/neo4j/user_on_engine.rb
 - test/rails_app/app/neo4j/user_on_main_app.rb
+- test/rails_app/app/neo4j/user_without_email.rb
 - test/rails_app/config/application.rb
 - test/rails_app/config/environment.rb
 - test/support/i18n.rb
 - test/test_helper.rb
-- test/test_models.rb
 homepage: http://github.com/benjackson/devise-neo4j
 licenses: []
 metadata: {}
@@ -172,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Devise ORM for Neo4j
@@ -186,9 +189,8 @@ test_files:
 - test/rails_app/app/neo4j/user.rb
 - test/rails_app/app/neo4j/user_on_engine.rb
 - test/rails_app/app/neo4j/user_on_main_app.rb
+- test/rails_app/app/neo4j/user_without_email.rb
 - test/rails_app/config/application.rb
 - test/rails_app/config/environment.rb
 - test/support/i18n.rb
 - test/test_helper.rb
-- test/test_models.rb
-has_rdoc: 

data/test/test_models.rb

@@ -1,33 +0,0 @@
-class Configurable < User
-  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
-         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
-         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
-end
-
-class WithValidation < Admin
-  devise :database_authenticatable, :validatable, :password_length => 2..6
-end
-
-class UserWithValidation < User
-  validates_presence_of :username
-end
-
-class UserWithCustomEncryption < User
-  protected
-  def password_digest(password)
-    password.reverse
-  end
-end
-
-class UserWithVirtualAttributes < User
-  devise :case_insensitive_keys => [ :email, :email_confirmation ]
-  validates :email, :presence => true, :confirmation => {:on => :create}
-end
-
-class Several < Admin
-  devise :validatable
-  devise :lockable
-end
-
-class Inheritable < Admin
-end