friendly-attributes 0.4.0 → 0.5.0

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+### 0.5.0
+  
+  * (ihoka) Added configurable active_record_key to the FriendlyDetails model. active_record_key affects the name of the generated Friendly index table and the attribute in which the ActiveRecord model ID is stored. It defaults to :active_record_id.
+
+### 0.4.0
+  
+  * (ihoka) Added #attributes method to FriendlyAttributes::Details base class.
+
 ### 0.3.2
   
   * (ihoka) Added description to spec matcher.

data/lib/friendly_attributes/class_methods.rb

@@ -3,9 +3,14 @@ module FriendlyAttributes
     def friendly_details(*args, &block)
       klass = args.shift
       options = args.extract_options!
+      attributes = args.extract_options!
+      if attributes.empty?
+        attributes = options
+        options = {}
+      end
       
       delegate_options = proc {
-        options.each do |key, value|
+        attributes.each do |key, value|
           if Array === value
             value.each { |v| delegated_attribute v, key }
           else
@@ -14,7 +19,7 @@ module FriendlyAttributes
         end
       }
       
-      DetailsDelegator.new(klass, self, &block).tap do |dd|
+      DetailsDelegator.new(klass, self, options, &block).tap do |dd|
         dd.instance_eval(&delegate_options)
       end
     end

data/lib/friendly_attributes/details.rb

@@ -2,7 +2,7 @@ module FriendlyAttributes
   class Details
     class << self
       def find_or_build_by_active_record_id(active_record_id)
-        active_record_id && first(:active_record_id => active_record_id) || new(:active_record_id => active_record_id)
+        active_record_id && first(active_record_key => active_record_id) || new(active_record_key => active_record_id)
       end
     end
     

data/lib/friendly_attributes/details_delegator.rb

@@ -4,16 +4,21 @@ module FriendlyAttributes
     
     delegate :attribute, :indexes, :to => :friendly_model
     
-    def initialize(friendly_model, ar_model, &block)
+    def initialize(friendly_model, ar_model, options={}, &block)
       @ar_model       = ar_model
       @friendly_model = friendly_model
       
+      _active_record_key = options.delete(:active_record_key) || :active_record_id
+      
       friendly_model.instance_eval do
         include Friendly::Document
-      
-        attribute :active_record_id, Integer
-        indexes :active_record_id
+        
+        attribute _active_record_key, Integer
+        indexes _active_record_key
+        
+        cattr_accessor :active_record_key
       end
+      friendly_model.active_record_key = _active_record_key
       
       ar_model.class_eval do
         cattr_accessor :friendly_model

data/lib/friendly_attributes/instance_methods.rb

@@ -14,7 +14,7 @@ module FriendlyAttributes
 
     def update_friendly_details
       return unless details_present?
-      details.active_record_id = id unless details.active_record_id == id
+      details.send(:"#{details.active_record_key}=", id) unless details.send(details.active_record_key) == id
       details.save if details.changed?
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: friendly-attributes
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Istvan Hoka
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +02:00
+date: 2010-11-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency