rails_admin_settings 0.4.3 → 0.5.0

data/.ruby-gemset

@@ -0,0 +1 @@
+rails_admin_settings

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p392

data/app/models/rails_admin_settings/setting.rb

@@ -18,6 +18,7 @@ module RailsAdminSettings
 
     field :key, type: String
     field :raw, type: String, default: ''
+    field :label
 
     include RailsAdminSettings::RequireHelpers
     include RailsAdminSettings::Processing
@@ -33,6 +34,10 @@ module RailsAdminSettings
       enabled
     end
 
+    before_save do
+      self.label = self.key  unless self.label.present?
+    end
+
     index(key: 1)
 
     if Object.const_defined?('RailsAdmin')
@@ -41,4 +46,4 @@ module RailsAdminSettings
       puts "[rails_admin_settings] Rails Admin not detected -- put this gem after rails_admin in gemfile"
     end
   end
-end
+end

data/config/locales/ru.rails_admin_settings.yml

@@ -13,7 +13,8 @@ ru:
 
     attributes:
       rails_admin_settings/setting:
-        key: Название
+        label: Название
+        key: Ключ
         raw: Значение
         type: Тип
 

data/lib/rails_admin_settings/rails_admin_config.rb

@@ -6,7 +6,7 @@ module RailsAdminSettings
           navigation_label I18n.t('admin.settings.label')
 
           object_label_method do
-            :key
+            :label
           end
 
           list do
@@ -15,14 +15,14 @@ module RailsAdminSettings
             else
               field :enabled
             end
-            field :key
+            field :label
             field :raw
             field :type
           end
 
           edit do
             field :enabled
-            field :key do
+            field :label do
               read_only true
               help false
             end

data/lib/rails_admin_settings/settings.rb

@@ -168,5 +168,9 @@ class Settings
       end
       @@settings[key]
     end
+
+    def label key
+      get(key).label
+    end
   end
-end
+end

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/rails_admin_settings.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "mongoid", '~> 3.1'
+  spec.add_runtime_dependency "mongoid", ">= 3.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0.3"

data/spec/label_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe 'Settings label' do
+  
+  it "should have label" do
+    label = "E-Mail"
+    Settings.email(label: label, default: "my@mail.ru")
+    Settings.label(:email).should == label
+  end
+
+  it "should properly set label as key if blank" do
+    Settings.email(default: "my@mail.ru")
+    Settings.label(:email).should == 'email'
+  end
+
+end

data/spec/settings_spec.rb

@@ -56,4 +56,5 @@ describe Settings do
     Settings.enabled?(:phone, type: 'phone').should eq true
     Settings.get(:phone).type.should eq 'phone'
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
@@ -244,7 +244,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -270,6 +271,7 @@ files:
 - spec/advanced_usage_spec.rb
 - spec/database_trickery_spec.rb
 - spec/factories/setting.rb
+- spec/label_spec.rb
 - spec/model_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
@@ -292,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1867951047541267235
+      hash: 1108480110300401227
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -301,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1867951047541267235
+      hash: 1108480110300401227
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -312,6 +314,7 @@ test_files:
 - spec/advanced_usage_spec.rb
 - spec/database_trickery_spec.rb
 - spec/factories/setting.rb
+- spec/label_spec.rb
 - spec/model_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3-p392@rails_admin_settings --create