piggyback 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 0.2.2 / 2011-03-21
+
+  * Removed `piggyback_sql` method in favor of `piggyback_attributes`.
+
 = 0.2.1 / 2011-03-21
 
   * Added `piggyback_sql` method for getting the SQL generated for the SELECT

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'  
 require 'echoe'  
   
-Echoe.new('piggyback', '0.2.1') do |p|  
+Echoe.new('piggyback', '0.2.2') do |p|  
   p.description     = "Piggyback attributes from associated models with ActiveRecord"  
   p.url             = "http://github.com/juni0r/piggyback"  
   p.author          = "Andreas Korth"  

data/lib/piggyback.rb

@@ -3,6 +3,8 @@ module Piggyback
   
   class Association #:nodoc:
     
+    attr_reader :reflection, :mappings
+    
     def initialize(reflection, mappings = {})
       @reflection = reflection
       @mappings   = mappings
@@ -16,6 +18,10 @@ module Piggyback
       @mappings.map(&block)
     end
     
+    def attributes
+      @mappings.keys
+    end
+    
     def has_attribute?(attr_name)
       @mappings.has_key? attr_name
     end
@@ -86,28 +92,27 @@ module Piggyback
         end
       end
     end
-    
-    def piggyback_select(*assoc_names)
-      assoc_names.map do |assoc_name|
-        association = piggyback_associations[assoc_name]
+
+    def piggyback_attributes(assoc_name)
+      piggyback_associations[assoc_name].attributes
+    end
+
+    def piggyback(*assoc_names)
+      columns = piggyback_associations.values_at(*assoc_names).map do |association|
         association.map do |attr_name, mapped_name|
-          if attr_name != mapped_name
+          if attr_name == mapped_name
+            "#{association.quoted_table_name}.#{connection.quote_column_name(attr_name)}"
+          else
             if mapped_name.is_a? Arel::Nodes::SqlLiteral
               "#{mapped_name} AS #{attr_name}"
             else
               "#{association.quoted_table_name}.#{connection.quote_column_name(mapped_name)} AS #{attr_name}"
             end
-          else
-            "#{association.quoted_table_name}.#{connection.quote_column_name(attr_name)}"
           end
         end
-      end.flatten.join(', ')
-    end
-
-    def piggyback(*assoc_names)
-      selection = piggyback_select(*assoc_names)
-      selection = "#{quoted_table_name}.*, #{selection}" unless scoped.select_values.any?
-      select(selection).joins(*assoc_names)
+      end
+      columns.unshift("#{quoted_table_name}.*") unless scoped.select_values.any?
+      select(columns.flatten.join(', ')).joins(*assoc_names)
     end
   end
 end

data/piggyback.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{piggyback}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Korth"]

data/spec/piggyback_spec.rb

@@ -75,16 +75,8 @@ describe Piggyback do
     end
   end
   
-  it "should generate SQL for selecting piggybacked attributes" do
-    Essential.piggyback_select(:detail).split(', ').should =~ [
-      %("details"."first_name"), 
-      %("details"."last_name"), 
-      %("details"."count"), 
-      %("details"."checked"), 
-      %("details"."birthday"), 
-      %("details"."baggage"), 
-      %(details.first_name || ' ' || details.last_name AS name), 
-      %("details"."updated_at" AS detail_updated_at)
-    ]
+  it "should return the column names for a given association name" do
+    Essential.piggyback_attributes(:detail).should =~ 
+      %w{ first_name last_name name count checked birthday baggage detail_updated_at }
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: piggyback
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Andreas Korth