active_model_serializers_cancancan 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce161c1d6f79a45223d67cf65bfc0784d4a0b821
-  data.tar.gz: e3f6e01156ac758f0bf84993dcdde3483a519a7b
+  metadata.gz: 51635d6ac71d004e31b78819b6a75770581a935a
+  data.tar.gz: 4b00c64ace4c8f841b6d89e400384a415e1c2091
 SHA512:
-  metadata.gz: f7786db0b565437bc845468150c071bc6ffe83af441c57ed6c231c41a281fdc7ad02782fd690edee1267bb88177e793965d8d903d79ecf68f24fc86da30de7bf
-  data.tar.gz: 7b351437cb30afabc1cff37e0aa288ddf87957e2b4a241bca1dffd2e8015f015585123e2535b85bba924df153878e1597d858515d76b3ab63f69f7af201f1b26
+  metadata.gz: af700feee294692d04313b3e44bfa6fc796ba410105f18681a59a1787430e311fa76b1312d357febcdc70bf7a56159f77bdc73f35c96b5791a63b2f1216164c3
+  data.tar.gz: 5ff61626515287b4354f0457c015a8e90b556630c186ed84098806d4e1fc695442e0c09844b0faf68b7e16d6f61ccf2ae300717ed6605d6a50018fa7faa9f307

data/lib/active_model_serializers/cancan/associations.rb

@@ -1,16 +1,13 @@
 module ActiveModel
   class Serializer
-    module Associations #:nodoc:
-
-      class Config #:nodoc:
-
+    module Associations
+      class Config
         def authorize?
           !!options[:authorize]
         end
       end
 
-      class HasMany #:nodoc:
-
+      class HasMany
         def serialize_with_cancan
           return serialize_without_cancan unless authorize?
           associated_object.select {|item| find_serializable(item).can?(:read, item) }.map do |item|
@@ -18,21 +15,24 @@ module ActiveModel
           end
         end
         alias_method_chain :serialize, :cancan
-
       end
 
-      class HasOne #:nodoc:
-
+      class HasOne
         def serialize_with_cancan
+          unless authorize?
+            return serialize_without_cancan 
+          end
           object = associated_object
           serializer = find_serializable(object)
-          #p !authorize?, serializer, serializer.can?(:read, object)
-          return nil unless !authorize? || serializer && serializer.can?(:read, object)
-          serialize_without_cancan
+          if serializer && serializer.can?(:read, object)
+            serialize_without_cancan
+          else
+            nil
+          end
         end
         alias_method_chain :serialize, :cancan
-
       end
     end
   end
 end
+

data/lib/active_model_serializers/cancan/monkeypatch.rb

@@ -2,7 +2,7 @@
 class ActiveModel::Serializer
   def include_associations!
     _associations.each_pair do |name, asst|
-      include!(name, asst.options) if include?(name)
+      include!(name, asst.options.dup) if include?(name)
     end
   end
 end

data/lib/active_model_serializers/cancan/version.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   module Serializers
     module Cancan
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/spec/active_model_serializers/cancan/associations_spec.rb

@@ -6,8 +6,40 @@ describe ActiveModel::Serializer::Associations do
 
   let(:category) { Category.first }
 
-  context 'when authorize is set to false' do
+  context 'when authorize is not set' do
+    before do
+      Object.send(:remove_const, :CategorySerializer) if defined?(CategorySerializer)
+      Object.send(:remove_const, :ProjectSerializer) if defined?(ProjectSerializer)
+      Object.send(:remove_const, :Ability) if defined?(Ability)
+
+      CategorySerializer = Class.new(ActiveModel::Serializer) do
+        attributes :id
+        has_many :projects
+        has_one :project
+      end
 
+      ProjectSerializer = Class.new(ActiveModel::Serializer) do
+        attributes :id
+      end
+
+      Ability = Class.new do
+        include CanCan::Ability
+        def initialize(user)
+          cannot :read, :project
+        end
+      end
+    end
+
+    it 'should serialize forbidden has_many records' do
+      expect(CategorySerializer.new(category, scope: user).serializable_hash[:projects].length).to eq(2)
+    end
+
+    it 'should serialize forbidden has_one records' do
+      expect(CategorySerializer.new(category, scope: user).serializable_hash[:project]).to_not be_nil
+    end
+  end
+
+  context 'when authorize is set to false' do
     before do
       Object.send(:remove_const, :CategorySerializer) if defined?(CategorySerializer)
       Object.send(:remove_const, :ProjectSerializer) if defined?(ProjectSerializer)
@@ -37,12 +69,11 @@ describe ActiveModel::Serializer::Associations do
 
     it 'should serialize forbidden has_one records' do
       expect(CategorySerializer.new(category, scope: user).serializable_hash[:project]).to_not be_nil
+      expect(CategorySerializer.new(category, scope: user).serializable_hash[:project]).to_not be_nil
     end
-
   end
 
   context 'when authorize set to true' do
-
     before do
       Object.send(:remove_const, :CategorySerializer) if defined?(CategorySerializer)
       Object.send(:remove_const, :ProjectSerializer) if defined?(ProjectSerializer)
@@ -80,7 +111,6 @@ describe ActiveModel::Serializer::Associations do
     it 'should serialize authorized has_one records' do
       expect(CategorySerializer.new(category, scope: User.find(2)).serializable_hash[:project]).to_not be_nil
     end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_cancancan
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - GlebTv