weeler 1.5.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ee10f8516518e8f94a7a070769705e9be3afc60
-  data.tar.gz: b80f390824beaeea1843dc6c0b66c05a9687ce52
+SHA256:
+  metadata.gz: 9a5843d8169cc1f00da76876d33c136077878f6f02b516207402652068bfb54b
+  data.tar.gz: 2b1d3e9aa399794f81e91b096b76147cd7529bae9966e1798668551321890c2c
 SHA512:
-  metadata.gz: 8c13922970253df07730ad789829b39da9a2f4ec4475e8e1f164c5eb832e7cda2e36bcc7904c9ce485bad0a1d1f2c49ed6592843a47388eb8d683c07ec8cfdc6
-  data.tar.gz: 7e03858fac241b529ae823933720d13054f257c28f3c17ea0c43fd008327499e1946cfd1e43b8a7e88d118fb3095c4da54ef1eb7aadb885dc93df4a72c0b9309
+  metadata.gz: f8a8056a9690d1dfab75ea1e570e1b332e0c22b245c48908ad46f4994e9dd8c3ae1557b7d089555143d6824a0a0af2756817bf623a62a23a50d1922f3ba56cd5
+  data.tar.gz: 02dc435b1cd9f7f358b2a36b2a2507389071ca0e0a65a8d43136dd442c0b748664d77d2d99f4f5d1473effff97cb0e335c8441993d960071b5ff01822bfd66ab

data/.ruby-version

@@ -0,0 +1 @@
+3.0.0

data/.travis.yml

@@ -7,20 +7,9 @@ sudo: false
 before_script:
   - psql -c 'create database travis_ci_test;' -U postgres
 rvm:
-  - "2.0.0"
-  - "2.1.0"
-  - "2.1.1"
-  - "2.1.2"
-  - "2.1.3"
-  - "2.1.4"
-  - "2.1.5"
-  - "2.1.6"
-  - "2.2.0"
-  - "2.2.1"
-  - "2.2.2"
-  - "2.2.3"
-  - "2.2.4"
-  - "2.3.0"
+  - "2.6.0"
+  - "2.7.2"
+  - "3.0.0"
 # uncomment this line if your project needs to run something other than `rake`:
 script:
   - RAILS_ENV=test bundle exec rake db:migrate --trace

data/CHANGELOG.md

@@ -1,3 +1,46 @@
+## 2.0.1
+
+### Features & Enhancements
+
+* Optimized translation import and export (avoiding n+1 queries)
+
+## 2.0.0
+
+### Features & Enhancements
+
+* Add Rails 6.0 support
+* Add Ruby 2.6 - 2.7 support (drop other rubys)
+* Removed 'image_upload_field' helper
+
+### Contributors
+
+* Arturs Braucs
+
+## 1.6.0
+
+### Features & Enhancements
+
+* Add Rails 5.0 support
+* Add Ruby 2.4.0 support
+* Drop ruby's < 2.2.2 support
+
+### Bug Fixes
+
+* Fixed RailsSettings::CachedSettings deprication warning
+
+### Contributors
+
+* Arturs Braucs
+
+## 1.5.4
+
+* Using RailsSettings::CachedSettings instead of RailsSettings::Base
+
+## 1.5.3
+
+* Rails depricated table exists, using data source exists instead
+* Using RailsSettings::Base instead of RailsSettings::CachedSettings
+
 ## 1.5.2
 
 * Added translation filter by created at

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'globalize', github: 'globalize/globalize'
+gem 'rails-controller-testing'
+
 # Specify your gem's dependencies in weeler.gemspec
 gemspec

data/README.md

@@ -1,26 +1,39 @@
 # Weeler
 
-[![Gem Version](https://badge.fury.io/rb/weeler.png)](http://badge.fury.io/rb/weeler)
-[![Build Status](https://travis-ci.org/weby-lv/weeler.png?branch=master)](https://travis-ci.org/weby-lv/weeler)
-[![Coverage Status](https://coveralls.io/repos/weby-lv/weeler/badge.png)](https://coveralls.io/r/weby-lv/weeler)
-[![Code Climate](https://codeclimate.com/github/weby-lv/weeler.png)](https://codeclimate.com/github/weby-lv/weeler)
-
-CMS for weby.lv projects.
+[![Gem Version](https://badge.fury.io/rb/weeler.svg)](https://badge.fury.io/rb/weeler)
+[![Build Status](https://travis-ci.org/weby-lv/weeler.svg?branch=master)](https://travis-ci.org/weby-lv/weeler)
+[![Coverage Status](https://coveralls.io/repos/weby-lv/weeler/badge.svg)](https://coveralls.io/r/weby-lv/weeler)
+[![Code Climate](https://codeclimate.com/github/weby-lv/weeler/badges/gpa.svg)](https://codeclimate.com/github/weby-lv/weeler)
 
 ## Installation
 
-Add this line to your application's Gemfile:
+### Rails 6.0
+
+2.0.0 version only supports Rails 6.0 and ruby 2.5 or higher version. In Gemfile include:
+
+```ruby
+gem 'weeler', '~> 2.0'
+```
+
+### Rails 5.0
 
-    gem 'weeler'
+1.6.0 version only supports Rails 5.0 and ruby 2.2.2 and higher version. In Gemfile include:
 
-And then execute:
+```ruby
+gem 'weeler', '~> 1.6'
+```
 
-    $ bundle
+### Rails 4.2
 
-Or install it yourself as:
+```ruby
+gem 'weeler', '~> 1.5'
+```
 
-    $ gem install weeler
+After specifying necessary gems in Gemfile run
 
+```bash
+bundle install
+```
 
 ## Setup
 
@@ -41,9 +54,9 @@ This will generate follwing files:
 
 Following will be appended to your route file:
 
-    mount_weeler_at "weeler" do 
-      # weeler_resources :example, include_in_weeler_menu: true 
-      # Also you orderable and imageable concerns 
+    mount_weeler_at "weeler" do
+      # weeler_resources :example, include_in_weeler_menu: true
+      # Also you orderable and imageable concerns
     end
 
 And then migrate database:
@@ -111,7 +124,7 @@ you must add block <tt>permit_params: -> (params) { params.require(:post).permit
 
 You can override redirect path after <tt>:create</tt>, <tt>:update</tt>, <tt>:destroy</tt> actions.
 You can do this by overriding private methods in your controller.
-        
+
     def after_create_path
       { action: :edit, id: @item.id }
     end
@@ -126,7 +139,7 @@ You can do this by overriding private methods in your controller.
 
 Or you can override what happens after successful <tt>:create</tt>, <tt>:update</tt>, <tt>:destroy</tt> actions.
 You can do this by overriding private methods in your controller.
-        
+
     def after_create_action
       redirect_to( after_create_path, {:notice => "Successfully created item"} )
     end
@@ -150,26 +163,6 @@ Also you can override all standart restful action view and implement, if you nee
 
 Weeler have default views for index, new, edit actions. You should override <tt>_form.html.haml</tt> partial.
 
-### View helper image_upload_field :
-
-Weeler action view helper method.
-It creates file upload field with info and preview for image.
-
-e.g.
-
-    <%= f.image_upload_field :image, size_info: "270x294" %>
-
-It creates:
-
-    <div class="col-lg-10 col-md-10">
-      <label class="col-lg-2 col-md-2 control-label" for="object_image">Image</label><div class="col-lg-5 col-md-5"><div class="row"><div class="col-lg-12 col-md-12"><input class="form-control" id="object_image" name="object[image]" type="file"></div></div><div class="row"><div class="col-lg-12 col-md-12">Size should be 270x294</div></div></div><div class="col-lg-5 col-md-5"><div class="row"><div class="col-lg-12 col-md-12"><img alt="Name" src="/images/name.jpg" style="height: 80px;"></div></div></div>
-    </div>
-
-If you use another image handler than Paperclip, you can also pass <tt>image_url_method</tt> for image preview.
-
-Also with remove_image action in controller and route for that,
-it removes only image from object.
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,5 +1,5 @@
-Bundler::GemHelper.install_tasks
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+require 'bundler/gem_tasks'
+# require 'spec/dummy/tasks'
 
-require "bundler/gem_tasks"
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'

data/app/assets/javascripts/weeler/init.js

@@ -0,0 +1,32 @@
+//= require jquery
+//= require jquery-ui
+//= require jquery_ujs
+//= require ./vendor/moment
+//= require_tree ./vendor
+//= require_tree ./lib
+//= require weeler/app
+//= require_self
+
+(function() {
+  var app;
+
+  app = {
+    boot: function() {
+      $('.weeler-file-inputs').bootstrapFileInput();
+      sortable.init();
+      flash.init();
+      $('[data-provide="rowlink"],[data-provides="rowlink"]').each(function() {
+        return $(this).rowlink($(this).data());
+      });
+      $('.datepicker').datetimepicker({
+        format: 'DD/MM/YYYY'
+      });
+      return $('.datetimepicker').datetimepicker();
+    }
+  };
+
+  $(document).ready(function() {
+    return app.boot();
+  });
+
+}).call(this);

data/app/assets/stylesheets/weeler/style.css.scss

@@ -78,4 +78,10 @@ span.weeler_version{
   vertical-align: super;
   font-size:10px;
   color:#C2C2C2;
-}
+}
+
+.sidebar-nav {
+  .nav > li > a:hover, .nav > li > a:focus, .nav > li > a.active {
+    background-color: #ddd;
+  }
+}

data/app/controllers/concerns/weeler/section_seo.rb

@@ -3,7 +3,7 @@ module Weeler
     extend ActiveSupport::Concern
 
     included do
-      before_filter :initialize_seo_for_section
+      before_action :initialize_seo_for_section
     end
 
   private

data/app/controllers/weeler/base_controller.rb

@@ -1,6 +1,6 @@
 class Weeler::BaseController < Weeler::ApplicationController
-  before_filter :set_current_menu_item
-  before_filter :run_weeler_required_user_method
+  before_action :set_current_menu_item
+  before_action :run_weeler_required_user_method
 
 protected
 

data/app/controllers/weeler/seo_items_controller.rb

@@ -17,8 +17,9 @@ module Weeler
         translation.value = value
         translation.save
       end
-      Settings.i18n_updated_at = Time.now
+      Setting.i18n_updated_at = Time.now
+
       redirect_to({action: :edit, id: params[:id]}, {flash: {success: "Section updated."}})
     end
   end
-end
+end

data/app/controllers/weeler/settings_controller.rb

@@ -1,21 +1,39 @@
 class Weeler::SettingsController < Weeler::ConfigurationController
+  HIDDEN_SETTINGS_KEYS = %w[i18n_updated_at].freeze
+
   def index
-    # to get all items for render list
-    @settings = Settings.unscoped
+    @settings = Setting.all.order(:id).where.not(var: HIDDEN_SETTINGS_KEYS)
+  end
+
+  def create
+    @setting = Setting.new(create_setting_params)
+
+    if @setting.save
+      redirect_to weeler_settings_path, flash: { success: 'Setting created.' }
+    else
+      flash.now[:error] = 'Errors on creating.'
+      render :index
+    end
   end
 
   def update
-    @setting = Settings.unscoped.find(params[:id])
-    if @setting.update_attributes(setting_params)
-      redirect_to weeler_settings_path, flash: {success: "Setting updated."}
+    @setting = Setting.find(params[:id])
+
+    if @setting.update(update_setting_params)
+      redirect_to weeler_settings_path, flash: { success: 'Setting updated.' }
     else
-      flash.now[:error] = "Errors in updating."
+      flash.now[:error] = 'Errors on updating.'
       render :index
     end
   end
-protected
-  def setting_params
-    params.require(:settings).permit([:value])
+
+  protected
+
+  def create_setting_params
+    params.require(:setting).permit(:var, :value)
   end
 
+  def update_setting_params
+    params.require(:setting).permit(:value)
+  end
 end

data/app/controllers/weeler/static_sections_controller.rb

@@ -12,8 +12,8 @@ module Weeler
         translation.value = value
         translation.save
       end
-      Settings.i18n_updated_at = Time.now
-      redirect_to({action: :show, id: params[:id]}, {flash: {success: "Section updated."}})
+      Setting.i18n_updated_at = Time.current
+      redirect_to({ action: :show, id: params[:id] }, { flash: { success: "Section updated." } })
     end
   end
 end

data/app/controllers/weeler/translations_controller.rb

@@ -19,7 +19,7 @@ module Weeler
       @translation = I18n::Backend::Weeler::Translation.new(translation_params)
 
       if @translation.save
-        Settings.i18n_updated_at = Time.now
+        Setting.i18n_updated_at = Time.now
         redirect_to ({ action: :edit, id: @translation }), flash: { success: "Translation saved." }
       else
         flash.now[:error] = "Errors in saving."
@@ -30,8 +30,8 @@ module Weeler
     def update
       @translation = I18n::Backend::Weeler::Translation.find(params[:id])
 
-      if @translation.update_attributes(translation_params)
-        Settings.i18n_updated_at = Time.now
+      if @translation.update(translation_params)
+        Setting.i18n_updated_at = Time.now
 
         redirect_to ({ action: :edit, id: @translation }), flash: { success: "Translation updated." }
       else
@@ -44,24 +44,11 @@ module Weeler
       @translation = I18n::Backend::Weeler::Translation.find(params[:id])
       @translation.destroy
 
-      Settings.i18n_updated_at = Time.now
+      Setting.i18n_updated_at = Time.now
 
       redirect_to ({ action: :index }), flash: {success: "Translation succesfully removed."}
     end
 
-    def usage_stats
-      @used_keys = []
-      if Settings.log_key_usage == 'dump'
-        I18n::Backend::Weeler::TranslationStat.all.each do |translation_stat|
-          @used_keys << [translation_stat.key, translation_stat.usage_count]
-        end
-      else
-        Weeler.i18n_cache.instance_variable_get(:@data).keys.each do |key|
-          @used_keys << [key, Weeler.i18n_cache.read(key)] if key.start_with?('usage_stats')
-        end
-      end
-    end
-
     def export
       respond_to do |format|
         format.xlsx do
@@ -76,7 +63,7 @@ module Weeler
       if params[:file].present?
         I18n::Backend::Weeler::Translation.import params[:file]
 
-        Settings.i18n_updated_at = Time.now
+        Setting.i18n_updated_at = Time.now
 
         redirect_to ({ action: :index }), flash: {success: "Translations succesfully imported."}
       else
@@ -108,6 +95,5 @@ module Weeler
       translations = translations.lookup(params[:group]) if params[:group].present?
       translations
     end
-
   end
 end

data/app/models/setting.rb

@@ -0,0 +1,7 @@
+class Setting < RailsSettings::Base
+  field :i18n_updated_at, type: :string
+
+  Weeler.settings_fields.each do |field_options|
+    field field_options[:name], **field_options.except(:name)
+  end
+end

data/app/views/kaminari/weeler/_first_page.html.haml

@@ -0,0 +1,3 @@
+- unless current_page.first?
+  %li.first
+    = link_to "<<", url, {:remote => remote}

data/app/views/kaminari/weeler/_gap.html.haml

@@ -0,0 +1,2 @@
+%li.page.gap.disabled
+  %a{:href => "javascript:void(0)"} ...

data/app/views/kaminari/weeler/_last_page.html.haml

@@ -0,0 +1,3 @@
+- unless current_page.last?
+  %li.last
+    = link_to ">>", url, {:remote => remote}

data/app/views/kaminari/weeler/_next_page.html.haml

@@ -0,0 +1,3 @@
+- unless current_page.last?
+  %li.next
+    = link_to ">", url, :remote => remote, :rel => 'next'

data/app/views/kaminari/weeler/_page.html.haml

@@ -0,0 +1,2 @@
+%li{:class => "page#{' active' if page.current?}"}
+  = link_to page, (page.current? ? 'javascript:void(0)' : url), opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}

data/app/views/kaminari/weeler/_paginator.html.haml

@@ -0,0 +1,11 @@
+= paginator.render do
+  %ul.pagination.pagination-lg.col-lg-12.col-md-12
+    = first_page_tag unless current_page.first?
+    = prev_page_tag unless current_page.first?
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+    = next_page_tag unless current_page.last?
+    = last_page_tag unless current_page.last?

data/app/views/kaminari/weeler/_prev_page.html.haml

@@ -0,0 +1,3 @@
+- unless current_page.first?
+  %li.prev
+    = link_to "<", url, :remote => remote, :rel => 'prev'

data/app/views/weeler/base/_footer.html.haml

@@ -1,2 +1,2 @@
 %footer
-  %p © Weby 2014
+  %p © Weby 2021

data/app/views/weeler/settings/_form.html.haml

@@ -0,0 +1,16 @@
+= form_for [:weeler, item], html: {class: "form-vertical", role: "form"} do |f|
+  - if item.new_record?
+    = f.hidden_field :var
+
+  .form-group
+    %label.col-lg-4.col-md-4.control-label
+      = "#{item.var.humanize.capitalize}:"
+    .col-lg-6.col-md-6
+      - type = item.class.get_field(item.var)[:type]
+      - if type == :boolean
+        = f.check_box :value, class: "form-check-input"
+      - else
+        = f.text_field :value, class: "form-control"
+
+  .col-lg-2.col-md-2
+    = f.submit "Save", class: "btn btn-primary"

data/app/views/weeler/settings/index.html.haml

@@ -9,11 +9,8 @@
   %div{class: "col-lg-8 col-md-8"}
     - @settings.each do |item|
       %div{style: "min-height: 50px;"}
-        = form_for [:weeler, item], html: {class: "form-vertical", role: "form"} do |f|
-          .form-group
-            %label.col-lg-4.col-md-4.control-label
-              = "#{item.var.humanize.capitalize}:"
-            .col-lg-6.col-md-6
-              = f.text_field :value, value: item.value, class: "form-control"
-          .col-lg-2.col-md-2
-            = f.submit "Save", class: "btn btn-primary"
+        = render 'form', item: item
+    - Setting.keys.each do |key|
+      - if !Setting.all.map(&:var).include?(key)
+        %div{style: "min-height: 50px;"}
+          = render 'form', item: Setting.new(var: key)

data/app/views/weeler/static_sections/show.html.haml

@@ -17,8 +17,12 @@
           .form-group
             = label_tag key, key.to_s.split('.').last.humanize, class: "col-lg-2 col-md-2 control-label"
             %div{class: "col-lg-10 col-md-10"}
+              
               - if translation.html?
-                = text_area_tag "translations[#{translation.id}]", translation.value, class: 'form-control redactor'
+                - if ::Weeler.use_rails_rich_text_editor
+                  = rich_text_area_tag "translations[#{translation.id}]", translation.value
+                - else
+                  = text_area_tag "translations[#{translation.id}]", translation.value, class: 'form-control html'
               - else
                 = text_area_tag "translations[#{translation.id}]", translation.value, class: 'form-control'
 

data/app/views/weeler/translations/_form.html.haml

@@ -10,8 +10,11 @@
 .form-group
   %label.col-lg-2.col-md-2.control-label Value
   .col-lg-10.col-md-10
-    %textarea.form-control{class: "#{'redactor' if translation.html?}", name: 'i18n_backend_weeler_translation[value]', id: 'i18n_backend_weeler_translation_value'}
-      = translation.value
+    - if ::Weeler.use_rails_rich_text_editor && translation.html?
+      = rich_text_area_tag 'i18n_backend_weeler_translation[value]', translation.value
+    - else
+      %textarea.form-control{class: "#{'html' if translation.html?}", name: 'i18n_backend_weeler_translation[value]', id: 'i18n_backend_weeler_translation_value'}
+        = translation.value
 %h4 Info
 .form-group
   %label.col-lg-2.col-md-2.control-label Variables

data/app/views/weeler/translations/index.html.haml

@@ -10,15 +10,6 @@
           = link_to 'Show translations', weeler_translations_path(show_translation_keys: false)
         - else
           = link_to 'Show translation keys', weeler_translations_path(show_translation_keys: true)
-      %h1 Stats
-      %p.lead.text-muted
-        - if Settings.log_key_usage == 'true'
-          = 'Translation usage stat gathering is ON'
-        - else
-          = 'Translation usage stat gathering is OFF'
-      %p.lead.text-muted
-        = link_to 'Go to Stats', {action: :usage_stats}
-
 .row
   .col-xs-12
     %nav.navbar.navbar-default{ role: "navigation" }
@@ -39,7 +30,6 @@
                   %li
                     %a{href: weeler_translations_path(group: params[:group], filtered_locale: locale)}= locale.capitalize
 
-
         / key group lookup
         %ul.nav.navbar-nav.navbar-left
           %li.dropdown

data/lib/generators/weeler/templates/assets/javascripts/weeler/app/index.js

@@ -1,2 +1,4 @@
 // Here you can implement your JS code
-// For example //= require redactor-rails
+// //= require activestorage
+// //= require trix/dist/trix
+// //= require @rails/actiontext/app/javascript/actiontext/index

data/lib/generators/weeler/templates/assets/stylesheets/weeler/app/index.css

@@ -1,4 +1,4 @@
 /*
   Here you can implement your css code
-  // For example *= require redactor-rails
+  @import "trix/dist/trix"; // For example 
 */

data/lib/generators/weeler/templates/controllers/weeler/application_controller.rb

@@ -1,6 +1,6 @@
 module Weeler
   class ApplicationController < ::ApplicationController
     # Here you can define controller methods for using in weeler.
-    # Also you can set before_filter 's and define those methods.
+    # Also you can set before_action 's and define those methods.
   end
 end