ack_rocket_cms 0.9.1.3 → 0.9.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 76e740b4e0a6193e0e812185c0f883323af76b17
4
- data.tar.gz: bc5043832ab0154f7b98936af6f0ed2dd6553d96
3
+ metadata.gz: a9b557fd3118b2ced3b24f8d5432a15b53d1d491
4
+ data.tar.gz: 4160b2196d2ba321d21546c81ec3cffe2f735197
5
5
  SHA512:
6
- metadata.gz: ec7c2168994bca0fdd4056b998ff808937119603e268c7d9a493e62a6af383d732e4145fb88aa83af268db306dfc451013849131d58f3b15aad7e5e052917875
7
- data.tar.gz: 948f83ad8d3a6af1ca0638e36c1154d42f47d3cbe7f8149eed80e623f49fdf35eaa94d30bda7ac8805a250bd0ceabce181b30edb20b28e27970a5416566fa3c8
6
+ metadata.gz: 95758c68852f892a18069ab51d974947a63b135dc4f1972546a860f89e4609f956c136719b477a4a07305ebb1988575d9c51995efb122d7f205d82df6d7287f0
7
+ data.tar.gz: ff37a5e494caeb68f591050fed260129d63065bff0d913ac338f03c10b2ea945d79579b49b6ca9b9f25050b51158ab8e8988c0d52c3a0d57c184f8758929258d
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- ack_rocket_cms (0.9.1.3)
4
+ ack_rocket_cms (0.9.2)
5
5
  ack_rails_admin_jcrop
6
6
  addressable
7
7
  ckeditor
@@ -34,52 +34,52 @@ GEM
34
34
  mini_magick
35
35
  rails (>= 3.0.0)
36
36
  rails_admin (>= 0.3.0)
37
- actionmailer (4.2.4)
38
- actionpack (= 4.2.4)
39
- actionview (= 4.2.4)
40
- activejob (= 4.2.4)
37
+ actionmailer (4.2.5)
38
+ actionpack (= 4.2.5)
39
+ actionview (= 4.2.5)
40
+ activejob (= 4.2.5)
41
41
  mail (~> 2.5, >= 2.5.4)
42
42
  rails-dom-testing (~> 1.0, >= 1.0.5)
43
- actionpack (4.2.4)
44
- actionview (= 4.2.4)
45
- activesupport (= 4.2.4)
43
+ actionpack (4.2.5)
44
+ actionview (= 4.2.5)
45
+ activesupport (= 4.2.5)
46
46
  rack (~> 1.6)
47
47
  rack-test (~> 0.6.2)
48
48
  rails-dom-testing (~> 1.0, >= 1.0.5)
49
49
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
50
- actionview (4.2.4)
51
- activesupport (= 4.2.4)
50
+ actionview (4.2.5)
51
+ activesupport (= 4.2.5)
52
52
  builder (~> 3.1)
53
53
  erubis (~> 2.7.0)
54
54
  rails-dom-testing (~> 1.0, >= 1.0.5)
55
55
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
56
- activejob (4.2.4)
57
- activesupport (= 4.2.4)
56
+ activejob (4.2.5)
57
+ activesupport (= 4.2.5)
58
58
  globalid (>= 0.3.0)
59
- activemodel (4.2.4)
60
- activesupport (= 4.2.4)
59
+ activemodel (4.2.5)
60
+ activesupport (= 4.2.5)
61
61
  builder (~> 3.1)
62
- activerecord (4.2.4)
63
- activemodel (= 4.2.4)
64
- activesupport (= 4.2.4)
62
+ activerecord (4.2.5)
63
+ activemodel (= 4.2.5)
64
+ activesupport (= 4.2.5)
65
65
  arel (~> 6.0)
66
- activesupport (4.2.4)
66
+ activesupport (4.2.5)
67
67
  i18n (~> 0.7)
68
68
  json (~> 1.7, >= 1.7.7)
69
69
  minitest (~> 5.1)
70
70
  thread_safe (~> 0.3, >= 0.3.4)
71
71
  tzinfo (~> 1.1)
72
- addressable (2.3.8)
72
+ addressable (2.4.0)
73
73
  arel (6.0.3)
74
74
  bcrypt (3.1.10)
75
- bson (3.2.6)
75
+ bson (4.0.0)
76
76
  builder (3.2.2)
77
- ckeditor (4.1.4)
77
+ ckeditor (4.1.5)
78
78
  cocaine
79
79
  orm_adapter (~> 0.5.0)
80
80
  climate_control (0.0.3)
81
81
  activesupport (>= 3.0)
82
- cocaine (0.5.7)
82
+ cocaine (0.5.8)
83
83
  climate_control (>= 0.0.3, < 1.0)
84
84
  coffee-rails (4.1.0)
85
85
  coffee-script (>= 2.2.0)
@@ -87,8 +87,9 @@ GEM
87
87
  coffee-script (2.4.1)
88
88
  coffee-script-source
89
89
  execjs
90
- coffee-script-source (1.9.1.1)
91
- devise (3.5.2)
90
+ coffee-script-source (1.10.0)
91
+ concurrent-ruby (1.0.0)
92
+ devise (3.5.3)
92
93
  bcrypt (~> 3.0)
93
94
  orm_adapter (~> 0.1)
94
95
  railties (>= 3.2.6, < 5)
@@ -97,9 +98,9 @@ GEM
97
98
  warden (~> 1.2.3)
98
99
  erubis (2.7.0)
99
100
  execjs (2.6.0)
100
- font-awesome-rails (4.4.0.0)
101
+ font-awesome-rails (4.5.0.0)
101
102
  railties (>= 3.2, < 5.0)
102
- geocoder (1.2.11)
103
+ geocoder (1.2.12)
103
104
  glebtv-simple_captcha (0.6.7)
104
105
  globalid (0.3.6)
105
106
  activesupport (>= 4.1.0)
@@ -121,20 +122,20 @@ GEM
121
122
  nokogiri (>= 1.5.9)
122
123
  mail (2.6.3)
123
124
  mime-types (>= 1.16, < 3)
124
- mime-types (2.6.2)
125
+ mime-types (2.99)
125
126
  mini_magick (4.3.6)
126
- mini_portile (0.6.2)
127
- minitest (5.8.1)
128
- mongo (2.1.1)
129
- bson (~> 3.0)
130
- mongoid (5.0.0)
127
+ mini_portile2 (2.0.0)
128
+ minitest (5.8.3)
129
+ mongo (2.2.0)
130
+ bson (~> 4.0)
131
+ mongoid (5.0.1)
131
132
  activemodel (~> 4.0)
132
133
  mongo (~> 2.1)
133
134
  origin (~> 2.1)
134
135
  tzinfo (>= 0.3.37)
135
136
  nested_form (0.3.2)
136
- nokogiri (1.6.6.2)
137
- mini_portile (~> 0.6.0)
137
+ nokogiri (1.6.7)
138
+ mini_portile2 (~> 2.0.0.rc2)
138
139
  origin (2.1.1)
139
140
  orm_adapter (0.5.0)
140
141
  rack (1.6.4)
@@ -143,16 +144,16 @@ GEM
143
144
  rack (~> 1.1)
144
145
  rack-test (0.6.3)
145
146
  rack (>= 1.0)
146
- rails (4.2.4)
147
- actionmailer (= 4.2.4)
148
- actionpack (= 4.2.4)
149
- actionview (= 4.2.4)
150
- activejob (= 4.2.4)
151
- activemodel (= 4.2.4)
152
- activerecord (= 4.2.4)
153
- activesupport (= 4.2.4)
147
+ rails (4.2.5)
148
+ actionmailer (= 4.2.5)
149
+ actionpack (= 4.2.5)
150
+ actionview (= 4.2.5)
151
+ activejob (= 4.2.5)
152
+ activemodel (= 4.2.5)
153
+ activerecord (= 4.2.5)
154
+ activesupport (= 4.2.5)
154
155
  bundler (>= 1.3.0, < 2.0)
155
- railties (= 4.2.4)
156
+ railties (= 4.2.5)
156
157
  sprockets-rails
157
158
  rails-deprecated_sanitizer (1.0.3)
158
159
  activesupport (>= 4.2.0.alpha)
@@ -162,7 +163,7 @@ GEM
162
163
  rails-deprecated_sanitizer (>= 1.0.1)
163
164
  rails-html-sanitizer (1.0.2)
164
165
  loofah (~> 2.0)
165
- rails_admin (0.7.0)
166
+ rails_admin (0.8.1)
166
167
  builder (~> 3.1)
167
168
  coffee-rails (~> 4.0)
168
169
  font-awesome-rails (>= 3.0, < 5)
@@ -183,12 +184,12 @@ GEM
183
184
  rails_admin (>= 0.5)
184
185
  rails_admin_nested_set (0.4.5)
185
186
  rails_admin
186
- rails_admin_settings (1.0.1)
187
+ rails_admin_settings (1.1.3)
187
188
  rails_admin_toggleable (0.5.1)
188
189
  rails_admin
189
- railties (4.2.4)
190
- actionpack (= 4.2.4)
191
- activesupport (= 4.2.4)
190
+ railties (4.2.5)
191
+ actionpack (= 4.2.5)
192
+ activesupport (= 4.2.5)
192
193
  rake (>= 0.8.7)
193
194
  thor (>= 0.18.1, < 2.0)
194
195
  rake (10.4.2)
@@ -196,7 +197,7 @@ GEM
196
197
  responders (2.1.0)
197
198
  railties (>= 4.2.0, < 5)
198
199
  safe_yaml (1.0.4)
199
- sass (3.4.19)
200
+ sass (3.4.20)
200
201
  sass-rails (5.0.4)
201
202
  railties (>= 4.0.0, < 5.0)
202
203
  sass (~> 3.1)
@@ -213,7 +214,8 @@ GEM
213
214
  smart_excerpt (0.1.5)
214
215
  activesupport
215
216
  htmlentities
216
- sprockets (3.4.0)
217
+ sprockets (3.5.2)
218
+ concurrent-ruby (~> 1.0)
217
219
  rack (> 1, < 3)
218
220
  sprockets-rails (2.3.3)
219
221
  actionpack (>= 3.0)
@@ -229,7 +231,7 @@ GEM
229
231
  thread_safe (~> 0.1)
230
232
  validates_email_format_of (1.6.3)
231
233
  i18n
232
- warden (1.2.3)
234
+ warden (1.2.4)
233
235
  rack (>= 1.0)
234
236
  x-real-ip (0.2.1)
235
237
  activesupport
@@ -0,0 +1,14 @@
1
+ module RsFancybox
2
+ extend ActiveSupport::Concern
3
+ included do
4
+ helper_method :request_for_fancybox?
5
+ end
6
+
7
+ def render_for_fancybox
8
+ render layout: false if request_for_fancybox?
9
+ end
10
+
11
+ def request_for_fancybox?
12
+ request.xhr? and params[:load_by_fancybox] == "true"
13
+ end
14
+ end
@@ -0,0 +1,33 @@
1
+ module RocketCMSMongoidPaperclip
2
+ extend ActiveSupport::Concern
3
+
4
+ module ClassMethods
5
+ def rocket_cms_mongoid_attached_file(name, opts = {})
6
+ name = name.to_sym
7
+ unless opts.blank?
8
+ content_type = opts.delete(:content_type)
9
+ jcrop_options = opts.delete(:jcrop_options)
10
+ end
11
+
12
+ has_mongoid_attached_file name, opts
13
+ validates_attachment name, content_type: content_type unless content_type.blank?
14
+ class_eval <<-EVAL
15
+ def #{name}_file_name=(val)
16
+ return self[:#{name}_file_name] = "" if val == ""
17
+ return self[:#{name}_file_name] = nil if val == nil
18
+ val = val.to_s
19
+ extension = File.extname(val)[1..-1]
20
+ file_name = val[0..val.size-extension.size-1]
21
+ self[:#{name}_file_name] = "\#{file_name.filename_to_slug}.\#{extension.filename_to_slug}"
22
+ end
23
+ EVAL
24
+ if jcrop_options
25
+ class_eval <<-EVAL
26
+ def #{name}_jcrop_options
27
+ #{jcrop_options}
28
+ end
29
+ EVAL
30
+ end
31
+ end
32
+ end
33
+ end
@@ -1,5 +1,5 @@
1
1
  unless defined?(RocketCMS) && RocketCMS.respond_to?(:orm) && [:active_record, :mongoid].include?(RocketCMS.orm)
2
- puts "please use rocket_cms_mongoid or rocket_cms_activerecord and not rocket_cms directly"
2
+ puts "please use ack_rocket_cms_mongoid or ack_rocket_cms_activerecord and not ack_rocket_cms directly"
3
3
  exit 1
4
4
  end
5
5
 
@@ -57,6 +57,10 @@ module RocketCMS
57
57
 
58
58
  autoload :Migration, 'rocket_cms/migration'
59
59
 
60
+ # module Mongoid
61
+ # autoload :Paperclip 'rocket_cms/mongoid/paperlcip'
62
+ # end
63
+
60
64
  module Models
61
65
  autoload :Seo, 'rocket_cms/models/seo'
62
66
  autoload :Menu, 'rocket_cms/models/menu'
@@ -102,4 +106,3 @@ module RocketCMS
102
106
  end
103
107
 
104
108
  require 'manual_slug'
105
-
@@ -229,7 +229,7 @@ module RocketCMS
229
229
  RocketCMS.only_patches self, [:show, :list, :export]
230
230
 
231
231
  if block_given?
232
- yield
232
+ yield(self)
233
233
  end
234
234
  }
235
235
  end
@@ -4,12 +4,13 @@ module RocketCMS::Controller
4
4
  include RsErrors
5
5
  include RsPages
6
6
  include RsMenu
7
+ include RsFancybox
7
8
  protect_from_forgery with: :exception
8
9
  helper_method :page_title
9
10
  end
10
11
 
11
12
  protected
12
-
13
+
13
14
  def page_title
14
15
  if @seo_page.nil?
15
16
  Settings ? Settings.default_title : "" #temp
@@ -18,8 +18,17 @@ module RocketCMS
18
18
  errors.add(:email, I18n.t('rs.no_contact_info'))
19
19
  end
20
20
  end
21
+
21
22
  after_create do
22
- ContactMailer.new_message_email(self).deliver
23
+ mailer_class.send(mailer_method, self).deliver
24
+ end
25
+
26
+ def mailer_class
27
+ ContactMailer
28
+ end
29
+
30
+ def mailer_method
31
+ :new_message_email
23
32
  end
24
33
  end
25
34
  end
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.9.1.3"
2
+ VERSION = "0.9.2"
3
3
  end
@@ -3,7 +3,7 @@ version = rails_spec.version.to_s
3
3
 
4
4
  mongoid = options[:skip_active_record]
5
5
 
6
- if Gem::Version.new(version) < Gem::Version.new('4.2.3')
6
+ if Gem::Version.new(version) < Gem::Version.new('4.2.4')
7
7
  puts "You are using an old version of Rails (#{version})"
8
8
  puts "Please update"
9
9
  puts "Stopping"
@@ -213,7 +213,7 @@ create_file '.ruby-gemset', "#{app_name}\n"
213
213
 
214
214
  run 'bundle install --without production'
215
215
 
216
- generate 'rails_email_preview:install'
216
+ # generate 'rails_email_preview:install'
217
217
  remove_file 'app/mailer_previews/contact_mailer_preview.rb'
218
218
  create_file 'app/mailer_previews/contact_mailer_preview.rb' do <<-TEXT
219
219
  class ContactMailerPreview
@@ -632,6 +632,131 @@ TEXT
632
632
  end
633
633
 
634
634
 
635
+ #god+unicorn
636
+ remove_file 'config/unicorn.rb'
637
+ create_file 'config/unicorn.rb' do <<-TEXT
638
+ worker_processes 2
639
+ working_directory "/home/ack/www/#{app_name.downcase}"
640
+
641
+ # This loads the application in the master process before forking
642
+ # worker processes
643
+ # Read more about it here:
644
+ # http://unicorn.bogomips.org/Unicorn/Configurator.html
645
+ preload_app true
646
+
647
+ timeout 30
648
+
649
+ # This is where we specify the socket.
650
+ # We will point the upstream Nginx module to this socket later on
651
+ listen "/home/ack/www/#{app_name.downcase}/tmp/sockets/unicorn.sock", :backlog => 64
652
+
653
+ pid "/home/ack/www/qiwi_middleware/tmp/pids/unicorn.pid"
654
+
655
+ # Set the path of the log files inside the log folder of the testapp
656
+ stderr_path "/home/ack/www/#{app_name.downcase}/log/unicorn.stderr.log"
657
+ stdout_path "/home/ack/www/#{app_name.downcase}/log/unicorn.stdout.log"
658
+
659
+
660
+ before_fork do |server, worker|
661
+ server.logger.info("worker=#{worker.nr} spawning in #{Dir.pwd}")
662
+
663
+ # graceful shutdown.
664
+ old_pid_file = "/home/ack/www/#{app_name.downcase}/tmp/pids/unicorn.pid.oldbin"
665
+ if File.exists?(old_pid_file) && server.pid != old_pid_file
666
+ begin
667
+ old_pid = File.read(old_pid_file).to_i
668
+ server.logger.info("sending QUIT to #{old_pid}")
669
+ # we're killing old unicorn master right there
670
+ Process.kill("QUIT", old_pid)
671
+ rescue Errno::ENOENT, Errno::ESRCH
672
+ # someone else did our job for us
673
+ end
674
+ end
675
+ end
676
+
677
+ ## no need for noSQL
678
+ # before_fork do |server, worker|
679
+ # # This option works in together with preload_app true setting
680
+ # # What is does is prevent the master process from holding
681
+ # # the database connection
682
+ # defined?(ActiveRecord::Base) and
683
+ # ActiveRecord::Base.connection.disconnect!
684
+ # end
685
+ #
686
+ # after_fork do |server, worker|
687
+ # # Here we are establishing the connection after forking worker
688
+ # # processes
689
+ # defined?(ActiveRecord::Base) and
690
+ # ActiveRecord::Base.establish_connection
691
+ # end
692
+ TEXT
693
+ end
694
+
695
+ remove_file 'config/unicorn.god'
696
+ create_file 'config/unicorn.god' do <<-TEXT
697
+ # http://unicorn.bogomips.org/SIGNALS.html
698
+
699
+ rails_env = ENV['RAILS_ENV'] || 'production'
700
+ rails_root = ENV['RAILS_ROOT'] || File.dirname(File.dirname(__FILE__))
701
+
702
+ God.watch do |w|
703
+ w.name = "unicorn_qiwi_middleware"
704
+ w.interval = 30.seconds # default
705
+
706
+ # unicorn needs to be run from the rails root
707
+ w.start = "cd #{rails_root} && unicorn -c #{rails_root}/config/unicorn.rb -E #{rails_env} -D"
708
+
709
+ # QUIT gracefully shuts down workers
710
+ w.stop = "kill -KILL `cat #{rails_root}/tmp/pids/unicorn.pid`"
711
+
712
+ # USR2 causes the master to re-create itself and spawn a new worker pool
713
+ w.restart = "kill -USR2 `cat #{rails_root}/tmp/pids/unicorn.pid`"# && cd #{rails_root} && unicorn -c #{rails_root}/config/unicorn.rb -E #{rails_env} -D"
714
+
715
+ w.start_grace = 10.seconds
716
+ w.restart_grace = 10.seconds
717
+ w.pid_file = "#{rails_root}/tmp/pids/unicorn.pid"
718
+
719
+ w.uid = 'ack'
720
+ w.gid = 'ack'
721
+
722
+ w.behavior(:clean_pid_file)
723
+
724
+ w.start_if do |start|
725
+ start.condition(:process_running) do |c|
726
+ c.interval = 5.seconds
727
+ c.running = false
728
+ end
729
+ end
730
+
731
+ w.restart_if do |restart|
732
+ restart.condition(:memory_usage) do |c|
733
+ c.above = 150.megabytes
734
+ c.times = [3, 5] # 3 out of 5 intervals
735
+ end
736
+
737
+ restart.condition(:cpu_usage) do |c|
738
+ c.above = 40.percent
739
+ c.times = 5
740
+ end
741
+ end
742
+
743
+ # lifecycle
744
+ w.lifecycle do |on|
745
+ on.condition(:flapping) do |c|
746
+ c.to_state = [:start, :restart]
747
+ c.times = 5
748
+ c.within = 5.minute
749
+ c.transition = :unmonitored
750
+ c.retry_in = 10.minutes
751
+ c.retry_times = 5
752
+ c.retry_within = 2.hours
753
+ end
754
+ end
755
+ end
756
+ TEXT
757
+ end
758
+
759
+
635
760
 
636
761
  #scripts
637
762
  remove_file 'scripts/assets_precompile.sh'
@@ -667,19 +792,19 @@ kill $(cat ./tmp/pids/unicorn.pid)
667
792
  TEXT
668
793
  end
669
794
 
670
- remove_file 'scripts/send_hup.sh'
671
- create_file 'scripts/send_hup.sh' do <<-TEXT
795
+ remove_file 'scripts/send_usr2.sh'
796
+ create_file 'scripts/send_usr2.sh' do <<-TEXT
672
797
  #!/bin/sh
673
798
 
674
- kill -HUP $(cat ./tmp/pids/unicorn.pid)
799
+ kill -USR2 $(cat ./tmp/pids/unicorn.pid)
675
800
  TEXT
676
801
  end
677
802
 
678
- remove_file 'scripts/start_god_rvm_wrapper.sh'
679
- create_file 'scripts/start_god_rvm_wrapper.sh' do <<-TEXT
803
+ remove_file 'scripts/send_hup.sh'
804
+ create_file 'scripts/send_hup.sh' do <<-TEXT
680
805
  #!/bin/sh
681
806
 
682
- sudo /etc/init.d/god_bootup_#{app_name.downcase}
807
+ kill -HUP $(cat ./tmp/pids/unicorn.pid)
683
808
  TEXT
684
809
  end
685
810
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ack_rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.1.3
4
+ version: 0.9.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-10-14 00:00:00.000000000 Z
12
+ date: 2015-12-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -409,6 +409,7 @@ files:
409
409
  - app/assets/stylesheets/rocket_cms/normalize.scss
410
410
  - app/controllers/concerns/no_cache.rb
411
411
  - app/controllers/concerns/rs_errors.rb
412
+ - app/controllers/concerns/rs_fancybox.rb
412
413
  - app/controllers/concerns/rs_localizeable.rb
413
414
  - app/controllers/concerns/rs_menu.rb
414
415
  - app/controllers/concerns/rs_pages.rb
@@ -423,6 +424,7 @@ files:
423
424
  - app/models/concerns/enableable.rb
424
425
  - app/models/concerns/geocodeable.rb
425
426
  - app/models/concerns/mappable.rb
427
+ - app/models/concerns/rocket_cms_mongoid_paperclip.rb
426
428
  - app/models/concerns/seoable.rb
427
429
  - app/models/concerns/sitemap_data.rb
428
430
  - app/models/concerns/sort_field.rb