hello-rails 0.5.0 → 0.5.1

data/spec/models/credential_spec.rb

@@ -2,8 +2,17 @@ require 'spec_helper'
 
 describe Credential do
   example 'Validations' do
-    subject.valid?
-    expect(subject.errors.messages).to eq(user: ["can't be blank"],
-                                          type: ['is not included in the list'])
+    expect(subject.valid?).to eq(true)
+    expect(subject.errors.messages).to eq({})
+  end
+
+  example 'Saving Validations' do
+    # can save without a user
+    expect(subject.save).to eq(true)
+    expect(subject.errors.messages).to eq({})
+
+    # cannot update without a user
+    expect(subject.save).to eq(false)
+    expect(subject.errors.messages).to eq({:user => ["can't be blank"]})
   end
 end

data/spec/models/email_credential_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe EmailCredential do
   example 'Validations' do
     subject.valid?
-    expect(subject.errors.messages).to eq(user: ["can't be blank"],
-                                          email: ["can't be blank"])
+    expect(subject.errors.messages).to eq(email: ["can't be blank"])
   end
 
   context 'Fields' do

data/spec/models/password_credential_spec.rb

@@ -4,8 +4,7 @@ describe PasswordCredential do
   describe 'validations' do
     it 'presence of name' do
       subject.valid?
-      expect(subject.errors.messages).to eq(user: ["can't be blank"],
-                                            password: ["can't be blank"])
+      expect(subject.errors.messages).to eq(password: ["can't be blank"])
     end
   end
 

data/spec/models/user_spec.rb

@@ -18,15 +18,30 @@ describe User do
   end
 
   describe 'validations' do
-    it 'validations' do
+    it 'creating' do
       @user.valid?
-      # city is only here because we need to test code customization, and this is how we are currently testing it
       expect(@user.errors.messages).to eq(
-        name: ["can't be blank"],
-        locale: ["can't be blank", 'is not included in the list'],
-        time_zone: ["can't be blank", 'is not included in the list'],
-        city: ["can't be blank"],
-        username: ["can't be blank", 'is invalid', 'is too short (minimum is 4 characters)']
+        :name=>["can't be blank"],
+        :locale=>["can't be blank", 'is not included in the list'],
+        :time_zone=>["can't be blank", 'is not included in the list'],
+        :username=>["can't be blank"],
+        :email=>["can't be blank"],
+        :password=>["can't be blank"],
+        :email_credentials=>["is too short (minimum is 1 character)"],
+      )
+    end
+
+    it 'updating' do
+      @user = create(:user)
+      attrs = attributes_for(:user)
+      attrs.each { |k, _v| attrs[k] = nil }
+      expect(@user.update(attrs)).to eq(false)
+      expect(@user.errors.messages).to eq(
+        :name=>["can't be blank"],
+        :locale=>["can't be blank", 'is not included in the list'],
+        :time_zone=>["can't be blank", 'is not included in the list'],
+        :username=>["can't be blank"],
+        :role=>["can't be blank"],
       )
     end
   end
@@ -42,20 +57,75 @@ describe User do
   describe 'username' do
     describe 'validations' do
       describe 'uniqueness' do
-        def test_uniqueness(a, b)
-          create(:user, username: a)
-          user = build(:user, username: b)
-          user.valid?
-          # expect(user.errors.messages).to eq(1)
-          expect(user.errors.added?(:username, :taken)).to eq(true)
+        def expects_uniqueness_to_be_applied(a, b)
+          user1 = build(:user)
+          user1.username = a
+          user1.save!
+
+          user2 = build(:user)
+          user2.username = b
+          user2.valid?
+          expect(user2.errors.messages).to eq({:username=>["has already been taken"]})
         end
 
-        it 'normal case' do
-          test_uniqueness('james', 'james')
+        def expects_uniqueness_to_be_ignored(a, b)
+          user1 = build(:user)
+          user1.username = a
+          user1.save!
+
+          user2 = build(:user)
+          user2.username = b
+          user2.save!
+          expect(user2.errors.messages).to eq({})
         end
 
-        it 'downcase' do
-          test_uniqueness('JaMeS', 'james')
+        describe "config" do
+          subject { build(:user, username: '', email: 'foo@bar.com') }
+          after do
+            reload_initializer!
+          end
+
+          describe 'config.username_presence = true' do
+            before do
+              Hello.configure { |config| config.username_presence = true }
+            end
+
+            it 'requires a username' do
+              expect(subject).to be_invalid
+              expect(subject.errors.messages).to eq({:username=>["can't be blank"]})
+            end
+
+            it 'expects uniqueness to be applied for normal-cased usernames' do
+              expects_uniqueness_to_be_applied('james', 'james')
+            end
+
+            it 'expects uniqueness to be applied for down-cased usernames' do
+              expects_uniqueness_to_be_applied('JaMeS', 'james')
+            end
+          end
+
+          describe 'config.username_presence = false' do
+            before do
+              Hello.configure { |config| config.username_presence = false }
+            end
+
+            it 'does not require a username' do
+              expect(subject).to be_valid
+              expect(subject.errors.messages).to eq({})
+            end
+
+            it 'expects uniqueness to be applied for normal-cased usernames' do
+              expects_uniqueness_to_be_applied('james', 'james')
+            end
+
+            it 'expects uniqueness to be applied for down-cased usernames' do
+              expects_uniqueness_to_be_applied('JaMeS', 'james')
+            end
+
+            it 'expects uniqueness to be ignored for blank usernames' do
+              expects_uniqueness_to_be_ignored('', '')
+            end
+          end
         end
       end
 
@@ -79,15 +149,5 @@ describe User do
         end
       end
     end
-
-    describe 'private ._make_up_new_username' do
-      let(:model) { build(:user, username: '') }
-
-      it 'works when called' do
-        a_username = model.send(:_make_up_new_username)
-        expect(a_username.length).to eq(32)
-        expect(model.username).to eq('')
-      end
-    end
   end
 end

data/spec/requests/forgot_password_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe 'Forgot Password', type: :request do
     end
 
     it 'Success' do
-      given_I_have_an_email_credential
+      given_I_have_a_user
 
       forgot_password_params = { login: 'foobar', password: '1234' }
       post '/hello/passwords/forgot.json', forgot_password: forgot_password_params

data/spec/support/factories.rb

@@ -1,41 +1,37 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
-# https://github.com/thoughtbot/factory_girl/blob/webmaster/GETTING_STARTED.md
+# https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md
 
 # https://github.com/stympy/faker#usage
 
 FactoryGirl.define do
+
   factory :user do
     name { Faker::Name.name }
-    city { Faker::Address.city } # for dummy's customized sign up
     locale 'en'
     time_zone Time.zone.name
     role 'user'
-
     username { Faker::Internet.user_name(name, %w(-_)) }
+    email { "#{username}@provider.com" }
+    password '1234'
 
-    # TODO: improve this
-    after(:build)  { |user| build(:password_credential,  user: user) }
-    after(:create) { |user| create(:password_credential, user: user) }
+    trait :without_credentials do
+      email nil
+      password nil
+    end
 
-    factory :webmaster_user do
-      name 'Admin'
+    factory :user_webmaster do
+      name 'Webmaster'
       role 'webmaster'
-      username 'webmaster'
-      factory :user_webmaster do
-        name 'Webmaster'
-      end
     end
 
     factory :user_onboarding do
       name 'Onboarding'
       role 'onboarding'
-      username 'onboarding'
     end
 
     factory :user_user do
       name 'User'
       role 'user'
-      username 'user'
     end
   end
 

data/spec/support/helpers/given.rb

@@ -4,34 +4,26 @@ USER_TEST_EMAIL    = 'foo@bar.com'.freeze
 USER_TEST_USERNAME = 'foobar'.freeze
 
 def given_I_have_a_classic_access_token
-  user = create(:user, name: 'James Pinto', username: USER_TEST_USERNAME, city: 'Brasilia')
-  create(:email_credential, user: user, email: USER_TEST_EMAIL)
+  user = create(:user, name: 'James Pinto', username: USER_TEST_USERNAME, email: USER_TEST_EMAIL)
   Access.create!(user: user, user_agent_string: 'testing', expires_at: 24.hours.from_now)
 end
 
-def given_I_have_an_email_credential
-  user = create(:user, name: 'James Pinto', username: USER_TEST_USERNAME, city: 'Brasilia')
-  create(:email_credential, user: user, email: USER_TEST_EMAIL)
-end
-
-def given_I_have_an_onboarding_password_credential
-  user = create(:onboarding)
-  create(:email_credential, user: user, email: USER_TEST_EMAIL)
+def given_I_have_a_user
+  create(:user, name: 'James Pinto', email: USER_TEST_EMAIL, username: USER_TEST_USERNAME)
 end
 
 def given_I_have_a_webmaster_password_credential
-  user = create(:webmaster_user)
-  create(:email_credential, user: user, email: 'webmaster@bar.com')
+  create(:user_webmaster)
 end
 
-def given_I_have_an_email_credential_and_forgot_my_password
-  credential = given_I_have_an_email_credential
-  unencrypted_token = credential.user.password_credential.reset_verifying_token!
+def given_I_have_a_user_and_forgot_my_password
+  user = given_I_have_a_user
+  unencrypted_token = user.password_credential.reset_verifying_token!
 end
 
 def given_I_am_logged_in_with_a_classic_credential
   # when_sign_up_with_standard_data(expect_welcome_mailer: true)
-  given_I_have_an_email_credential
+  given_I_have_a_user
   when_sign_in_with_standard_data
   then_I_should_be_logged_in
 end

data/spec/support/helpers/when.rb

@@ -30,7 +30,6 @@ def when_sign_up_as_an_onboarding(options = {})
     fill_in 'sign_up_email',    with: 'foo@bar.com'
     fill_in 'sign_up_username', with: 'foobar'
     fill_in 'sign_up_password', with: '1234'
-    fill_in 'sign_up_city',     with: 'OMG! I can customize Hello!'
     click_button 'Sign Up'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hello-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Pinto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: before_actions
@@ -17,154 +17,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: user_agent_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -185,14 +185,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -227,14 +227,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 description: Provides a set of valuable features for Registration, Authentication,
   Management and Internationalization.
 email:
@@ -310,11 +310,9 @@ files:
 - db/migrate/1_create_credentials.rb
 - db/migrate/2_create_accesses.rb
 - db/migrate/3_create_users.rb
+- lib/data/locales.yml
 - lib/generators/hello/concerns/USAGE
 - lib/generators/hello/concerns/concerns_generator.rb
-- lib/generators/hello/from_devise/USAGE
-- lib/generators/hello/from_devise/from_devise_generator.rb
-- lib/generators/hello/from_devise/templates/from_devise.migration.rb
 - lib/generators/hello/install/USAGE
 - lib/generators/hello/install/install_generator.rb
 - lib/generators/hello/install/templates/application.html.erb
@@ -326,13 +324,15 @@ files:
 - lib/generators/hello/install/templates/onboarding/onboarding_controller.rb
 - lib/generators/hello/install/templates/root/index.html.erb
 - lib/generators/hello/install/templates/root/root_controller.rb
-- lib/generators/hello/install/templates/users/controllers/users_controller.rb
-- lib/generators/hello/install/templates/users/views/users/index.html.erb
-- lib/generators/hello/install/templates/users/views/users/list.html.erb
-- lib/generators/hello/install/templates/users/views/users/new.html.erb
-- lib/generators/hello/install/templates/users/views/users/show.html.erb
 - lib/generators/hello/locales/USAGE
 - lib/generators/hello/locales/locales_generator.rb
+- lib/generators/hello/users/USAGE
+- lib/generators/hello/users/templates/app/controllers/users_controller.rb
+- lib/generators/hello/users/templates/app/views/users/index.html.erb
+- lib/generators/hello/users/templates/app/views/users/list.html.erb
+- lib/generators/hello/users/templates/app/views/users/new.html.erb
+- lib/generators/hello/users/templates/app/views/users/show.html.erb
+- lib/generators/hello/users/users_generator.rb
 - lib/generators/hello/views/USAGE
 - lib/generators/hello/views/views_generator.rb
 - lib/hello-rails.rb
@@ -436,9 +436,11 @@ files:
 - spec/fixtures/hello/password_mailer/sign_up
 - spec/mailers/hello/mailer_spec.rb
 - spec/models/access_spec.rb
+- spec/models/create_and_destroy/email_credential_create_and_destroy_spec.rb
+- spec/models/create_and_destroy/password_credential_create_and_destroy_spec.rb
+- spec/models/create_and_destroy/user_create_and_destroy_spec.rb
 - spec/models/credential_spec.rb
 - spec/models/email_credential_spec.rb
-- spec/models/hello/sign_up_model_spec.rb
 - spec/models/password_credential_spec.rb
 - spec/models/user_spec.rb
 - spec/others/configuration_spec.rb
@@ -554,9 +556,11 @@ test_files:
 - spec/fixtures/hello/password_mailer/sign_up
 - spec/mailers/hello/mailer_spec.rb
 - spec/models/access_spec.rb
+- spec/models/create_and_destroy/email_credential_create_and_destroy_spec.rb
+- spec/models/create_and_destroy/password_credential_create_and_destroy_spec.rb
+- spec/models/create_and_destroy/user_create_and_destroy_spec.rb
 - spec/models/credential_spec.rb
 - spec/models/email_credential_spec.rb
-- spec/models/hello/sign_up_model_spec.rb
 - spec/models/password_credential_spec.rb
 - spec/models/user_spec.rb
 - spec/others/configuration_spec.rb