ee_preferences 0.4.3 → 0.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDc1NTg2MzkyYmYxMGRmMDgxNzY0M2EyYTRmMTczYThlZTgxN2IxNg==
+    ZGE4N2ZiN2RhZGNiNzUyNWY5Nzk4YzMxNzQ3OGJjZmMyOTgyNDBmYg==
   data.tar.gz: !binary |-
-    Njk2N2U0OTBmYWY2NjVkM2Y5N2NhNzIxNjZmMWRjOWUyN2I4ZjZjMg==
+    MmNlMjY5ZGFkOGRjOWYxYmZiNWQ0ZGMzY2EyZWU2ZDNlNzU1NTgwYg==
 SHA512:
   metadata.gz: !binary |-
-    Mjc5MmQ5MmYwYzhhNWVmOGMyMmY5NTEwNDI1OThhNDMxNWFkYzRmNjdlNGI4
-    YjkxNjJhZDU0M2NiMTIyMzU5Mzg5ZjFlNzQwMGUyMWJiY2M2ZTBkNDIxZTZm
-    Y2NiODY3N2M1NmY2ZWM5NjA3NDAwNmRjYjk1MGJlODJlOGIyNDA=
+    ZTJkMmEyNzUxOGU1YTlkMjUwMDkxMDJhOTE0NGIxZjEwMmI5N2RmNTJhYjk1
+    MjM0MDJiOGM5YTNjY2JhNDZkZTZjYzk1ZmY4MTY3ZjIwODM1NzU5ZTY2ZDA3
+    YmVhNGZkN2Y2ZDExNmJiMGI1NGYzZTE2NmU1NzMxYzhkNTU3YzU=
   data.tar.gz: !binary |-
-    MWUxY2M4MTM4MTU4ZTc0NmQ0ZGUxMTZhMWIyMWM4NTkxYmJhN2M0OTczNGIz
-    ZjcyOGQxMGE5YTdlZGU3MDUwMDYzZmI5ZGQ4Y2MwNGE5ODQ3NjZlMzAxODE1
-    ZjhkZWEyZjY1MDQzYWFjOGI2YmJiMjVjMzc1YjZlNTMxMjAwMGI=
+    NzM3NzIzNWFhY2M3YjdiZWIwNTIxZGRhNGFlYzE0NGRmNTcxYzEyZTNkZTY0
+    ZWJlMzJiMGRiYWUxNTNiMmUwYTg3ZjhlMzBiMjNmYWRkNWY3MjY3NjhhZTU1
+    MTJkNzVkOGJjNmM4ODE2NjZiNzc0YjM5MGJkOWFjYzFhYTBiYzg=

data/.gitignore

@@ -1,8 +1,5 @@
-*.gem
 coverage
 pkg
 rdoc
 test/app_root/log
 test/app_root/script
-Gemfile.lock
-.idea/*

data/CHANGELOG.rdoc

@@ -1,7 +1,11 @@
 == master
+== 0.6.1 / 2014-09-08
+
+* Merge of preferences fix so it will work as a gem.
+
 == 0.4.3 / 2014-09-08
 
-* Fix #named_scope to #scope
+* Fix of named_scope to scope for Rails 3.0 +
 
 == 0.4.2 / 2010-04-17
 

data/README.rdoc

@@ -1,4 +1,4 @@
-== preferences http://travis-ci.org/pluginaweek/preferences.png
+== preferences
 
 +preferences+ adds support for easily creating custom preferences for models.
 
@@ -10,24 +10,16 @@ API
 
 Bugs
 
-* http://github.com/pluginaweek/preferences/issues
+* http://pluginaweek.lighthouseapp.com/projects/13286-preferences
 
 Development
 
 * http://github.com/pluginaweek/preferences
 
-Testing
-
-* http://travis-ci.org/pluginaweek/preferences
-
 Source
 
 * git://github.com/pluginaweek/preferences.git
 
-Mailing List
-
-* http://groups.google.com/group/pluginaweek-talk
-
 == Description
 
 Preferences for models within an application, such as for users, is a pretty

data/Rakefile

@@ -1,36 +1 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run all tests.'
-task :default => :test
-
-desc "Test preferences."
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.test_files = Dir['test/**/*_test.rb']
-  t.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  namespace :test do
-    desc "Test preferences with Rcov."
-    Rcov::RcovTask.new(:rcov) do |t|
-      t.libs << 'lib'
-      t.test_files = Dir['test/**/*_test.rb']
-      t.rcov_opts << '--exclude="^(?!lib/|app/)"'
-      t.verbose = true
-    end
-  end
-rescue LoadError
-end
-
-desc "Generate documentation for preferences."
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'preferences'
-  rdoc.options << '--line-numbers' << '--inline-source' << '--main=README.rdoc'
-  rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG.rdoc', 'LICENSE', 'lib/**/*.rb', 'app/**/*.rb')
-end
+require "bundler/gem_tasks"

data/{generators/preferences → lib/generators}/USAGE

@@ -1,5 +1,5 @@
 Usage:
 
-  script/generate preferences
+  rails generate preferences
 
 This will create a migration that will add the proper table to store preferences.

data/lib/generators/preferences_generator.rb

@@ -0,0 +1,17 @@
+class PreferencesGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  source_root File.expand_path("../templates", __FILE__)
+
+  def self.next_migration_number(dirname)
+    if ActiveRecord::Base.timestamped_migrations
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    else
+      "%.3d" % (current_migration_number(dirname) + 1)
+    end
+  end
+
+  def create_migration_file
+    migration_template 'create_preferences.rb', "db/migrate/create_preferences.rb"
+  end
+end

data/{generators/preferences/templates/001_create_preferences.rb → lib/generators/templates/create_preferences.rb}

@@ -1,5 +1,5 @@
 class CreatePreferences < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :preferences do |t|
       t.string :name, :null => false
       t.references :owner, :polymorphic => true, :null => false
@@ -9,8 +9,4 @@ class CreatePreferences < ActiveRecord::Migration
     end
     add_index :preferences, [:owner_id, :owner_type, :name, :group_id, :group_type], :unique => true, :name => 'index_preferences_on_owner_and_name_and_preference'
   end
-  
-  def self.down
-    drop_table :preferences
-  end
 end

data/lib/preferences/engine.rb

@@ -0,0 +1,4 @@
+module Preferences
+  class Engine < Rails::Engine
+  end
+end

data/lib/preferences/version.rb

@@ -1,3 +1,3 @@
 module Preferences
-  VERSION = '0.4.3'
+  VERSION = "0.6.1"
 end

data/lib/preferences.rb

@@ -1,46 +1,47 @@
+require 'preferences/engine'
 require 'preferences/preference_definition'
 
 # Adds support for defining preferences on ActiveRecord models.
-# 
+#
 # == Saving preferences
-# 
+#
 # Preferences are not automatically saved when they are set.  You must save
 # the record that the preferences were set on.
-# 
+#
 # For example,
-# 
+#
 #   class User < ActiveRecord::Base
 #     preference :notifications
 #   end
-#   
+#
 #   u = User.new(:login => 'admin', :prefers_notifications => false)
 #   u.save!
-#   
+#
 #   u = User.find_by_login('admin')
 #   u.attributes = {:prefers_notifications => true}
 #   u.save!
-# 
+#
 # == Validations
-# 
+#
 # Since the generated accessors for a preference allow the preference to be
 # treated just like regular ActiveRecord attributes, they can also be
 # validated against in the same way.  For example,
-# 
+#
 #   class User < ActiveRecord::Base
 #     preference :color, :string
-#     
+#
 #     validates_presence_of :preferred_color
 #     validates_inclusion_of :preferred_color, :in => %w(red green blue)
 #   end
-#   
+#
 #   u = User.new
 #   u.valid?                        # => false
 #   u.errors.on(:preferred_color)   # => "can't be blank"
-#   
+#
 #   u.preferred_color = 'white'
 #   u.valid?                        # => false
 #   u.errors.on(:preferred_color)   # => "is not included in the list"
-#   
+#
 #   u.preferred_color = 'red'
 #   u.valid?                        # => true
 module Preferences
@@ -48,66 +49,66 @@ module Preferences
     # Defines a new preference for all records in the model.  By default,
     # preferences are assumed to have a boolean data type, so all values will
     # be typecasted to true/false based on ActiveRecord rules.
-    # 
+    #
     # Configuration options:
     # * <tt>:default</tt> - The default value for the preference. Default is nil.
     # * <tt>:group_defaults</tt> - Defines the default values to use for various
     #   groups.  This should map group_name -> defaults.  For ActiveRecord groups,
-    #   use the class name. 
-    # 
+    #   use the class name.
+    #
     # == Examples
-    # 
+    #
     # The example below shows the various ways to define a preference for a
     # particular model.
-    # 
+    #
     #   class User < ActiveRecord::Base
     #     preference :notifications, :default => false
     #     preference :color, :string, :default => 'red', :group_defaults => {:car => 'black'}
     #     preference :favorite_number, :integer
     #     preference :data, :any # Allows any data type to be stored
     #   end
-    # 
+    #
     # All preferences are also inherited by subclasses.
-    # 
+    #
     # == Associations
-    # 
+    #
     # After the first preference is defined, the following associations are
     # created for the model:
     # * +stored_preferences+ - A collection of all the custom preferences
     #   specified for a record.  This will not include default preferences
     #   unless they have been explicitly set.
-    # 
+    #
     # == Named scopes
-    # 
+    #
     # In addition to the above associations, the following named scopes get
     # generated for the model:
     # * +with_preferences+ - Finds all records with a given set of preferences
     # * +without_preferences+ - Finds all records without a given set of preferences
-    # 
+    #
     # In addition to utilizing preferences stored in the database, each of the
     # above scopes also take into account the defaults that have been defined
     # for each preference.
-    # 
+    #
     # Example:
-    # 
+    #
     #   User.with_preferences(:notifications => true)
     #   User.with_preferences(:notifications => true, :color => 'blue')
-    #   
+    #
     #   # Searching with group preferences
     #   car = Car.find(:first)
     #   User.with_preferences(car => {:color => 'blue'})
     #   User.with_preferences(:notifications => true, car => {:color => 'blue'})
-    # 
+    #
     # == Generated accessors
-    # 
+    #
     # In addition to calling <tt>prefers?</tt> and +preferred+ on a record,
     # you can also use the shortcut accessor methods that are generated when a
     # preference is defined.  For example,
-    # 
+    #
     #   class User < ActiveRecord::Base
     #     preference :notifications
     #   end
-    # 
+    #
     # ...generates the following methods:
     # * <tt>prefers_notifications?</tt> - Whether a value has been specified, i.e. <tt>record.prefers?(:notifications)</tt>
     # * <tt>prefers_notifications</tt> - The actual value stored, i.e. <tt>record.prefers(:notifications)</tt>
@@ -117,7 +118,7 @@ module Preferences
     # * <tt>prefers_notifications_change</tt> - A list of [original_value, new_value] if the preference has changed
     # * <tt>prefers_notifications_will_change!</tt> - Forces the preference to get updated
     # * <tt>reset_prefers_notifications!</tt> - Reverts any unsaved changes to the preference
-    # 
+    #
     # ...and the equivalent +preferred+ methods:
     # * <tt>preferred_notifications?</tt>
     # * <tt>preferred_notifications</tt>
@@ -127,108 +128,108 @@ module Preferences
     # * <tt>preferred_notifications_change</tt>
     # * <tt>preferred_notifications_will_change!</tt>
     # * <tt>reset_preferred_notifications!</tt>
-    # 
+    #
     # Notice that there are two tenses used depending on the context of the
     # preference.  Conventionally, <tt>prefers_notifications?</tt> is better
     # for accessing boolean preferences, while +preferred_color+ is better for
     # accessing non-boolean preferences.
-    # 
+    #
     # Example:
-    # 
+    #
     #   user = User.find(:first)
     #   user.prefers_notifications?         # => false
     #   user.prefers_notifications          # => false
     #   user.preferred_color?               # => true
     #   user.preferred_color                # => 'red'
     #   user.preferred_color = 'blue'       # => 'blue'
-    #   
+    #
     #   user.prefers_notifications = true
-    #   
+    #
     #   car = Car.find(:first)
     #   user.preferred_color = 'red', car   # => 'red'
     #   user.preferred_color(car)           # => 'red'
     #   user.preferred_color?(car)          # => true
-    #   
+    #
     #   user.save!  # => true
     def preference(name, *args)
       unless included_modules.include?(InstanceMethods)
-        class_inheritable_hash :preference_definitions
+        class_attribute :preference_definitions
         self.preference_definitions = {}
-        
+
         has_many :stored_preferences, :as => :owner, :class_name => 'Preference'
-        
+
         after_save :update_preferences
         before_destroy :destroy_preferences
 
         # Named scopes
         scope :with_preferences, lambda {|preferences| build_preference_scope(preferences)}
         scope :without_preferences, lambda {|preferences| build_preference_scope(preferences, true)}
-        
+
         extend Preferences::ClassMethods
         include Preferences::InstanceMethods
       end
-      
+
       # Create the definition
       name = name.to_s
       definition = PreferenceDefinition.new(name, *args)
       self.preference_definitions[name] = definition
-      
+
       # Create short-hand accessor methods, making sure that the name
       # is method-safe in terms of what characters are allowed
       name = name.gsub(/[^A-Za-z0-9_-]/, '').underscore
-      
+
       # Query lookup
       define_method("preferred_#{name}?") do |*group|
         preferred?(name, group.first)
       end
       alias_method "prefers_#{name}?", "preferred_#{name}?"
-      
+
       # Reader
       define_method("preferred_#{name}") do |*group|
         preferred(name, group.first)
       end
       alias_method "prefers_#{name}", "preferred_#{name}"
-      
+
       # Writer
       define_method("preferred_#{name}=") do |*args|
         write_preference(*args.flatten.unshift(name))
       end
       alias_method "prefers_#{name}=", "preferred_#{name}="
-      
+
       # Changes
       define_method("preferred_#{name}_changed?") do |*group|
         preference_changed?(name, group.first)
       end
       alias_method "prefers_#{name}_changed?", "preferred_#{name}_changed?"
-      
+
       define_method("preferred_#{name}_was") do |*group|
         preference_was(name, group.first)
       end
       alias_method "prefers_#{name}_was", "preferred_#{name}_was"
-      
+
       define_method("preferred_#{name}_change") do |*group|
         preference_change(name, group.first)
       end
       alias_method "prefers_#{name}_change", "preferred_#{name}_change"
-      
+
       define_method("preferred_#{name}_will_change!") do |*group|
         preference_will_change!(name, group.first)
       end
       alias_method "prefers_#{name}_will_change!", "preferred_#{name}_will_change!"
-      
+
       define_method("reset_preferred_#{name}!") do |*group|
         reset_preference!(name, group.first)
       end
       alias_method "reset_prefers_#{name}!", "reset_preferred_#{name}!"
-      
+
       definition
     end
   end
-  
+
   module ClassMethods #:nodoc:
     # Generates the scope for looking under records with a specific set of
     # preferences associated with them.
-    # 
+    #
     # Note thate this is a bit more complicated than usual since the preference
     # definitions aren't in the database for joins, defaults need to be accounted
     # for, and querying for the the presence of multiple preferences requires
@@ -237,7 +238,7 @@ module Preferences
       joins = []
       statements = []
       values = []
-      
+
       # Flatten the preferences for easier processing
       preferences = preferences.inject({}) do |result, (group, value)|
         if value.is_a?(Hash)
@@ -247,16 +248,16 @@ module Preferences
         end
         result
       end
-      
+
       preferences.each do |(group, preference), value|
         group_id, group_type = Preference.split_group(group)
         preference = preference.to_s
         definition = preference_definitions[preference.to_s]
         value = definition.type_cast(value)
         is_default = definition.default_value(group_type) == value
-        
+
         table = "preferences_#{group_id}_#{group_type}_#{preference}"
-        
+
         # Since each preference is a different record, they need their own
         # join so that the proper conditions can be set
         joins << "LEFT JOIN preferences AS #{table} ON #{table}.owner_id = #{table_name}.#{primary_key} AND " + sanitize_sql(
@@ -265,7 +266,7 @@ module Preferences
           "#{table}.group_type" => group_type,
           "#{table}.name" => preference
         )
-        
+
         if inverse
           statements << "#{table}.id IS NOT NULL AND #{table}.value " + (value.nil? ? ' IS NOT NULL' : ' != ?') + (!is_default ? " OR #{table}.id IS NULL" : '')
         else
@@ -273,104 +274,104 @@ module Preferences
         end
         values << value unless value.nil?
       end
-      
+
       sql = statements.map! {|statement| "(#{statement})"} * ' AND '
       {:joins => joins, :conditions => values.unshift(sql)}
     end
   end
-  
+
   module InstanceMethods
     def self.included(base) #:nodoc:
       base.class_eval do
         alias_method :prefs, :preferences
       end
     end
-    
+
     # Finds all preferences, including defaults, for the current record.  If
     # looking up custom group preferences, then this will include all default
     # preferences within that particular group as well.
-    # 
+    #
     # == Examples
-    # 
+    #
     # A user with no stored values:
-    # 
+    #
     #   user = User.find(:first)
     #   user.preferences
     #   => {"language"=>"English", "color"=>nil}
-    #   
+    #
     # A user with stored values for a particular group:
-    # 
+    #
     #   user.preferred_color = 'red', :cars
     #   user.preferences(:cars)
     #   => {"language=>"English", "color"=>"red"}
     def preferences(group = nil)
       preferences = preferences_group(group)
-      
+
       unless preferences_group_loaded?(group)
         group_id, group_type = Preference.split_group(group)
         find_preferences(:group_id => group_id, :group_type => group_type).each do |preference|
           preferences[preference.name] = preference.value unless preferences.include?(preference.name)
         end
-        
+
         # Add defaults
         preference_definitions.each do |name, definition|
           preferences[name] = definition.default_value(group_type) unless preferences.include?(name)
         end
       end
-      
+
       preferences.inject({}) do |typed_preferences, (name, value)|
         typed_preferences[name] = value.nil? ? value : preference_definitions[name].type_cast(value)
         typed_preferences
       end
     end
-    
+
     # Queries whether or not a value is present for the given preference.
     # This is dependent on how the value is type-casted.
-    # 
+    #
     # == Examples
-    # 
+    #
     #   class User < ActiveRecord::Base
     #     preference :color, :string, :default => 'red'
     #   end
-    #   
+    #
     #   user = User.create
     #   user.preferred(:color)              # => "red"
     #   user.preferred?(:color)             # => true
     #   user.preferred?(:color, 'cars')     # => true
     #   user.preferred?(:color, Car.first)  # => true
-    #   
+    #
     #   user.write_preference(:color, nil)
     #   user.preferred(:color)              # => nil
     #   user.preferred?(:color)             # => false
     def preferred?(name, group = nil)
       name = name.to_s
       assert_valid_preference(name)
-      
+
       value = preferred(name, group)
       preference_definitions[name].query(value)
     end
     alias_method :prefers?, :preferred?
-    
+
     # Gets the actual value stored for the given preference, or the default
     # value if nothing is present.
-    # 
+    #
     # == Examples
-    # 
+    #
     #   class User < ActiveRecord::Base
     #     preference :color, :string, :default => 'red'
     #   end
-    #   
+    #
     #   user = User.create
     #   user.preferred(:color)            # => "red"
     #   user.preferred(:color, 'cars')    # => "red"
     #   user.preferred(:color, Car.first) # => "red"
-    #   
+    #
     #   user.write_preference(:color, 'blue')
     #   user.preferred(:color)            # => "blue"
     def preferred(name, group = nil)
       name = name.to_s
       assert_valid_preference(name)
-      
+
       if preferences_group(group).include?(name)
         # Value for this group/name has been written, but not saved yet:
         # grab from the pending values
@@ -379,35 +380,35 @@ module Preferences
         # Grab the first preference; if it doesn't exist, use the default value
         group_id, group_type = Preference.split_group(group)
         preference = find_preferences(:name => name, :group_id => group_id, :group_type => group_type).first unless preferences_group_loaded?(group)
-        
+
         value = preference ? preference.value : preference_definitions[name].default_value(group_type)
         preferences_group(group)[name] = value
       end
-      
+
       definition = preference_definitions[name]
       value = definition.type_cast(value) unless value.nil?
       value
     end
     alias_method :prefers, :preferred
-    
+
     # Sets a new value for the given preference.  The actual Preference record
     # is *not* created until this record is saved.  In this way, preferences
     # act *exactly* the same as attributes.  They can be written to and
     # validated against, but won't actually be written to the database until
     # the record is saved.
-    # 
+    #
     # == Examples
-    # 
+    #
     #   user = User.find(:first)
     #   user.write_preference(:color, 'red')              # => "red"
     #   user.save!
-    #   
+    #
     #   user.write_preference(:color, 'blue', Car.first)  # => "blue"
     #   user.save!
     def write_preference(name, value, group = nil)
       name = name.to_s
       assert_valid_preference(name)
-      
+
       preferences_changed = preferences_changed_group(group)
       if preferences_changed.include?(name)
         old = preferences_changed[name]
@@ -416,24 +417,24 @@ module Preferences
         old = clone_preference_value(name, group)
         preferences_changed[name] = old if preference_value_changed?(name, old, value)
       end
-      
-      value = convert_number_column_value(value) if preference_definitions[name].number?
+
+      value = ActiveRecord::ConnectionAdapters::Column.value_to_integer(value) if preference_definitions[name].number?
       preferences_group(group)[name] = value
-      
+
       value
     end
-    
+
     # Whether any attributes have unsaved changes.
-    # 
+    #
     # == Examples
-    # 
+    #
     #   user = User.find(:first)
     #   user.preferences_changed?                   # => false
     #   user.write_preference(:color, 'red')
     #   user.preferences_changed?                   # => true
     #   user.save
     #   user.preferences_changed?                   # => false
-    #   
+    #
     #   # Groups
     #   user.preferences_changed?(:car)             # => false
     #   user.write_preference(:color, 'red', :car)
@@ -441,18 +442,18 @@ module Preferences
     def preferences_changed?(group = nil)
       !preferences_changed_group(group).empty?
     end
-    
+
     # A list of the preferences that have unsaved changes.
-    # 
+    #
     # == Examples
-    # 
+    #
     #   user = User.find(:first)
     #   user.preferences_changed                    # => []
     #   user.write_preference(:color, 'red')
     #   user.preferences_changed                    # => ["color"]
     #   user.save
     #   user.preferences_changed                    # => []
-    #   
+    #
     #   # Groups
     #   user.preferences_changed(:car)              # => []
     #   user.write_preference(:color, 'red', :car)
@@ -460,20 +461,20 @@ module Preferences
     def preferences_changed(group = nil)
       preferences_changed_group(group).keys
     end
-    
+
     # A map of the preferences that have changed in the current object.
-    # 
+    #
     # == Examples
-    # 
+    #
     #   user = User.find(:first)
     #   user.preferred(:color)                      # => nil
     #   user.preference_changes                     # => {}
-    #   
+    #
     #   user.write_preference(:color, 'red')
     #   user.preference_changes                     # => {"color" => [nil, "red"]}
     #   user.save
     #   user.preference_changes                     # => {}
-    #   
+    #
     #   # Groups
     #   user.preferred(:color, :car)                # => nil
     #   user.preference_changes(:car)               # => {}
@@ -485,36 +486,36 @@ module Preferences
         changes
       end
     end
-    
+
     # Reloads the pereferences of this object as well as its attributes
     def reload(*args) #:nodoc:
       result = super
-      
+
       @preferences.clear if @preferences
       @preferences_changed.clear if @preferences_changed
-      
+
       result
     end
-    
+
     private
       # Asserts that the given name is a valid preference in this model.  If it
       # is not, then an ArgumentError exception is raised.
       def assert_valid_preference(name)
         raise(ArgumentError, "Unknown preference: #{name}") unless preference_definitions.include?(name)
       end
-      
+
       # Gets the set of preferences identified by the given group
       def preferences_group(group)
         @preferences ||= {}
         @preferences[group.is_a?(Symbol) ? group.to_s : group] ||= {}
       end
-      
+
       # Determines whether the given group of preferences has already been
       # loaded from the database
       def preferences_group_loaded?(group)
         preference_definitions.length == preferences_group(group).length
       end
-      
+
       # Generates a clone of the current value stored for the preference with
       # the given name / group
       def clone_preference_value(name, group)
@@ -523,41 +524,41 @@ module Preferences
       rescue TypeError, NoMethodError
         value
       end
-      
+
       # Keeps track of all preferences that have been changed so that they can
       # be properly updated in the database.  Maps group -> preference -> value.
       def preferences_changed_group(group)
         @preferences_changed ||= {}
         @preferences_changed[group.is_a?(Symbol) ? group.to_s : group] ||= {}
       end
-      
+
       # Determines whether a preference changed in the given group
       def preference_changed?(name, group)
         preferences_changed_group(group).include?(name)
       end
-      
+
       # Builds an array of [original_value, new_value] for the given preference.
       # If the perference did not change, this will return nil.
       def preference_change(name, group)
         [preferences_changed_group(group)[name], preferred(name, group)] if preference_changed?(name, group)
       end
-      
+
       # Gets the last saved value for the given preference
       def preference_was(name, group)
         preference_changed?(name, group) ? preferences_changed_group(group)[name] : preferred(name, group)
       end
-      
+
       # Forces the given preference to be saved regardless of whether the value
       # is actually diferent
       def preference_will_change!(name, group)
         preferences_changed_group(group)[name] = clone_preference_value(name, group)
       end
-      
+
       # Reverts any unsaved changes to the given preference
       def reset_preference!(name, group)
         write_preference(name, preferences_changed_group(group)[name], group) if preference_changed?(name, group)
       end
-      
+
       # Determines whether the old value is different from the new value for the
       # given preference.  This will use the typecasted value to determine
       # equality.
@@ -572,40 +573,45 @@ module Preferences
         else
           value = definition.type_cast(value)
         end
-        
+
         old != value
       end
-      
+
       # Updates any preferences that have been changed/added since the record
       # was last saved
       def update_preferences
         if @preferences_changed
           @preferences_changed.each do |group, preferences|
             group_id, group_type = Preference.split_group(group)
-            
+
             preferences.keys.each do |name|
               # Find an existing preference or build a new one
               attributes = {:name => name, :group_id => group_id, :group_type => group_type}
-              preference = find_preferences(attributes).first || stored_preferences.build(attributes)
+
+              unless (preference = find_preferences(attributes).first)
+                preference = stored_preferences.build
+                attributes.each_pair { |attribute, value| preference[attribute] = value }
+              end
+
               preference.value = preferred(name, group)
               preference.save!
             end
           end
-          
+
           @preferences_changed.clear
         end
       end
-      
+
       # Finds all stored preferences with the given attributes.  This will do a
       # smart lookup by looking at the in-memory collection if it was eager-
       # loaded.
       def find_preferences(attributes)
         if stored_preferences.loaded?
           stored_preferences.select do |preference|
-            attributes.all? {|attribute, value| preference[attribute] == value} 
+            attributes.all? {|attribute, value| preference[attribute] == value}
           end
         else
-          stored_preferences.find(:all, :conditions => attributes)
+          stored_preferences.where(attributes)
         end
       end
   end

data/preferences.gemspec

@@ -1,20 +1,23 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'preferences/version'
 
-Gem::Specification.new do |s|
-  s.name              = "ee_preferences"
-  s.version           = Preferences::VERSION
-  s.authors           = ["Aaron Pfeifer"]
-  s.email             = "aaron@pluginaweek.org"
-  s.homepage          = "http://www.pluginaweek.org"
-  s.description       = "Adds support for easily creating custom preferences for ActiveRecord models"
-  s.summary           = "Custom preferences for ActiveRecord models"
-  s.require_paths     = ["lib"]
-  s.files             = `git ls-files`.split("\n")
-  s.test_files        = `git ls-files -- test/*`.split("\n")
-  s.rdoc_options      = %w(--line-numbers --inline-source --title preferences --main README.rdoc)
-  s.extra_rdoc_files  = %w(README.rdoc CHANGELOG.rdoc LICENSE)
-  
-  s.add_development_dependency("rake")
-  s.add_development_dependency("plugin_test_helper", ">= 0.3.1")
+Gem::Specification.new do |spec|
+  spec.name          = "ee_preferences"
+  spec.version       = Preferences::VERSION
+  spec.authors       = ["Aaron Pfeifer", "Jack Dempsey", "Brenda Strech"]
+  spec.email         = ["aaron@pluginaweek.org"]
+  spec.description   = %q{Adds support for easily creating custom preferences for ActiveRecord models. Fork for Rails 4.}
+  spec.summary       = %q{Adds support for easily creating custom preferences for ActiveRecord models}
+  spec.homepage      = %q{http://www.pluginaweek.org}
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
 end

metadata

@@ -1,66 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: ee_preferences
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Aaron Pfeifer
+- Jack Dempsey
+- Brenda Strech
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: plugin_test_helper
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0'
 description: Adds support for easily creating custom preferences for ActiveRecord
-  models
-email: aaron@pluginaweek.org
+  models. Fork for Rails 4.
+email:
+- aaron@pluginaweek.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- CHANGELOG.rdoc
-- LICENSE
+extra_rdoc_files: []
 files:
 - .gitignore
-- .travis.yml
 - CHANGELOG.rdoc
-- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - app/models/preference.rb
-- generators/preferences/USAGE
-- generators/preferences/preferences_generator.rb
-- generators/preferences/templates/001_create_preferences.rb
-- init.rb
+- lib/generators/USAGE
+- lib/generators/preferences_generator.rb
+- lib/generators/templates/create_preferences.rb
 - lib/preferences.rb
+- lib/preferences/engine.rb
 - lib/preferences/preference_definition.rb
 - lib/preferences/version.rb
 - preferences.gemspec
@@ -78,16 +76,11 @@ files:
 - test/unit/preference_definition_test.rb
 - test/unit/preference_test.rb
 homepage: http://www.pluginaweek.org
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- preferences
-- --main
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -105,7 +98,7 @@ rubyforge_project:
 rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
-summary: Custom preferences for ActiveRecord models
+summary: Adds support for easily creating custom preferences for ActiveRecord models
 test_files:
 - test/app_root/app/models/car.rb
 - test/app_root/app/models/employee.rb

data/.travis.yml

@@ -1,3 +0,0 @@
-rvm:
-  - 1.9.2
-  - 1.8.7

data/Gemfile

@@ -1,3 +0,0 @@
-source "http://www.rubygems.org"
- 
-gemspec

data/generators/preferences/preferences_generator.rb

@@ -1,7 +0,0 @@
-class PreferencesGenerator < Rails::Generator::Base
-  def manifest
-    record do |m|
-      m.migration_template '001_create_preferences.rb', 'db/migrate', :migration_file_name => 'create_preferences'
-    end
-  end
-end

data/init.rb

@@ -1 +0,0 @@
-require 'preferences'