weeler 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44fc8a0f68fa0815dccb59bc304d2e16de9cd81f
-  data.tar.gz: bdda41f336d7afa53f9911be300726d26ff92db9
+  metadata.gz: fea4149ae99f131b04cd70cd590aa35ac208faa4
+  data.tar.gz: 3b2531ec56b936aaf6bdee72f6527feb551a2500
 SHA512:
-  metadata.gz: dcee832c23b6156e03f903cc75023e9089993120e1085d09b2eb87268056a1c544c5d76470160d0681ac00eb620e8f9b3ba29a7913954710317e575969b7ffef
-  data.tar.gz: f28975eae77bed4026fd3cc0d77999d4f3ebf1c1005c3f6a0415d0af3fe2ae85995e47c850eb286664d1f8026c61709227c41c6f0978f6b2f8dc2c8fec046e56
+  metadata.gz: 1550cb9a66e8ac1a3ba2db906ec69a08110e8147c4133beebfe604fc0617f83b49ecd915fa9a733f42147057e0598fda485ac0d5e994568697d812d4f8faa553
+  data.tar.gz: da420f6968da1ea6749ca05df0649244938c1f8f7bbb83f8e9b78634efaaf23d6dcd0b84e95718170e4fab6da1c9edd6be8d996ce3c1415ccb0a3d2e2d4f579d

data/.travis.yml

@@ -7,20 +7,16 @@ 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.2.5"
+  - "2.2.6"
   - "2.3.0"
+  - "2.3.1"
+  - "2.3.2"
+  - "2.3.3"
+  - "2.4.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,19 @@
+## 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

data/Gemfile

@@ -1,4 +1,14 @@
 source 'https://rubygems.org'
 
+gem 'globalize', github: 'globalize/globalize'
+gem 'rails-controller-testing'
+
+# platform :jruby do
+#   github 'jruby/activerecord-jdbc-adapter', branch: 'rails-5' do
+#     gem 'activerecord-jdbc-adapter'
+#     gem 'activerecord-jdbcpostgresql-adapter'
+#   end
+# end
+
 # Specify your gem's dependencies in weeler.gemspec
 gemspec

data/README.md

@@ -1,26 +1,31 @@
 # 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 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'
+```
 
-    $ 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 +46,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 +116,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 +131,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

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/models/settings.rb

@@ -1,2 +1,2 @@
-class Settings < RailsSettings::CachedSettings
+class Settings < RailsSettings::Base
 end

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

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

@@ -30,7 +30,7 @@ module Weeler
           # <tt>_filter.html.haml</tt>
           #
           def acts_as_restful(active_record_model, options = {})
-            before_filter(:load_record, only: [:show, :edit, :update, :destroy, :remove_image])
+            before_action(:load_record, only: [:show, :edit, :update, :destroy, :remove_image])
 
             include InstanceMethodsOnActivation
             helper_method :item_humanized_name
@@ -118,7 +118,7 @@ module Weeler
               permited_params.call(params)
             elsif permited_params.blank?
               warning_suggestion = params[parameterized_name.to_sym].is_a?(Hash) ? params[parameterized_name.to_sym].keys.map{ |k| k.to_sym } : "permit_params:"
-              warn "[UNPERMITED PARAMS] To permit #{params[parameterized_name.to_sym].inspect} params, add 'permit_params: #{warning_suggestion}' option to 'acts_as_restful'"
+              warn "[UNPERMITED PARAMS] To permit #{params[parameterized_name.to_sym].to_unsafe_h.inspect} params, add 'permit_params: #{warning_suggestion}' option to 'acts_as_restful'"
             else
               params.require(parameterized_name.to_sym).permit(permited_params)
             end
@@ -199,7 +199,7 @@ module Weeler
               item.sequence = index
               item.save!
             end
-            render :text => 'all ok'
+            render plain: 'all ok'
           end
 
         end # Instance methods

data/lib/weeler/engine.rb

@@ -10,7 +10,6 @@ module Weeler
     config.weeler = Weeler
 
     config.i18n.available_locales = [:en] unless config.i18n.available_locales.present?
-    config.active_record.raise_in_transactional_callbacks = true
     config.assets.precompile += ["weeler/init.js", "weeler/init.css"]
 
     # Load extend Rails classes

data/lib/weeler/version.rb

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

data/spec/controllers/translations_controller_spec.rb

@@ -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, i18n_backend_weeler_translation: FactoryGirl.attributes_for(:translation)
+      post :create, params: { i18n_backend_weeler_translation: FactoryGirl.attributes_for(:translation) }
 
       expect(I18n.t("title", locale: :en)).to eq("This is weeler")
     end
@@ -33,10 +33,10 @@ describe Weeler::TranslationsController, type: :controller do
     it "doesnt create a duplicate key" do
       I18n::Backend::Weeler::Translation.delete_all
 
-      post :create, i18n_backend_weeler_translation: {locale: "en", key: "no.dup.title", value: "This is weeler"}
+      post :create, params: { i18n_backend_weeler_translation: {locale: "en", key: "no.dup.title", value: "This is weeler"} }
       expect(I18n.t("no.dup.title", locale: :en)).to eq("This is weeler")
 
-      post :create, i18n_backend_weeler_translation: {locale: "en", key: "no.dup.title", value: "This is weeler"}
+      post :create, params: { i18n_backend_weeler_translation: {locale: "en", key: "no.dup.title", value: "This is weeler"} }
       expect(response).to render_template(:edit)
     end
   end
@@ -46,7 +46,7 @@ describe Weeler::TranslationsController, type: :controller do
       I18n::Backend::Weeler::Translation.delete_all
       translation = FactoryGirl.create(:translation, key: 'foo.updated', value: nil)
 
-      put "update", id: translation.id, i18n_backend_weeler_translation: {value: "Updated weeler!"}
+      put "update", params: { id: translation.id, i18n_backend_weeler_translation: {value: "Updated weeler!"} }
       expect(I18n.t("foo.updated", locale: :en)).to eq("Updated weeler!")
     end
 
@@ -54,7 +54,7 @@ describe Weeler::TranslationsController, type: :controller do
       I18n::Backend::Weeler::Translation.delete_all
       translation = FactoryGirl.create(:translation, key: 'foo.updated', value: nil)
 
-      put "update", id: translation.id, i18n_backend_weeler_translation: {value: "Updated weeler!", key: nil}
+      put "update", params: { id: translation.id, i18n_backend_weeler_translation: {value: "Updated weeler!", key: nil} }
       expect(response).to render_template(:edit)
     end
   end
@@ -69,7 +69,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)
-      get "edit", id: translation.id
+      get "edit", params: { id: translation.id }
       expect(response).to render_template(:edit)
     end
   end
@@ -77,7 +77,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")
-      delete "destroy", id: translation.id
+      delete "destroy", params: { id: translation.id }
 
       expect(I18n.t("foo.removing", locale: :en)).to eq("Removing") # Returns empty key
     end
@@ -90,7 +90,7 @@ describe Weeler::TranslationsController, type: :controller do
         Settings.i18n_updated_at = Time.now
 
         expect(I18n.t("welcome.title", locale: :en)).to eq("Title") # Missing translation
-        post "import", file: fixture_file_upload(File.dirname(__FILE__) + '/../fixtures/test.xlsx', 'application/xlsx')
+        post "import", params: { file: fixture_file_upload(File.dirname(__FILE__) + '/../fixtures/test.xlsx', 'application/xlsx') }
         expect(I18n.t("welcome.title", locale: :en)).to eq("EN welcome")
       end
     end

data/spec/dummy/config/database.yml

@@ -1,3 +1,4 @@
 test:
   adapter: postgresql
   database: travis_ci_test
+  pool: 5

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_files = false
+  config.public_file_server.enabled = true
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -13,8 +13,8 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files  = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/spec_helper.rb

@@ -36,7 +36,7 @@ RSpec.configure do |config|
 
   # FactoryGirl
   config.include FactoryGirl::Syntax::Methods
-  
+
   Capybara.javascript_driver = :webkit
 
   # disable empty translation creation

data/spec/weeler/action_controller/acts/restful_spec.rb

@@ -54,13 +54,13 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
             #   end
             # end
 
-            post "create", post: attributes_for(:dummy_post)
+            post "create", params: { post: attributes_for(:dummy_post) }
             post = Post.last
             expect(response).to redirect_to("http://test.host/weeler-admin/foos/#{post.id}/edit")
           end
 
           it "sets only permited params" do
-            post "create", post: attributes_for(:dummy_post, body: "Heila")
+            post "create", params: { post: attributes_for(:dummy_post, body: "Heila") }
             post = Post.last
             expect(post.title).to eq("Foo bar")
             expect(post.body).to eq(nil)
@@ -69,7 +69,7 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
 
         describe "GET #edit" do
           it "returns success status" do
-            get "edit", id: Post.last.id
+            get "edit", params: { id: Post.last.id }
             expect(response).to be_success
           end
         end
@@ -84,7 +84,7 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
         describe "PUT #update" do
           it "sets only permited params" do
             post = Post.last
-            put "update", id: post.id, post: {title: "Shivauva", body: "Another world!"}
+            put "update", params: { id: post.id, post: {title: "Shivauva", body: "Another world!"} }
             post.reload
             expect(post.title).to eq("Shivauva")
             expect(post.body).to eq("Foo baar bazaar")
@@ -94,7 +94,7 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
         describe "DELETE #destroy" do
           it "destroys item" do
             post = Post.last
-            delete "destroy", id: post.id
+            delete "destroy", params: { id: post.id }
             expect { post.reload }.to raise_error(ActiveRecord::RecordNotFound)
           end
         end
@@ -102,7 +102,7 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
         specify "POST #order" do
           routes.draw { post "order" => "weeler/foos#order" }
 
-          post "order", orders: "order[]=2&order[]=1"
+          post "order", params: { orders: "order[]=2&order[]=1" }
           post1 = Post.order(sequence: :asc).first
           post2 = Post.order(sequence: :asc).last
           expect(post1.sequence).to eq(0)
@@ -120,15 +120,15 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
       describe "actions" do
         describe "POST #create" do
           it "sets only permited params" do
-            post "create", post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila")
+            post "create", params: { post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila") }
             post = Post.last
             expect(post.title).to eq(nil)
             expect(post.body).to eq(nil)
           end
 
           it "warns developer" do
-            warning_message = "[UNPERMITED PARAMS] To permit {\"title\"=>\"Foo lala\", \"body\"=>\"Heila\"} params, add 'permit_params: [:title, :body]' option to 'acts_as_restful'\n"
-            expect { post("create", post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila")) }.to output(warning_message).to_stderr
+            warning_message = "[UNPERMITED PARAMS] To permit {\"body\"=>\"Heila\", \"title\"=>\"Foo lala\"} params, add 'permit_params: permit_params:' option to 'acts_as_restful'\n"
+            expect { post("create", params: { post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila") }) }.to output(warning_message).to_stderr
           end
         end
       end
@@ -142,7 +142,7 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
       describe "actions" do
         describe "POST #create" do
           it "sets only permited params" do
-            post "create", post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila")
+            post "create", params: { post: attributes_for(:dummy_post, title: "Foo lala", body: "Heila") }
             post = Post.last
             expect(post.title).to eq("Foo lala")
             expect(post.body).to eq("Heila")
@@ -165,7 +165,5 @@ describe Weeler::ActionController::Acts::Restful, type: :controller do
         end
       end
     end
-
-
   end
 end

data/weeler.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails', '>= 4'
+  spec.add_dependency 'rails', '~> 5.0'
   spec.add_dependency 'i18n'
-  spec.add_dependency 'rails-settings-cached', '~> 0.6.5'
+  spec.add_dependency 'rails-settings-cached'
   spec.add_dependency 'globalize'
 
   spec.add_dependency 'kaminari'
@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
   end
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'shoulda-matchers'
+  spec.add_development_dependency 'rails-controller-testing'
   spec.add_development_dependency 'coveralls'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weeler
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Artūrs Braučs
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +43,16 @@ dependencies:
   name: rails-settings-cached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
@@ -291,6 +291,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -543,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: CMS for weby.lv projects.