hello-rails 0.5.0 → 0.5.1

data/lib/generators/hello/install/templates/initializer.rb

@@ -14,7 +14,7 @@ Hello.configure do |config|
   config.password_length = 4..250
 
   config.sign_up_disabled = false # {reason: "standard maintenance", until: "3PM"}
-  config.sign_up_fields = %w(username time_zone locale name)
+  config.sign_up_fields = %w(username email password time_zone locale name)
 
   config.locales    = %w(en es fr pl pt-BR zh-CN)
   config.time_zones = Hello::TimeZones.all

data/lib/generators/hello/install/templates/models/concerns/user/authorization.rb

@@ -1,21 +1,16 @@
-class User < Hello::RailsActiveRecord::User
-  module Authorization
+module User::Authorization
 
-    def guest?
+  def role_is?(string)
+    case string.to_s
+    when 'guest'
       %w(guest).include?(role)
-    end
-
-    def onboarding?
+    when 'onboarding'
       %w(onboarding).include?(role)
-    end
-
-    def user?
+    when 'user'
       %w(user webmaster).include?(role)
-    end
-
-    def webmaster?
+    when 'webmaster'
       %w(webmaster).include?(role)
     end
-
   end
+
 end

data/lib/generators/hello/install/templates/models/user.rb

@@ -1,4 +1,5 @@
-class User < Hello::RailsActiveRecord::User
+class User < ApplicationRecord
+  include Hello::RailsActiveRecord::User
   include Authorization
 
   def to_param

data/lib/generators/hello/users/USAGE

@@ -0,0 +1,10 @@
+Description:
+    Suggested scaffold for users
+
+Example:
+    rails generate hello:users
+
+    This will create:
+        app/controller/users_controller.rb
+        app/views/users/[...]
+

data/lib/generators/hello/{install/templates/users → users/templates/app}/controllers/users_controller.rb

@@ -36,16 +36,14 @@ class UsersController < ApplicationController
 
   # GET /users/new
   def new
-    @starting_role = 'onboarding'
   end
 
   # POST /users
   def create
-    if @user.register(params.require(:user))
-      @user.user.update!(role: params[:role])
+    create_user_params = params.require(:user).permit!
+    if @user.register(create_user_params)
       redirect_to new_user_path, notice: t('hello.business.registration.sign_up.success')
     else
-      @starting_role = params[:role]
       render action: :new
     end
   end

data/lib/generators/hello/{install/templates/users → users/templates/app}/views/users/index.html.erb

@@ -1,6 +1,6 @@
 <h1>Listing Users (<%= @count %>)</h1>
 
-<% if current_user && current_user.webmaster? %>
+<% if current_user && current_user.role_is?(:webmaster) %>
   <p><%= link_to "View User List as a Webmaster", list_users_path %></p>
 <% end %>
 

data/lib/generators/hello/{install/templates/users → users/templates/app}/views/users/list.html.erb

@@ -1,5 +1,7 @@
 <h1>Listing Users (<%= @count %>)</h1>
 
+<%= link_to('New User as a Webmaster', new_user_path) %>
+
 <table class="table table-condensed">
   <thead>
     <tr>
@@ -11,7 +13,7 @@
       <th>Time zone</th>
       <th>Credentials</th>
       <th>Accesses</th>
-        <!-- actions -->
+      <!-- actions -->
       <th colspan="1"></th>
     </tr>
   </thead>

data/lib/generators/hello/{install/templates/users → users/templates/app}/views/users/new.html.erb

@@ -6,9 +6,9 @@
   <% end %>
 
   <div class="form-group">
-    <%= label_tag :role, nil, class: "col-sm-4 control-label" %>
+    <%= f.label :role, class: "col-sm-4 control-label" %>
     <div class="col-sm-4">
-      <%= text_field_tag :role, @starting_role, class: "form-control", placeholder: "Role" %>
+      <%= f.text_field :role, class: "form-control", placeholder: "Role" %>
     </div>
   </div>
 

data/lib/generators/hello/users/users_generator.rb

@@ -0,0 +1,21 @@
+class Hello::UsersGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  def copy_the_files
+    directory 'app'
+  end
+
+  def append_the_routes
+    route %(
+  resources :users, only: [:index, :show, :new, :create] do
+    collection do
+      get 'list'
+    end
+    member do
+      post 'impersonate'
+    end
+  end
+)
+  end
+
+end

data/lib/hello/business/registration/sign_up.rb

@@ -2,16 +2,21 @@ module Hello
   module Business
     module Registration
       class SignUp < Base
-        attr_reader :email_credential, :password_credential, :user
+        attr_reader :user
 
         def initialize
-          generate_accessors
-          write_defaults
+          init_user
         end
 
         def register(attrs)
-          write_attrs(attrs.with_indifferent_access)
-          create_models
+          init_user(attrs)
+
+          user.save.tap do
+            merge_errors_for(@email_credential)
+            merge_errors_for(@password_credential)
+            errors.delete(:email_credentials)
+            errors.delete(:password_credentials)
+          end
         end
 
         # errors.added? DOES NOT WORK when the validation was given a custom message :)
@@ -21,138 +26,41 @@ module Hello
 
         # errors.added? DOES NOT WORK when the validation was given a custom message :)
         def username_taken?
-          @user && user.errors.added?(:username, :taken)
-        end
-
-        private
-
-        # initialize helpers
-
-        def generate_accessors
-          self.class.send :attr_accessor, *all_fields
-        end
-
-        def all_fields
-          user_fields + %w(email password)
-        end
-
-        def write_defaults
-          # defaults.each { |k, v| instance_variable_set(:"@#{k}", v) }
-          defaults.each { |k, v| send("#{k}=", v) }
-        end
-
-        # save helpers
-
-        def write_attrs(attrs)
-          # attrs.slice(*all_fields).each { |k, v| instance_variable_set(:"@#{k}", v) if v }
-          attrs.slice(*all_fields).each { |k, v| send("#{k}=", v) if v }
-        end
-
-        # NOTE:
-        # All validations are delegated to the models
-        def create_models
-          validate_presences
-          return false if errors.any?
-
-          build_and_validate_models
-          return false if errors.any?
-
-          save_models!
-          true
-        end
-
-        def validate_presences
-          validates_presence_of :email if validates_presence_of_email?
-
-          validates_presence_of :username if validates_presence_of_username?
-
-          validates_presence_of :password if validates_presence_of_password?
-
-          ::User.validators.each do |validator|
-            next unless validator.is_a?(ActiveRecord::Validations::PresenceValidator)
-            next unless validator.attributes.first.to_sym != :username
-            options = validator.options.dup
-            options[:attributes] = validator.attributes
-            validates_with(validator.class, options)
-          end
+          errors.added?(:username, :taken)
         end
 
-        def build_and_validate_models
-          # user & username
-          @user = ::User.new(user_attributes)
-          if username.blank? && !validates_presence_of_username?
-            user.set_generated_username
-          end
-          merge_errors_for(user)
-
-          # email_credential & email
-          if email.present? || validates_presence_of_email?
-            @email_credential = ::EmailCredential.new user: @user, email: email
-            merge_errors_for(email_credential)
-          end
-
-          # password_credential & password
-          @password_credential = ::PasswordCredential.new user: @user, password: password
-          if password.blank? && !validates_presence_of_password?
-            password_credential.set_generated_password
-          end
-          merge_errors_for(password_credential)
-        end
-
-        def merge_errors_for(model)
-          model.valid?
-          model.errors.each do |k, v|
-            errors.add(k, v)
-          end
-        end
-
-        def save_models!
-          user.save!
-          email_credential && email_credential.save!
-          password_credential.save!
-        end
-
-        # returns {name: "...", city: "..."}
-        def user_attributes
-          r = {}
-          user_fields.each { |k| r[k.to_s] = instance_variable_get(:"@#{k}") }
-          r['role'] = starting_role
-          r
+        def method_missing(method_name, *args, &block)
+          user.send(method_name)
         end
 
-        def starting_role
-          'onboarding'
-        end
+        private
 
-        def user_fields
-          Hello.configuration.sign_up_fields.map(&:to_s)
+        def init_user(attrs={})
+          attrs.reverse_merge!(defaults)
+          @user = User.new(attrs)
+          @email_credential = user.email_credentials.first
+          @password_credential = user.password_credentials.first
+          @errors = user.errors
         end
 
         def defaults
           {
             locale:    I18n.locale.to_s,
-            time_zone: Time.zone.name
+            time_zone: Time.zone.name,
+            email: '',
+            password: '',
           }
         end
 
-        # config helpers
-
-        def validates_presence_of_email?
-          Hello.configuration.email_presence
-        end
-
-        def validates_presence_of_username?
-          Hello.configuration.username_presence
-        end
-
-        def validates_presence_of_password?
-          Hello.configuration.password_presence
+        def merge_errors_for(model)
+          if model
+            model.valid?
+            model.errors.each do |k, v|
+              errors.add(k, v)
+            end
+          end
         end
 
-        # just because!
-
-        def self._reflect_on_association(*_args)
-        end
       end
     end
   end

data/lib/hello/locales.rb

@@ -1,238 +1,7 @@
 module Hello
   module Locales
-    ALL = {
-      'af'     => 'Afrikaans',
-      'af-ZA'  => 'Afrikaans (South Africa)',
-      'ar'     => 'Arabic',
-      'ar-AE'  => 'Arabic (U.A.E.)',
-      'ar-BH'  => 'Arabic (Bahrain)',
-      'ar-DZ'  => 'Arabic (Algeria)',
-      'ar-EG'  => 'Arabic (Egypt)',
-      'ar-IQ'  => 'Arabic (Iraq)',
-      'ar-JO'  => 'Arabic (Jordan)',
-      'ar-KW'  => 'Arabic (Kuwait)',
-      'ar-LB'  => 'Arabic (Lebanon)',
-      'ar-LY'  => 'Arabic (Libya)',
-      'ar-MA'  => 'Arabic (Morocco)',
-      'ar-OM'  => 'Arabic (Oman)',
-      'ar-QA'  => 'Arabic (Qatar)',
-      'ar-SA'  => 'Arabic (Saudi Arabia)',
-      'ar-SY'  => 'Arabic (Syria)',
-      'ar-TN'  => 'Arabic (Tunisia)',
-      'ar-YE'  => 'Arabic (Yemen)',
-      'az'     => 'Azeri (Latin)',
-      'az-AZ'  => 'Azeri (Cyrillic) (Azerbaijan)',
-      'be'     => 'Belarusian',
-      'be-BY'  => 'Belarusian (Belarus)',
-      'bg'     => 'Bulgarian',
-      'bg-BG'  => 'Bulgarian (Bulgaria)',
-      'bs-BA'  => 'Bosnian (Bosnia and Herzegovina)',
-      'ca'     => 'Catalan',
-      'ca-ES'  => 'Catalan (Spain)',
-      'cs'     => 'Czech',
-      'cs-CZ'  => 'Czech (Czech Republic)',
-      'cy'     => 'Welsh',
-      'cy-GB'  => 'Welsh (United Kingdom)',
-      'da'     => 'Danish',
-      'da-DK'  => 'Danish (Denmark)',
-      'de'     => 'German',
-      'de-AT'  => 'German (Austria)',
-      'de-CH'  => 'German (Switzerland)',
-      'de-DE'  => 'German (Germany)',
-      'de-LI'  => 'German (Liechtenstein)',
-      'de-LU'  => 'German (Luxembourg)',
-      'dv'     => 'Divehi',
-      'dv-MV'  => 'Divehi (Maldives)',
-      'el'     => 'Greek',
-      'el-GR'  => 'Greek (Greece)',
-      'en'     => 'English',
-      'en-AU'  => 'English (Australia)',
-      'en-BZ'  => 'English (Belize)',
-      'en-CA'  => 'English (Canada)',
-      'en-CB'  => 'English (Caribbean)',
-      'en-GB'  => 'English (United Kingdom)',
-      'en-IE'  => 'English (Ireland)',
-      'en-JM'  => 'English (Jamaica)',
-      'en-NZ'  => 'English (New Zealand)',
-      'en-PH'  => 'English (Republic of the Philippines)',
-      'en-TT'  => 'English (Trinidad and Tobago)',
-      'en-US'  => 'English (United States)',
-      'en-ZA'  => 'English (South Africa)',
-      'en-ZW'  => 'English (Zimbabwe)',
-      'eo'     => 'Esperanto',
-      'es'     => 'Spanish',
-      'es-AR'  => 'Spanish (Argentina)',
-      'es-BO'  => 'Spanish (Bolivia)',
-      'es-CL'  => 'Spanish (Chile)',
-      'es-CO'  => 'Spanish (Colombia)',
-      'es-CR'  => 'Spanish (Costa Rica)',
-      'es-DO'  => 'Spanish (Dominican Republic)',
-      'es-EC'  => 'Spanish (Ecuador)',
-      'es-ES'  => 'Spanish (Spain)',
-      'es-GT'  => 'Spanish (Guatemala)',
-      'es-HN'  => 'Spanish (Honduras)',
-      'es-MX'  => 'Spanish (Mexico)',
-      'es-NI'  => 'Spanish (Nicaragua)',
-      'es-PA'  => 'Spanish (Panama)',
-      'es-PE'  => 'Spanish (Peru)',
-      'es-PR'  => 'Spanish (Puerto Rico)',
-      'es-PY'  => 'Spanish (Paraguay)',
-      'es-SV'  => 'Spanish (El Salvador)',
-      'es-UY'  => 'Spanish (Uruguay)',
-      'es-VE'  => 'Spanish (Venezuela)',
-      'et'     => 'Estonian',
-      'et-EE'  => 'Estonian (Estonia)',
-      'eu'     => 'Basque',
-      'eu-ES'  => 'Basque (Spain)',
-      'fa'     => 'Farsi',
-      'fa-IR'  => 'Farsi (Iran)',
-      'fi'     => 'Finnish',
-      'fi-FI'  => 'Finnish (Finland)',
-      'fo'     => 'Faroese',
-      'fo-FO'  => 'Faroese (Faroe Islands)',
-      'fr'     => 'French',
-      'fr-BE'  => 'French (Belgium)',
-      'fr-CA'  => 'French (Canada)',
-      'fr-CH'  => 'French (Switzerland)',
-      'fr-FR'  => 'French (France)',
-      'fr-LU'  => 'French (Luxembourg)',
-      'fr-MC'  => 'French (Principality of Monaco)',
-      'gl'     => 'Galician',
-      'gl-ES'  => 'Galician (Spain)',
-      'gu'     => 'Gujarati',
-      'gu-IN'  => 'Gujarati (India)',
-      'he'     => 'Hebrew',
-      'he-IL'  => 'Hebrew (Israel)',
-      'hi'     => 'Hindi',
-      'hi-IN'  => 'Hindi (India)',
-      'hr'     => 'Croatian',
-      'hr-BA'  => 'Croatian (Bosnia and Herzegovina)',
-      'hr-HR'  => 'Croatian (Croatia)',
-      'hu'     => 'Hungarian',
-      'hu-HU'  => 'Hungarian (Hungary)',
-      'hy'     => 'Armenian',
-      'hy-AM'  => 'Armenian (Armenia)',
-      'id'     => 'Indonesian',
-      'id-ID'  => 'Indonesian (Indonesia)',
-      'is'     => 'Icelandic',
-      'is-IS'  => 'Icelandic (Iceland)',
-      'it'     => 'Italian',
-      'it-CH'  => 'Italian (Switzerland)',
-      'it-IT'  => 'Italian (Italy)',
-      'ja'     => 'Japanese',
-      'ja-JP'  => 'Japanese (Japan)',
-      'ka'     => 'Georgian',
-      'ka-GE'  => 'Georgian (Georgia)',
-      'kk'     => 'Kazakh',
-      'kk-KZ'  => 'Kazakh (Kazakhstan)',
-      'kn'     => 'Kannada',
-      'kn-IN'  => 'Kannada (India)',
-      'ko'     => 'Korean',
-      'ko-KR'  => 'Korean (Korea)',
-      'kok'    => 'Konkani',
-      'kok-IN' => 'Konkani (India)',
-      'ky'     => 'Kyrgyz',
-      'ky-KG'  => 'Kyrgyz (Kyrgyzstan)',
-      'lt'     => 'Lithuanian',
-      'lt-LT'  => 'Lithuanian (Lithuania)',
-      'lv'     => 'Latvian',
-      'lv-LV'  => 'Latvian (Latvia)',
-      'mi'     => 'Maori',
-      'mi-NZ'  => 'Maori (New Zealand)',
-      'mk'     => 'FYRO Macedonian',
-      'mk-MK'  => 'FYRO Macedonian (Former Yugoslav Republic of Macedonia)',
-      'mn'     => 'Mongolian',
-      'mn-MN'  => 'Mongolian (Mongolia)',
-      'mr'     => 'Marathi',
-      'mr-IN'  => 'Marathi (India)',
-      'ms'     => 'Malay',
-      'ms-BN'  => 'Malay (Brunei Darussalam)',
-      'ms-MY'  => 'Malay (Malaysia)',
-      'mt'     => 'Maltese',
-      'mt-MT'  => 'Maltese (Malta)',
-      'nb'     => 'Norwegian (Bokm?l)',
-      'nb-NO'  => 'Norwegian (Bokm?l) (Norway)',
-      'nl'     => 'Dutch',
-      'nl-BE'  => 'Dutch (Belgium)',
-      'nl-NL'  => 'Dutch (Netherlands)',
-      'nn-NO'  => 'Norwegian (Nynorsk) (Norway)',
-      'ns'     => 'Northern Sotho',
-      'ns-ZA'  => 'Northern Sotho (South Africa)',
-      'pa'     => 'Punjabi',
-      'pa-IN'  => 'Punjabi (India)',
-      'pl'     => 'Polish',
-      'pl-PL'  => 'Polish (Poland)',
-      'ps'     => 'Pashto',
-      'ps-AR'  => 'Pashto (Afghanistan)',
-      'pt'     => 'Portuguese',
-      'pt-BR'  => 'Portuguese (Brazil)',
-      'pt-PT'  => 'Portuguese (Portugal)',
-      'qu'     => 'Quechua',
-      'qu-BO'  => 'Quechua (Bolivia)',
-      'qu-EC'  => 'Quechua (Ecuador)',
-      'qu-PE'  => 'Quechua (Peru)',
-      'ro'     => 'Romanian',
-      'ro-RO'  => 'Romanian (Romania)',
-      'ru'     => 'Russian',
-      'ru-RU'  => 'Russian (Russia)',
-      'sa'     => 'Sanskrit',
-      'sa-IN'  => 'Sanskrit (India)',
-      'se'     => 'Sami (Northern)',
-      'se-FI'  => 'Sami (Northern) (Finland)',
-      'se-NO'  => 'Sami (Northern) (Norway)',
-      'se-SE'  => 'Sami (Lule) (Sweden)',
-      'sk'     => 'Slovak',
-      'sk-SK'  => 'Slovak (Slovakia)',
-      'sl'     => 'Slovenian',
-      'sl-SI'  => 'Slovenian (Slovenia)',
-      'sq'     => 'Albanian',
-      'sq-AL'  => 'Albanian (Albania)',
-      'sr-BA'  => 'Serbian (Latin) (Bosnia and Herzegovina)',
-      'sr-SP'  => 'Serbian (Latin) (Serbia and Montenegro)',
-      'sv'     => 'Swedish',
-      'sv-FI'  => 'Swedish (Finland)',
-      'sv-SE'  => 'Swedish (Sweden)',
-      'sw'     => 'Swahili',
-      'sw-KE'  => 'Swahili (Kenya)',
-      'syr'    => 'Syriac',
-      'syr-SY' => 'Syriac (Syria)',
-      'ta'     => 'Tamil',
-      'ta-IN'  => 'Tamil (India)',
-      'te'     => 'Telugu',
-      'te-IN'  => 'Telugu (India)',
-      'th'     => 'Thai',
-      'th-TH'  => 'Thai (Thailand)',
-      'tl'     => 'Tagalog',
-      'tl-PH'  => 'Tagalog (Philippines)',
-      'tn'     => 'Tswana',
-      'tn-ZA'  => 'Tswana (South Africa)',
-      'tr'     => 'Turkish',
-      'tr-TR'  => 'Turkish (Turkey)',
-      'tt'     => 'Tatar',
-      'tt-RU'  => 'Tatar (Russia)',
-      'ts'     => 'Tsonga',
-      'uk'     => 'Ukrainian',
-      'uk-UA'  => 'Ukrainian (Ukraine)',
-      'ur'     => 'Urdu',
-      'ur-PK'  => 'Urdu (Islamic Republic of Pakistan)',
-      'uz'     => 'Uzbek (Latin)',
-      'uz-UZ'  => 'Uzbek (Cyrillic) (Uzbekistan)',
-      'vi'     => 'Vietnamese',
-      'vi-VN'  => 'Vietnamese (Viet Nam)',
-      'xh'     => 'Xhosa',
-      'xh-ZA'  => 'Xhosa (South Africa)',
-      'zh'     => 'Chinese',
-      'zh-CN'  => 'Chinese (S)',
-      'zh-HK'  => 'Chinese (Hong Kong)',
-      'zh-MO'  => 'Chinese (Macau)',
-      'zh-SG'  => 'Chinese (Singapore)',
-      'zh-TW'  => 'Chinese (T)',
-      'zu'     => 'Zulu',
-      'zu-ZA'  => 'Zulu (South Africa)'
-    }.freeze
-
     def self.all
-      ALL
+      @all ||= YAML.load(File.read(Hello.root.join('lib/data/locales.yml')))
     end
   end
 end