setler 0.0.12 → 0.0.13

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDlmODVjNzM5ZWZiMzY3Njk4YjJkMWM4YTZiMTQyMDEyYTRkYzU3MA==
+  data.tar.gz: !binary |-
+    MWM0MTJjNWE2YmYyZmE4MWM1NGUyYWZkNzllNTM3YzgxMTQ4NzdiNg==
+SHA512:
+  metadata.gz: !binary |-
+    NDVjNDRlNjU0MDZjZWJiODdkNzNiY2YyNGQ2MDBhMTBmZjE3NzJiYTcxMjc0
+    NmFkNzRhZTZhOTllZTU2MTk5MDZkZDBmOTBiZjNhMTdiNDQ0NjQ5MGQ0ZDg4
+    NTcwOWY2ZWFiMGM5YjU4MGM0MDg1MzhjMGVhZjQ3YWVhZTcxMGM=
+  data.tar.gz: !binary |-
+    MzdlNDgwMGZlNzYxMGQ3ODQ5Y2Q2Y2JkMDNiNWIwNmYyY2FhMjYzMmE4MWYw
+    OTY0MDE3MDVhNjVmYWM3Mjc1OWEwOGUzNDVjYmJmZWViOTY3NjYzYjczMmEw
+    M2NkNDZhNDQ4ZmViOGNiMzJjZTc2MmE3MjIwOTY1ZDM1NmM2Mzk=

data/.ruby-gemset

@@ -0,0 +1 @@
+setler

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p547

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.9.3
+  - 2.1.2
+cache: bundler
+script:
+  - bundle exec rake test
+notifications:
+  email: false

data/README.rdoc

@@ -2,20 +2,24 @@
 
 Setler is a Gem that lets one easily implement the "Feature Flags" pattern, or add settings to individual models. This is a cleanroom implementation of what the 'rails-settings' gem does. It's been forked all over the place, and my favorite version of it doesn't have any tests and doesn't work with settings associated with models.
 
+{<img src="https://travis-ci.org/ckdake/setler.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/ckdake/setler]
+
 == Setup
 
 Install the gem by adding this to your Gemfile:
 
   gem "setler"
-  
+
 Generate the model:
 
   rails g setler <model_name>
-  
+
 Run the migration:
 
   rake db:migrate
-  
+
+If you are using the `protected_attributes` gem you must add `attr_protected` to the top of you setler model.
+
 == Usage
 
 Create/Update settings:
@@ -23,22 +27,22 @@ Create/Update settings:
   # Method calls and []= are synonymous
   Featureflags.bacon_dispenser_enabled = true
   Settings[:allowed_meats] = ['bacon', 'crunchy bacon']
-  
+
 Read settings:
 
   Featureflags.bacon_dispenser_enabled # true
   Settings[:allowed_meats].include?('bacon')  # true
-  
+
 Destroy them:
 
   Featureflags.destroy :bacon_dispenser_enabled
   Settings.destroy :allowed_meats
-  
+
 List all settings:
 
   Featureflags.all_settings
   Settings.all_settings
-  
+
 Set defaults in an initializer with something like:
 
   Featureflags.defaults[:bacon_dispenser_enabled] = false
@@ -46,20 +50,20 @@ Set defaults in an initializer with something like:
 
 To revert to the default after changing a setting, destroy it.
 Note: Updating the setting to nil or false no longer makes it the default setting (> 0.0.6), but changes the setting to nil or false.
-  
+
 Add them to any ActiveRecord object:
 
   class User < ActiveRecord::Base
-    has_setler as: :settings
+    has_setler  :settings
   end
-  
+
 Then you get:
-  
+
   user = User.first
   user.settings.favorite_meat = :bacon
   user.settings.favorite_meat  # :bacon
   user.settings.all # { "favorite_meat" => :bacon }
-  
+
 TODO: And look em up:
 
   User.with_settings_for('favorite_meat') # => scope of users with the favorite_meat setting
@@ -71,7 +75,7 @@ Getting started is pretty straightforward:
   1. Check out the code:  `git clone git://github.com/ckdake/setler.git`
   2. Bundle install:  `bundle install`
   3. Run the tests and make sure they all pass and code coverage is still 100%:  `rake test`
-  
+
 If you'd like to contribute code, make your changes and submit a pull request that includes appropriate tests
 
 For building the gem: `rake build` and to release a gem to github and Rubygems: `rake release`

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rake'
 require 'rake/testtask'
 require 'bundler/gem_tasks'
 
@@ -8,19 +9,3 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task default: [:test]
-
-namespace :cover_me do
-  desc "Generates and opens code coverage report."
-  task :report do
-    require 'cover_me'
-    CoverMe.complete!
-  end
-end
-
-task :test do
-  Rake::Task['cover_me:report'].invoke
-end
-
-task :spec do
-  Rake::Task['cover_me:report'].invoke
-end

data/lib/setler/scoped_settings.rb

@@ -2,6 +2,7 @@ module Setler
   class ScopedSettings < Settings
     def self.for_thing(object, scopename)
       self.table_name = scopename
+      self.defaults = settings_constantize(scopename).defaults
       @object = object
       self
     end
@@ -10,5 +11,11 @@ module Setler
       self.base_class.where(thing_type: @object.class.base_class.to_s, thing_id: @object.id)
     end
 
+    # do not use rails default to singularize because setler examples
+    # user plural class names
+    def self.settings_constantize(scopename)
+      Object.const_get(scopename.to_s.camelize)
+    end
+
   end
 end

data/lib/setler/settings.rb

@@ -5,8 +5,13 @@ module Setler
     serialize :value
     self.abstract_class = true
 
-    cattr_accessor :defaults
-    @@defaults = {}.with_indifferent_access
+    def self.defaults
+      @defaults ||= {}.with_indifferent_access
+    end
+
+    def self.defaults=(defaults)
+      @defaults = defaults.with_indifferent_access
+    end
 
     if Rails::VERSION::MAJOR == 3
       attr_accessible :var, :value
@@ -35,7 +40,7 @@ module Setler
 
     def self.[](var)
       the_setting = thing_scoped.find_by_var(var.to_s)
-      the_setting.present? ? the_setting.value : @@defaults[var]
+      the_setting.present? ? the_setting.value : defaults[var]
     end
 
     def self.[]=(var, value)
@@ -43,10 +48,10 @@ module Setler
       # thing_scoped.find_or_create_by_var(method_name[0..-2]) should work but doesnt for some reason
       # When @object is present, thing_scoped sets the where scope for the polymorphic association
       # but the find_or_create_by wasn't using the thing_type and thing_id
-      thing_scoped.find_or_create_by_var_and_thing_type_and_thing_id(
-        var.to_s,
-        @object.try(:class).try(:base_class).try(:to_s),
-        @object.try(:id)
+      thing_scoped.find_or_create_by(
+        var: var.to_s,
+        thing_type: @object.try(:class).try(:base_class).try(:to_s),
+        thing_id: @object.try(:id)
       ).update_attributes({ :value => value })
     end
 
@@ -61,7 +66,7 @@ module Setler
     end
 
     def self.all_settings
-      @@defaults.merge(Hash[thing_scoped.all.collect{ |s| [s.var, s.value] }])
+      defaults.merge(Hash[thing_scoped.all.collect{ |s| [s.var, s.value] }])
     end
 
     def self.thing_scoped

data/lib/setler/version.rb

@@ -1,3 +1,3 @@
 module Setler
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/setler.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('rake')
-  s.add_development_dependency('cover_me')
+  s.add_development_dependency('minitest')
 end

data/test/settings_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ::SettingsTest < Test::Unit::TestCase
+class ::SettingsTest < Minitest::Test
   setup_db
 
   def setup
@@ -10,7 +10,10 @@ class ::SettingsTest < Test::Unit::TestCase
 
   def teardown
     ::Settings.delete_all
+    ::Settings.defaults = {}.with_indifferent_access
+
     ::Preferences.delete_all
+    ::Preferences.defaults = {}.with_indifferent_access
   end
 
   def test_defaults
@@ -91,7 +94,7 @@ class ::SettingsTest < Test::Unit::TestCase
   end
 
   def test_destroy
-    assert_not_nil ::Settings.test
+    refute_nil ::Settings.test
     ::Settings.destroy :test
     assert_nil ::Settings.test
   end
@@ -155,7 +158,7 @@ class ::SettingsTest < Test::Unit::TestCase
   # end
 
   def test_destroy_when_setting_does_not_exist
-    assert_raise Setler::SettingNotFound do
+    assert_raises Setler::SettingNotFound do
       ::Settings.destroy :not_a_setting
     end
   end
@@ -164,11 +167,17 @@ class ::SettingsTest < Test::Unit::TestCase
     ::Preferences.create var: 'test',  value: 'preferences foo'
     ::Preferences.create var: 'test2', value: 'preferences bar'
 
-    assert_not_equal ::Settings.defaults, ::Preferences.defaults
+    refute_match ::Settings.all_settings, ::Preferences.all_settings
 
     assert_equal 'foo', ::Settings[:test]
     assert_equal 'bar', ::Settings[:test2]
     assert_equal 'preferences foo', ::Preferences[:test]
     assert_equal 'preferences bar', ::Preferences[:test2]
   end
+
+  def test_defaults_are_independent
+    ::Settings.defaults[:foo] = false
+
+    refute_equal ::Settings.defaults, ::Preferences.defaults
+  end
 end

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-require 'cover_me'
 require 'rubygems'
 
 require 'bundler'
@@ -10,8 +9,9 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
+require 'rails'
 require 'active_record'
-require 'test/unit'
+require 'minitest/autorun'
 
 require_relative '../lib/setler'
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: setler
 version: !ruby/object:Gem::Version
-  version: 0.0.12
-  prerelease: 
+  version: 0.0.13
 platform: ruby
 authors:
 - Chris Kelly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,15 +62,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cover_me
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -103,7 +92,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -123,33 +114,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/ckdake/setler
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 153021876405387793
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 153021876405387793
 requirements: []
 rubyforge_project: setler
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Settler lets you use the 'Feature Flags' pettern or add settings to models.
 test_files:
 - test/settings_test.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create 1.9.2@setler