Merge pull request #305 from platanus/ruby27-adjustments

Ruby27 adjustments

Author: ldlsegovia

Gemfile

@@ -12,5 +12,5 @@ gemspec
 
 # To use debugger
 # gem "debugger"
-gem "activeadmin", github: "activeadmin"
+gem "activeadmin"
 gem "devise"

Gemfile.lock

@@ -1,19 +1,3 @@
-GIT
-  remote: git://github.com/activeadmin/activeadmin.git
-  revision: a92ee4d2394f3f5b8ee15de7f26e4ce754834842
-  specs:
-    activeadmin (2.6.1)
-      arbre (~> 1.2, >= 1.2.1)
-      formtastic (~> 3.1)
-      formtastic_i18n (~> 0.4)
-      inherited_resources (~> 1.7)
-      jquery-rails (~> 4.2)
-      kaminari (~> 1.0, >= 1.0.1)
-      railties (>= 5.2, < 6.1)
-      ransack (~> 2.1, >= 2.1.1)
-      sassc-rails (~> 2.1)
-      sprockets (>= 3.0, < 4.1)
-
 PATH
   remote: .
   specs:
@@ -54,6 +38,17 @@ GEM
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_material (1.4.2)
+    activeadmin (2.7.0)
+      arbre (~> 1.2, >= 1.2.1)
+      formtastic (~> 3.1)
+      formtastic_i18n (~> 0.4)
+      inherited_resources (~> 1.7)
+      jquery-rails (~> 4.2)
+      kaminari (~> 1.0, >= 1.0.1)
+      railties (>= 5.2, < 6.1)
+      ransack (~> 2.1, >= 2.1.1)
+      sassc-rails (~> 2.1)
+      sprockets (>= 3.0, < 4.1)
     activejob (5.2.4.1)
       activesupport (= 5.2.4.1)
       globalid (>= 0.3.6)
@@ -77,6 +72,7 @@ GEM
     arbre (1.2.1)
       activesupport (>= 3.0.0)
     arel (9.0.0)
+    ast (2.4.0)
     bcrypt (3.1.13)
     builder (3.2.4)
     capybara (3.31.0)
@@ -142,6 +138,7 @@ GEM
       has_scope (~> 0.6)
       railties (>= 5.0, < 6.1)
       responders (>= 2, < 4)
+    jaro_winkler (1.5.4)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -191,13 +188,18 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
+    parallel (1.19.1)
+    parser (2.7.1.2)
+      ast (~> 2.4.0)
     polyamorous (2.3.2)
       activerecord (>= 5.2.1)
+    powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
+    psych (3.1.0)
     public_suffix (4.0.3)
     puma (4.3.3)
       nio4r (~> 2.0)
@@ -228,6 +230,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
     rake (13.0.1)
     ransack (2.3.2)
       activerecord (>= 5.2.1)
@@ -263,6 +266,16 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rubocop (0.65.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      psych (>= 3.1.0)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.1)
     rubyzip (2.2.0)
     sassc (2.2.1)
       ffi (~> 1.9)
@@ -293,6 +306,7 @@ GEM
     tilt (2.0.10)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    unicode-display_width (1.4.1)
     warden (1.2.8)
       rack (>= 2.0.6)
     webdrivers (4.2.0)
@@ -313,7 +327,7 @@ PLATFORMS
 
 DEPENDENCIES
   aasm
-  activeadmin!
+  activeadmin
   activeadmin_addons!
   capybara-selenium
   database_cleaner
@@ -327,6 +341,7 @@ DEPENDENCIES
   puma
   rails (~> 5.2, >= 5.2.4.1)
   rspec-rails
+  rubocop (~> 0.65.0)
   shoulda-matchers
   sqlite3
   webdrivers

activeadmin_addons.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "puma"
   s.add_development_dependency "rails", "~> 5.2", ">= 5.2.4.1"
   s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rubocop", "~> 0.65.0"
   s.add_development_dependency "shoulda-matchers"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "webdrivers"

spec/dummy/config/application.rb

@@ -26,5 +26,6 @@ class Application < Rails::Application
     # config.i18n.default_locale = :de
     config.secret_key_base = 'TODO Put something here'
     config.action_controller.permit_all_parameters = true
+    config.active_record.sqlite3.represent_boolean_as_integer = true
   end
 end

spec/dummy/spec/factories/cities.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :city do
-    name "MyString"
-    region nil
+    name { "MyString" }
+    region { nil }
   end
 end

spec/dummy/spec/factories/countries.rb

@@ -2,6 +2,6 @@
 
 FactoryBot.define do
   factory :country do
-    name "MyString"
+    name { "MyString" }
   end
 end

spec/dummy/spec/factories/regions.rb

@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :region do
-    name "MyString"
-    country nil
+    name { "MyString" }
+    country { nil }
   end
 end