attr_encodable 0.1.2 → 0.1.3

data/lib/encodable/active_record/class_methods.rb

@@ -3,11 +3,11 @@ module Encodable
     module ClassMethods
       def attr_encodable(*attributes)
         options = extract_encodable_options!(attributes)
-
-        unless @encodable_whitelist_started
+        unless @encodable_whitelist_started && @encodable_whitelist_started.key?(options[:as])
           # Since we're white-listing, make sure we black-list every attribute to begin with
           unencodable_attributes(options[:as]).push *column_names.map(&:to_sym)
-          @encodable_whitelist_started = true
+          @encodable_whitelist_started ||= {}
+          @encodable_whitelist_started[options[:as]] = true
         end
 
         attributes.each do |attribute|
@@ -21,7 +21,8 @@ module Encodable
         end
 
         if options[:as] != :default
-          scope options[:as], select(default_attributes(options[:as]).reject{|attribute| !column_names.include?(attribute.to_s)})
+          columns = default_attributes(options[:as]).reject{|attribute| !column_names.include?(attribute.to_s)}
+          scope options[:as], select(columns.map {|column| "#{table_name}.#{column}" })
         end
       end
 
@@ -74,7 +75,7 @@ module Encodable
       private
       def extract_encodable_options!(attributes)
         begin
-          attributes.last.assert_valid_keys(:prefix, :as)
+          attributes.last.assert_valid_keys(:as, :prefix)
           options = attributes.extract_options!
         rescue ArgumentError
         end if attributes.last.is_a?(Hash)

data/spec/attr_encodable_spec.rb

@@ -68,31 +68,31 @@ describe Encodable do
     User.attr_encodable :id, :first_name
     User.unencodable_attributes(:default).map(&:to_s).should == ['foo', 'bar', 'baz'] + User.column_names - ['id', 'first_name']
   end
-
+  
   describe "at the parent model level" do
     it "should not mess with to_json unless when attr_encodable and attr_unencodable are not set" do
       @user.as_json.should == @user.attributes
     end
-
+  
     it "should not mess with :include options" do
       @user.as_json(:include => :permissions).should == @user.attributes.merge(:permissions => @user.permissions.as_json)
     end
-
+  
     it "should not mess with :methods options" do
       @user.as_json(:methods => :foobar).should == @user.attributes.merge(:foobar => "baz")
     end
-
+  
     it "should allow me to whitelist attributes" do
       User.attr_encodable :login, :first_name, :last_name
       @user.as_json.should == @user.attributes.slice('login', 'first_name', 'last_name')
     end
-
+  
     it "should allow me to blacklist attributes" do
       User.attr_unencodable :login, :first_name, :last_name
       @user.as_json.should == @user.attributes.except('login', 'first_name', 'last_name')
     end
-
-
+  
+  
     # Of note is the INSANITY of ActiveRecord in that it applies :only / :except to :include as well. Which is
     # obviously insane. Similarly, it doesn't allow :methods to come along when :only is specified. Good god, what
     # a shame.
@@ -100,33 +100,33 @@ describe Encodable do
       User.attr_encodable :login, :first_name, :last_name
       @user.as_json(:include => :permissions).should == @user.attributes.slice('login', 'first_name', 'last_name').merge(:permissions => @user.permissions.as_json)
     end
-
+  
     it "should allow me to blacklist attributes without messing with :include and :methods" do
       User.attr_unencodable :login, :first_name, :last_name
       @user.as_json(:include => :permissions, :methods => :foobar).should == @user.attributes.except('login', 'first_name', 'last_name').merge(:permissions => @user.permissions.as_json, :foobar => "baz")
     end
-
+  
     it "should not screw with :include if it's a hash" do
       User.attr_unencodable :login, :first_name, :last_name
       @user.as_json(:include => {:permissions => {:methods => :hello, :except => :id}}, :methods => :foobar).should == @user.attributes.except('login', 'first_name', 'last_name').merge(:permissions => @user.permissions.as_json(:methods => :hello, :except => :id), :foobar => "baz")
     end
   end
-
+  
   describe "at the child model level when the parent model has attr_encodable set" do
     before :each do
       User.attr_encodable :login, :first_name, :last_name
     end
-
+  
     it "should not mess with to_json unless when attr_encodable and attr_unencodable are not set on the child, but are on the parent" do
       @user.permissions.as_json.should == @user.permissions.map(&:attributes)
     end
-
+  
     it "should not mess with :include options" do
       # This is testing that the implicit ban on the :id attribute from User.attr_encodable is not
       # applying to serialization of permissions
       @user.as_json(:include => :permissions)[:permissions].first['id'].should_not be_nil
     end
-
+  
     it "should inherit any attr_encodable options from the child model" do
       User.attr_encodable :id
       Permission.attr_encodable :name
@@ -145,33 +145,33 @@ describe Encodable do
     #   @user.as_json.should == @user.attributes.except('login', 'first_name', 'last_name')
     # end
   end
-
+  
   it "should let me specify automatic includes as well as attributes" do
     User.attr_encodable :login, :first_name, :id, :permissions
     @user.as_json.should == @user.attributes.slice('login', 'first_name', 'id').merge(:permissions => @user.permissions.as_json)
   end
-
+  
   it "should let me specify methods as well as attributes" do
     User.attr_encodable :login, :first_name, :id, :foobar
     @user.as_json.should == @user.attributes.slice('login', 'first_name', 'id').merge(:foobar => "baz")
   end
-
+  
   it "should allow me to only request certain whitelisted attributes and methods" do
     User.attr_encodable :login, :first_name, :last_name, :foobar
     @user.as_json(:only => [:login, :foobar]).should == {'login' => 'flipsasser', :foobar => 'baz'}
   end
-
+  
   it "should allow me to use :only with aliased methods and attributes" do
     User.attr_encodable :login => :login_eh, :first_name => :foist, :last_name => :last, :foobar => :baz
     @user.as_json(:only => [:login, :foobar]).should == {'login_eh' => 'flipsasser', 'baz' => 'baz'}
   end
-
+  
   describe "reassigning" do
     it "should let me reassign attributes" do
       User.attr_encodable :id => :identifier
       @user.as_json.should == {'identifier' => @user.id}
     end
-
+  
     it "should let me reassign attributes alongside regular attributes" do
       User.attr_encodable :login, :last_name, :id => :identifier
       @user.as_json.should == {'identifier' => 1, 'login' => 'flipsasser', 'last_name' => 'sasser'}
@@ -181,29 +181,29 @@ describe Encodable do
       User.attr_encodable :id => :identifier, :first_name => :foobar
       @user.as_json.should == {'identifier' => 1, 'foobar' => 'flip'}
     end
-
+  
     it "should let me reassign :methods" do
       User.attr_encodable :foobar => :w00t
       @user.as_json.should == {'w00t' => 'baz'}
     end
-
+  
     it "should let me reassign :include" do
       User.attr_encodable :permissions => :deez_permissions
       @user.as_json.should == {'deez_permissions' => @user.permissions.as_json}
     end
-
+  
     it "should let me specify a prefix to a set of attr_encodable's" do
       User.attr_encodable :id, :first_name, :foobar, :permissions, :prefix => :t
       @user.as_json.should == {'t_id' => @user.id, 't_first_name' => @user.first_name, 't_foobar' => 'baz', 't_permissions' => @user.permissions.as_json}
     end
   end
-
+  
   it "should propagate down subclasses as well" do
     User.attr_encodable :name
     class SubUser < User; end
     SubUser.unencodable_attributes.should == User.unencodable_attributes
   end
-
+  
   describe "named groups" do
     it "should be supported on a class-basis with a :name option" do
       User.attr_unencodable :id
@@ -211,13 +211,13 @@ describe Encodable do
       User.attr_encodable :id, :first_name, :last_name, :as => :short
       User.all.as_json(:short).should == [{'id' => 1, 'first_name' => 'flip', 'last_name' => 'sasser'}]
     end
-
+  
     it "should be supported on an instance-basis with a :name option" do
       User.attr_encodable :id, :first_name, :last_name, :as => :short
       @user.as_json.should == @user.attributes
       @user.as_json(:short).should == {'id' => 1, 'first_name' => 'flip', 'last_name' => 'sasser'}
     end
-
+  
     it "should also create a named_scope that limits the SELECT statement to the included attributes" do
       User.attr_encodable :id, :as => :short
       User.first.first_name.should == 'flip'
@@ -225,4 +225,35 @@ describe Encodable do
       User.short.first.id.should == 1
     end
   end
+
+  describe "additive changes" do
+    it "should allow me to add columns after defining a default group" do
+      User.attr_encodable :id
+      @user.as_json.should == {'id' => 1}
+      User.attr_encodable :first_name
+      @user.as_json.should == {'id' => 1, 'first_name' => 'flip'}
+    end
+    
+    it "should allow me to add columns after defining an alias" do
+      User.attr_encodable :id => :slug
+      @user.as_json.should == {'slug' => 1}
+      User.attr_encodable :first_name
+      @user.as_json.should == {'slug' => 1, 'first_name' => 'flip'}
+    end
+    
+    it "should allow me to add columns after defining a group named 'other'" do
+      User.attr_encodable :id, :as => :other
+      @user.as_json(:other).should == {'id' => 1}
+      User.attr_encodable :first_name, :as => :other
+      @user.as_json(:other).should == {'id' => 1, 'first_name' => 'flip'}
+    end
+
+    it "should allow me to add columns after defining an alias on a group named 'other'" do
+      User.attr_encodable({:id => :slug}, :as => :other)
+      User.default_attributes(:other).should == [:id]
+      @user.as_json(:other).should == {'slug' => 1}
+      User.attr_encodable :first_name, :as => :other
+      @user.as_json(:other).should == {'slug' => 1, 'first_name' => 'flip'}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attr_encodable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec