active_model_serializers_cancancan 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c73184a79fdd879b8191cb33131026be82a74a4
-  data.tar.gz: a3b5dcad57c29c664b7af657e8713530594318ce
+  metadata.gz: f0ec85b16ca00aa3dc67b76e197749a3201765b4
+  data.tar.gz: faf305683d37e1786a558acb890865caf5a8e205
 SHA512:
-  metadata.gz: a6abdaa71b6e3ed251c6e31caa8376b66e33f69af1d79662d756d8c55199957fda5ebe1d2833cf291a3da1067d4aea02addafd59aa1c3015690231cda1a1e4e5
-  data.tar.gz: 8ba3ced18b6092081ce2efdaa1d7b7f0e4e28d3586f80fd264890728bdd9c64619e64ada9c88d882861958828f6cfd24381b9f9cc122259f74c084895e72d682
+  metadata.gz: 51daa4dad16cd539c2990329e22989d6f95ab0eb405a660f2192707a113f155c2957f42158f97a12a5497ac73f67c80eaf01ac1b1378d3cdfb44cf178216af4a
+  data.tar.gz: 973ca7e04de70f4203e0cd3b04a757a7561cce4861c8d443cba19e6674bcefa5cc85a0d74edf797f260b34f9fb570c20f8955bfe1a1d171d41414f39b6905310

data/active_model_serializers_cancancan.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 2.99.0'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'mongoid', '~> 5'
+  gem.add_development_dependency 'mongoid', '~> 6'
 end

data/lib/active_model_serializers/cancan/associations.rb

@@ -7,8 +7,8 @@ module ActiveModel
         !!options[:authorize]
       end
 
-      def value_with_cancan(serializer)
-        val = value_without_cancan(serializer)
+      def value_with_cancan(serializer, include_slice)
+        val = value_without_cancan(serializer, include_slice)
         unless authorize?
           return val
         end

data/lib/active_model_serializers/cancan/version.rb

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

data/spec/active_model_serializers/cancan/abilities_spec.rb

@@ -4,6 +4,13 @@ describe ActiveModel::Serializer::CanCan::Abilities do
   let(:user) { User.first }
   let(:category) { Category.first }
 
+  describe 'sane' do
+    it do
+      expect(user).to_not be_nil
+      expect(category).to_not be_nil
+    end
+  end
+
   class MockAbility
     include CanCan::Ability
     def initialize(user)
@@ -15,7 +22,7 @@ describe ActiveModel::Serializer::CanCan::Abilities do
   describe '.abilities' do
     let(:serializer) do
       Class.new(ActiveModel::Serializer) do
-        attributes :id
+        attribute :id
         abilities :restful, :foo, :bar
         def current_ability
           MockAbility.new(nil)
@@ -27,7 +34,7 @@ describe ActiveModel::Serializer::CanCan::Abilities do
 
         def can_bar?
           cannot? :read, Category
-        end        
+        end
       end
     end
 
@@ -41,10 +48,10 @@ describe ActiveModel::Serializer::CanCan::Abilities do
     context 'abilities key' do
       subject { category_serializer.serializable_hash[:can] }
       its([:restful]) { should be_nil }
-      its([:update]) { should be_true }
-      its([:show]) { should be_false }
-      its([:foo]) { should be_true }
-      its([:bar]) { should be_true }
+      its([:update]) { should be true }
+      its([:show]) { should be false }
+      its([:foo]) { should be true }
+      its([:bar]) { should be true }
     end
   end
 end

data/spec/active_model_serializers/cancan/associations_spec.rb

@@ -94,7 +94,7 @@ describe ActiveModel::Serializer::Associations do
         def initialize(user)
           can :read, Category
           can :read, Project do |pr|
-            pr.user == user
+            pr.user.id == user.id
           end
         end
       end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ Bundler.require(:default, :test)
 require 'mongoid'
 require 'active_model_serializers_cancancan'
 
+require 'rspec/its'
+
 Mongoid.configure do |config|
   config.connect_to "ams-test"
 end
@@ -19,30 +21,30 @@ end
 
 class Project
   include Mongoid::Document
-  belongs_to :user
-  belongs_to :category
+  belongs_to :user, required: false
+  belongs_to :category, required: false
   has_many :categories
 end
 
 class Category
   include Mongoid::Document
-  belongs_to :user
-  belongs_to :project
+  belongs_to :user, required: false
+  belongs_to :project, required: false
   has_many :projects
 end
 
 RSpec.configure do |config|
-  config.before do
-    user1 = User.create(id: 1, name: "User1") 
-    user2 = User.create(id: 2, name: "User2")
+  config.before(:each) do
+    user1 = User.create!(id: 1, name: "User1")
+    user2 = User.create!(id: 2, name: "User2")
 
-    c = Category.create(project: Project.create(user: user2))
+    c = Category.create!(project: Project.create!(user: user2))
 
-    Project.create(user: user1, category: c)
-    Project.create(user: user2, category: c)
+    Project.create!(user: user1, category: c)
+    Project.create!(user: user2, category: c)
   end
 
-  config.after do
+  config.after(:each) do
     User.delete_all
     Project.delete_all
     Category.delete_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_cancancan
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - GlebTv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -73,14 +73,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 description: 
 email:
 - glebtv@gmail.com
@@ -154,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: CanCanCan integration with Active Model Serializers