acts_as_user 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08b2f1423c8dbd79e5e1bf685b6e49e4073049e2
-  data.tar.gz: 21aaaad336508302c5dd34ce74a5962900e2a7a4
+  metadata.gz: 83f6ee78d21aa3ba484e1ffb50d2bd473bfff98a
+  data.tar.gz: f8e7ac9d1ec1f307c6f046bbf5443e22c563dfba
 SHA512:
-  metadata.gz: 80b6d83f6dcd68843679a6cb799c08895d6dd275f90825b878f233562dff9f2170a599eb736dd7832d1308dd3b1f326870023ca4603f7ad9c59c8901b4fd3061
-  data.tar.gz: 0f0c76be3fe6af02c066193611c67f4def3591b089826b97b454be00ab60d8279c015bf6003f7c28d8e531c09d5f8556ca0bf42c1b9b10fff13440667b12c016
+  metadata.gz: 7ae1a038f289cbed8d1464febc3ea8905a5b66f4289c4ad7f32f12b834edb9d7042aab976613c99ed0d12c33afd4675e242535d8784e4bbf40f8c86274e4b53a
+  data.tar.gz: d9ab729c639a062dc5f9f797bc2e313e7411f564e48978bd39dc191880ccbbaa5e9d329caa923347452203748f4f1fda210f70aec6a96fa84db8bcca21b069c5

data/lib/acts_as_user/is_user.rb

@@ -2,7 +2,7 @@ module ActsAsUser
   module IsUser
 
     def self.included(base)
-      base.belongs_to :userable, polymorphic: true
+      base.belongs_to :userable, polymorphic: true, inverse_of: :user
       base.extend ClassMethods
       #loads models acting as users when the hook is loaded
       base.define_models_acting_as_users
@@ -13,7 +13,7 @@ module ActsAsUser
         models_acting_as_users  = ActsAsUser.models_acting_as_users.map(&:to_s).map(&:downcase)
         models_acting_as_users.each do |model_class_name|
           define_method("#{model_class_name}?") do
-            self.userable_type.to_s.downcase == model_class_name
+            self.userable_type.to_s.underscore == model_class_name
           end
         end
       end

data/lib/acts_as_user/railtie.rb

@@ -7,8 +7,10 @@ module ActsAsUser
         ActsAsUser.add_devise_attributes_to_ignore
 
         class ActiveRecord::Base
-          def self.acts_as_user
-            include ActsAsUser::UserDelegate    
+          cattr_accessor :acts_as_user_options
+          def self.acts_as_user options={}
+            self.acts_as_user_options = options
+            include ActsAsUser::UserDelegate
           end
           def self.is_user
             include ActsAsUser::IsUser

data/lib/acts_as_user/user_delegate.rb

@@ -1,17 +1,28 @@
 module ActsAsUser
   module UserDelegate
     def self.included(base)
-      base.has_one :user, :as => :userable, :dependent => :destroy, :autosave => true
-      base.validate :user_must_be_valid
-      base.alias_method_chain :user, :autobuild
-      base.extend ClassMethods
-      base.define_user_accessors
+      options = base.class_variable_get('@@acts_as_user_options')
+      if !!options[:has_many]
+        base.has_many :users, :as => :userable, :dependent => :destroy, :autosave => true
+        base.alias_method_chain :users, :autobuild
+        base.accepts_nested_attributes_for :users, :allow_destroy => true
+      else
+        base.has_one :user, :as => :userable, :dependent => :destroy, :autosave => true
+        base.alias_method_chain :user, :autobuild
+        base.validate :user_must_be_valid
+        base.extend ClassMethods
+        base.define_user_accessors
+      end
     end
 
     def user_with_autobuild
       user_without_autobuild || build_user
     end
 
+    def users_with_autobuild
+      users_without_autobuild.present? ? users_without_autobuild : (users_without_autobuild << User.new)
+    end
+
     def method_missing(meth, *args, &blk)
       user.send(meth, *args, &blk)
     rescue NoMethodError

data/lib/acts_as_user/version.rb

@@ -1,3 +1,3 @@
 module ActsAsUser
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/spec/models/active_record/partner_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Partner do
+  it { should have_many(:users).dependent(:destroy) }
+  it { should respond_to :users }
+  it { should respond_to :name }
+  it { should accept_nested_attributes_for(:users).allow_destroy(true) }
+
+  describe 'partner with many users' do
+    let(:partner) { Partner.create(name: 'Company', users: users) }
+    let(:users)   { Array.new(2) { User.create(email: 'test@icalialabs.com') } }
+
+    it 'gives back all users on partner' do
+      partner.users.to_a.should =~ users
+    end
+  end
+
+  describe 'users autobuild' do
+    let(:partner) { Partner.new }
+
+    it 'has to have a user already' do
+      partner.users.first.should be_an_instance_of User
+    end
+  end
+end

data/spec/models/active_record/user_spec.rb

@@ -6,6 +6,7 @@ describe User do
   it { should respond_to :userable_id }
   it { should respond_to :customer? }
   it { should respond_to :admin? }
+  it { should respond_to :partner? }
 
 
   describe '#customer?' do
@@ -24,7 +25,7 @@ describe User do
         @current_user = @fake_customer_user.user
       end
       it 'returns false' do
-        expect(@current_user).not_to be_customer 
+        expect(@current_user).not_to be_customer
       end
     end
     context 'when is an admin' do
@@ -36,5 +37,12 @@ describe User do
         expect(@current_user).to be_admin
       end
     end
+    context 'when is a partner' do
+      let(:partner) { Partner.create name: 'Fake Name', users: [ User.create(email: 'test@icalialabs.com') ] }
+      let(:user)    { partner.users.first }
+      it 'returns true' do
+        expect(user).to be_partner
+      end
+    end
   end
 end

data/spec/support/acts_as_user_initializer.rb

@@ -2,7 +2,7 @@
 # rails generators
 ActsAsUser.setup do |config|
 
-  config.models_acting_as_users = [:admin, :customer]
+  config.models_acting_as_users = [:admin, :customer, :partner]
 
   # ==> ORM Configuration
   # Load and configure the ORM. Supports :active_record

data/spec/support/models.rb

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
-  is_user 
+  is_user
   validates :email, presence: true
 end
 
@@ -10,3 +10,7 @@ end
 class Admin < ActiveRecord::Base
   acts_as_user
 end
+
+class Partner < ActiveRecord::Base
+  acts_as_user :has_many => true
+end

data/spec/support/schema.rb

@@ -1,7 +1,7 @@
 ActiveRecord::Schema.define(:version => 0) do
   create_table :users do |t|
     t.string :email
-    t.string :userable_type 
+    t.string :userable_type
     t.integer :userable_id
   end
   add_index :users, [:userable_id, :userable_type]
@@ -13,4 +13,8 @@ ActiveRecord::Schema.define(:version => 0) do
 
   create_table :admins do |t|
   end
+
+  create_table :partners do |t|
+    t.string :name
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_user
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Abraham Kuri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,6 +198,7 @@ files:
 - lib/generators/templates/acts_as_user.rb
 - spec/fake_gem.rb
 - spec/models/active_record/customer_spec.rb
+- spec/models/active_record/partner_spec.rb
 - spec/models/active_record/user_spec.rb
 - spec/models/config/setup_spec.rb
 - spec/spec_helper.rb
@@ -226,13 +227,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Handles multiple user roles on a rails app
 test_files:
 - spec/fake_gem.rb
 - spec/models/active_record/customer_spec.rb
+- spec/models/active_record/partner_spec.rb
 - spec/models/active_record/user_spec.rb
 - spec/models/config/setup_spec.rb
 - spec/spec_helper.rb