ledermann-rails-settings 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be934fefff4c87ca3858e881e4c094e256af5381
-  data.tar.gz: f13141fd1154045b71a0bd332288309a916ceba9
+  metadata.gz: 52c95388606a87927fda30bf3da02f2d530f6143
+  data.tar.gz: e21c14935226687e5d01676e48108629f8df6b81
 SHA512:
-  metadata.gz: b8b17fd4dd288c307233a26f1ae2c29aee029fc77fee738545c59e3f1fc6906a182786d737b894d89581d774ed62274db7b55f24ec6f21b828116b31e79a04d6
-  data.tar.gz: 171041cbb7fb74001ac6bfb756bb3819fbd31a03adfc1696998afb4f6194d849ea547077a4c59779dea04225833f08e69a2f1cad19bf63e218ca698a5aab76fa
+  metadata.gz: 4e7143ee981010ad0c9123bd0348742c9cb4833a750d1c50c88af32ab16bc2a847cf41543cd777118b08c56a8e483372ec003a030c670e5a49cd771505a221e6
+  data.tar.gz: be08c695d558779710887e971f7aa41575b62480813687e0273c15b60641d5f1a6a21eaafee663755874542010b9676d88e311052f41e6d2a0536136749d1548

data/.travis.yml

@@ -3,9 +3,9 @@ rvm:
   - 1.9.3
   - 2.0.0
 gemfile:
-  - ci/Gemfile.rails-3.1.x
-  - ci/Gemfile.rails-3.2.x
-  - ci/Gemfile.rails-4.0.x
+  - ci/Gemfile-rails-3-1
+  - ci/Gemfile-rails-3-2
+  - ci/Gemfile-rails-4-0
 env:
   - DB=sqlite
   - DB=mysql

data/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 2.2.0 (2013-11-29)
+
+- Added RailsSettings::Base#to_settings_hash (thanks to @mguymon)
+
+
 ## Version 2.1.0 (2013-09-13)
 
 - Support for Rails 4

data/README.md

@@ -102,7 +102,7 @@ User.without_settings_for(:calendar)
 
 ## Installation
 
-Include the gem in your Gemfile und run `bundle` to install it:
+Include the gem in your Gemfile and run `bundle` to install it:
 
 ```ruby
 gem 'ledermann-rails-settings', :require => 'rails-settings'

data/ci/{Gemfile.rails-3.1.x → Gemfile-rails-3-1}

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'activerecord', '~> 3.1.0'
 gem 'sqlite3', '~> 1.3'

data/ci/{Gemfile.rails-3.2.x → Gemfile-rails-3-2}

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'activerecord', '~> 3.2.0'
 gem 'sqlite3', '~> 1.3'

data/ci/{Gemfile.rails-4.0.x → Gemfile-rails-4-0}

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'activerecord', '~> 4.0.0'
 gem 'sqlite3', '~> 1.3'

data/lib/rails-settings/base.rb

@@ -34,6 +34,14 @@ module RailsSettings
             settings(var).value.present?
           end
         end
+
+        def to_settings_hash
+          settings_hash = self.class.default_settings
+          settings_hash.each do |var, vals|
+            settings_hash[var] = settings_hash[var].merge(settings(var.to_sym).value)
+          end
+          settings_hash
+        end
       end
     end
   end

data/lib/rails-settings/version.rb

@@ -1,3 +1,3 @@
 module RailsSettings
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/settings_spec.rb

@@ -204,3 +204,21 @@ describe "Customized SettingObject" do
     project.settings(:info).should be_valid
   end
 end
+
+describe "to_settings_hash" do
+  let(:user) do
+    User.new :name => 'Mrs. Fin' do |user|
+      user.settings(:dashboard).theme = 'green'
+      user.settings(:dashboard).sound = 11
+      user.settings(:calendar).scope = 'some'
+    end
+  end
+
+  it "should return defaults" do
+    User.new.to_settings_hash.should == {:dashboard=>{"theme"=>"blue", "view"=>"monthly", "filter"=>true}, :calendar=>{"scope"=>"company"}}
+  end
+
+  it "should return merged settings" do
+    user.to_settings_hash.should ==  {:dashboard=>{"theme"=>"green", "view"=>"monthly", "filter"=>true, "sound" => 11}, :calendar=>{"scope"=>"some"}}
+  end
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ledermann-rails-settings
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Settings gem for Ruby on Rails
@@ -87,16 +87,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- ci/Gemfile.rails-3.1.x
-- ci/Gemfile.rails-3.2.x
-- ci/Gemfile.rails-4.0.x
+- ci/Gemfile-rails-3-1
+- ci/Gemfile-rails-3-2
+- ci/Gemfile-rails-4-0
 - lib/generators/rails_settings/migration/migration_generator.rb
 - lib/generators/rails_settings/migration/templates/migration.rb
 - lib/rails-settings.rb
@@ -125,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby gem to handle settings for ActiveRecord instances by storing them as