active_model_serializers_cancancan 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9085896d17f7f4d0cba7dfbaafb9af6c6f1244a8
-  data.tar.gz: b1895581af462fc4936516be90317b30c8ac3593
+  metadata.gz: 0deafd346094e3f7262e194e3b172efebe82c1a6
+  data.tar.gz: 1c00fabc26fa8fb2b697b119bad616ab687cc46d
 SHA512:
-  metadata.gz: 31d68875d9ba1f25b5a1b0999a0c707b4f7efd377d0905fbf5fcfc9aa00944bf14377ae67481804584a2cfc05b02b14ba7ecd21fdfe11dedd070e3f8c8911b2e
-  data.tar.gz: 8ccd70b1d4459fff5f85fd8da4036efa201a7c34acee92476a3188d4f658861853a69c57aeac2ac1adcc9ec32ec3fd8ce124e741451b053cdf12e678f4a07251
+  metadata.gz: db8ae6a127b71dfa77816890e07cb16087c71ae2b8ee3303bbcae92b7270b19a995d5b4643380e5b2f496f2142c8c107b01286e568fc638014acccbc7484b720
+  data.tar.gz: b81eceda7ac47713893019f55a0d2cf9c443edd2ef64464d15c48ab5c400cba9ef5b0f80683a928c3211317bda2b7981d8af7f52f8e79a2ee17eabc39b1c36ba

data/active_model_serializers_cancancan.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'active_model_serializers'
+  gem.add_dependency 'active_model_serializers', '~> 0.10.0'
   gem.add_dependency 'cancancan'
 
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 2.14.0'
+  gem.add_development_dependency 'rspec', '~> 2.99.0'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'mongoid', '~> 4.0.0.beta1'
+  gem.add_development_dependency 'mongoid', '~> 5'
 end

data/lib/active_model_serializers/cancan.rb

@@ -1,6 +1,5 @@
 require 'cancancan'
 require 'active_model_serializers'
-require 'active_model_serializers/cancan/monkeypatch'
 require 'active_model_serializers/cancan/version'
 require 'active_model_serializers/cancan/helpers'
 require 'active_model_serializers/cancan/associations'

data/lib/active_model_serializers/cancan/associations.rb

@@ -1,38 +1,30 @@
+require 'active_model/serializer/reflection'
+
 module ActiveModel
   class Serializer
-    module Associations
-      class Config
-        def authorize?
-          !!options[:authorize]
-        end
+    class Reflection < Field
+      def authorize?
+        !!options[:authorize]
       end
 
-      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|
-            find_serializable(item).serializable_hash
-          end
+      def value_with_cancan(serializer)
+        val = value_without_cancan(serializer)
+        unless authorize?
+          return val
         end
-        alias_method_chain :serialize, :cancan
-      end
-
-      class HasOne
-        def serialize_with_cancan
-          unless authorize?
-            return serialize_without_cancan 
+        if val.kind_of?(Array)
+          val.select do |item|
+            serializer.current_ability.can?(:read, item)
           end
-          object = associated_object
-          serializer = find_serializable(object)
-          if serializer && serializer.can?(:read, object)
-            serialize_without_cancan
+        else
+          if serializer.current_ability.can?(:read, val)
+            val
           else
             nil
           end
         end
-        alias_method_chain :serialize, :cancan
       end
+      alias_method_chain :value, :cancan
     end
   end
 end
-

data/lib/active_model_serializers/cancan/helpers.rb

@@ -3,7 +3,7 @@ module ActiveModel
     module CanCan
       module Helpers
         def current_ability
-          Ability.new(options[:scope])
+          Ability.new(instance_options[:scope])
         end
 
         def can?(*args)

data/lib/active_model_serializers/cancan/version.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   module Serializers
     module Cancan
-      VERSION = "0.0.5"
+      VERSION = "0.1.0"
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require 'active_model_serializers_cancancan'
 Mongoid.configure do |config|
   config.connect_to "ams-test"
 end
+Mongo::Logger.logger.level = ::Logger::FATAL
 
 class User
   include Mongoid::Document

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_cancancan
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - GlebTv
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: '5'
 description: 
 email:
 - glebtv@gmail.com
@@ -130,7 +130,6 @@ 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/monkeypatch.rb
 - lib/active_model_serializers/cancan/version.rb
 - lib/active_model_serializers_cancancan.rb
 - spec/active_model_serializers/cancan/abilities_spec.rb
@@ -155,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CanCanCan integration with Active Model Serializers

data/lib/active_model_serializers/cancan/monkeypatch.rb

@@ -1,9 +0,0 @@
-# A small hack to allow passing options to associations
-class ActiveModel::Serializer
-  def include_associations!
-    _associations.each_pair do |name, asst|
-      include!(name, asst.options.dup) if include?(name)
-    end
-  end
-end
-