From 5382902d722d889cbf84bad678e88db63d9f73ef Mon Sep 17 00:00:00 2001 From: Gary Taylor Date: Fri, 15 Jul 2011 07:43:59 +0100 Subject: [PATCH 1/3] Added rails 3 engine --- lib/preferences.rb | 2 +- lib/preferences/engine.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 lib/preferences/engine.rb diff --git a/lib/preferences.rb b/lib/preferences.rb index 23ae075..5323329 100644 --- a/lib/preferences.rb +++ b/lib/preferences.rb @@ -1,5 +1,5 @@ require 'preferences/preference_definition' - +require 'preferences/engine' # Adds support for defining preferences on ActiveRecord models. # # == Saving preferences diff --git a/lib/preferences/engine.rb b/lib/preferences/engine.rb new file mode 100644 index 0000000..d0b9e08 --- /dev/null +++ b/lib/preferences/engine.rb @@ -0,0 +1,5 @@ +module Preferences + class Engine < Rails::Engine + + end +end \ No newline at end of file From 50754242a3933377e0e2c2b59168b66f251050fa Mon Sep 17 00:00:00 2001 From: garytaylor Date: Sun, 1 Apr 2012 12:58:58 +0200 Subject: [PATCH 2/3] Replaced class_inheritable_hash with class_attribute for rails 3.2 --- lib/preferences.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/preferences.rb b/lib/preferences.rb index 5323329..ff27472 100644 --- a/lib/preferences.rb +++ b/lib/preferences.rb @@ -152,7 +152,7 @@ module MacroMethods # 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' From 77afad033f0856b872f588d9c4fad401ccd98942 Mon Sep 17 00:00:00 2001 From: garytaylor Date: Sun, 1 Apr 2012 13:02:44 +0200 Subject: [PATCH 3/3] Changed named_scope to simply scope for rails 3.2 --- lib/preferences.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/preferences.rb b/lib/preferences.rb index ff27472..7560adb 100644 --- a/lib/preferences.rb +++ b/lib/preferences.rb @@ -160,8 +160,8 @@ def preference(name, *args) after_save :update_preferences # Named scopes - named_scope :with_preferences, lambda {|preferences| build_preference_scope(preferences)} - named_scope :without_preferences, lambda {|preferences| build_preference_scope(preferences, true)} + 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