jt-rails-toolbox 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8efeb85d5103a77b383af309a088ff46ba4c0f06
-  data.tar.gz: ec59f9e4bbe1e748fc538bc830ee373beb0f098b
+  metadata.gz: f55a0e6e4ea57cb2e8819b2791925834d07cdbe7
+  data.tar.gz: 866ac65d9cd86c1013c2ea94790ffa0e61929dce
 SHA512:
-  metadata.gz: 2ca76fb38baeff44a943aaf7753a0654beb1f8f47f1784e476e35c6c42b687c77814ba02af8f302b80db5a4e7bc533ab3dde70e9249719e1acb2bfc8ae7942c6
-  data.tar.gz: cb71dd3f7101474347b8fc2b1edc8bd12236a6ce8a5bf93d986c44aa8c5e94767601f3f716033da132473166e6e3cd88df0050705cdb32b6146d44b633912373
+  metadata.gz: 9702d49c0ff96c1add1d02f3d4a037dde284abea6ef8342c6dfd16c7883aab1b4a1130a7466b08e0df40684e1796c9d8274b4fb556e117655f5817def7f2d81d
+  data.tar.gz: 631e112a8228e66af6db20375c5a63167674055850b093ea35d332f4f1cf611505a2f4ea83e8dcf1cbcb1018b5c09dd9b6fe9c4de319b472915a9222371371fe

data/jt-rails-toolbox.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
 	s.summary = "Common libs used for Ruby On Rails development."
 	s.description = "JTRailsToolbox contains a list of common libs used for Ruby On Rails development."
 	s.homepage = 'https://github.com/jonathantribouharet/jt-rails-toolbox'
-	s.version = '2.4.3'
+	s.version = '2.5.0'
 	s.files = `git ls-files`.split("\n")
 	s.require_paths = ['lib']
 	s.authors = ['Jonathan TRIBOUHARET']
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 	s.license = 'MIT'
 	s.platform = Gem::Platform::RUBY
 
-	s.add_dependency('rails', '~> 5.0')
+	s.add_dependency('rails', '>= 5')
 	
 	s.add_dependency('dotenv-rails')
 	s.add_dependency('http_accept_language')
@@ -22,12 +22,14 @@ Gem::Specification.new do |s|
 	s.add_dependency('paperclip', '~> 5.0')
 	s.add_dependency('validates_email_format_of', '~> 1.6')
 	s.add_dependency('validates_phone_format_of', '~> 1.0')
-	s.add_dependency('rails-i18n', '~> 5.0')
+	s.add_dependency('rails-i18n', '>= 5')
 	s.add_dependency('jt-rails-meta', '~> 1.0')
 	s.add_dependency('jt-rails-generator-user', '~> 1.0')
 	s.add_dependency('jt-rails-tokenizable', '~> 1.0')
 
-	s.add_dependency('sidekiq', '~> 4.0')
-	s.add_dependency('sinatra') # Admin for sidekiq
-	s.add_dependency('redis-namespace') # Sidekiq
+	s.add_dependency('sidekiq', '< 6')
+	s.add_dependency('redis-namespace')
+
+	s.add_dependency('oj')
+	s.add_dependency('oj_mimic_json')
 end

data/lib/jt-rails-toolbox.rb

@@ -7,6 +7,8 @@ require 'rails_i18n'
 require 'jt-rails-meta'
 require 'jt-rails-generator-user'
 require 'jt-rails-tokenizable'
+require 'oj'
+require 'oj_mimic_json'
 
 require 'yaml'
 
@@ -144,9 +146,12 @@ module JTRailsToolbox
 			# Params in url are bad for SEO, it's better to use fingerprint for having an unique url
 			Paperclip::Attachment.default_options[:use_timestamp] = false
 
-			path = "#{@params['files']['folder']}/:class/:attachment/:id/:style/:fingerprint.:content_type_extension"
+			path = @params['files']['folder'].to_s
+			path = "/#{path}" if !path.start_with?('/')
+			path += '/' if !path.end_with?('/')
+			path += ":class/:attachment/:id/:style/:fingerprint.:content_type_extension"
 
-			Paperclip::Attachment.default_options[:path] = ":rails_root/public/#{path}"
+			Paperclip::Attachment.default_options[:path] = ":rails_root/public#{path}"
 			Paperclip::Attachment.default_options[:url] = "#{@params['hosts']['cdn_host']}#{path}"
 
 			ActionController::Base.asset_host = @params['hosts']['asset_host']

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jt-rails-toolbox
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors:
 - Jonathan TRIBOUHARET
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: jt-rails-meta
   requirement: !ruby/object:Gem::Requirement
@@ -182,18 +182,18 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -207,7 +207,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj_mimic_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='