rails_admin_settings 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57658fd2928a77d8a69898ac2ff336d9e7f23e53
-  data.tar.gz: 0d405cef62c4a0c3510c58cf6351789810506df9
+  metadata.gz: 7ecf4ad503149d3f549316467e96fe4658be16c8
+  data.tar.gz: 21fb9425a3697cb478574aee9e04851fc452d093
 SHA512:
-  metadata.gz: d91de52bed3eae39ac6fadc8acc3660c22aafdf40fc6d0a7308ac3efc75503e3147eb1d3ceae5c2abf48c41093cc62e2f4632a25c7304a3f288769554a99962c
-  data.tar.gz: ec2eee814918a600f63fb69c92cfcbf77fc68cff9357e696b477b9f85387eb44305dc79eeb0dcce05836eb7a8fd8c9304e377f01ad3bc7a4c0889a2c7fcae3df
+  metadata.gz: 9a6d1f94827ecf3498afa242faceac251bd05561a795fa3634e6398506334f1aa157ae29539f2479fab758f4382ac244b4cf76ee5bf87687321c96728b5bb020
+  data.tar.gz: e8e7f35c9dcf00d6e6db546ebf8a3cbae5e33fa08fd00062363c15327c560760d7e7b1cd14bab54eac1c8b1e4041b8a8a5fd461ccdeb71e18880c150f5800fad

data/.travis.yml

@@ -7,8 +7,10 @@ notifications:
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-
+  - jruby-20mode
+  
 env:
   - "UPLOADS=paperclip"
   - "UPLOADS=carrierwave"

data/gemfiles/mongoid-4.0.gemfile.lock

@@ -0,0 +1,130 @@
+GIT
+  remote: git://github.com/mongoid/mongoid.git
+  revision: 151e2a937f08a3f2a45082bf0d84e4ba2ddaf2be
+  branch: master
+  specs:
+    mongoid (4.0.0.alpha2)
+      activemodel (>= 4.0.0)
+      moped (~> 2.0.beta5)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+
+PATH
+  remote: /data/rails_admin_settings
+  specs:
+    rails_admin_settings (0.6.1)
+      mongoid (>= 3.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    atomic (1.1.14)
+    bson (2.1.0)
+    builder (3.1.4)
+    carrierwave (0.9.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.3)
+      climate_control (>= 0.0.3, < 1.0)
+    coderay (1.1.0)
+    connection_pool (1.2.0)
+    database_cleaner (1.2.0)
+    diff-lcs (1.2.5)
+    docile (1.1.1)
+    factory_girl (4.3.0)
+      activesupport (>= 3.0.0)
+    geocoder (1.1.9)
+    glebtv-carrierwave-mongoid (0.6.5)
+      carrierwave (>= 0.8.0, < 0.10.0)
+      mongoid (>= 3.0, < 5.0)
+      mongoid (>= 3.0, < 5.0)
+    glebtv-mongoid-paperclip (0.1.0)
+      paperclip (>= 2.3.6)
+    i18n (0.6.9)
+    json (1.8.1)
+    method_source (0.8.2)
+    mime-types (2.0)
+    mini_portile (0.5.2)
+    minitest (4.7.5)
+    mongoid-rspec (1.10.0)
+      mongoid (>= 3.0.1)
+      rake
+      rspec (>= 2.14)
+    moped (2.0.0.beta5)
+      bson (~> 2.1)
+      connection_pool (~> 1.2)
+      optionable (~> 0.2.0)
+    multi_json (1.8.4)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    optionable (0.2.0)
+    origin (2.1.0)
+    paperclip (3.5.2)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
+      mime-types
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    russian_phone (0.3.5)
+      mongoid (>= 3.0.0)
+    safe_yaml (1.0.1)
+    sanitize (2.0.6)
+      nokogiri (>= 1.4.4)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.4.7)
+    thread_safe (0.1.3)
+      atomic
+    tzinfo (0.3.38)
+    validates_email_format_of (1.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  addressable (~> 2.3.3)
+  bundler
+  database_cleaner (~> 1.2.0)
+  factory_girl (~> 4.3.0)
+  geocoder (~> 1.1.6)
+  glebtv-carrierwave-mongoid
+  glebtv-mongoid-paperclip
+  mongoid!
+  mongoid-rspec (~> 1.10.0)
+  pry
+  rails_admin_settings!
+  rake (~> 10.1.1)
+  rspec (~> 2.14.1)
+  russian_phone (~> 0.3.2)
+  safe_yaml (~> 1.0.0)
+  sanitize (~> 2.0.3)
+  simplecov (~> 0.8.2)
+  validates_email_format_of (~> 1.5.3)

data/lib/rails_admin_settings/namespaced.rb

@@ -163,6 +163,7 @@ module RailsAdminSettings
       end
 
       options.delete(:value)
+      options.delete(:default)
       options[:ns] = @name
 
       if @settings[key].nil?

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/settings_spec.rb

@@ -43,6 +43,12 @@ describe 'Settings' do
     Settings.loaded.should eq false
   end
 
+  it 'should work with type and default' do
+    Settings.phone(type: 'phone', default: '906 111 11 11').should eq '+7 (906) 111-11-11'
+    Settings.phone = '906 222 22 22'
+    Settings.phone(type: 'phone', default: '906 111 11 11').should eq '+7 (906) 222-22-22'
+  end
+  
   it 'should properly store settings to DB' do
     Settings.unload!
     Settings.loaded.should eq false

data/spec/support/mongoid.yml

@@ -4,5 +4,3 @@ test:
       database: rails_admin_settings
       hosts:
         - localhost:27017
-      options:
-        consistency: :strong

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -271,6 +271,7 @@ files:
 - config/locales/ru.yml
 - gemfiles/mongoid-3.1.gemfile
 - gemfiles/mongoid-4.0.gemfile
+- gemfiles/mongoid-4.0.gemfile.lock
 - lib/rails_admin_settings.rb
 - lib/rails_admin_settings/dumper.rb
 - lib/rails_admin_settings/engine.rb