symphonia 2.2.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dbb027e9c0aabbd327fd90ec05a572978a20404790f27decfcecc1db39ca347
-  data.tar.gz: 11320d1a38c2ebc7b95cee4020ac1192849c1473fbca1bf58508ce6c882c4e91
+  metadata.gz: a0e10863dd8e75d183b562258003c40246689f75f0d93ff6943934107be2abfd
+  data.tar.gz: a985e3482c1e9b9901de42e3c7f20dd7f322eec1a2695c0b42acfe33e8a2f99a
 SHA512:
-  metadata.gz: 74731d7d000a1591b7046715a9118fd566a990c30900ddac2e6638a9799b8350f256a11a074e9e6b6eb2b3ed43911fb5785348bd0407644d2581450b4ab278be
-  data.tar.gz: 5a38f655057548ff77d21b738aee676adfa25ac6117647e45ad00d80d41a1dee52f5c59af5ef2d86f8096d431f7ff9552486bbd1f99ab0ec05372460569399db
+  metadata.gz: 3fff9a1db7d9b89780d878198ba3d1a5fe59bcf924a2d5b2487a435120268ead124b8df1f5a80ba649e0f3b2dd25af17a31efba8f6c204d024dcc4add2793064
+  data.tar.gz: b5d316307dc2b6b894585beff086f66bbe8be9ca6d768d91c463c536a074002bebb5f354058d709607c38fa72dfdf0291d10a2f0c6f961d91a47955b44110910

data/app/assets/stylesheets/symphonia/symphonia_bootstrap.scss

@@ -2,32 +2,23 @@
 // *= require rails_bootstrap_forms
 // *= require bootstrap-datepicker3
 //@import "bootstrap-sprockets";
+
 @import "bootstrap";
 @import "bootstrap-datepicker3";
 
-//@media (min-width: $screen-sm) {
-//  #internal_static_page_sign {
-//    font-size: 20em;
-//  }
-//}
-//
-//@media (min-width: $screen-md) {
-//  #internal_static_page_sign {
-//    font-size: 25em;
-//  }
-//}
-//
-//@media (min-width: $screen-lg) {
-//  #internal_static_page_sign {
-//    font-size: 30em;
-//  }
-//}
 
+// fixed navbar
 body > .container {
-  padding-top: 80px; // fixed navbar
+  padding-top: 80px;
+}
+
+@media print {
+  body > .container {
+    padding-top: 0 !important;
+  }
 }
+
 footer.footer {
-  //position: absolute;
   height: 40px;
   line-height: 40px;
   bottom: 0;

data/app/controllers/symphonia/accounts_controller.rb

@@ -113,9 +113,9 @@ module Symphonia
       @user = find_account_by_token(params.require(:id))
       return render_404 if @user.nil?
 
-      if params[:password] && params[:password_confirmation]
+      if params[:password]# && params[:password_confirmation]
         @user.password = params[:password]
-        @user.password_confirmation = params[:password_confirmation]
+        # @user.password_confirmation = params[:password_confirmation]
       end
 
       if @user.changed? && @user.save
@@ -166,4 +166,4 @@ module Symphonia
 
   end
 
-end
+end

data/app/controllers/symphonia/login_controller.rb

@@ -35,6 +35,7 @@ module Symphonia
 
     def destroy
       current_session && current_session.destroy
+      session.delete :return_to
       redirect_to '/', notice: t(:text_successfully_logout)
     end
 
@@ -53,12 +54,12 @@ module Symphonia
       path ||= Symphonia.config.after_login_path.presence
       path ||= get_first_menu_item_path(Symphonia::MenuManager.menu(:top_menu).values) || :admin_path
       case path
-        when Symbol
-          main_app.send(path)
-        when Proc
-          path.call(self)
-        else
-          path
+      when Symbol
+        main_app.send(path)
+      when Proc
+        path.call(self)
+      else
+        path
       end
     end
 

data/app/controllers/symphonia/user_sessions_controller.rb

@@ -8,7 +8,7 @@ module Symphonia
     end
 
     def current_session
-      current_user_session
+        current_user_session
     end
 
   end

data/app/controllers/symphonia/users_controller.rb

@@ -25,12 +25,12 @@ module Symphonia
             key :'$ref', :User
           end
         end
-          # response :default do
-          #   key :description, 'unexpected error'
-          #   schema do
-          #     key :'$ref', :ErrorModel
-          #   end
-          # end
+        # response :default do
+        #   key :description, 'unexpected error'
+        #   schema do
+        #     key :'$ref', :ErrorModel
+        #   end
+        # end
       end
     end
 
@@ -49,7 +49,7 @@ module Symphonia
           @entities = @entities.page(params[:page])
           render layout: !request.xhr?
         end
-        format.json { render json: @entities.all, only: %i[id]+Symphonia::User.registered_attributes.keys }
+        format.json { render json: @entities.all, only: %i[id] + Symphonia::User.registered_attributes.keys }
       end
     end
 
@@ -105,7 +105,7 @@ module Symphonia
         @user.edited_at = DateTime.now
         if @user.save
           format.html { redirect_back_or_default user_path(@user), notice: t(:text_updated) }
-          format.any(:json ,:xml) { head :no_content }
+          format.any(:json, :xml) { head :no_content }
         else
           format.html do
             @roles = Symphonia::Role.all
@@ -122,7 +122,7 @@ module Symphonia
 
       respond_to do |format|
         format.html { redirect_to params[:back_url] || users_url }
-        format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@user)}')"}
+        format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@user)}')" }
         format.json { head :no_content }
       end
     end
@@ -152,7 +152,7 @@ module Symphonia
     end
 
     def authorize
-      if User.current.id == @user.try!(:id)
+      if User.current.logged_in? && User.current.id == @user&.id
         true
       else
         super

data/app/models/symphonia/user.rb

@@ -20,6 +20,13 @@ module Symphonia
 
     acts_as_authentic do |config|
     end
+    validates :email, uniqueness: { case_sensitive: false }
+    validates :password,
+              confirmation: { if: :require_password? },
+              length: {
+                minimum: 8,
+                if: :require_password?
+              }
 
     include UserManagement
 
@@ -47,6 +54,8 @@ module Symphonia
       end
     end
 
+    attr_writer :password_confirmation
+
     has_and_belongs_to_many :preferences, foreign_key: 'user_id'
 
     belongs_to :edited_by, class_name: 'Symphonia::User', required: false
@@ -57,6 +66,7 @@ module Symphonia
     scope :recipients_for, ->(notification) { joins(:preferences).where(preferences: { name: notification, type: 'Symphonia::EmailPreference' }) }
 
     scope :like, ->(q) { t = arel_table; where(t[:email].matches("%#{q}%").or(t[:first_name].matches("%#{q}%").or(t[:last_name].matches("%#{q}%")))) }
+    scope :admins, -> { where(admin: true) }
 
     alias_attribute :mail, :email
 
@@ -64,6 +74,9 @@ module Symphonia
     before_save do |model|
       Rails.cache.delete_matched('user_allowed_to*') if model.role_id_changed?
     end
+    before_validation do |model|
+      model.login ||= model.email
+    end
 
     def allowed_to?(action)
       return true if admin?
@@ -134,12 +147,8 @@ module Symphonia
       def persistence_token
         nil
       end
-
-      def language
-        Symphonia.config.default_locale || I18n.default_locale
-      end
     end
 
   end
 
-end
+end

data/app/views/layouts/symphonia/application.html.erb

@@ -33,7 +33,7 @@
       <slot id="flash_messages" name="flash_messages"><%= render_flash_messages.html_safe -%></slot>
       <%= yield %>
     </div>
-    <footer class="footer">
+    <footer class="footer d-print-none">
       <div class="container text-center">
         &copy; Lukáš Pokorný
         <%= yield :footer %>

data/app/views/symphonia/accounts/_form.html.erb

@@ -1,14 +1,7 @@
 <div class="row">
-  <div class="col-xs-12 col-sm-6 col-md-3"><%= f.text_field :login, required: true %></div>
+<!--  <div class="col-xs-12 col-sm-6 col-md-3"><%#= f.text_field :login, required: true %></div>-->
   <div class="col-xs-12 col-sm-6 col-md-3"><%= f.email_field :mail, required: true %></div>
   <div class="col-xs-12 col-sm-6 col-md-3"><%= f.text_field :first_name, required: true %></div>
   <div class="col-xs-12 col-sm-6 col-md-3"><%= f.text_field :last_name, required: true %></div>
-</div>
-<div class="row">
-  <div class="col-xs-12 col-sm-6">
-    <%= f.password_field :password, required: f.object.new_record?, prepend: icon('key') %>
-  </div>
-  <div class="col-xs-12 col-sm-6">
-    <%= f.password_field :password_confirmation, required: f.object.new_record? %>
-  </div>
+  <div class="col-xs-12 col-sm-6 col-md-3"><%= f.password_field :password, required: f.object.new_record?, prepend: icon('key') %></div>
 </div>

data/app/views/symphonia/accounts/reset_password.html.erb

@@ -6,7 +6,7 @@
         <%= symphonia_form_tag(url: reset_password_account_path(params[:id]), method: 'put') do |f| %>
           <%= f.error_messages %>
           <%= f.password_field(:password, label: t(:'attributes.password'), required: true, wrapper_class: 'required') -%>
-          <%= f.password_field(:password_confirmation, label: t(:'attributes.password_confirmation'), required: true, wrapper_class: 'required') -%>
+          <%#= f.password_field(:password_confirmation, label: t(:'attributes.password_confirmation'), required: true, wrapper_class: 'required') -%>
 
           <%= f.submit(t(:button_submit), class: 'btn btn-primary btn-block') -%>
 

data/db/migrate/20190706130409_add_external_id_to_users.rb

@@ -0,0 +1,7 @@
+class AddExternalIdToUsers < ActiveRecord::Migration[5.2]
+  def change
+    change_table :users do |t|
+      t.string :external_id, null: true
+    end
+  end
+end

data/db/seeds.rb

@@ -5,7 +5,7 @@ u.attributes = {
   last_name: 'Pokorný',
   email: 'luk4s.pokorny@gmail.com',
   password: 'admin',
-  password_confirmation: 'admin',
+  # password_confirmation: 'admin',
   admin: true
 }
 u.single_access_token = SecureRandom.hex(20)

data/lib/symphonia/controller_extensions.rb

@@ -74,9 +74,8 @@ module Symphonia
     # private
 
     def set_locale
-      client_lang = Array(params.fetch(:locale, nil).presence || session[:locale].presence || request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten)
-      client_lang.unshift current_user.language if current_user.language
-      @client_lang = client_lang.detect { |l| I18n.available_locales.include?(l.to_sym) }
+      client_lang = params.fetch(:locale, nil).presence || session[:locale].presence || request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').collect { |l| l.scan(/^[a-z]{2}/) }.flatten
+      @client_lang = Array(client_lang).detect { |l| I18n.available_locales.include?(l.to_sym) }
 
       I18n.locale = (@client_lang || I18n.default_locale)
       session[:locale] = I18n.locale
@@ -152,11 +151,13 @@ module Symphonia
 
     def current_user_session
       return @current_user_session if defined?(@current_user_session)
+
       @current_user_session = UserSession.find
     end
 
     def current_user
       return (Symphonia::User.current ||= @current_user) if defined?(@current_user)
+
       @current_user = current_user_session && current_user_session.user
       Symphonia::User.current = @current_user || Symphonia::User::Anonymous.new
     end

data/lib/symphonia/query.rb

@@ -12,7 +12,7 @@ module Symphonia
 
     class_attribute :model
 
-    # @param [nil, String] sort
+    # @param [nil, String] sort column_name:asc|desc
     # @param [Hash] filters
     # @param [nil, Array] columns
     def initialize(c = nil, sort: "", filters: {}, columns: nil, **options)

data/lib/symphonia/user_management.rb

@@ -27,6 +27,10 @@ module Symphonia
         "#{first_name} #{last_name}"
       end
 
+      def name=(string)
+        self.first_name, self.last_name = string.split(" ")
+      end
+
       def status_new?
         pending?
       end

data/lib/symphonia/version.rb

@@ -1,3 +1,3 @@
 module Symphonia
-  VERSION = '2.2.1'
+  VERSION = '3.0.0'
 end

data/spec/factories/factories.rb

@@ -6,7 +6,7 @@ FactoryBot.define do
     login { email }
     admin { false }
     password { SecureRandom.hex(16) }
-    password_confirmation { password }
+    # password_confirmation { password }
     last_request_at { Time.now }
 
     trait :admin do
@@ -18,7 +18,7 @@ FactoryBot.define do
         preference_names { [] }
       end
       after(:build) do |user, evaluator|
-        user.preferences = evaluator.preference_names.collect { |pref_name| FactoryBot.create(:email_preference, name: pref_name) }
+        user.preferences = evaluator.preference_names.collect { |pref_name| Symphonia::EmailPreference.find_by(name: pref_name) || FactoryBot.create(:email_preference, name: pref_name) }
       end
     end
     factory :admin_user, traits: [:admin]

data/spec/models/user_spec.rb

@@ -7,4 +7,10 @@ RSpec.describe Symphonia::User do
   it "#to_s" do
     expect(subject.to_s).to eq "#{subject.first_name} #{subject.last_name}"
   end
+
+  it "#name=" do
+    subject.name = "Tata smoula"
+    expect(subject.first_name).to eq "Tata"
+    expect(subject.last_name).to eq "smoula"
+  end
 end

data/spec/rails_helper.rb

@@ -10,4 +10,4 @@ require File.expand_path("../dummy/config/environment.rb", __FILE__)
 # Prevent database truncation if the environment is production
 abort('The Rails environment is running in production mode!') if Rails.env.production?
 
-require_relative 'spec_helper'
+require_relative 'spec_helper'

data/spec/requests/accounts_spec.rb

@@ -34,10 +34,10 @@ describe Symphonia::AccountsController do
   end
 
   context 'pending' do
-    let(:pending_user) { FactoryBot.create(:user, status: 'pending', password: 'heslo123', password_confirmation: 'heslo123')}
+    let(:pending_user) { FactoryBot.create(:user, status: 'pending', password: 'heslo123') }
 
     it '#login' do
-      post symphonia.user_sessions_path, params: { login_session: { login: pending_user.login, password: 'heslo123' }}
+      post symphonia.user_sessions_path, params: { login_session: { login: pending_user.login, password: 'heslo123' } }
       expect(response).to have_http_status :success
       expect(Symphonia::User.current.id).not_to eq pending_user.id
     end
@@ -90,13 +90,13 @@ describe Symphonia::AccountsController do
       before { FactoryBot.create(:user, status: 'active'); user.update_columns(perishable_token: token) }
 
       it 'valid token' do
-        put symphonia.reset_password_account_path(id: token, password: password, password_confirmation: password )
+        put symphonia.reset_password_account_path(id: token, password: password, password_confirmation: password)
         expect(response).to redirect_to symphonia.user_current_path
         expect(flash[:notice]).not_to be :blank
       end
 
       it 'invalid password' do
-        put symphonia.reset_password_account_path(id: token, password: '12', password_confirmation: '11' )
+        put symphonia.reset_password_account_path(id: token, password: '12', password_confirmation: '11')
         expect(response).to have_http_status :success
         expect(flash[:notice]).to be_nil
       end
@@ -104,7 +104,6 @@ describe Symphonia::AccountsController do
     end
 
 
-
   end
 
   context 'form for user', logged: true do
@@ -115,4 +114,4 @@ describe Symphonia::AccountsController do
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Lukas Pokorny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-28 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: jbuilder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +126,16 @@ dependencies:
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -565,6 +551,7 @@ files:
 - db/migrate/20130714140502_create_preferences.rb
 - db/migrate/20130828175114_create_attachments.rb
 - db/migrate/20141213204351_create_admin_modules.rb
+- db/migrate/20190706130409_add_external_id_to_users.rb
 - db/seeds.rb
 - lib/generators/symphonia/entity_controller/entity_controller_generator.rb
 - lib/generators/symphonia/entity_controller/templates/controller.rb