merge 0.6.0 → 0.6.1

data/CHANGELOG

@@ -1,4 +1,7 @@
-= 0.1.0 / 2012-12-18
+= 0.6.0 / 2012-12-18
 
   Forked from Piggyback
 
+= 0.6.1 / 2012-12-18
+
+  Better attribute method handling

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'  
 require 'echoe'  
 
-Echoe.new('merge', '0.6.0') do |p|  
+Echoe.new('merge', '0.6.1') do |p|  
 
   p.description     = "Merge attributes from associated models with ActiveRecord"  
   p.url             = "http://github.com/juni0r/merge"  
@@ -20,7 +20,7 @@ Echoe.new('merge', '0.6.0') do |p|
   }
                  
   p.runtime_dependencies     = [ "activerecord >=3.1.0" ]
-  p.development_dependencies = [ "echoe", "rspec", "sqlite3" ]
+  p.development_dependencies = [ "echoe", "sqlite3", "rspec", "guard-rspec", "rb-fsevent", "growl" ]
 end  
   
 require 'rspec/core'

data/lib/merge/base.rb

@@ -42,36 +42,45 @@ module Merge
       def define_attribute_methods
         @attribute_methods_mutex.synchronize do
           return if attribute_methods_generated?
-      
-          # This stunt is to call "super.super"
-          _super = ActiveModel::AttributeMethods::ClassMethods::instance_method(:define_attribute_methods).bind(self)
-
-          columns = merges.each_value.map do |assoc|
+          merges.each_value do |assoc|
             assoc.each_column do |name, column, serialized|
               columns_hash[name] = column
               serialized_attributes[name] = serialized if serialized
+              define_merge_attribute_methods(assoc.name, name)
             end
           end
-        
-          _super.call(columns.flatten)
         end
         super
-      end    
+      end
+      
+      def define_merge_attribute_methods(assoc_name, attr_name)
+        generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def __temp__
+            if @attributes.has_key?("#{attr_name}")
+              (v=@attributes["#{attr_name}"]) && #{attribute_cast_code(attr_name)}
+            else
+              #{assoc_name}.#{attr_name}
+            end
+          end
+          alias_method :"#{attr_name}", :__temp__
+          undef_method :__temp__
+
+          def __temp__
+            !!send(:"#{attr_name}")
+          end
+
+          alias_method '#{attr_name}?', :__temp__
+          undef_method :__temp__
+        RUBY
+      end
     end
 
     class Association #:nodoc:
 
       def initialize(reflection, options = nil)
         @reflection = reflection
-      
-        unless options.is_a? Hash
-          options = { only: options }
-        end
-      
-        options.assert_valid_keys(:only, :except)
-      
-        @only   = Array.wrap(options[:only]).map(&:to_s)
-        @except = Array.wrap(options[:except]).map(&:to_s)
+        @options = options.is_a?(Hash) ? options : { only: options }
+        @options.assert_valid_keys(:only, :except)      
       end
     
       def method_missing(method, *args, &block)
@@ -84,13 +93,14 @@ module Merge
     
       def attributes
         unless @attributes
-          @attributes = klass.attribute_names
-          @attributes &= @only if @only.any?
-        
-          @attributes -= active_record.attribute_names        
-          @attributes -= @except if @except.any?
+          only = Array.wrap(@options[:only]).map(&:to_s)
+          except = Array.wrap(@options[:except]).map(&:to_s)
 
+          @attributes = klass.attribute_names
+          @attributes &= only if only.any?
+          @attributes -= active_record.attribute_names
           @attributes -= [foreign_key] unless belongs_to?
+          @attributes -= except if except.any?
         end
         @attributes
       end

data/merge.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "merge"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Korth"]
@@ -24,18 +24,27 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.1.0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_development_dependency(%q<growl>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.1.0"])
       s.add_dependency(%q<echoe>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_dependency(%q<growl>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.1.0"])
     s.add_dependency(%q<echoe>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<guard-rspec>, [">= 0"])
+    s.add_dependency(%q<rb-fsevent>, [">= 0"])
+    s.add_dependency(%q<growl>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merge
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +76,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: growl
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: