friendly-attributes 0.6.1 → 0.7.0

data/CHANGELOG.md

@@ -1,28 +1,33 @@
 Changelog
 =========
 
+### 0.7.0
+  * (ihoka,cristi) Support for associating multiple FriendlyAttributes models with a single ActiveRecord model
+  * (ihoka,cristi) FriendlyAttributes::Details renamed to FriendlyAttributes::Base
+  * (ihoka,cristi) Documentation
+
 ### 0.6.1
-  * (ihoka) Extended #changed? on the ActiveRecord model to indicate the record has been changed if the associated Friendly has changed.
+  * (ihoka,cristi) Extended #changed? on the ActiveRecord model to indicate the record has been changed if the associated Friendly has changed.
 
 ### 0.6.0
-  * (ihoka) Added #friendly_details_build_options method to the ActiveRecord model, allowing to specify default attributes when initially building the Friendly model.
+  * (ihoka,cristi) Added #friendly_details_build_options method to the ActiveRecord model, allowing to specify default attributes when initially building the Friendly model.
 
 ### 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.
+  * (ihoka,cristi) 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.
+  * (ihoka,cristi) Added #attributes method to FriendlyAttributes::Details base class.
 
 ### 0.3.2
   
-  * (ihoka) Added description to spec matcher.
+  * (ihoka,cristi) Added description to spec matcher.
 
 ### 0.3.1
   
-  * (ihoka) added spec matchers
+  * (ihoka,cristi) added spec matchers
 
 ### 0.3.0
 
-  * (ihoka) Extended the DSL to allow passing a hash of options when defining friendly_attributes.
+  * (ihoka,cristi) Extended the DSL to allow passing a hash of options when defining friendly_attributes.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Istvan Hoka
+Copyright (c) 2011 Aissac Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -0,0 +1,109 @@
+# Friendly Attributes
+
+Extend your ActiveRecord models with attributes dynamically, without any schema migrations.
+
+## Description
+
+[FriendlyORM][friendly] is an implementation of a document based storage on top of MySQL.
+
+FriendlyAttributes associates FriendlyORM documents with your ActiveRecord models, handles delegation of attribute accessors and automatically saves and destroys the associated document.
+
+## Installation
+
+Currently, only ActiveRecord 2.3.x is supported. ActiveRecord 3 is not supported yet.
+
+Add it to your Gemfile:
+    
+    gem 'friendly-attributes'
+    
+or, to your `config/environment.rb` in Rails:
+  
+    config.gem 'friendly-attributes'
+
+## Usage
+
+To use Friendly Attributes, you must have an existing ActiveRecord model:
+    
+    # app/models/user.rb
+    class User < ActiveRecord::Base
+      # ...
+    end
+
+Create a class for storing your Friendly document, extending `FriendlyAttributes::Base`:
+    
+    # app/models/user_details.rb
+    class UserDetails < FriendlyAttributes::Base
+    end
+
+`FriendlyAttributes::Base` mixes in `Friendly::Document`, so check out the [Friendly ORM documentation][friendly] for what options you can use here, like defining indexes and scopes.
+
+Configure the attributes you need to extend your ActiveRecord model:
+    
+    # app/models/account.rb
+    class User < ActiveRecord::Base
+      include FriendlyAttributes
+    
+      friendly_details UserDetails, {
+        String  => :github_username,
+        Integer => [:shoe_size, :birth_year]
+      }
+    end
+
+If using Rails, configure the database to be used by Friendly, by creating `config/friendly.yml` and specifying the configuration. If you don't mind mixing tables, the database can be the same as the one configured for Rails, but it does not have to be. Note that Friendly automatically creates a table for each index you define in your Friendly document.
+    
+    # config/friendly.yml
+    development:
+      adapter: mysql
+      socket: /tmp/mysql.sock
+      database: friendly_database_development
+      username: root
+      password:
+    
+Use the Rails console or a rake task to create the Friendly document tables:
+    
+    Friendly.create_tables!
+
+Once complete, you can use your Friendly Attributes just like you would regular ActiveRecord attributes:
+    
+    user = User.first
+    user.shoe_size = 42
+    user.save!
+
+## Documentation
+
+Check out the source documentation for more information about usage.
+
+## Development
+ 
+In order to setup a development environment and run the specs, you need Bundler:
+
+    gem install bundler
+
+Then, install the dependencies:
+    
+    bundle install
+
+Create a database to use for runnning specs:
+    
+    mysqladmin create friendly_attributes_test
+
+Copy spec/config.yml.example and customize it with the database you have created:
+    
+    cp spec/config.yml.sample spec/config.yml
+
+Run the specs:
+    
+    rake spec
+
+## Credits
+
+Friendly Attributes was developed by [Istvan Hoka][ihoka] and [Cristi Duma][cduma].
+
+Copyright (c) 2011 Aissac Labs. See [LICENSE.txt][license] for further details.
+
+[github]: http://github.com/ihoka/friendly-attributes
+[friendly]: http://github.com/jamesgolick/friendly
+[ihoka]: http://istvanhoka.com
+[cduma]: http://twitter.com/cristiduma
+[blinksale]: http://www.blinksale.com
+[license]: LICENSE.txt

data/lib/friendly_attributes.rb

@@ -4,8 +4,9 @@ require 'active_record'
 module FriendlyAttributes
   autoload :ClassMethods,     'friendly_attributes/class_methods'
   autoload :InstanceMethods,  'friendly_attributes/instance_methods'
-  autoload :Details,          'friendly_attributes/details'
+  autoload :Base,             'friendly_attributes/base'
   autoload :DetailsDelegator, 'friendly_attributes/details_delegator'
+  autoload :Configuration,    'friendly_attributes/configuration'
   
   module Test
     autoload :Matchers, 'friendly_attributes/test/matchers'

data/lib/friendly_attributes/base.rb

@@ -0,0 +1,49 @@
+module FriendlyAttributes
+  class Base
+    class << self
+      # Finds an existing Friendly model, associated with an ActiveRecord model,
+      # or builds a new Friendly model, using the specified options.
+      # 
+      # @param [Integer] ActiveRecord model ID for which to find the associated Friendly model
+      # @param [Hash] options
+      # @return [FriendlyAttributes::Base] found or new record
+      def find_or_build_by_active_record_id(active_record_id, options={})
+        active_record_id && first(active_record_key => active_record_id) || new(options.merge(active_record_key => active_record_id))
+      end
+    end
+    
+    # Set the ID of the associated ActiveRecord model.
+    #
+    # Uses the :active_record_key property of the model.
+    #
+    # @param [String, Integer] active_record_id value to set the attribute
+    # @return [String, Integer] value
+    def write_active_record_id(active_record_id)
+      send(:"#{active_record_key}=", active_record_id)
+    end
+    
+    # Get the ID of the associated ActiveRecord model.
+    #
+    # Uses the :active_record_key property of the model.
+    #
+    # @return [Integer] ActiveRecord ID
+    def read_active_record_id
+      send(active_record_key)
+    end
+    
+    # Save the FriendlyAttribute model if it has been changed.
+    # Before saving, it sets the specified active_record_id, to handle the case when it is a new record or has been reassigned.
+    #
+    # @param [Integer] active_record_id ID of the associated ActiveRecord model
+    # @return [true, false] result of saving the record
+    def update_if_changed_with_model(active_record_id)
+      write_active_record_id(active_record_id) unless read_active_record_id == active_record_id
+      save if changed?
+    end
+    
+    # Alias for Friendly::Document#to_hash
+    def attributes
+      to_hash
+    end
+  end
+end

data/lib/friendly_attributes/class_methods.rb

@@ -1,5 +1,15 @@
 module FriendlyAttributes
   module ClassMethods
+    # Configure a Friendly Base model associated with an ActiveRecord model.
+    # 
+    # @overload friendly_details(klass, attributes)
+    #   @param [Class] klass FriendlyAttributes::Base instance used to extend the ActiveRecord model
+    #   @param [Hash] attributes hash of types and attributes names with which to extend the ActiveRecord, through FriendlyAttributes::Base
+    # 
+    # @overload friendly_details(klass, attributes, options)
+    #   @param [Hash] options configuration options for extending the FriendlyAttributes extension (see {DetailsDelegator#initialize})
+    # 
+    # @return [DetailsDelegator]
     def friendly_details(*args, &block)
       klass = args.shift
       options = args.extract_options!
@@ -9,18 +19,9 @@ module FriendlyAttributes
         options = {}
       end
       
-      delegate_options = proc {
-        attributes.each do |key, value|
-          if Array === value
-            value.each { |v| delegated_attribute v, key }
-          else
-            delegated_attribute value, key
-          end
-        end
-      }
-      
-      DetailsDelegator.new(klass, self, options, &block).tap do |dd|
-        dd.instance_eval(&delegate_options)
+      DetailsDelegator.new(klass, self, attributes, options, &block).tap do |dd|
+        dd.setup_delegated_attributes
+        dd.instance_eval(&block) if block_given?
       end
     end
     

data/lib/friendly_attributes/configuration.rb

@@ -0,0 +1,35 @@
+module FriendlyAttributes
+  class Configuration
+    attr_reader :details_delegators, :model, :attributes
+    
+    def initialize(active_record_model)
+      @model = active_record_model
+      @details_delegators = []
+      @attributes = {}
+    end
+    
+    def add(delegator)
+      details_delegators << delegator
+    end
+    
+    def add_attribute(name, friendly_model)
+      attributes[name] = friendly_model
+    end
+    
+    def model_for_attribute(attr)
+      attributes[attr]
+    end
+    
+    def friendly_models
+      details_delegators.map { |dd| dd.friendly_model }
+    end
+    
+    def map_models(&block)
+      friendly_models.map(&block)
+    end
+    
+    def each_model(&block)
+      friendly_models.each(&block)
+    end
+  end
+end

data/lib/friendly_attributes/details_delegator.rb

@@ -1,51 +1,121 @@
 module FriendlyAttributes
   class DetailsDelegator
-    attr_reader :friendly_model, :ar_model
+    # @attr_reader [Class] friendly_model FriendlyAttributes::Base class towa which the attributes are delegated
+    # @attr_reader [Class] active_record_model The ActiveRecord::Base class from which the attributes are delegated
+    # @attr_reader [Hash<Symbol, Class>] delegated_attributes Attributes delegated by this DetailsDelegator
+    attr_reader :friendly_model, :active_record_model, :delegated_attributes, :attributes
     
     delegate :attribute, :indexes, :to => :friendly_model
     
-    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_key, Integer
-        indexes _active_record_key
-        
-        cattr_accessor :active_record_key
+    class << self
+      # Method name for the FriendlyAttributes::Base class passed to it.
+      #
+      # @param [Class] klass class we want to get the name for
+      # @return [Symbol] underscored name of the class.
+      def friendly_model_name(klass)
+        klass.name.underscore.to_sym
       end
-      friendly_model.active_record_key = _active_record_key
       
-      ar_model.class_eval do
-        cattr_accessor :friendly_model
-        
-        after_save :update_friendly_details
-        after_destroy :destroy_friendly_details
-                
-        define_method(:details) do
-          @details ||= friendly_model.find_or_build_by_active_record_id(id, friendly_details_build_options)
-        end
+      # Instance variable name for the FriendlyAttributes::Base or `friendly_model_name` passed to it.
+      #
+      # @param [Symbol, String, Class] name_or_klass Class or name for which to generate the ivar name
+      # @return [Symbol] ivar name
+      def friendly_model_ivar(name_or_klass)
+        name_or_klass = friendly_model_name(name_or_klass) if name_or_klass.is_a?(Class)
+        :"@#{name_or_klass}_ivar"
       end
       
-      ar_model.friendly_model = friendly_model
+      # Reader method name for a certain FriendlyAttributes::Base instance associated with the model.
+      #
+      # @param [Symbol, String, Class] name_or_klass Class or name for which to generate the reader method name
+      # @return [Symbol] reader method name
+      def friendly_model_reader(name_or_klass)
+        name_or_klass = friendly_model_name(name_or_klass) if name_or_klass.is_a?(Class)
+        :"load_#{name_or_klass}"
+      end
+    end
+    
+    # Initialize new DetailsDelegator instance.
+    #
+    # @param [Class] friendly_model FriendlyAttributes model, that inherits from FriendlyModel::Base
+    # @param [Class] ar_model ActiveRecord model, host for the FriendlyAttributes model
+    # @param [Hash] attributes
+    # @param [Hash] options
+    # @option options [Symbol] :active_record_key (:active_record_id) name of the 'foreign key' in which the FriendlyModel::Base instance keeps a reference to the ActiveRecord model
+    def initialize(friendly_model, ar_model, attributes, options={})
+      @active_record_model  = ar_model
+      @friendly_model       = friendly_model
+      @attributes           = attributes
+      @delegated_attributes = {}
       
-      self.instance_eval(&block) if block_given?
+      setup_friendly_model(options.delete(:active_record_key) || :active_record_id)
+      setup_active_record_model
     end
     
     def delegated_attribute(name, klass)
+      delegated_attributes[name] = klass
+      
       attribute name, klass
       delegated_method(:"#{name}")
       delegated_method(:"#{name}=")
+      
+      active_record_model.friendly_attributes_configuration.add_attribute(name, friendly_model)
     end
     
     def delegated_method(name)
-      ar_model.class_eval do
-        delegate :"#{name}", :to => :details
+      friendly_model = self.friendly_model
+      
+      active_record_model.class_eval do
+        delegate :"#{name}", :to => FriendlyAttributes::DetailsDelegator.friendly_model_reader(friendly_model)
       end
     end
+    
+    def setup_delegated_attributes
+      attributes.each do |key, value|
+        if Array === value
+          value.each { |v| delegated_attribute v, key }
+        else
+          delegated_attribute value, key
+        end
+      end
+    end
+    
+    private
+      
+      def setup_friendly_model(_active_record_key)
+        friendly_model.instance_eval do
+          include Friendly::Document
+
+          attribute _active_record_key, Integer
+          indexes _active_record_key
+
+          cattr_accessor :active_record_key
+        end
+        friendly_model.active_record_key = _active_record_key
+      end
+    
+      def setup_active_record_model
+        friendly_model = self.friendly_model
+
+        active_record_model.class_eval do
+          # Stores the FriendlyAttributes configuration for the ActiveRecord model.
+          cattr_accessor :friendly_attributes_configuration
+
+          define_method(FriendlyAttributes::DetailsDelegator.friendly_model_reader(friendly_model)) do
+            find_or_build_and_memoize_details(friendly_model)
+          end
+        end
+
+        unless active_record_model.friendly_attributes_configuration
+          active_record_model.friendly_attributes_configuration = Configuration.new(active_record_model)
+          
+          active_record_model.class_eval do
+            after_save :update_friendly_models
+            after_destroy :destroy_friendly_models
+          end
+        end
+        
+        active_record_model.friendly_attributes_configuration.add(self)
+      end
   end
 end

data/lib/friendly_attributes/instance_methods.rb

@@ -1,33 +1,135 @@
 module FriendlyAttributes
   module InstanceMethods
-    def read_friendly_attribute(column)
-      details.send(column)
+    # Read the value of a Friendly attribute
+    #
+    # @param [Symbol, String] attr name of the attribute to read
+    # @return [Object] value of the read attribute
+    def read_friendly_attribute(attr)
+      friendly_instance_for_attribute(attr).send(attr)
     end
-
-    def write_friendly_attribute(column, instance)
-      details.send(:"#{column}=", instance)
+    
+    # Write the value of a Friendly attribute
+    #
+    # @param [Symbol, String] attr name of the attribute to set
+    # @param [Object] value value to set the attribute to
+    def write_friendly_attribute(attr, value)
+      friendly_instance_for_attribute(attr).send(:"#{attr}=", value)
     end
-
-    def details_present?
-      @details.present?
+    
+    # Returns the Friendly instance corresponding to the specified attribute
+    #
+    # @param [Symbol, String] attr name of the attribute
+    # @return [Class] FriendyAttributes::Base instance
+    def friendly_instance_for_attribute(attr)
+      klass = friendly_attributes_configuration.model_for_attribute(attr)
+      send DetailsDelegator.friendly_model_reader(klass)
     end
-
-    def update_friendly_details
-      return unless details_present?
-      details.send(:"#{details.active_record_key}=", id) unless details.send(details.active_record_key) == id
-      details.save if details.changed?
+    
+    # Update all associated Friendly instances, if they have been changed.
+    # If assigning attributes resulted in new instances being built, they will be created.
+    def update_friendly_models
+      present_friendly_instances.each do |details|
+        details.update_if_changed_with_model(id)
+      end
     end
-
-    def destroy_friendly_details
-      details.destroy
+    
+    # Destroys all FriendlyAttributes associated with the model. Forces loading and sends :destroy to all associated Friendly models.
+    #
+    # @return [true, false] result of attempting to destroy the associated FriendlyAttributes
+    def destroy_friendly_models
+      all_friendly_instances.map(&:destroy).all?
     end
     
-    def friendly_details_build_options
+    # Hook provided in order to customize the defaults for building Friendly model instances associated with a certain model.
+    # Redefine the method on the FriendlyAttributes::Base subclass to customize.
+    #
+    # Defaults to an empty Hash.
+    #
+    # @example We want to specify build options for the UserDetails instances, but not for UserSecondDetails
+    #   class User < ActiveRecord::Base
+    #     include FriendlyAttributes
+    #   
+    #     friendly_details(UserDetails, Integer => :shoe_size)
+    #     friendly_details(UserSecondDetails, Integer => :second_int)
+    #   
+    #     def friendly_details_build_options(friendly_model)
+    #       if UserDetails == friendly_model
+    #         { :shoe_size => 42 }
+    #       else
+    #         {}
+    #       end
+    #     end
+    #   end
+    # 
+    # @param [Class] friendly_model FriendlyAttributes::Base subclass for which the build options should be returned
+    # @return [Hash] default attributes to be used when building the associated friendly_model
+    def friendly_details_build_options(friendly_model = nil)
       {}
     end
     
+    # Finds or builds the Friendly instance associated through friendly_model. Result is memoized in an instance variable.
+    # @see FriendlyAttributes::Base.find_or_build_by_active_record_id
+    # @see FriendlyAttributes::DetailsDelegator.friendly_model_ivar
+    #
+    # @param [Class] friendly_model FriendlyAttributes::Base subclass
+    def find_or_build_and_memoize_details(friendly_model)
+      friendly_model_ivar = DetailsDelegator.friendly_model_ivar(friendly_model)
+      
+      val = instance_variable_get(friendly_model_ivar)
+      return val if val.present?
+      
+      instance_variable_set(friendly_model_ivar,
+        friendly_model.
+        find_or_build_by_active_record_id(id, friendly_details_build_options(friendly_model)))
+    end
+    
+    # Returns true if the FriendlyAttributes specified instance is loaded.
+    #
+    # @param [Class, Symbol, String] friendly_model Class or name of the FriendlyAttributes model
+    # @return [true, false] is the FriendlyAttributes instance loaded
+    def friendly_instance_present?(friendly_model)
+      friendly_model_ivar = DetailsDelegator.friendly_model_ivar(friendly_model)
+      val = instance_variable_get(friendly_model_ivar)
+      val.present?
+    end
+    
+    # Returns the associated FriendlyAttributes instance, if it has been loaded. If not loaded, returns nil.
+    #
+    # @param [Class, Symbol, String] friendly_model Class or name of the FriendlyAttributes model
+    # @return [FriendlyAttributes::Base, nil] instance of the FriendlyAttributes or nil
+    def friendly_instance_presence(friendly_model)
+      friendly_instance_present?(friendly_model) ?
+        send(DetailsDelegator.friendly_model_reader(friendly_model)) :
+        nil
+    end
+    
+    # List of all the FriendlyAttributes::Base instances associated with the model.
+    # Forces loading if the details have not been loaded yet.
+    #
+    # @return [Array<FriendlyAttributes::Base>] FriendlyAttributes instances
+    def all_friendly_instances
+      friendly_attributes_configuration.friendly_models.map do |friendly_model|
+        send(DetailsDelegator.friendly_model_reader(friendly_model))
+      end
+    end
+    
+    # List of FriendlyAttributes::Base instances that have been loaded.
+    # Does not force loading of details not loaded yet.
+    #
+    # @return [Array<FriendlyAttributes::Base>] FriendlyAttributes instances
+    def present_friendly_instances
+      friendly_attributes_configuration.friendly_models.map do |friendly_model|
+        friendly_instance_presence(friendly_model)
+      end.compact
+    end
+    
+    # Returns if the record has been changed and should be saved, taking into account any FriendlyAttributes.
+    #
+    # Overloads ActiveRecord::Base#changed?
+    #
+    # @return [true, false]
     def changed?
-      super || (details_present? && details.changed?)
+      super || present_friendly_instances.any?(&:changed?)
     end
   end
 end

data/lib/friendly_attributes/test/matchers.rb

@@ -5,6 +5,8 @@ module FriendlyAttributes
         def initialize(example, type, *attributes)
           @example    = example
           @type       = type
+          @options    = attributes.extract_options!
+          @through    = @options[:through]
           @attributes = attributes
         end
         
@@ -12,7 +14,7 @@ module FriendlyAttributes
           @actual = Class === actual ? actual : actual.class
           
           result = @actual.ancestors.include?(FriendlyAttributes) && @attributes.all? { |attr|
-            @actual.friendly_model.attributes.include?(attr) && @actual.friendly_model.attributes[attr].type == @type
+            @through.attributes.include?(attr) && @through.attributes[attr].type == @type
           }
         end
         
@@ -29,6 +31,14 @@ module FriendlyAttributes
         end
       end
       
+      # RSpec matcher for checking Friendly attributes.
+      # Passes if the model has the specified FriendlyAttributes associated with it.
+      #
+      # @example Using the matcher
+      #     it { should have_friendly_attributes(String, :ssn, :work_email, :through => UserDetails)        }
+      #     it { should have_friendly_attributes(Friendly::Boolean, :is_active, :through => CompanyDetails) }
+      #
+      # @return [HaveFriendlyAttribute] matcher
       def have_friendly_attributes(*args)
         HaveFriendlyAttribute.new(self, *args)
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: friendly-attributes
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Istvan Hoka
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +02:00
+date: 2011-02-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: activerecord
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,26 +31,24 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: friendly
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 0
-        - 6
-        - 0
-        version: 0.6.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+        version: "0"
   prerelease: false
   type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -65,10 +61,10 @@ dependencies:
         - 7
         - 7
         version: 0.7.7
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: memcached
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -81,12 +77,26 @@ dependencies:
         - 20
         - 1
         version: 0.20.1
+  prerelease: false
+  type: :runtime
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  type: :development
+  type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: mysql
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,28 +107,28 @@ dependencies:
         - 8
         - 1
         version: 2.8.1
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 27
         segments: 
         - 2
-        - 1
+        - 5
         - 0
-        version: 2.1.0
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+        version: 2.5.0
   prerelease: false
   type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,12 +139,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -145,12 +155,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,12 +169,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
   name: database_cleaner
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -175,12 +185,68 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  requirement: *id010
+  prerelease: false
+  type: :development
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
+  name: autotest
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  type: :runtime
+  type: :development
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  name: autotest-fsevent
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id013
+- !ruby/object:Gem::Dependency 
+  name: autotest-growl
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id014
+- !ruby/object:Gem::Dependency 
+  name: syntax
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id015
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -191,12 +257,12 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id016
+- !ruby/object:Gem::Dependency 
   name: friendly
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -207,12 +273,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id017
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -223,12 +289,12 @@ dependencies:
         - 7
         - 7
         version: 0.7.7
-  requirement: *id013
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id018
+- !ruby/object:Gem::Dependency 
   name: memcached
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -239,12 +305,12 @@ dependencies:
         - 20
         - 1
         version: 0.20.1
-  requirement: *id014
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+  type: :runtime
+  requirement: *id019
+- !ruby/object:Gem::Dependency 
   name: mysql
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -255,12 +321,12 @@ dependencies:
         - 8
         - 1
         version: 2.8.1
-  requirement: *id015
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id020
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -271,12 +337,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id016
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id021
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -287,12 +353,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id017
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id022
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -303,12 +369,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id018
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id023
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -317,12 +383,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id019
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id024
+- !ruby/object:Gem::Dependency 
   name: database_cleaner
-  version_requirements: &id020 !ruby/object:Gem::Requirement 
+  version_requirements: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -333,7 +399,9 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  requirement: *id020
+  prerelease: false
+  type: :development
+  requirement: *id025
 description: Pattern to add fields to ActiveRecord models, using an associated document, without needing schema migrations.
 email: istvan.hoka@gmail.com
 executables: []
@@ -342,18 +410,19 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
-- README.rdoc
+- README.md
 files: 
 - CHANGELOG.md
 - LICENSE.txt
-- README.rdoc
 - lib/friendly-attributes.rb
 - lib/friendly_attributes.rb
+- lib/friendly_attributes/base.rb
 - lib/friendly_attributes/class_methods.rb
-- lib/friendly_attributes/details.rb
+- lib/friendly_attributes/configuration.rb
 - lib/friendly_attributes/details_delegator.rb
 - lib/friendly_attributes/instance_methods.rb
 - lib/friendly_attributes/test/matchers.rb
+- README.md
 has_rdoc: true
 homepage: http://github.com/ihoka/friendly-attributes
 licenses: 
@@ -384,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Extend ActiveRecord models using Friendly ORM delegate models

data/README.rdoc

@@ -1,21 +0,0 @@
-= friendly-attributes
-
-Pattern to add fields to ActiveRecord models, using an associated document, without needing schema migrations.
-
-Uses http://friendlyorm.com/
-
-== Contributing to friendly-attributes
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2010 Istvan Hoka. See LICENSE.txt for
-further details.
-

data/lib/friendly_attributes/details.rb

@@ -1,17 +0,0 @@
-module FriendlyAttributes
-  class Details
-    class << self
-      def find_or_build_by_active_record_id(active_record_id, options={})
-        active_record_id && first(active_record_key => active_record_id) || new(options.merge(active_record_key => active_record_id))
-      end
-    end
-    
-    def attributes
-      {}.tap do |attributes|
-        self.class.attributes.keys.each do |attr|
-          attributes[attr] = self.send(attr)
-        end
-      end
-    end
-  end
-end