settler 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWIzMzYxNTI2ZTE3NmNjOTlhZmZkZDEwMzU0Mzg4NjlmNDU1MTZkNg==
+    ODA5NmY2NDkxMGVjOWQ3Y2JiM2ZkZGI4Yzk5NWU5NWRjNGRiYTc2Yw==
   data.tar.gz: !binary |-
-    ZmY5MGY5YTkzZjg4NDdmOWM5MjJlZWRkZTdkY2RlNmNiMDM3NDJhOA==
+    ZjZkNDYwMWMwOGFmNjg4MThiYmE5MDUwZThlYWNmNmQwMjgxYzI2Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTM5YTU4NDE5N2ZlMThiY2MyODA5MGQ3M2UwNDliNDNlZWE1MDE1MGVhOGJj
-    M2JlZDc1YTZkM2IzNGUyMTM3MzJiOGIzZDcxYzNlZWU2Y2FiY2MzN2ZhYTc5
-    MzViNzZkMmVkMmRkYzUyNjJiNDUxZWRmZWQxNGUxY2RlNGU1M2Q=
+    Y2EwYTU1ZDAxYTgzYThiYzQyYWZlZTNmNzFhZDZlYjFlZDkzYjRhZDc1MmJm
+    Nzg5ZmU5NDUwOGEwOGE3MTJmMDQzNmQ4ZjgwNjIwMGI3MTY2MTQ5YTVhZTgy
+    ZWRjY2JjM2FhYzE0NzM3M2VlZTI5ZmIwNjE0NGQzMmIyNDhjNzY=
   data.tar.gz: !binary |-
-    Mjc3NDA4MWZhMTBmMzAwNmQzODhlMjExYzkxMzQ4ZjU1ZmMwNjdhYTkxZjVi
-    ZTA0NThiMDM2NzZkNGM2Mzg4NzNlODA3MjY2YzgzZDJlYzU2ZTg4Y2EwYThk
-    OWU4YzU4OGJlZWIzZDIxY2RjYjVhY2VkMjhiYzAzOGU2NjU1ZGU=
+    MGYwMzE4MTk1ZjhlNjIxYzU4NGU4MmU1NDJkZDc4MjBlYzY4YTA5ZjIxYmVk
+    MzFkNDA1OGRkZTllY2RjYWE1ZDVmZGNlMjcxOTIyMzY5MTVmYzcwNzY4MGQ1
+    NjRiNWVkZTMxOTk2YzY2YzI0MzExMGFkN2E0NmZlZTNjYTY0NTU=

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 2.0.0
   
 gemfile:
-  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile 
   

data/Appraisals

@@ -1,15 +1,15 @@
-appraise '3.0' do
-  gem 'activerecord', '~> 3.0'
-  gem 'activesupport', '~> 3.0'
+appraise '3.1' do
+  gem 'activerecord', '~> 3.1.0'
+  gem 'activesupport', '~> 3.1.0'
 end
 
 appraise '3.2' do
-  gem 'activerecord', '~> 3.2'
-  gem 'activesupport', '~> 3.2'  
+  gem 'activerecord', '~> 3.2.0'
+  gem 'activesupport', '~> 3.2.0'  
 end
 
 appraise '4.0' do
-  gem 'activerecord', '~> 4.0'
-  gem 'activesupport', '~> 4.0'  
+  gem 'activerecord', '~> 4.0.0'
+  gem 'activesupport', '~> 4.0.0'  
 end
 

data/Gemfile

@@ -1,10 +1,14 @@
 source 'http://rubygems.org'
 
-gem 'activerecord', '>= 3.2'
-gem 'activesupport', '>= 3.2'
+gem 'activerecord', '>= 3.1'
+gem 'activesupport', '>= 3.1'
 
 gem 'appraisal', :group => :test
-gem 'jeweler', :group => :test
 gem 'sqlite3', :group => :test
+gem 'rdoc', '>= 2.4.2', :group => :test
 # gem 'debugger', :group => :test
 
+group :test do
+  gem 'jeweler'
+end
+

data/Gemfile.lock

@@ -74,8 +74,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.2)
-  activesupport (>= 3.2)
+  activerecord (>= 3.1)
+  activesupport (>= 3.1)
   appraisal
   jeweler
+  rdoc (>= 2.4.2)
   sqlite3

data/README.rdoc

@@ -7,7 +7,7 @@ Settler can be used for defining application wide settings in Rails. Settings ar
 == Requirements
 
 * Ruby >= 1.9  (tested with Rails 1.9.2, 1.9.3 and 2.0.0)
-* Activerecord >= 3.0 (tested with Rails 3.0, 3.2 and 4.0)
+* Activerecord >= 3.1 (tested with Rails 3.1, 3.2 and 4.0)
 
 == Installation
  

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/gemfiles/{3.0.gemfile → 3.1.gemfile}

@@ -3,8 +3,8 @@
 source "http://rubygems.org"
 
 gem "appraisal", :group=>:test
-gem "jeweler", :group=>:test
 gem "sqlite3", :group=>:test
-gem "activerecord", "~> 3.0"
-gem "activesupport", "~> 3.0"
+gem "rdoc", ">= 2.4.2", :group=>:test
+gem "activerecord", "~> 3.1.0"
+gem "activesupport", "~> 3.1.0"
 

data/gemfiles/3.1.gemfile.lock

@@ -0,0 +1,37 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.12)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (2.2.3)
+    builder (3.0.4)
+    i18n (0.6.4)
+    json (1.8.0)
+    multi_json (1.7.9)
+    rake (10.1.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.1.0)
+  activesupport (~> 3.1.0)
+  appraisal
+  rdoc (>= 2.4.2)
+  sqlite3

data/gemfiles/3.2.gemfile

@@ -3,8 +3,8 @@
 source "http://rubygems.org"
 
 gem "appraisal", :group=>:test
-gem "jeweler", :group=>:test
 gem "sqlite3", :group=>:test
-gem "activerecord", "~> 3.2"
-gem "activesupport", "~> 3.2"
+gem "rdoc", ">= 2.4.2", :group=>:test
+gem "activerecord", "~> 3.2.0"
+gem "activesupport", "~> 3.2.0"
 

data/gemfiles/3.2.gemfile.lock

@@ -12,50 +12,14 @@ GEM
     activesupport (3.2.14)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
     appraisal (0.5.2)
       bundler
       rake
     arel (3.0.2)
     builder (3.0.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
     i18n (0.6.4)
-    jeweler (1.8.6)
-      builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
-      rake
-      rdoc
     json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.7.8)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
+    multi_json (1.7.9)
     rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
@@ -66,8 +30,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.2)
-  activesupport (~> 3.2)
+  activerecord (~> 3.2.0)
+  activesupport (~> 3.2.0)
   appraisal
-  jeweler
+  rdoc (>= 2.4.2)
   sqlite3

data/gemfiles/4.0.gemfile

@@ -3,8 +3,8 @@
 source "http://rubygems.org"
 
 gem "appraisal", :group=>:test
-gem "jeweler", :group=>:test
 gem "sqlite3", :group=>:test
-gem "activerecord", "~> 4.0"
-gem "activesupport", "~> 4.0"
+gem "rdoc", ">= 2.4.2", :group=>:test
+gem "activerecord", "~> 4.0.0"
+gem "activesupport", "~> 4.0.0"
 

data/gemfiles/4.0.gemfile.lock

@@ -16,52 +16,16 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    addressable (2.3.5)
     appraisal (0.5.2)
       bundler
       rake
     arel (4.0.0)
     atomic (1.1.12)
     builder (3.1.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
     i18n (0.6.4)
-    jeweler (1.8.6)
-      builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
-      rake
-      rdoc
     json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
     minitest (4.7.5)
-    multi_json (1.7.8)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
+    multi_json (1.7.9)
     rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
@@ -74,8 +38,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 4.0)
-  activesupport (~> 4.0)
+  activerecord (~> 4.0.0)
+  activesupport (~> 4.0.0)
   appraisal
-  jeweler
+  rdoc (>= 2.4.2)
   sqlite3

data/lib/settler.rb

@@ -17,8 +17,9 @@ class Settler
       
       self.config = File.exist?(source) ? YAML.load(ERB.new(File.read(source)).result).to_hash : {}
       self.config = config[namespace] || {} if namespace
-      self.config.each do  |key, attributes| 
-        Setting.unscoped do 
+
+      Setting.unscoped do
+        self.config.each do  |key, attributes| 
           setting = Setting.where(:key => key).first || Setting.create(:key => key) do |s|
              s.label = attributes['label']
              s.value = attributes['value']             
@@ -26,8 +27,9 @@ class Settler
              s.deletable = attributes['deletable']
           end
           p "[Settler] Validation failed for setting '#{setting.key}': #{setting.errors.full_messages.to_sentence}" if !setting.valid?
-        end 
+        end
       end
+      
       Setting.all.each{ |s| key = s.key; Settler.class.send(:define_method, key){ Setting.find_by_key(key) } }
     end    
     
@@ -40,7 +42,7 @@ class Settler
     # Returns an array of all setting keys
     def settings(options = {})
       Settler.load! if config.nil?
-      Setting.order(options[:order]).pluck(:key)
+      Setting.order(options[:order]).select(:key).map(&:key)
     end  
     
     # Returns a list of validations to perform on a setting.

data/settler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "settler"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "gemfiles/3.0.gemfile",
-    "gemfiles/3.0.gemfile.lock",
+    "gemfiles/3.1.gemfile",
+    "gemfiles/3.1.gemfile.lock",
     "gemfiles/3.2.gemfile",
     "gemfiles/3.2.gemfile.lock",
     "gemfiles/4.0.gemfile",
@@ -58,15 +58,15 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.2"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.2"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.1"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.1"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.2"])
-      s.add_dependency(%q<activesupport>, [">= 3.2"])
+      s.add_dependency(%q<activerecord>, [">= 3.1"])
+      s.add_dependency(%q<activesupport>, [">= 3.1"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.2"])
-    s.add_dependency(%q<activesupport>, [">= 3.2"])
+    s.add_dependency(%q<activerecord>, [">= 3.1"])
+    s.add_dependency(%q<activesupport>, [">= 3.1"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: settler
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Reinier de Lange
@@ -15,12 +15,12 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   name: activerecord
@@ -29,12 +29,12 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   name: activesupport
@@ -59,8 +59,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- gemfiles/3.0.gemfile
-- gemfiles/3.0.gemfile.lock
+- gemfiles/3.1.gemfile
+- gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
 - gemfiles/4.0.gemfile

data/gemfiles/3.0.gemfile.lock

@@ -1,73 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    appraisal (0.5.2)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    i18n (0.6.4)
-    jeweler (1.8.6)
-      builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
-      rake
-      rdoc
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.7.8)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    sqlite3 (1.3.7)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.0)
-  activesupport (~> 3.0)
-  appraisal
-  jeweler
-  sqlite3