active_model_serializers_cancancan 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0ec85b16ca00aa3dc67b76e197749a3201765b4
-  data.tar.gz: faf305683d37e1786a558acb890865caf5a8e205
+  metadata.gz: c8399c133ca78481e609c696052dd6247a7b23e0
+  data.tar.gz: cc753a8711f2d93ef69f28b898a979dab7a48a8a
 SHA512:
-  metadata.gz: 51daa4dad16cd539c2990329e22989d6f95ab0eb405a660f2192707a113f155c2957f42158f97a12a5497ac73f67c80eaf01ac1b1378d3cdfb44cf178216af4a
-  data.tar.gz: 973ca7e04de70f4203e0cd3b04a757a7561cce4861c8d443cba19e6674bcefa5cc85a0d74edf797f260b34f9fb570c20f8955bfe1a1d171d41414f39b6905310
+  metadata.gz: b9010e84b574addaa16fdc6b67c44761d829846344285c1f3785fc2feb9c4dbd6086f185c0e68a514a2b21d571c6aa2fe6bd5558508a0cadd65fa4a17cf03092
+  data.tar.gz: b37b48af29100d674c1686947c77bd8b6bb73d96c432e7043c3b338dbaa38dc12c39bf4962060b1d5ad20605f3879c117b7d22679d58f6d08fbeb5b06a53289c

data/active_model_serializers_cancancan.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'mongoid', '~> 6'
+  gem.add_development_dependency 'rails', '~> 5.1.0.rc1'
 end

data/lib/active_model_serializers/cancan.rb

@@ -2,5 +2,6 @@ require 'cancancan'
 require 'active_model_serializers'
 require 'active_model_serializers/cancan/version'
 require 'active_model_serializers/cancan/helpers'
+require 'active_model_serializers/cancan/reflection_value'
 require 'active_model_serializers/cancan/associations'
 require 'active_model_serializers/cancan/abilities'

data/lib/active_model_serializers/cancan/associations.rb

@@ -3,28 +3,11 @@ require 'active_model/serializer/reflection'
 module ActiveModel
   class Serializer
     class Reflection < Field
+      prepend ActiveModel::Serializer::CanCan::ReflectionValue
+
       def authorize?
         !!options[:authorize]
       end
-
-      def value_with_cancan(serializer, include_slice)
-        val = value_without_cancan(serializer, include_slice)
-        unless authorize?
-          return val
-        end
-        if val.kind_of?(Array)
-          val.select do |item|
-            serializer.current_ability.can?(:read, item)
-          end
-        else
-          if serializer.current_ability.can?(:read, val)
-            val
-          else
-            nil
-          end
-        end
-      end
-      alias_method_chain :value, :cancan
     end
   end
 end

data/lib/active_model_serializers/cancan/reflection_value.rb

@@ -0,0 +1,26 @@
+module ActiveModel
+  class Serializer
+    module CanCan
+      module ReflectionValue
+        def value(serializer, include_slice)
+          val = super(serializer, include_slice)
+          unless authorize?
+            return val
+          end
+          if val.kind_of?(Array)
+            val.select do |item|
+              serializer.current_ability.can?(:read, item)
+            end
+          else
+            if serializer.current_ability.can?(:read, val)
+              val
+            else
+              nil
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/active_model_serializers/cancan/version.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   module Serializers
     module Cancan
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_cancancan
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - GlebTv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -123,6 +123,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.0.rc1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.0.rc1
 description: 
 email:
 - glebtv@gmail.com
@@ -144,6 +158,7 @@ files:
 - lib/active_model_serializers/cancan/abilities.rb
 - lib/active_model_serializers/cancan/associations.rb
 - lib/active_model_serializers/cancan/helpers.rb
+- lib/active_model_serializers/cancan/reflection_value.rb
 - lib/active_model_serializers/cancan/version.rb
 - lib/active_model_serializers_cancancan.rb
 - spec/active_model_serializers/cancan/abilities_spec.rb