work on rails 5 version

Karpikau Andrei
1 parent 391b5fd2
Showing 8 changed files with 23 additions and 62 deletions
Gemfile.lock
app/controllers/kanjai/admin/pages_controller.rb
app/controllers/kanjai/pages_controller.rb
app/helpers/kanjai/admin/pages_helper.rb
config/initializers/assets.rb
kanjai.gemspec
lib/kanjai.rb
lib/kanjai/engine.rb
--- a/Gemfile.lock
View file @8c59b56
+++ b/Gemfile.lock
View file @8c59b56
 PATH
   remote: .
   specs:
-    kanjai (0.0.86)
+    kanjai (0.0.92)
       acts_as_list
       acts_as_tree
       aws-sdk-s3
-      daemons
-      delayed_job_active_record
       devise
-      jbuilder (~> 2.0)
-      json
       pg (= 1.0.0)
       rails (~> 5.2)
-      rails_12factor
       sass-rails (~> 5.0)
-      sdoc (~> 0.4.0)
-      therubyracer (= 0.12.2)
-      uglifier (>= 1.3.0)
 GEM
   remote: https://rubygems.org/
@@ -68,17 +60,17 @@ GEM
       activerecord (>= 3.0.0)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.100.0)
-    aws-sdk-core (3.24.1)
+    aws-partitions (1.105.0)
+    aws-sdk-core (3.31.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.7.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-kms (1.9.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.17.0)
-      aws-sdk-core (~> 3, >= 3.21.2)
+    aws-sdk-s3 (1.21.0)
+      aws-sdk-core (~> 3, >= 3.26.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
@@ -86,12 +78,6 @@ GEM
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
-    daemons (1.2.6)
-    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.3)
-    delayed_job_active_record (4.1.3)
-      activerecord (>= 3.0, < 5.3)
-      delayed_job (>= 3.0, < 5)
     devise (4.5.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -99,18 +85,12 @@ GEM
       responders
       warden (~> 1.2.3)
     erubi (1.7.1)
-    execjs (2.7.0)
     ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (1.1.1)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.7.0)
-      activesupport (>= 4.2.0)
-      multi_json (>= 1.2)
     jmespath (1.4.0)
-    json (1.8.6)
-    libv8 (3.16.14.19-x86_64-darwin-16)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -123,7 +103,6 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
     nio4r (2.3.1)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
@@ -150,11 +129,6 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    rails_12factor (0.0.3)
-      rails_serve_static_assets
-      rails_stdout_logging
-    rails_serve_static_assets (0.0.5)
-    rails_stdout_logging (0.0.5)
     railties (5.2.1)
       actionpack (= 5.2.1)
       activesupport (= 5.2.1)
@@ -165,8 +139,6 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rdoc (4.3.0)
-    ref (2.0.0)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
@@ -181,9 +153,6 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sdoc (0.4.2)
-      json (~> 1.7, >= 1.7.7)
-      rdoc (~> 4.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -191,16 +160,11 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
-      ref
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
-      execjs (>= 0.3.0, < 3)
     warden (1.2.7)
       rack (>= 1.0)
     websocket-driver (0.7.0)
--- a/app/controllers/kanjai/admin/pages_controller.rb
View file @8c59b56
+++ b/app/controllers/kanjai/admin/pages_controller.rb
View file @8c59b56
@@ -235,7 +235,7 @@ module Kanjai
         end
       end
-      render :nothing => true
+      render body: nil
     end
     def show_frontend_editor
--- a/app/controllers/kanjai/pages_controller.rb
View file @8c59b56
+++ b/app/controllers/kanjai/pages_controller.rb
View file @8c59b56
@@ -32,7 +32,7 @@ module Kanjai
             @pdf_content = content_for_render
             respond_to do |format|
-              format.html{render :text => content_for_render}
+              format.html{render :plain => content_for_render}
               format.pdf{
                 options = {
                   pdf: "file_name",
@@ -61,7 +61,7 @@ module Kanjai
             if stale?(last_modified: @page_data.last_modified, etag: @page_data.etag_cache_key)
               layer = @page_data.page.page_template.get_html_content
               content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
-              render :text => content_for_render and return
+              render :plain => content_for_render and return
             end
           end
           #render :html => content_for_render.html_safe
--- a/app/helpers/kanjai/admin/pages_helper.rb
View file @8c59b56
+++ b/app/helpers/kanjai/admin/pages_helper.rb
View file @8c59b56
@@ -91,6 +91,11 @@ module Kanjai
       html.to_s
     end
+    def get_html_by_json_client_url(url, locale)
+      page_data = PageDatum.where(:url => url, lang: locale).first
+      get_html_by_json_client(page_data)
+    end
+
     def make_navigation(parent_id, level)
       html = ''
       if level > 0
--- a/config/initializers/assets.rb
View file @8c59b56
+++ b/config/initializers/assets.rb
View file @8c59b56
+Rails.application.config.assets.precompile += %w( spree/frontend/all.css )
--- a/kanjai.gemspec
View file @8c59b56
+++ b/kanjai.gemspec
View file @8c59b56
@@ -21,13 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sass-rails", "~> 5.0"
 # Use Uglifier as compressor for JavaScript assets
-  s.add_dependency 'uglifier', '>= 1.3.0'
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  s.add_dependency 'therubyracer', '0.12.2'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-  s.add_dependency 'jbuilder', '~> 2.0'
-# bundle exec rake doc:rails generates the API under doc/api.
-  s.add_dependency 'sdoc', '~> 0.4.0'
+  #s.add_dependency 'uglifier', '>= 1.3.0'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
@@ -44,15 +38,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'aws-sdk-s3'
-  s.add_dependency 'delayed_job_active_record'
+  #s.add_dependency 'delayed_job_active_record'
   s.add_dependency 'acts_as_list'
   s.add_dependency 'acts_as_tree'
-  s.add_dependency 'json'
+  #s.add_dependency 'json'
-  s.add_dependency "daemons"
+  #s.add_dependency "daemons"
-  s.add_runtime_dependency 'rails_12factor'
+  #s.add_runtime_dependency 'rails_12factor'
 end
--- a/lib/kanjai.rb
View file @8c59b56
+++ b/lib/kanjai.rb
View file @8c59b56
 require 'rubygems'
 require "devise"
 require "aws-sdk"
-require "delayed_job_active_record"
 require "rails"
 require "kanjai/engine"
--- a/lib/kanjai/engine.rb
View file @8c59b56
+++ b/lib/kanjai/engine.rb
View file @8c59b56
@@ -5,7 +5,7 @@ module Kanjai
   class Engine < ::Rails::Engine
     isolate_namespace Kanjai
     config.autoload_paths += %W(#{config.root}/lib)
-    config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
+    #config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
     config.to_prepare do
       Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
@@ -14,10 +14,8 @@ module Kanjai
     end
     initializer "kanjai.assets.precompile" do |app|
-      app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/frontend_extend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js kanjai/frontend_not_login.js kanjai/frontend_extend)
+      app.config.assets.precompile += %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/frontend_extend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js kanjai/frontend_not_login.js kanjai/frontend_extend)
     end
-
-
   end
 end