a_a_n 0.2.3 → 0.2.5

data/Gemfile

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

data/a_a_n.gemspec

@@ -5,8 +5,8 @@ require "a_a_n/version"
 Gem::Specification.new do |s|
   s.name        = "a_a_n"
   s.version     = AAN::VERSION
-  s.authors     = ["E-Max"]
-  s.email       = ["max@studentify.nl"]
+  s.authors     = ["E-Max","shell"]
+  s.email       = ["developers@studentify.nl"]
   s.homepage    = "https://github.com/Studentify/association_as_name"
   s.summary     = %q{Association as name}
   s.description = %q{Whenever you need assign an association by its attribute,
@@ -23,9 +23,13 @@ Gem::Specification.new do |s|
                      "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) }
   s.require_paths = ["lib"]
 
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("activerecord", ">= 3.0.0")
+  s.add_development_dependency('sqlite3')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('guard')
+  s.add_development_dependency('guard-rspec')
+  s.add_development_dependency('ruby-debug19')
 end

data/lib/a_a_n/association_as_name.rb

@@ -1,4 +1,4 @@
-###
+#
 # Module that allows assing attributes by <tt>name</tt>(or any other method)
 #
 #  Example:
@@ -17,9 +17,7 @@
 #    end
 module AAN
   module AssociationAsName
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def acts_as_aan &block
@@ -30,34 +28,13 @@ module AAN
             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}
-
+              # Could not use delegate for that, since attribute and aliased method could have different names
               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_#{association}
-                unless #{aliased_method}.blank?
-                  obj = association(:#{association}).klass.find_by_#{attribute} #{aliased_method}
-                  self.#{association} = obj unless obj.nil?
-                end
+                self.send(:#{association}).try(:#{attribute})
               end
 
-              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
+              def #{aliased_method}=(value)
+                self.send(:#{association}_id=, association(:#{association}).klass.find_by_#{attribute}(value).try(:id))
               end
 EOF
           end

data/lib/a_a_n/keeper.rb

@@ -1,8 +1,10 @@
 module AAN
-  class Keeper
-    cattr_reader :current_model
+  module Keeper
+    mattr_reader :current_model
 
-    def self.nullify_aliased_methods_for model, assoc
+    extend self
+
+    def nullify_aliased_methods_for model, assoc
       aliased_methods = []
       AAN::Keeper.aliases_for(model, assoc).each do |aliased_method|
         aliased_methods << "@#{aliased_method} = nil"
@@ -10,20 +12,20 @@ module AAN
       aliased_methods.join("\n")
     end
 
-    def self.structure
+    def structure
       @@structures ||= {}
     end
 
-    def self.[](*args)
+    def [](*args)
       (structure[args.first] ||= {})
     end
 
-    def self.associations model, &block
+    def associations model, &block
       @@current_model = model
       instance_eval &block
     end
 
-    def self.association(name, &block)
+    def association(name, &block)
       sub_structure = block.call
       sub_structure.each do |element|
         if element.is_a? Hash
@@ -38,11 +40,10 @@ module AAN
 
     protected
 
-    def self.aliases_for model, assoc
+    def 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.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: a_a_n
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
 - E-Max
+- shell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &74437120 !ruby/object:Gem::Requirement
+  requirement: &85815950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *74437120
+  version_requirements: *85815950
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &74436820 !ruby/object:Gem::Requirement
+  requirement: &85815570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,11 +33,66 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *74436820
+  version_requirements: *85815570
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &85815250 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *85815250
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &85815020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *85815020
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &85771780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *85771780
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &85771560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *85771560
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &85771220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *85771220
 description: ! "Whenever you need assign an association by its attribute,\n like name,
   this gem comes to busines."
 email:
-- max@studentify.nl
+- developers@studentify.nl
 executables: []
 extensions: []
 extra_rdoc_files: []