to_api 1.2.0 → 1.2.1

data/lib/to_api/version.rb

@@ -1,3 +1,3 @@
 module ToApi
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/to_api.rb

@@ -62,7 +62,7 @@ if Object.const_defined? :ActiveRecord
       include_hash.delete_if{|k,v| !valid_includes.include?(k.to_s)}
       to_api_attributes.each do |k, v|
         unless hash[k]
-          v.to_api_filters = to_api_filters if v.respond_to? :to_api_filters
+          v.to_api_filters = to_api_filters if to_api_filters.any? && v.respond_to?(:to_api_filters)
 
           attribute_includes = include_hash[k] || []
           to_api_v = v.to_api(*[attribute_includes].flatten.compact)
@@ -74,7 +74,7 @@ if Object.const_defined? :ActiveRecord
         unless hash[relation]
           relation_includes = include_hash[relation] || []
           api_obj = self.send(relation)
-          api_obj.to_api_filters = to_api_filters if api_obj.respond_to? :to_api_filters
+          api_obj.to_api_filters = to_api_filters if api_obj.respond_to?(:to_api_filters)
 
           hash[relation.to_s] = api_obj.respond_to?(:to_api) ? api_obj.to_api(*[relation_includes].flatten.compact) : api_obj
         end
@@ -115,7 +115,8 @@ if Object.const_defined? :ActiveRecord
       include ToApiFilter
       def to_api(*includes)
         map{|e|
-          e.to_api_filters = to_api_filters if e.respond_to? :to_api_filters
+          e.to_api_filters = to_api_filters if to_api_filters.any? && e.respond_to?(:to_api_filters)
+          e.to_api_filters = to_api_filters if e.respond_to?(:to_api_filters)
           e.to_api(*includes)
         }
       end
@@ -127,7 +128,7 @@ class Array
   include ToApiFilter
   def to_api(*includes)
     map{|e|
-      e.to_api_filters = to_api_filters if e.respond_to? :to_api_filters
+      e.to_api_filters = to_api_filters if to_api_filters.any? && e.respond_to?(:to_api_filters)
 
       e.to_api(*includes)
     }
@@ -151,7 +152,7 @@ class Hash
 
     (keys-values.keys).each do |k|
       val = self[k]
-      val.to_api_filters = to_api_filters if val.respond_to? :to_api_filters
+      val.to_api_filters = to_api_filters if to_api_filters.any? && val.respond_to?(:to_api_filters)
       child_includes = include_hash[k] || []
       values[k] = val.to_api(*[child_includes].flatten.compact)
     end

data/spec/to_api_spec.rb

@@ -27,10 +27,14 @@ class AssociatedRecord < ActiveRecord::Base
 end
 
 class OtherRecord < ActiveRecord::Base
+  attr_accessor :foo
+
+  def to_api_attributes
+    attributes.merge("foo" => foo)
+  end
 end
 
 class Category < ActiveRecord::Base
-
 end
 
 describe '#to_api' do
@@ -58,6 +62,16 @@ describe '#to_api' do
       a.should_receive(:to_api).with('bar').and_return(:apiz)
       {:one => a}.to_api(:one => ['bar']).should == {:one => :apiz}
     end
+
+    it "can have frozen stuff inside it" do
+      hash = {
+        :key => {:foo => "bar"}
+      }
+      hash[:key].freeze
+      hash.freeze
+
+      hash.to_api.should == {:key => {:foo => "bar"}}.to_api
+    end
   end
 
   describe String do
@@ -182,6 +196,13 @@ describe '#to_api' do
       a.should_receive(:to_api).with(['bar']).and_return(:apiz)
       [a].to_api(['bar']).should == [:apiz]
     end
+
+    it "can be frozen" do
+      a = [["foo"], ["bar"]]
+      a.each { |e| e.freeze }
+      a.freeze
+      a.to_api.should == [["foo"], ["bar"]].to_api
+    end
   end
 
   describe nil do
@@ -254,6 +275,28 @@ describe '#to_api' do
         @base.to_api("group")["group"].should be_nil
       end
 
+      it "can handle frozen attributes" do
+        obj = OtherRecord.new
+        obj.foo = ["bar"]
+        obj.to_api["foo"].should == ["bar"]
+
+        obj.freeze
+        obj.foo.freeze
+        obj.to_api["foo"].should == ["bar"]
+      end
+
+      it "can handle frozen associations" do
+        obj = ChildRecord.new(:name => "a child")
+        category = Category.new(:name => "cat 1")
+        obj.category = category
+
+        obj.to_api("category")["category"].should == category.to_api
+
+        obj.freeze
+        category.freeze
+        obj.to_api("category")["category"].should == category.to_api
+      end
+
       describe "versions of params" do
 
         before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_api
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors: