mix-rails-settings 0.16.0 → 0.22.0

data/app/models/setting.rb

@@ -13,7 +13,7 @@ class Setting
 
   def self.app_title
     begin
-      Setting.find_by(key: 'app_title').value
+      Setting.find_by(key: 'app_title', activated: true).value
     rescue
       false
     end
@@ -21,7 +21,7 @@ class Setting
 
   def self.app_email
     begin
-      Setting.find_by(key: 'app_email').value
+      Setting.find_by(key: 'app_email', activated: true).value
     rescue
       false
     end
@@ -29,7 +29,7 @@ class Setting
   
   def self.admix_logo
     begin
-      Setting.find_by(key: 'admix_logo')
+      Setting.find_by(key: 'admix_logo', activated: true)
     rescue
       false
     end
@@ -37,7 +37,7 @@ class Setting
 
   def self.link_twitter
     begin
-      Setting.find_by(key: 'link_twitter').value
+      Setting.find_by(key: 'link_twitter', activated: true).value
     rescue
       false
     end
@@ -45,7 +45,23 @@ class Setting
 
   def self.link_facebook
     begin
-      Setting.find_by(key: 'link_facebook').value
+      Setting.find_by(key: 'link_facebook', activated: true).value
+    rescue
+      false
+    end
+  end
+
+  def self.albums_watermark
+    begin
+      Setting.find_by(key: 'albums_watermark', activated: true)
+    rescue
+      false
+    end
+  end
+
+  def self.albums_title
+    begin
+      Setting.find_by(key: 'albums_title', activated: true).value
     rescue
       false
     end

data/app/uploaders/settings/image_uploader.rb

@@ -21,6 +21,10 @@ class Settings::ImageUploader < CarrierWave::Uploader::Base
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
+  def cache_dir
+    "system/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url
   #   # For Rails 3.1+ asset pipeline compatibility:

data/lib/mix-rails-settings/engine.rb

@@ -38,7 +38,7 @@ module MixRailsSettings
               
               submenu.instance_eval do
                 def can_render?(current_user)
-                  current_user.is?(:admin)  
+                  current_user.has_role?(:admin)
                 end
               end
               

data/lib/mix-rails-settings/version.rb

@@ -1,7 +1,7 @@
 module MixRailsSettings
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 16
+    MINOR = 22
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-settings
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.22.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,22 +36,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/stylesheets/scaffold.css
+- app/uploaders/settings/image_uploader.rb
+- app/controllers/admix/settings_controller.rb
 - app/assets/stylesheets/settings.css
+- app/assets/stylesheets/scaffold.css
 - app/assets/javascripts/settings.js
-- app/views/admix/settings/_form_fields.html.haml
-- app/views/admix/settings/_show.html.haml
-- app/controllers/admix/settings_controller.rb
 - app/models/admix/settings_datagrid.rb
 - app/models/setting.rb
-- app/uploaders/settings/image_uploader.rb
-- config/routes.rb
+- app/views/admix/settings/_show.html.haml
+- app/views/admix/settings/_form_fields.html.haml
 - config/locales/settings.pt-BR.yml
 - config/locales/settings.en.yml
-- lib/mix-rails-settings.rb
+- config/routes.rb
+- lib/tasks/settings_tasks.rake
 - lib/mix-rails-settings/version.rb
 - lib/mix-rails-settings/engine.rb
-- lib/tasks/settings_tasks.rake
+- lib/mix-rails-settings.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4237159742205013822
+      hash: -4399716911145312350
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4237159742205013822
+      hash: -4399716911145312350
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24