cybele 1.6.0 → 1.7.0

data/cybele.gemspec

@@ -1,26 +1,28 @@
-# coding: utf-8
+# encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require File.expand_path('../lib/cybele/version', __FILE__)
+require 'date'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'cybele'
-  spec.version       = Cybele::VERSION
-  spec.authors       = %w[lab2023]
-  spec.email         = %w[info@lab2023.com]
-  spec.description   = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
-  spec.summary       = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
-  spec.homepage      = 'https://github.com/kebab-project/cybele'
-  spec.license       = 'MIT'
+  spec.name         = 'cybele'
+  spec.version      = Cybele::VERSION
+  spec.authors      = %w[lab2023]
+  spec.email        = %w[info@lab2023.com]
+  spec.description  = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
+  spec.summary      = %q{Rails 4.x template with responder, simple form, haml, exception notification, etc etc ...}
+  spec.homepage     = 'https://github.com/kebab-project/cybele'
+  spec.license      = 'MIT'
+  spec.date         = Date.today.strftime('%Y-%m-%d')
 
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = ">= #{Cybele::RUBY_VERSION}"
   spec.add_dependency 'bundler', '~> 1.5'
-  spec.add_dependency 'rails', '~> 4.0'
+  spec.add_dependency 'rails', Cybele::RAILS_VERSION
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = %w[cybele]
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = %w[lib]
+  spec.files        = `git ls-files`.split($/)
+  spec.executables  = %w[cybele]
+  spec.test_files   = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths= %w[lib]
 
   spec.add_development_dependency 'rake'
 

data/lib/cybele/app_builder.rb

@@ -81,7 +81,7 @@ module Cybele
 
       config = <<-RUBY
 
-
+    config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
     config.sass.preferred_syntax = :sass
       RUBY
@@ -106,8 +106,15 @@ module Cybele
 
       config = <<-RUBY
 config.action_mailer.delivery_method = :smtp
-config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.smtp_settings = Settings.smtp.mandrill
+  config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.smtp_settings = {
+      address: Settings.smtp.mandrill.address,
+      port: Settings.smtp.mandrill.port,
+      enable_starttls_auto: Settings.smtp.mandrill.enable_starttls_auto,
+      user_name: Settings.smtp.mandrill.user_name,
+      password: Settings.smtp.mandrill.password,
+      authentication: Settings.smtp.mandrill.authentication
+  }
       RUBY
 
       configure_environment 'production', config
@@ -121,7 +128,7 @@ config.after_initialize do
     Bullet.alert = true
     Bullet.bullet_logger = true
   end
-  RUBY
+      RUBY
 
       configure_environment 'development', config
     end
@@ -134,14 +141,14 @@ config.after_initialize do
 
       config = <<-YML
 email:
-  noreply: noreply@appname.org
+  noreply: no-reply@#{app_name}.com
       YML
       prepend_file 'config/settings.yml', config
     end
 
     def configure_action_mailer
-      action_mailer_host 'development', "#{app_name}.dev"
-      action_mailer_host 'test', "#{app_name}.com"
+      action_mailer_host 'development', "localhost:3000"
+      action_mailer_host 'staging', "staging.#{app_name}.com"
       action_mailer_host 'production', "#{app_name}.com"
     end
 
@@ -180,7 +187,7 @@ require 'capybara/rspec'
     end
 
     def generate_simple_form
-      generate 'simple_form:install --bootstrap'
+      generate 'simple_form:install --bootstrap  --force'
       copy_file 'config/locales/simple_form.tr.yml', 'config/locales/simple_form.tr.yml'
       copy_file 'config/locales/tr.yml', 'config/locales/tr.yml'
     end
@@ -191,12 +198,12 @@ require 'capybara/rspec'
 
     def add_exception_notification_to_environments
       config = <<-CODE
-        config.middleware.use ExceptionNotification::Rack,
-          :email => {
-            :email_prefix => "[Whatever] ",
-            :sender_address => %{"notifier" <notifier@example.com>},
-            :exception_recipients => %w{exceptions@example.com}
-          }
+config.middleware.use ExceptionNotification::Rack, 
+                        :email => {
+                            :email_prefix => "[#{app_name}]", 
+                            :sender_address => %{"Notifier" <notifier@#{app_name}.com>}, 
+                            :exception_recipients => %w{your_email@address.com}
+  }
       CODE
 
       configure_environment('production', config)
@@ -224,7 +231,7 @@ require 'capybara/rspec'
     def generate_devise_settings
       generate 'devise:install'
       gsub_file 'config/initializers/filter_parameter_logging.rb', /:password/, ':password, :password_confirmation'
-      gsub_file 'config/initializers/devise.rb', /please-change-me-at-config-initializers-devise@example.com/, 'CHANGEME@example.com'
+      gsub_file 'config/initializers/devise.rb', /please-change-me-at-config-initializers-devise@example.com/, "no-reply@#{app_name}.com"
     end
 
     def generate_devise_model(model_name)
@@ -254,7 +261,7 @@ require 'capybara/rspec'
              path_names: {sign_in: 'login', sign_out: 'logout', password: 'secret',
                           confirmation: 'verification'}"
       gsub_file 'app/models/admin.rb', /:registerable,/, ''
-
+      
       say 'Configuring profile editors...'
       setup_profile_editors
     end
@@ -264,14 +271,14 @@ require 'capybara/rspec'
       inject_into_file 'config/routes.rb', :after => "namespace :hq do\n" do <<-RUBY
       root to: 'dashboard#index'
       resource :admin_profile, except: [:destroy], path: 'profile'
-        RUBY
+      RUBY
       end
 
-      inject_into_file 'config/routes.rb', :after => "'welcome#index'\n" do <<-RUBY
+      inject_into_file 'config/routes.rb', :after => "to: 'welcome#index'\n" do <<-RUBY
 
-      resource :user_profile, except: [:destroy], path: 'profile'
+  resource :user_profile, except: [:destroy], path: 'profile'
 
-        RUBY
+      RUBY
       end
     end
 
@@ -299,13 +306,42 @@ require 'capybara/rspec'
       copy_file 'config/initializers/simple_form.rb', 'config/initializers/simple_form.rb'
       copy_file 'config/initializers/simple_form_bootstrap.rb', 'config/initializers/simple_form_bootstrap.rb'
     end
-
+ 
     def setup_capistrano
-      run 'capify .'
+      run 'bundle exec cap install'
     end
 
-    def setup_recipes
+    def setup_capistrano_settings 
       run 'rm config/deploy.rb'
+      # Copy teplates/config/deploy.rb to app directory
+      copy_file 'config/deploy.rb', 'config/deploy.rb'
+      # Change my_app_name string in the deploy.rb file with app_name that is created 
+      gsub_file 'config/deploy.rb', /my_app_name/, "#{app_name}"
+
+      inject_into_file 'Capfile', :after => "require 'capistrano/deploy'\n" do <<-RUBY
+require 'capistrano/rails'
+require 'capistrano/bundler'
+require 'sshkit/sudo'
+require 'capistrano/maintenance'
+      RUBY
+      end
+
+      append_to_file 'config/deploy/production.rb' do
+        'server "example.com", user: "#{fetch(:local_user)}", roles: %w{app db web}, primary: true, port: 22
+set :rails_env, "production"
+set :branch, "master"
+set :project_domain, "example.com"'
+      end
+      append_to_file 'config/deploy/staging.rb' do 
+        'server "staging.example.com", user: "#{fetch(:local_user)}", roles: %w{app db web}, primary: true, port: 22 
+set :rails_env, "staging"
+set :branch, "develop"
+set :project_domain, "staging.example.com"'
+      end
+    end
+
+    # Nor using  
+    def setup_recipes 
       generate 'recipes_matic:install'
     end
 
@@ -326,9 +362,9 @@ require 'capybara/rspec'
       copy_file 'app/views/errors/internal_server_error.html.haml', 'app/views/errors/internal_server_error.html.haml'
       inject_into_file 'app/controllers/application_controller.rb', :before => 'protected' do <<-CODE
 
-  rescue_from Exception, :with => :server_error
+  # rescue_from Exception, :with => :server_error
   def server_error(exception)
-    ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver
+    # ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver
     respond_to do |format|
       format.html { render template: 'errors/internal_server_error', layout: 'layouts/application', status: 500 }
       format.all  { render nothing: true, status: 500}
@@ -354,6 +390,30 @@ require 'capybara/rspec'
       end
     end
 
+    # Add default admin user and admin profile seeder
+    def add_seeds
+      say 'Add seeds'
+      inject_into_file 'db/seeds.rb', :after => "#   Mayor.create(name: 'Emanuel', city: cities.first)\n" do <<-RUBY
+
+admin = Admin.create(email: "admin@#{app_name}.com", password: '12341234', password_confirmation: '12341234')
+admin.admin_profile = AdminProfile.create(first_name: 'Admin', last_name: "#{app_name}")
+
+      RUBY
+      end      
+    end
+
+    # Copy locale files
+    def copy_locales
+      say 'Coping files..'
+      copy_file 'config/locales/models.en.yml', 'config/locales/models.en.yml'
+      copy_file 'config/locales/models.tr.yml', 'config/locales/models.tr.yml'
+      copy_file 'config/locales/show_for.en.yml', 'config/locales/show_for.en.yml'
+      copy_file 'config/locales/show_for.tr.yml', 'config/locales/show_for.tr.yml'
+      copy_file 'config/locales/simple_form.tr.yml', 'config/locales/simple_form.tr.yml'
+      copy_file 'config/locales/view.en.yml', 'config/locales/view.en.yml'
+      copy_file 'config/locales/view.tr.yml', 'config/locales/view.tr.yml'
+    end
+
     private
 
     def action_mailer_host(rails_env, host)
@@ -398,9 +458,7 @@ require "#{path}"
 
     def devise_parameter_sanitizer(model_name)
       inject_into_file 'app/controllers/application_controller.rb', :after => 'protect_from_forgery with: :exception' do <<-CODE
-
   protected
-
   def devise_parameter_sanitizer
     if resource_class == #{model_name.classify}
       #{model_name.classify}::ParameterSanitizer.new(#{model_name.classify}, :#{model_name.parameterize}, params)
@@ -440,7 +498,6 @@ require "#{path}"
   def set_user_time_zone
     Time.zone = current_user.time_zone if user_signed_in? && current_user.time_zone.present?
   end
-
       CODE
       end
       inject_into_file 'app/controllers/application_controller.rb', :after => 'class ApplicationController < ActionController::Base' do <<-CODE
@@ -473,5 +530,6 @@ require "#{path}"
       RUBY
       end
     end
+
   end
 end

data/lib/cybele/generators/app_generator.rb

@@ -42,7 +42,7 @@ module Cybele
       invoke :setup_time_zone
       invoke :setup_bullet_config
       invoke :setup_hq_namespace
-      invoke :setup_profiles
+      invoke :setup_profiles 
     end
 
     def customize_gemfile
@@ -181,53 +181,79 @@ module Cybele
       build :create_profile
     end
 
-    def run_bundle
-    end
+    # def run_bundle
+    #   say 'Run bundle'
+    # end
 
     def setup_hierapolis
+      say 'Setup hierapolis'
       build :create_hierapolis_theme
     end
 
     def setup_sipmle_form_wrapper
+      say 'Setup sipmle form wrapper'
       build :replace_simple_form_wrapper
     end
 
     def setup_exception_notification_to_environments
+      say 'Setup exception notification for environments'
       build :add_exception_notification_to_environments
     end
 
     def install_capistrano
+      say 'Setup capistrano'
       build :setup_capistrano
     end
 
+    def setup_capistrano_settings
+      say 'Setup capistrano settings'
+      build :setup_capistrano_settings
+    end
+
     def setup_recipes
       build :setup_recipes
     end
 
     def setup_secret_token
+      say 'Setup secret token'
       build :update_secret_token
     end
 
     def setup_bullet_config
+      say 'Setup bullet config'
       build :configure_bullet
     end
 
     def install_show_for
+      say 'Setup show_for'
       build :setup_show_for
     end
 
     def create_dev_rake
+      say 'Create dev_rake'
       build :create_dev_rake
     end
 
     def custom_exception_page
+      say 'Setup custom exception pages'
       build :custom_exception_page
     end
 
     def custom_404
+      say 'Setup 404 page'
       build :custom_404
     end
 
+    def add_seeds
+      say 'Add seeds main'
+      build :add_seeds
+    end
+
+    def copy_locales
+      say 'Copy config/locale files'
+      build :copy_locales 
+    end
+
     def goodbye
       say 'Congratulations! That\'s all...'
     end

data/lib/cybele/version.rb

@@ -1,4 +1,5 @@
 module Cybele
-  VERSION = '1.6.0'.freeze
-end
-
+  RAILS_VERSION = '~> 4.2.3'
+  RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
+  VERSION = '1.7.0'
+end

data/templates/app/controllers/hq/admin_profiles_controller.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 class Hq::AdminProfilesController < Hq::ApplicationController
-  before_action :profile_controller
-  before_action :set_admin_profile, only: [:show, :edit, :update, :destroy]
+  
+  before_action :check_profile, only: [:new, :create]
+  before_action :profile_controller, except: [:new, :create] 
+  before_action :set_admin_profile, only: [:show, :edit, :update]
   add_breadcrumb I18n.t('activerecord.models.admin_profiles'), :hq_admin_profile_path
 
   def show
@@ -38,6 +40,12 @@ class Hq::AdminProfilesController < Hq::ApplicationController
     end
   end
 
+  def check_profile
+    if current_admin.admin_profile.present?
+      redirect_to user_profile_path
+    end
+  end
+
   def set_admin_profile
     @admin_profile = current_admin.admin_profile
   end

data/templates/app/controllers/hq/sessions_controller.rb

@@ -1,3 +1,16 @@
 class Hq::SessionsController < Devise::SessionsController
   layout 'login'
+
+  private
+
+  # Overwriting the sign_out redirect path method
+  def after_sign_in_path_for(resource_or_scope)
+    hq_root_path
+  end
+
+  # Overwriting the sign_out redirect path method
+  def after_sign_out_path_for(resource_or_scope)
+    new_admin_session_path
+  end
+  
 end

data/templates/app/controllers/user_profiles_controller.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 class UserProfilesController < ApplicationController
-  before_action :profile_controller
-  before_action :set_user_profile, only: [:show, :edit, :update, :destroy]
+  before_action :authenticate_user!
+  before_action :check_profile, only: [:new, :create]
+  before_action :profile_controller, except: [:new, :create]
+  before_action :set_user_profile, only: [:show, :edit, :update]
   add_breadcrumb I18n.t('activerecord.models.user_profiles'), :user_profile_path
 
   def show
@@ -38,6 +40,12 @@ class UserProfilesController < ApplicationController
     end
   end
 
+  def check_profile
+    if current_user.user_profile.present?
+      redirect_to user_profile_path
+    end
+  end
+
   def set_user_profile
     @user_profile = current_user.user_profile
   end

data/templates/app/views/devise/mailer/reset_password_instructions.html.haml

@@ -1,6 +1,9 @@
 %p
-  Hello #{@resource.email}!
-%p Someone has requested a link to change your password. You can do this through the link below.
-%p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
-%p If you didn't request this, please ignore this email.
-%p Your password won't change until you access the link above and create a new one.
+  = t( 'email.salut', email: @resource.email )
+%p
+  = t( 'email.devise.reset_password.desc1')
+%p= link_to t( 'email.devise.reset_password.change'), edit_password_url(@resource, :reset_password_token => @token)
+%p
+  = t( 'email.devise.reset_password.desc2')
+%p
+  = t( 'email.devise.reset_password.desc3')