weeler 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fea4149ae99f131b04cd70cd590aa35ac208faa4
-  data.tar.gz: 3b2531ec56b936aaf6bdee72f6527feb551a2500
+SHA256:
+  metadata.gz: f2174e5387e4473742f03bcb7d8676524c0909bf8ad711bb4a61b722c1d75834
+  data.tar.gz: 3c4250a6a160bf9cb62da039fc29e8d372d968ad05e02400ee1162bad4f61327
 SHA512:
-  metadata.gz: 1550cb9a66e8ac1a3ba2db906ec69a08110e8147c4133beebfe604fc0617f83b49ecd915fa9a733f42147057e0598fda485ac0d5e994568697d812d4f8faa553
-  data.tar.gz: da420f6968da1ea6749ca05df0649244938c1f8f7bbb83f8e9b78634efaaf23d6dcd0b84e95718170e4fab6da1c9edd6be8d996ce3c1415ccb0a3d2e2d4f579d
+  metadata.gz: '05382816c8433c45a716d23bccf68821c1d7872fb464ed353b291e0873e90cd6a5ee2be5a011112ed7674be33c205772de5849b3d72c095e626ebd924ee0b5d3'
+  data.tar.gz: 8ad0ed75b237f4bf39bbc47eaa4189100f9f6db5ee02342cf81fcbe8eafd52f70feeba24cb2ce45026f61f42f939eea66f231a88a72a882b3a18e840017eda82

data/.travis.yml

@@ -7,16 +7,8 @@ sudo: false
 before_script:
   - psql -c 'create database travis_ci_test;' -U postgres
 rvm:
-  - "2.2.2"
-  - "2.2.3"
-  - "2.2.4"
-  - "2.2.5"
-  - "2.2.6"
-  - "2.3.0"
-  - "2.3.1"
-  - "2.3.2"
-  - "2.3.3"
-  - "2.4.0"
+  - "2.6.0"
+  - "2.7.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,15 @@
+## 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

data/README.md

@@ -7,12 +7,20 @@
 
 ## Installation
 
+### 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
 
 1.6.0 version only supports Rails 5.0 and ruby 2.2.2 and higher version. In Gemfile include:
 
 ```ruby
-gem 'weeler'
+gem 'weeler', '~> 1.6'
 ```
 
 ### Rails 4.2
@@ -155,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,34 @@
+//= require jquery
+//= require jquery.turbolinks
+//= require jquery-ui
+//= require jquery_ujs
+//= require turbolinks
+//= 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/controllers/weeler/settings_controller.rb

@@ -6,7 +6,7 @@ class Weeler::SettingsController < Weeler::ConfigurationController
 
   def update
     @setting = Settings.unscoped.find(params[:id])
-    if @setting.update_attributes(setting_params)
+    if @setting.update(setting_params)
       redirect_to weeler_settings_path, flash: {success: "Setting updated."}
     else
       flash.now[:error] = "Errors in updating."

data/app/controllers/weeler/translations_controller.rb

@@ -30,7 +30,7 @@ module Weeler
     def update
       @translation = I18n::Backend::Weeler::Translation.find(params[:id])
 
-      if @translation.update_attributes(translation_params)
+      if @translation.update(translation_params)
         Settings.i18n_updated_at = Time.now
 
         redirect_to ({ action: :edit, id: @translation }), flash: { success: "Translation updated." }

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/lib/i18n/backend/weeler.rb

@@ -118,7 +118,7 @@ module I18n
             translation = result.first
             if translation.value.blank?
               fallback_value = fallback_backend_translation locale, key
-              translation.update_attributes value: fallback_value if fallback_value.present?
+              translation.update value: fallback_value if fallback_value.present?
             end
             return translation.value
           else

data/lib/weeler/action_controller/acts/restful.rb

@@ -90,7 +90,7 @@ module Weeler
           end
 
           def update
-            if @item.update_attributes(items_params)
+            if @item.update(items_params)
               after_update_action
             else
               render :action => 'edit'

data/lib/weeler/engine.rb

@@ -1,6 +1,5 @@
 require "weeler/action_controller/acts/restful"
 require "weeler/action_dispatch/routing/mapper"
-require "weeler/action_view/helpers/form_helper"
 require "weeler/action_view/helpers/translation_helper"
 
 module Weeler
@@ -16,7 +15,6 @@ module Weeler
     ::ActionDispatch::Routing::Mapper.send(:include, Weeler::ActionDispatch::Routing::Mapper)
     ::ActionController::Base.send(:include, Weeler::ActionController::Acts::Restful)
 
-    ::ActionView::Helpers::FormBuilder.send(:include, Weeler::ActionView::Helpers::FormHelper)
     ::ActionView::Base.send(:include, Weeler::ActionView::Helpers::TranslationHelper)
   end
 

data/lib/weeler/version.rb

@@ -1,7 +1,7 @@
 module Weeler
   module VERSION
-    MAJOR = 1
-    MINOR = 6
+    MAJOR = 2
+    MINOR = 0
     TINY  = 0
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/spec/controllers/translations_controller_spec.rb

@@ -10,8 +10,8 @@ describe Weeler::TranslationsController, type: :controller do
 
   describe "GET #index" do
     before do
-      FactoryGirl.create(:translation, key: 'foo.bar')
-      FactoryGirl.create(:translation, key: 'bar.foo')
+      FactoryBot.create(:translation, key: 'foo.bar')
+      FactoryBot.create(:translation, key: 'bar.foo')
     end
 
     it "list translations" do
@@ -25,7 +25,7 @@ describe Weeler::TranslationsController, type: :controller do
       expect(I18n.t("title", locale: :en)).to eq("Title")
       I18n::Backend::Weeler::Translation.delete_all
 
-      post :create, params: { i18n_backend_weeler_translation: FactoryGirl.attributes_for(:translation) }
+      post :create, params: { i18n_backend_weeler_translation: FactoryBot.attributes_for(:translation) }
 
       expect(I18n.t("title", locale: :en)).to eq("This is weeler")
     end
@@ -44,7 +44,7 @@ describe Weeler::TranslationsController, type: :controller do
   describe "PUT #update" do
     it "update translation in DB" do
       I18n::Backend::Weeler::Translation.delete_all
-      translation = FactoryGirl.create(:translation, key: 'foo.updated', value: nil)
+      translation = FactoryBot.create(:translation, key: 'foo.updated', value: nil)
 
       put "update", params: { id: translation.id, i18n_backend_weeler_translation: {value: "Updated weeler!"} }
       expect(I18n.t("foo.updated", locale: :en)).to eq("Updated weeler!")
@@ -52,7 +52,7 @@ describe Weeler::TranslationsController, type: :controller do
 
     it "dont updates if key is empty" do
       I18n::Backend::Weeler::Translation.delete_all
-      translation = FactoryGirl.create(:translation, key: 'foo.updated', value: nil)
+      translation = FactoryBot.create(:translation, key: 'foo.updated', value: nil)
 
       put "update", params: { id: translation.id, i18n_backend_weeler_translation: {value: "Updated weeler!", key: nil} }
       expect(response).to render_template(:edit)
@@ -68,7 +68,7 @@ describe Weeler::TranslationsController, type: :controller do
 
   describe "GET #edit" do
     it "retern edit translation form" do
-      translation = FactoryGirl.create(:translation, key: 'foo.updated', value: nil)
+      translation = FactoryBot.create(:translation, key: 'foo.updated', value: nil)
       get "edit", params: { id: translation.id }
       expect(response).to render_template(:edit)
     end
@@ -76,7 +76,7 @@ describe Weeler::TranslationsController, type: :controller do
 
   describe "DELETE #destroy" do
     it "destroys translation" do
-      translation = FactoryGirl.create(:translation, key: 'foo.removing', value: "Bla bla")
+      translation = FactoryBot.create(:translation, key: 'foo.removing', value: "Bla bla")
       delete "destroy", params: { id: translation.id }
 
       expect(I18n.t("foo.removing", locale: :en)).to eq("Removing") # Returns empty key
@@ -110,7 +110,7 @@ describe Weeler::TranslationsController, type: :controller do
     it "retursns translation file" do
       get "export", format: :xlsx
       expect(response.headers["Content-Type"]).to eq("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
-      expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"translations.xlsx\"")
+      expect(response.headers["Content-Disposition"]).to eq("attachment; filename=\"translations.xlsx\"; filename*=UTF-8''translations.xlsx")
     end
   end
 

data/spec/dummy/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.0

data/spec/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
-Dummy::Application.load_tasks
+Rails.application.load_tasks

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css
+//= link faker_manifest.js

data/spec/dummy/app/assets/stylesheets/application.css

@@ -3,11 +3,13 @@
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
- *= require_self
  *= require_tree .
+ *= require_self
  */

data/spec/dummy/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/spec/dummy/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,5 +1,2 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
 end

data/spec/dummy/app/{assets/javascripts → javascript/packs}/application.js

@@ -2,12 +2,14 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require rails-ujs
+//= require activestorage
 //= require_tree .

data/spec/dummy/app/jobs/application_job.rb

@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+  # Automatically retry jobs that encountered a deadlock
+  # retry_on ActiveRecord::Deadlocked
+
+  # Most jobs are safe to ignore if the underlying records are no longer available
+  # discard_on ActiveJob::DeserializationError
+end

data/spec/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/app/models/post.rb

@@ -3,7 +3,7 @@ class Post < ActiveRecord::Base
   has_many :translations
   accepts_nested_attributes_for :translations, :allow_destroy => true
 
-  Image = Struct.new(:url) do
+    Image = Struct.new(:url) do
       def url(type = nil)
         type = "original" if type.blank?
         Rails.root.join("sample/#{type.to_s}.png")

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
+  <head>
+    <title>Dummy</title>
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
 
-<%= yield %>
+    <%= stylesheet_link_tag    'application', media: 'all' %>
+  </head>
 
-</body>
+  <body>
+    <%= yield %>
+  </body>
 </html>

data/spec/dummy/app/views/layouts/mailer.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>