mongoid-app_settings 0.0.1 → 0.0.2

data/Gemfile

@@ -5,8 +5,7 @@ gem "activesupport"
 
 group :development do
   gem "database_cleaner"
-  gem "bson_ext", "1.4.1"
-  gem "rspec", "~> 2.3.0"
+  gem "rspec"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "rcov"
 end

data/Gemfile.lock

@@ -7,8 +7,7 @@ GEM
       i18n (~> 0.6)
     activesupport (3.1.1)
       multi_json (~> 1.0)
-    bson (1.4.1)
-    bson_ext (1.4.1)
+    bson (1.3.1)
     builder (3.0.0)
     database_cleaner (0.6.7)
     diff-lcs (1.1.3)
@@ -18,23 +17,23 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mongo (1.4.1)
-      bson (= 1.4.1)
-    mongoid (2.3.2)
-      activemodel (~> 3.1)
-      mongo (~> 1.4)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongoid (2.2.3)
+      activemodel (~> 3.0)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.0.3)
     rake (0.9.2.2)
     rcov (0.9.11)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    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.3.0)
+    rspec-mocks (2.7.0)
     tzinfo (0.3.30)
 
 PLATFORMS
@@ -42,9 +41,8 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  bson_ext (= 1.4.1)
   database_cleaner
   jeweler (~> 1.6.4)
   mongoid
   rcov
-  rspec (~> 2.3.0)
+  rspec

data/README.markdown

@@ -1,5 +1,7 @@
 # mongoid-app_settings
 
+[![Build Status](https://secure.travis-ci.org/marten/mongoid-app_settings.png)](http://travis-ci.org/marten/mongoid-app_settings)
+
 ## Usage
 
 Simply create some class and include `Mongoid::AppSettings`.
@@ -34,8 +36,7 @@ Then you can do things like:
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## Copyright
 
-Copyright (c) 2011 Marten Veldthuis. See LICENSE.txt for
-further details.
+Copyright (c) 2011 Marten Veldthuis. See LICENSE.txt for further details.
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/mongoid-app_settings.rb

@@ -4,9 +4,13 @@ module Mongoid
   module AppSettings
     extend ActiveSupport::Concern
 
+    included do |base|
+      @base = base
+    end
+
     class Record #:nodoc:
       include Mongoid::Document
-      identity type: String
+      identity :type => String
       store_in :settings
     end
 
@@ -23,6 +27,16 @@ module Mongoid
       #   end
       def setting(name, options = {})
         settings[name.to_s] = options
+
+        @base.class.class_eval do
+          define_method(name.to_s) do
+            @base[name.to_s]
+          end
+
+          define_method(name.to_s + "=") do |value|
+            @base[name.to_s] = value
+          end
+        end
       end
       
       # Force a reload from the database
@@ -32,16 +46,6 @@ module Mongoid
 
       protected
 
-      def method_missing(name, *args, &block) # :nodoc:
-        if name.to_s =~ /^(.*)=$/ and setting_defined?($1)
-          self[$1] = args[0]
-        elsif setting_defined?(name.to_s)
-          self[name.to_s]
-        else
-          super
-        end
-      end
-
       def settings # :nodoc:
         @settings ||= {}
       end
@@ -52,7 +56,7 @@ module Mongoid
 
       def record # :nodoc:
         return @record if @record
-        @record = Record.find_or_create_by(id: "settings")
+        @record = Record.find_or_create_by(:id => "settings")
       end
 
       def [](name) # :nodoc:
@@ -64,7 +68,15 @@ module Mongoid
       end
 
       def []=(name, value) # :nodoc:
-        record.set(name, value)
+        if value
+          record.set(name, value)
+        else 
+          # FIXME Mongoid's #set doesn't work for false/nil.
+          # Pull request has been submitted, but until then
+          # this workaround is needed.
+          record[name] = value
+          record.save
+        end
       end
     end
   end

data/mongoid-app_settings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mongoid-app_settings"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marten Veldthuis"]
-  s.date = "2011-10-26"
+  s.date = "2011-12-18"
   s.description = "Mongoid::AppSettings allows you to store settings in MongoDB, and access them easily"
   s.email = "marten@veldthuis.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/marten/mongoid-app_settings"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Store settings for your application in MongoDB"
 
   if s.respond_to? :specification_version then
@@ -43,16 +43,14 @@ Gem::Specification.new do |s|
       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<bson_ext>, ["= 1.4.1"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.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<bson_ext>, ["= 1.4.1"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
@@ -60,8 +58,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongoid>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
-    s.add_dependency(%q<bson_ext>, ["= 1.4.1"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/spec/mongoid-app_settings_spec.rb

@@ -32,12 +32,39 @@ describe "Mongoid::AppSettings" do
     settings.foo.should == "bar"
   end
 
+  it "should be possible to use defaults of other settings in defaults" do
+    settings.instance_eval { setting :foo, :default => "bar"
+                             setting :baz, :default => "#{foo} quux" }
+    settings.baz.should == "bar quux"
+  end
+
+  it "should be possible to use values of other settings in defaults" do
+    settings.instance_eval { setting :foo, :default => "bar" }
+    settings.foo = "baz"
+    settings.instance_eval { setting :qux, :default => "#{foo} quux" }
+    settings.qux.should === "baz quux"
+  end
+
   it "should be possible to overwrite a default value" do
     settings.instance_eval { setting :foo, :default => "bar" }
     settings.foo = "baz"
     settings.foo.should == "baz"
   end
 
+  it "should be possible to overwrite a value with something else" do
+    settings.instance_eval { setting :foo, :default => "bar" }
+    settings.foo = "baz"
+    settings.foo = "quux"
+    settings.foo.should == "quux"
+  end
+
+  it "should be possible to overwrite a value with something falsey" do
+    settings.instance_eval { setting :foo, :default => "bar" }
+    settings.foo = "baz"
+    settings.foo = false
+    settings.foo.should == false
+  end
+
   it "should not constantly reload" do
     settings.instance_eval { setting :foo }
     other_settings.instance_eval { setting :foo }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-app_settings
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &18436980 !ruby/object:Gem::Requirement
+  requirement: &11519520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18436980
+  version_requirements: *11519520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &18433280 !ruby/object:Gem::Requirement
+  requirement: &11518520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18433280
+  version_requirements: *11518520
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &18429820 !ruby/object:Gem::Requirement
+  requirement: &11517440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,32 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18429820
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &18428000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-  type: :development
-  prerelease: false
-  version_requirements: *18428000
+  version_requirements: *11517440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18426040 !ruby/object:Gem::Requirement
+  requirement: &11516440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18426040
+  version_requirements: *11516440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18328300 !ruby/object:Gem::Requirement
+  requirement: &11514520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18328300
+  version_requirements: *11514520
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18327440 !ruby/object:Gem::Requirement
+  requirement: &11513320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18327440
+  version_requirements: *11513320
 description: Mongoid::AppSettings allows you to store settings in MongoDB, and access
   them easily
 email: marten@veldthuis.com
@@ -124,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2074041831265364692
+      hash: 831259488136493402
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Store settings for your application in MongoDB