a_a_n 0.1.2 → 0.2.3

data/Gemfile

@@ -3,9 +3,10 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in a_a_n.gemspec
 gemspec
 
-gem 'rspec'
-
 group :development do
   gem 'rspec'
+end
+
+group :development, :test do
   gem 'sqlite3'
 end

data/README

@@ -6,12 +6,16 @@ Structure:
       belongs_to :current_university, :class_name => 'University'
 
       acts_as_aan do
-        [ [:current_university, 'University', :name],
-          [:home_country, 'Country', :name]]
+        association :current_university do
+          [:name]
+        end
+        association :home_country do
+          [:name, { :iso_3166_a2 => :country_code}]
+        end
       end
 
-      validates :home_country_name, :presence => true
-      validates :current_university_name, :presence => true
+      validates :home_country, :presence => true
+      validates :current_university, :presence => true
     end
 
 Usage:

data/a_a_n.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
                      "Rakefile",
                      "lib/a_a_n.rb",
                      "lib/a_a_n/association_as_name.rb",
+                     "lib/a_a_n/keeper.rb",
                      "lib/a_a_n/version.rb"]
   #s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/a_a_n.rb

@@ -2,6 +2,7 @@ require 'a_a_n/version'
 
 module AAN
   autoload :AssociationAsName, 'a_a_n/association_as_name'
+  autoload :Keeper, 'a_a_n/keeper'
 end
 
 ActiveRecord::Base.send :include, AAN::AssociationAsName

data/lib/a_a_n/association_as_name.rb

@@ -23,41 +23,46 @@ module AAN
 
     module ClassMethods
       def acts_as_aan &block
-        aan_structure = block.call
+        AAN::Keeper.associations(self, &block)
 
-        aan_structure.each do |aos|
-          class_eval <<EOF
-              attr_accessor :#{aos.first}_#{aos.last}
-              before_validation :aan_set_#{aos.first}
-              after_initialize :aan_set_#{aos.first}_#{aos.last}
+        AAN::Keeper.structure[self].each_pair do |association, assoc_attrs|
+          assoc_attrs.each do |structure|
+            attribute = structure.first
+            aliased_method = structure.last
+            class_eval <<EOF
+              attr_accessor :#{aliased_method}
+              before_validation :aan_set_#{association}
+              after_initialize :aan_set_#{aliased_method}
 
-              def #{aos.first}_#{aos.last}
-                @#{aos.first}_#{aos.last} ||= #{aos.first}.try(:#{aos.last})
+              def #{aliased_method}
+                @#{aliased_method} ||= #{association}.try(:#{attribute})
               end
 
+              def #{association}_with_aan_assigment=(new_object)
+                #{AAN::Keeper.nullify_aliased_methods_for self, association}
+                association(:#{association}).replace(new_object)
+              end
+              alias_method_chain :#{association}=, :aan_assigment
+
               protected
 
-              def aan_set_#{aos.first}
-                unless #{aos.first}_#{aos.last}.blank?
-                  obj = #{aos[1]}.find_by_#{aos.last} #{aos.first}_#{aos.last}
-                  self.#{aos.first} = obj unless obj.nil?
+              def aan_set_#{association}
+                unless #{aliased_method}.blank?
+                  obj = association(:#{association}).klass.find_by_#{attribute} #{aliased_method}
+                  self.#{association} = obj unless obj.nil?
                 end
               end
 
-              def aan_set_#{aos.first}_#{aos.last}
-                unless #{aos.first}_#{aos.last}.blank?
-                  obj = #{aos[1]}.find_by_#{aos.last} #{aos.first}_#{aos.last}
-                  self.#{aos.first} = obj unless obj.nil?
+              def aan_set_#{aliased_method}
+                unless #{aliased_method}.blank?
+                  obj = association(:#{association}).klass.find_by_#{attribute} #{aliased_method}
+                  self.#{association} = obj unless obj.nil?
                 end
               end
 EOF
+          end
         end
 
-        class_eval <<EOF
-
-            cattr_accessor :aan_structure
-            @@aan_structure = #{aan_structure}
-EOF
       end
     end
   end

data/lib/a_a_n/keeper.rb

@@ -0,0 +1,48 @@
+module AAN
+  class Keeper
+    cattr_reader :current_model
+
+    def self.nullify_aliased_methods_for model, assoc
+      aliased_methods = []
+      AAN::Keeper.aliases_for(model, assoc).each do |aliased_method|
+        aliased_methods << "@#{aliased_method} = nil"
+      end
+      aliased_methods.join("\n")
+    end
+
+    def self.structure
+      @@structures ||= {}
+    end
+
+    def self.[](*args)
+      (structure[args.first] ||= {})
+    end
+
+    def self.associations model, &block
+      @@current_model = model
+      instance_eval &block
+    end
+
+    def self.association(name, &block)
+      sub_structure = block.call
+      sub_structure.each do |element|
+        if element.is_a? Hash
+          element.symbolize_keys!
+          element = element.to_a.flatten
+        elsif
+          element = [element.to_sym, "#{name}_#{element}".to_sym]
+        end
+        (AAN::Keeper[current_model][name] ||= []) << element
+      end
+    end
+
+    protected
+
+    def self.aliases_for model, assoc
+      structure[model][assoc].collect do |params|
+        params.last
+      end
+    end
+
+  end
+end

data/lib/a_a_n/version.rb

@@ -1,3 +1,3 @@
 module AAN
-  VERSION = "0.1.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a_a_n
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &73043240 !ruby/object:Gem::Requirement
+  requirement: &74437120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *73043240
+  version_requirements: *74437120
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &73042980 !ruby/object:Gem::Requirement
+  requirement: &74436820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *73042980
+  version_requirements: *74436820
 description: ! "Whenever you need assign an association by its attribute,\n like name,
   this gem comes to busines."
 email:
@@ -47,6 +47,7 @@ files:
 - Rakefile
 - lib/a_a_n.rb
 - lib/a_a_n/association_as_name.rb
+- lib/a_a_n/keeper.rb
 - lib/a_a_n/version.rb
 homepage: https://github.com/Studentify/association_as_name
 licenses: []