mongoid-app_settings 1.0.0 → 1.1.0

data/.gitignore

@@ -0,0 +1,48 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+services:
+  - mongodb
+gemfile:
+  - gemfiles/mongoid2.gemfile
+  - gemfiles/mongoid3.gemfile
+matrix:
+  exclude:
+    # not supported by Mongoid 3
+    - rvm: 1.9.2
+      gemfile: gemfiles/mongoid3.gemfile

data/Appraisals

@@ -0,0 +1,8 @@
+appraise "mongoid2" do
+  gem "mongoid", "~> 2.0"
+  gem 'bson_ext', :platforms => [:mri]
+end
+
+appraise "mongoid3" do
+  gem "mongoid", "~> 3.0"
+end

data/Gemfile

@@ -1,11 +1,3 @@
 source "http://rubygems.org"
 
-gem "mongoid"
-gem "activesupport"
-
-group :development do
-  gem "database_cleaner"
-  gem "rspec"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov"
-end
+gemspec

data/Gemfile.lock

@@ -1,48 +1,50 @@
+PATH
+  remote: .
+  specs:
+    mongoid-app_settings (1.1.0)
+      activesupport
+      mongoid (>= 2.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
+    activesupport (3.2.11)
       i18n (~> 0.6)
-    activesupport (3.1.1)
       multi_json (~> 1.0)
-    bson (1.3.1)
-    builder (3.0.0)
-    database_cleaner (0.6.7)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
+    appraisal (0.5.1)
+      bundler
       rake
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongoid (2.2.3)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
+    builder (3.0.4)
+    database_cleaner (0.9.1)
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    mongoid (3.0.16)
+      activemodel (~> 3.1)
+      moped (~> 1.1)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.3)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    tzinfo (0.3.30)
+    moped (1.3.2)
+    multi_json (1.5.0)
+    origin (1.0.11)
+    rake (10.0.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  database_cleaner
-  jeweler (~> 1.6.4)
-  mongoid
-  rcov
-  rspec
+  appraisal
+  database_cleaner (~> 0.9)
+  mongoid-app_settings!
+  rspec (~> 2.11)

data/README.markdown

@@ -49,6 +49,22 @@ You can get a list of defaults:
 
     MySettings.defaults
     => {:enable_my_feature => true, :something_else => nil}
+    
+Settings are cached until manually reloaded. In your ApplicationController, you
+might want to do something like
+
+    class ApplicationController < ActionController::Base
+      before_filter :reload_settings
+      
+      def reload_settings
+        Settings.reload
+      end
+    end
+
+# Changelog
+
+* 1.0 - Feature complete and stable. Until I need more features, that is.
+* 1.1 - Add support for Mongoid 3. Mongoid 2 is still supported.
 
 # Contributing to mongoid-app\_settings
  

data/Rakefile

@@ -2,6 +2,8 @@
 
 require 'rubygems'
 require 'bundler'
+require 'bundler/gem_tasks'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -10,20 +12,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "mongoid-app_settings"
-  gem.homepage = "http://github.com/marten/mongoid-app_settings"
-  gem.license = "MIT"
-  gem.summary = %Q{Store settings for your application in MongoDB}
-  gem.description = %Q{Mongoid::AppSettings allows you to store settings in MongoDB, and access them easily}
-  gem.email = "marten@veldthuis.com"
-  gem.authors = ["Marten Veldthuis"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+require 'appraisal'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -38,12 +27,3 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mongoid-app_settings #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/gemfiles/mongoid2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "mongoid", "~> 2.0"
+gem "bson_ext", :platforms=>[:mri]
+
+gemspec :path=>"../"

data/gemfiles/mongoid2.gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: /Users/marten/prj/mongoid-app_settings
+  specs:
+    mongoid-app_settings (1.1.0)
+      activesupport
+      mongoid (>= 2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    bson (1.7.1)
+    bson_ext (1.7.1)
+      bson (~> 1.7.1)
+    builder (3.0.4)
+    database_cleaner (0.9.1)
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    mongo (1.7.0)
+      bson (~> 1.7.0)
+    mongoid (2.5.0)
+      activemodel (~> 3.1)
+      mongo (~> 1.7)
+      tzinfo (~> 0.3.22)
+    multi_json (1.5.0)
+    rake (10.0.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bson_ext
+  database_cleaner (~> 0.9)
+  mongoid (~> 2.0)
+  mongoid-app_settings!
+  rspec (~> 2.11)

data/gemfiles/mongoid3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "mongoid", "~> 3.0"
+
+gemspec :path=>"../"

data/gemfiles/mongoid3.gemfile.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: /Users/marten/prj/mongoid-app_settings
+  specs:
+    mongoid-app_settings (1.1.0)
+      activesupport
+      mongoid (>= 2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    builder (3.0.4)
+    database_cleaner (0.9.1)
+    diff-lcs (1.1.3)
+    i18n (0.6.1)
+    mongoid (3.0.16)
+      activemodel (~> 3.1)
+      moped (~> 1.1)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.22)
+    moped (1.3.2)
+    multi_json (1.5.0)
+    origin (1.0.11)
+    rake (10.0.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    tzinfo (0.3.35)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  database_cleaner (~> 0.9)
+  mongoid (~> 3.0)
+  mongoid-app_settings!
+  rspec (~> 2.11)

data/lib/mongoid/app_settings/version.rb

@@ -0,0 +1,5 @@
+module Mongoid
+  module AppSettings
+    VERSION = '1.1.0'
+  end
+end

data/lib/mongoid-app_settings.rb

@@ -1,4 +1,5 @@
 require 'mongoid'
+require 'mongoid/app_settings/version'
 
 module Mongoid
   module AppSettings
@@ -10,8 +11,12 @@ module Mongoid
 
     class Record #:nodoc:
       include Mongoid::Document
-      identity :type => String
-      store_in :settings
+      field :key, :type => String
+      if Mongoid::VERSION > '3'
+        store_in :collection => :settings
+      else
+        store_in 'settings'
+      end
     end
 
     module ClassMethods
@@ -81,7 +86,7 @@ module Mongoid
 
       def record # :nodoc:
         return @record if @record
-        @record = Record.find_or_create_by(:id => "settings")
+        @record = Record.find_or_create_by(:key => "settings")
       end
 
       def [](name) # :nodoc:

data/mongoid-app_settings.gemspec

@@ -1,66 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'mongoid/app_settings/version'
 
-Gem::Specification.new do |s|
-  s.name = "mongoid-app_settings"
-  s.version = "1.0.0"
+Gem::Specification.new do |gem|
+  gem.name = "mongoid-app_settings"
+  gem.version = Mongoid::AppSettings::VERSION
+  gem.authors = ["Marten Veldthuis"]
+  gem.email = "marten@veldthuis.com"
+  gem.description = "Mongoid::AppSettings allows you to store settings in MongoDB, and access them easily"
+  gem.summary = "Store settings for your application in MongoDB"
+  gem.homepage = "http://github.com/marten/mongoid-app_settings"
+  gem.licenses = ["MIT"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marten Veldthuis"]
-  s.date = "2012-01-02"
-  s.description = "Mongoid::AppSettings allows you to store settings in MongoDB, and access them easily"
-  s.email = "marten@veldthuis.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.markdown"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "lib/mongoid-app_settings.rb",
-    "mongoid-app_settings.gemspec",
-    "spec/mongoid-app_settings_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/marten/mongoid-app_settings"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "Store settings for your application in MongoDB"
+  gem.files = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.add_runtime_dependency('mongoid', [">= 2.0"])
+  gem.add_runtime_dependency('activesupport')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<mongoid>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mongoid>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<database_cleaner>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  gem.add_development_dependency('database_cleaner', ["~> 0.9"])
+  gem.add_development_dependency('rspec', ["~> 2.11"])
+  gem.add_development_dependency('appraisal')
 end
 

data/spec/mongoid2.yml

@@ -0,0 +1,3 @@
+test:
+  database: mongoid-app_settings_test
+  host: localhost

data/spec/mongoid3.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      database: mongoid-app_settings_test
+      hosts:
+        - localhost:27017

data/spec/spec_helper.rb

@@ -5,12 +5,13 @@ require 'database_cleaner'
 require 'mongoid'
 require 'mongoid-app_settings'
 
-Mongoid.configure do |config|
-  name = "mongoid-app_settings_test"
-  host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
-  config.autocreate_indexes = true
+ENV["MONGOID_ENV"] = "test"
+if Mongoid::VERSION > '3'
+  Mongoid.load!("#{File.dirname(__FILE__)}/mongoid3.yml")
+else
+  Mongoid.load!("#{File.dirname(__FILE__)}/mongoid2.yml")
 end
+Mongoid.logger.level = Logger::INFO
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-app_settings
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &11653860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *11653860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &11652580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,43 +37,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11652580
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: &11651400 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *11651400
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &11650500 !ruby/object:Gem::Requirement
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *11650500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &11649380 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *11649380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &11648700 !ruby/object:Gem::Requirement
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,27 +85,39 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11648700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mongoid::AppSettings allows you to store settings in MongoDB, and access
   them easily
 email: marten@veldthuis.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.markdown
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - .rspec
+- .travis.yml
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION
+- gemfiles/mongoid2.gemfile
+- gemfiles/mongoid2.gemfile.lock
+- gemfiles/mongoid3.gemfile
+- gemfiles/mongoid3.gemfile.lock
 - lib/mongoid-app_settings.rb
+- lib/mongoid/app_settings/version.rb
 - mongoid-app_settings.gemspec
 - spec/mongoid-app_settings_spec.rb
+- spec/mongoid2.yml
+- spec/mongoid3.yml
 - spec/spec_helper.rb
 homepage: http://github.com/marten/mongoid-app_settings
 licenses:
@@ -113,17 +134,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4007270136377991358
+      hash: 398499447771221044
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 398499447771221044
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Store settings for your application in MongoDB
-test_files: []
+test_files:
+- spec/mongoid-app_settings_spec.rb
+- spec/mongoid2.yml
+- spec/mongoid3.yml
+- spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.0