Commit 8c59b56902ac6de06881d228cbbde41d0b2b397b

Authored by Karpikau Andrei
1 parent 391b5fd2

work on rails 5 version

1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.86)
  4 + kanjai (0.0.92)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk-s3
8   - daemons
9   - delayed_job_active_record
10 8 devise
11   - jbuilder (~> 2.0)
12   - json
13 9 pg (= 1.0.0)
14 10 rails (~> 5.2)
15   - rails_12factor
16 11 sass-rails (~> 5.0)
17   - sdoc (~> 0.4.0)
18   - therubyracer (= 0.12.2)
19   - uglifier (>= 1.3.0)
20 12
21 13 GEM
22 14 remote: https://rubygems.org/
... ... @@ -68,17 +60,17 @@ GEM
68 60 activerecord (>= 3.0.0)
69 61 arel (9.0.0)
70 62 aws-eventstream (1.0.1)
71   - aws-partitions (1.100.0)
72   - aws-sdk-core (3.24.1)
  63 + aws-partitions (1.105.0)
  64 + aws-sdk-core (3.31.0)
73 65 aws-eventstream (~> 1.0)
74 66 aws-partitions (~> 1.0)
75 67 aws-sigv4 (~> 1.0)
76 68 jmespath (~> 1.0)
77   - aws-sdk-kms (1.7.0)
78   - aws-sdk-core (~> 3)
  69 + aws-sdk-kms (1.9.0)
  70 + aws-sdk-core (~> 3, >= 3.26.0)
79 71 aws-sigv4 (~> 1.0)
80   - aws-sdk-s3 (1.17.0)
81   - aws-sdk-core (~> 3, >= 3.21.2)
  72 + aws-sdk-s3 (1.21.0)
  73 + aws-sdk-core (~> 3, >= 3.26.0)
82 74 aws-sdk-kms (~> 1)
83 75 aws-sigv4 (~> 1.0)
84 76 aws-sigv4 (1.0.3)
... ... @@ -86,12 +78,6 @@ GEM
86 78 builder (3.2.3)
87 79 concurrent-ruby (1.0.5)
88 80 crass (1.0.4)
89   - daemons (1.2.6)
90   - delayed_job (4.1.5)
91   - activesupport (>= 3.0, < 5.3)
92   - delayed_job_active_record (4.1.3)
93   - activerecord (>= 3.0, < 5.3)
94   - delayed_job (>= 3.0, < 5)
95 81 devise (4.5.0)
96 82 bcrypt (~> 3.0)
97 83 orm_adapter (~> 0.1)
... ... @@ -99,18 +85,12 @@ GEM
99 85 responders
100 86 warden (~> 1.2.3)
101 87 erubi (1.7.1)
102   - execjs (2.7.0)
103 88 ffi (1.9.25)
104 89 globalid (0.4.1)
105 90 activesupport (>= 4.2.0)
106 91 i18n (1.1.1)
107 92 concurrent-ruby (~> 1.0)
108   - jbuilder (2.7.0)
109   - activesupport (>= 4.2.0)
110   - multi_json (>= 1.2)
111 93 jmespath (1.4.0)
112   - json (1.8.6)
113   - libv8 (3.16.14.19-x86_64-darwin-16)
114 94 loofah (2.2.2)
115 95 crass (~> 1.0.2)
116 96 nokogiri (>= 1.5.9)
... ... @@ -123,7 +103,6 @@ GEM
123 103 mini_mime (1.0.1)
124 104 mini_portile2 (2.3.0)
125 105 minitest (5.11.3)
126   - multi_json (1.13.1)
127 106 nio4r (2.3.1)
128 107 nokogiri (1.8.5)
129 108 mini_portile2 (~> 2.3.0)
... ... @@ -150,11 +129,6 @@ GEM
150 129 nokogiri (>= 1.6)
151 130 rails-html-sanitizer (1.0.4)
152 131 loofah (~> 2.2, >= 2.2.2)
153   - rails_12factor (0.0.3)
154   - rails_serve_static_assets
155   - rails_stdout_logging
156   - rails_serve_static_assets (0.0.5)
157   - rails_stdout_logging (0.0.5)
158 132 railties (5.2.1)
159 133 actionpack (= 5.2.1)
160 134 activesupport (= 5.2.1)
... ... @@ -165,8 +139,6 @@ GEM
165 139 rb-fsevent (0.10.3)
166 140 rb-inotify (0.9.10)
167 141 ffi (>= 0.5.0, < 2)
168   - rdoc (4.3.0)
169   - ref (2.0.0)
170 142 responders (2.4.0)
171 143 actionpack (>= 4.2.0, < 5.3)
172 144 railties (>= 4.2.0, < 5.3)
... ... @@ -181,9 +153,6 @@ GEM
181 153 sprockets (>= 2.8, < 4.0)
182 154 sprockets-rails (>= 2.0, < 4.0)
183 155 tilt (>= 1.1, < 3)
184   - sdoc (0.4.2)
185   - json (~> 1.7, >= 1.7.7)
186   - rdoc (~> 4.0)
187 156 sprockets (3.7.2)
188 157 concurrent-ruby (~> 1.0)
189 158 rack (> 1, < 3)
... ... @@ -191,16 +160,11 @@ GEM
191 160 actionpack (>= 4.0)
192 161 activesupport (>= 4.0)
193 162 sprockets (>= 3.0.0)
194   - therubyracer (0.12.2)
195   - libv8 (~> 3.16.14.0)
196   - ref
197 163 thor (0.20.0)
198 164 thread_safe (0.3.6)
199 165 tilt (2.0.8)
200 166 tzinfo (1.2.5)
201 167 thread_safe (~> 0.1)
202   - uglifier (4.1.19)
203   - execjs (>= 0.3.0, < 3)
204 168 warden (1.2.7)
205 169 rack (>= 1.0)
206 170 websocket-driver (0.7.0)
... ...
... ... @@ -235,7 +235,7 @@ module Kanjai
235 235 end
236 236 end
237 237
238   - render :nothing => true
  238 + render body: nil
239 239 end
240 240
241 241 def show_frontend_editor
... ...
... ... @@ -32,7 +32,7 @@ module Kanjai
32 32
33 33 @pdf_content = content_for_render
34 34 respond_to do |format|
35   - format.html{render :text => content_for_render}
  35 + format.html{render :plain => content_for_render}
36 36 format.pdf{
37 37 options = {
38 38 pdf: "file_name",
... ... @@ -61,7 +61,7 @@ module Kanjai
61 61 if stale?(last_modified: @page_data.last_modified, etag: @page_data.etag_cache_key)
62 62 layer = @page_data.page.page_template.get_html_content
63 63 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
64   - render :text => content_for_render and return
  64 + render :plain => content_for_render and return
65 65 end
66 66 end
67 67 #render :html => content_for_render.html_safe
... ...
... ... @@ -91,6 +91,11 @@ module Kanjai
91 91 html.to_s
92 92 end
93 93
  94 + def get_html_by_json_client_url(url, locale)
  95 + page_data = PageDatum.where(:url => url, lang: locale).first
  96 + get_html_by_json_client(page_data)
  97 + end
  98 +
94 99 def make_navigation(parent_id, level)
95 100 html = ''
96 101 if level > 0
... ...
  1 +Rails.application.config.assets.precompile += %w( spree/frontend/all.css )
\ No newline at end of file
... ...
... ... @@ -21,13 +21,7 @@ Gem::Specification.new do |s|
21 21 s.add_dependency "sass-rails", "~> 5.0"
22 22
23 23 # Use Uglifier as compressor for JavaScript assets
24   - s.add_dependency 'uglifier', '>= 1.3.0'
25   -# See https://github.com/sstephenson/execjs#readme for more supported runtimes
26   - s.add_dependency 'therubyracer', '0.12.2'
27   -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
28   - s.add_dependency 'jbuilder', '~> 2.0'
29   -# bundle exec rake doc:rails generates the API under doc/api.
30   - s.add_dependency 'sdoc', '~> 0.4.0'
  24 + #s.add_dependency 'uglifier', '>= 1.3.0'
31 25
32 26 # Use ActiveModel has_secure_password
33 27 # gem 'bcrypt', '~> 3.1.7'
... ... @@ -44,15 +38,15 @@ Gem::Specification.new do |s|
44 38
45 39 s.add_dependency 'aws-sdk-s3'
46 40
47   - s.add_dependency 'delayed_job_active_record'
  41 + #s.add_dependency 'delayed_job_active_record'
48 42
49 43 s.add_dependency 'acts_as_list'
50 44 s.add_dependency 'acts_as_tree'
51 45
52   - s.add_dependency 'json'
  46 + #s.add_dependency 'json'
53 47
54   - s.add_dependency "daemons"
  48 + #s.add_dependency "daemons"
55 49
56   - s.add_runtime_dependency 'rails_12factor'
  50 + #s.add_runtime_dependency 'rails_12factor'
57 51
58 52 end
... ...
1 1 require 'rubygems'
2 2 require "devise"
3 3 require "aws-sdk"
4   -require "delayed_job_active_record"
5 4 require "rails"
6 5 require "kanjai/engine"
7 6
... ...
... ... @@ -5,7 +5,7 @@ module Kanjai
5 5 class Engine < ::Rails::Engine
6 6 isolate_namespace Kanjai
7 7 config.autoload_paths += %W(#{config.root}/lib)
8   - config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
  8 + #config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
9 9
10 10 config.to_prepare do
11 11 Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
... ... @@ -14,10 +14,8 @@ module Kanjai
14 14 end
15 15
16 16 initializer "kanjai.assets.precompile" do |app|
17   - 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)
  17 + 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)
18 18 end
19 19
20   -
21   -
22 20 end
23 21 end
... ...