rails_admin_settings 0.2.0 → 0.3.0

data/{lib → app/models}/rails_admin_settings/setting.rb

@@ -33,8 +33,10 @@ module RailsAdminSettings
 
     index(key: 1)
 
-    if respond_to?(:rails_admin)
+    if Object.const_defined?('RailsAdmin')
       include RailsAdminSettings::RailsAdminConfig
+    else
+      puts "[rails_admin_settings] Rails Admin not detected -- put this gem after rails_admin in gemfile"
     end
   end
 end

data/app/views/rails_admin/main/_setting_value.html.haml

@@ -10,7 +10,7 @@
     = form.text_area :raw, :value => field.value, :rows => 10, :cols => 80
 
     = javascript_include_tag "rich/base.js"
-    javascript:
+    :javascript
       var instance = CKEDITOR.instances['#{form.dom_id(field)}'];
       if(instance) { CKEDITOR.remove(instance); }
       CKEDITOR.replace('#{form.dom_id(field)}', #{Rich.options().to_json.html_safe});

data/config/locales/en.rails_admin_settings.yml

@@ -1,4 +1,18 @@
 ru:
   admin:
     settings:
-      label: 'Settings'
+      label: 'Settings'
+      no_ckeditor_detected: CKEditor not found — showing as text input
+      phone_invalid: Incorrect phone
+      email_invalid: Incorrect email
+      yaml_invalid: Incorrect YAML
+  mongoid:
+    models:
+      rails_admin_settings/setting: Settings
+
+    attributes:
+      rails_admin_settings/setting:
+        key: Key
+        raw: Value
+        type: Type
+

data/lib/rails_admin_settings.rb

@@ -5,7 +5,6 @@ module RailsAdminSettings
   autoload :Validation,       "rails_admin_settings/validation"
   autoload :RequireHelpers,   "rails_admin_settings/require_helpers"
   autoload :RailsAdminConfig, "rails_admin_settings/rails_admin_config"
-  autoload :Setting,          "rails_admin_settings/setting"
 end
 
 require "rails_admin_settings/types"
@@ -13,4 +12,6 @@ require "rails_admin_settings/settings"
 
 if Object.const_defined?('Rails')
   require "rails_admin_settings/engine"
+else
+  require File.dirname(__FILE__) + '/../app/models/rails_admin_settings/setting.rb'
 end

data/lib/rails_admin_settings/rails_admin_config.rb

@@ -1,38 +1,42 @@
 module RailsAdminSettings
   module RailsAdminConfig
     def self.included(base)
-      base.rails_admin do
-        navigation_label t('admin.settings.label')
+      if base.respond_to?(:rails_admin)
+        base.rails_admin do
+          navigation_label I18n.t('admin.settings.label')
 
-        object_label_method do
-          :key
-        end
-
-        list do
-          if Object.const_defined?('RailsAdminToggleable')
-            field :enabled, :toggle
-          else
-            field :enabled
+          object_label_method do
+            :key
           end
 
-          field :key
-          field :type
-        end
-
-        edit do
-          field :enabled
-
-          field :raw do
-            partial "setting_value"
+          list do
+            if Object.const_defined?('RailsAdminToggleable')
+              field :enabled, :toggle
+            else
+              field :enabled
+            end
+            field :key
+            field :raw
+            field :type
           end
 
-          field :key do
-            read_only true
-          end
-          field :type do
-            read_only true
+          edit do
+            field :enabled
+            field :key do
+              read_only true
+              help false
+            end
+            field :type do
+              read_only true
+              help false
+            end
+            field :raw do
+              partial "setting_value"
+            end
           end
         end
+      else
+        puts "[rails_admin_settings] Problem: model does not respond to rails_admin: this should not happen"
       end
     end
   end

data/lib/rails_admin_settings/settings.rb

@@ -3,6 +3,9 @@ class Settings
     def load!
       unless @@loaded
         @@settings = {}
+        RailsAdminSettings::Setting.all.each do |setting|
+          @@settings[setting.key] = setting
+        end
         @@loaded = true
       end
     end
@@ -86,7 +89,7 @@ class Settings
       load!
       options.symbolize_keys!
       options[:raw] = options.delete(:default)
-      @@settings[key] = RailsAdminSettings::Setting.create(options.merge(key: key)) if @@settings[key].nil?
+      @@settings[key] = RailsAdminSettings::Setting.create!(options.merge(key: key)) if @@settings[key].nil?
     end
 
     # to satisfy rspec

data/lib/rails_admin_settings/validation.rb

@@ -11,7 +11,7 @@ module RailsAdminSettings
 
       base.validate if: :phone_type? do
         require_russian_phone do
-          errors.add(:raw, I18n.t('admin.settings.phone_invalid')) unless raw.blank? || RussianPhone::Number.new(:raw).valid?
+          errors.add(:raw, I18n.t('admin.settings.phone_invalid')) unless raw.blank? || RussianPhone::Number.new(raw).valid?
         end
       end
 

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/settings_spec.rb

@@ -29,6 +29,18 @@ describe Settings do
     Settings.loaded.should eq false
   end
 
+  it 'should properly store settings to DB' do
+    Settings.class_eval { cattr_accessor :loaded }
+    Settings.unload!
+    Settings.loaded.should eq false
+    Settings.temp = '123'
+    Settings.loaded.should eq true
+    Settings.unload!
+    Settings.loaded.should eq false
+    Settings.temp.should eq '123'
+    Settings.loaded.should eq true
+  end
+
   it 'should support yaml type' do
     Settings.tdata(type: 'yaml')
     Settings.tdata = ['one', 'two', 'three']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -202,6 +202,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/models/rails_admin_settings/setting.rb
 - app/views/rails_admin/main/_setting_value.html.haml
 - config/locales/en.rails_admin_settings.yml
 - config/locales/ru.rails_admin_settings.yml
@@ -210,7 +211,6 @@ files:
 - lib/rails_admin_settings/processing.rb
 - lib/rails_admin_settings/rails_admin_config.rb
 - lib/rails_admin_settings/require_helpers.rb
-- lib/rails_admin_settings/setting.rb
 - lib/rails_admin_settings/settings.rb
 - lib/rails_admin_settings/types.rb
 - lib/rails_admin_settings/validation.rb
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1852916835368037287
+      hash: -2625523890821583171
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1852916835368037287
+      hash: -2625523890821583171
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25