mix-rails-settings 0.16.0 → 0.22.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/app/models/setting.rb +21 -5
  2. data/app/uploaders/settings/image_uploader.rb +4 -0
  3. data/lib/mix-rails-settings/engine.rb +1 -1
  4. data/lib/mix-rails-settings/version.rb +1 -1
  5. metadata +12 -12
data/app/models/setting.rb CHANGED
@@ -13,7 +13,7 @@ class Setting
13
13
 
14
14
  def self.app_title
15
15
  begin
16
- Setting.find_by(key: 'app_title').value
16
+ Setting.find_by(key: 'app_title', activated: true).value
17
17
  rescue
18
18
  false
19
19
  end
@@ -21,7 +21,7 @@ class Setting
21
21
 
22
22
  def self.app_email
23
23
  begin
24
- Setting.find_by(key: 'app_email').value
24
+ Setting.find_by(key: 'app_email', activated: true).value
25
25
  rescue
26
26
  false
27
27
  end
@@ -29,7 +29,7 @@ class Setting
29
29
 
30
30
  def self.admix_logo
31
31
  begin
32
- Setting.find_by(key: 'admix_logo')
32
+ Setting.find_by(key: 'admix_logo', activated: true)
33
33
  rescue
34
34
  false
35
35
  end
@@ -37,7 +37,7 @@ class Setting
37
37
 
38
38
  def self.link_twitter
39
39
  begin
40
- Setting.find_by(key: 'link_twitter').value
40
+ Setting.find_by(key: 'link_twitter', activated: true).value
41
41
  rescue
42
42
  false
43
43
  end
@@ -45,7 +45,23 @@ class Setting
45
45
 
46
46
  def self.link_facebook
47
47
  begin
48
- Setting.find_by(key: 'link_facebook').value
48
+ Setting.find_by(key: 'link_facebook', activated: true).value
49
+ rescue
50
+ false
51
+ end
52
+ end
53
+
54
+ def self.albums_watermark
55
+ begin
56
+ Setting.find_by(key: 'albums_watermark', activated: true)
57
+ rescue
58
+ false
59
+ end
60
+ end
61
+
62
+ def self.albums_title
63
+ begin
64
+ Setting.find_by(key: 'albums_title', activated: true).value
49
65
  rescue
50
66
  false
51
67
  end
data/app/uploaders/settings/image_uploader.rb CHANGED
@@ -21,6 +21,10 @@ class Settings::ImageUploader < CarrierWave::Uploader::Base
21
21
  "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
22
22
  end
23
23
 
24
+ def cache_dir
25
+ "system/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
26
+ end
27
+
24
28
  # Provide a default URL as a default if there hasn't been a file uploaded:
25
29
  # def default_url
26
30
  # # For Rails 3.1+ asset pipeline compatibility:
data/lib/mix-rails-settings/engine.rb CHANGED
@@ -38,7 +38,7 @@ module MixRailsSettings
38
38
 
39
39
  submenu.instance_eval do
40
40
  def can_render?(current_user)
41
- current_user.is?(:admin)
41
+ current_user.has_role?(:admin)
42
42
  end
43
43
  end
44
44
 
data/lib/mix-rails-settings/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module MixRailsSettings
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
- MINOR = 16
4
+ MINOR = 22
5
5
  TINY = 0
6
6
  PRE = nil
7
7
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mix-rails-settings
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.0
4
+ version: 0.22.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-01-27 00:00:00.000000000 Z
13
+ date: 2013-02-06 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
@@ -36,22 +36,22 @@ executables: []
36
36
  extensions: []
37
37
  extra_rdoc_files: []
38
38
  files:
39
- - app/assets/stylesheets/scaffold.css
39
+ - app/uploaders/settings/image_uploader.rb
40
+ - app/controllers/admix/settings_controller.rb
40
41
  - app/assets/stylesheets/settings.css
42
+ - app/assets/stylesheets/scaffold.css
41
43
  - app/assets/javascripts/settings.js
42
- - app/views/admix/settings/_form_fields.html.haml
43
- - app/views/admix/settings/_show.html.haml
44
- - app/controllers/admix/settings_controller.rb
45
44
  - app/models/admix/settings_datagrid.rb
46
45
  - app/models/setting.rb
47
- - app/uploaders/settings/image_uploader.rb
48
- - config/routes.rb
46
+ - app/views/admix/settings/_show.html.haml
47
+ - app/views/admix/settings/_form_fields.html.haml
49
48
  - config/locales/settings.pt-BR.yml
50
49
  - config/locales/settings.en.yml
51
- - lib/mix-rails-settings.rb
50
+ - config/routes.rb
51
+ - lib/tasks/settings_tasks.rake
52
52
  - lib/mix-rails-settings/version.rb
53
53
  - lib/mix-rails-settings/engine.rb
54
- - lib/tasks/settings_tasks.rake
54
+ - lib/mix-rails-settings.rb
55
55
  - MIT-LICENSE
56
56
  - Rakefile
57
57
  - README.rdoc
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
69
69
  version: '0'
70
70
  segments:
71
71
  - 0
72
- hash: -4237159742205013822
72
+ hash: -4399716911145312350
73
73
  required_rubygems_version: !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
78
78
  version: '0'
79
79
  segments:
80
80
  - 0
81
- hash: -4237159742205013822
81
+ hash: -4399716911145312350
82
82
  requirements: []
83
83
  rubyforge_project:
84
84
  rubygems_version: 1.8.24