activeadmin-settings 0.2.5 → 0.2.6

data/{lib/generators/activeadmin_settings/templates/models → app/models/activeadmin_settings}/setting.rb

@@ -5,7 +5,7 @@ class ActiveadminSettings::Setting
   # Fields
   field           :name
   field           :string, :default => ""
-  mount_uploader  :file, SettingsFileUploader
+  mount_uploader  :file, ActiveadminSettings::SettingsFileUploader
 
   # Validators
   validates_presence_of   :name
@@ -25,7 +25,13 @@ class ActiveadminSettings::Setting
   end
 
   def default_value
-    (ActiveadminSettings.all_settings[name]["default_value"] ||= "").to_s
+    val = (ActiveadminSettings.all_settings[name]["default_value"] ||= "").to_s
+    
+    if type == "file" and not val.include? '//'
+      val = ActionController::Base.helpers.asset_path(val)
+    end
+    
+    val
   end
 
   def value

data/app/uploaders/activeadmin_settings/settings_file_uploader.rb

@@ -0,0 +1,5 @@
+class ActiveadminSettings::SettingsFileUploader < CarrierWave::Uploader::Base
+  def store_dir
+    "system/settings/files/#{model.id}"
+  end
+end

data/lib/activeadmin-settings/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminSettings
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/generators/activeadmin_settings/install_generator.rb

@@ -6,14 +6,6 @@ module ActiveadminSettings
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_files
-        # models
-        puts "Installing models:"
-        copy_file "models/setting.rb", "app/models/activeadmin_settings/setting.rb"
-
-        # uploaders
-        puts "Installing uploaders:"
-        copy_file "uploaders/settings_file_uploader.rb", "app/uploaders/settings_file_uploader.rb"
-
         # admin
         puts "Installing admin:"
         copy_file "admin/settings.rb",    "app/admin/settings.rb"

data/lib/tasks/activeadmin_settings.rake

@@ -1,24 +1,33 @@
 # encoding: UTF-8
 
 namespace :activeadmin do
-  desc "Create default admin user"
-  task :create_admin => :environment do
-    AdminUser.create :email => 'admin@example.com', :password => 'password', :password_confirmation => 'password'
-    puts "New admin user created:
-            email: admin@example.com
-            password: password"
-  end
+  namespace :settings do
+    desc "Create default admin user"
+    task :create_admin => :environment do
+      AdminUser.create :email => 'admin@example.com', :password => 'password', :password_confirmation => 'password'
+      puts "New admin user created:
+              email: admin@example.com
+              password: password"
+    end
 
-  desc "Add missing settings from activeadmin_settings.yml file to the db"
-  task :add_settings => :environment do
-    ActiveadminSettings.all_settings.each_key do |name|
-      puts "Add setting: #{name}"
-      ActiveadminSettings::Setting.find_or_create_by(name: name)
+    desc "Add missing settings from activeadmin_settings.yml file to the db"
+    task :add => :environment do
+      ActiveadminSettings.all_settings.each_key do |name|
+        puts "Add setting: #{name}"
+        s = ActiveadminSettings::Setting.find_or_create_by(name: name)
+        
+        # Save default text values to db,
+        # as this way it's more easy to edit them
+        if s.type == "text"
+          s.string = s.default_value
+          s.save
+        end
+      end
     end
-  end
 
-  desc "Add settings from activeadmin_settings.yml file to the db"
-  task :flush_settings => :environment do
-    ActiveadminSettings::Setting.all.destroy
+    desc "Add settings from activeadmin_settings.yml file to the db"
+    task :flush => :environment do
+      ActiveadminSettings::Setting.all.destroy
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-settings
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -24,6 +24,8 @@ files:
 - activeadmin-settings.gemspec
 - app/controller/activeadmin_settings/admin_users_controller.rb
 - app/controller/activeadmin_settings/settings_controller.rb
+- app/models/activeadmin_settings/setting.rb
+- app/uploaders/activeadmin_settings/settings_file_uploader.rb
 - app/views/admin/settings/_admin.html.erb
 - app/views/admin/settings/_admin_form.html.erb
 - app/views/admin/settings/_admins_table.html.erb
@@ -38,8 +40,6 @@ files:
 - lib/generators/activeadmin_settings/install_generator.rb
 - lib/generators/activeadmin_settings/templates/admin/settings.rb
 - lib/generators/activeadmin_settings/templates/config/activeadmin_settings.yml
-- lib/generators/activeadmin_settings/templates/models/setting.rb
-- lib/generators/activeadmin_settings/templates/uploaders/settings_file_uploader.rb
 - lib/tasks/activeadmin_settings.rake
 - vendor/assets/javascripts/activeadmin_settings/admins.js.coffee
 - vendor/assets/javascripts/activeadmin_settings/flashes.js.coffee
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2786191008632219396
+      hash: -2743706927528205930
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/generators/activeadmin_settings/templates/uploaders/settings_file_uploader.rb

@@ -1,5 +0,0 @@
-class SettingsFileUploader < CarrierWave::Uploader::Base
-  def store_dir
-    "system/settings/files/#{model.id}"
-  end
-end