guise 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7c5c286fa539febf7ea6219aab2a407081b7b12
-  data.tar.gz: 848f2e32a8bcbde9fefc49fb30fc1728e8e7c989
+  metadata.gz: 823b5e9bab357ec221cde51785d6c6e8707e7ae2
+  data.tar.gz: 033b80fb3da59c5778ab1f8f566bfa0cf8c37976
 SHA512:
-  metadata.gz: d114f4f75bcdfc5dad56b148292883812bdbd13c0153179cbee1347f62864fab1391f68b9c17f4bd59eeacd59ac299c4eb7e3498cc6f975d75e37b3c5cd12d9b
-  data.tar.gz: d7060c18f0b08727ec9a03d1bb96f6e835ea30b5ae915fa95012af4179832aa2e289de1d66a4e493510a2fd166dcc8fd11c4bf2e45d55c236fc82d69ae0d1d78
+  metadata.gz: 1f737e5cfa5dfbd9b7922299a4ec383af710571179d4de71503d92342558f9ac331fe83bb94b129ac1e8f036f37a09ddadd6df41ad13f3b1d215a3a30fe8bd9b
+  data.tar.gz: 961af27e3a10047502402cb1c6c556ab7c0be21365c28aabf6e23b065415f3978640639991efe985800e83502feb46bbde254bfce520896b4d5401fbea70170f

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    guise (0.3.0)
+    guise (0.3.1)
       activerecord (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
 

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    guise (0.3.0)
+    guise (0.3.1)
       activerecord (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
 

data/gemfiles/4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    guise (0.3.0)
+    guise (0.3.1)
       activerecord (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
 

data/lib/guise/syntax.rb

@@ -13,6 +13,7 @@ module Guise
       guises      = guises.map(&:to_s)
       association = options.fetch(:association)
       attribute   = options.fetch(:attribute)
+      table_name  = options[:table_name] || association
 
       Guise.registry[self.name] = {
         names: guises,
@@ -22,14 +23,14 @@ module Guise
 
       guises.each do |guise|
         method_name = guise.underscore
-        scope method_name.pluralize, -> { joins(association).where(association => { attribute => guise }) }
+        scope method_name.pluralize, -> { joins(association).where(table_name => { attribute => guise }) }
 
         define_method "#{method_name}?" do
           has_guise?(guise)
         end
       end
 
-      has_many association, options.except(:association, :attribute)
+      has_many association, options.except(:association, :attribute, :table_name)
 
       if association != :guises
         association_singular = association.to_s.singularize
@@ -66,7 +67,7 @@ module Guise
       association = class_name.to_s.underscore.to_sym
       guises      = guise_options[:names]
       attribute   = guise_options[:attribute]
-      foreign_key = options[:foreign_key] || "#{class_name.underscore}_id"
+      foreign_key = options[:foreign_key] || "#{class_name.to_s.underscore}_id"
 
       belongs_to association, options.except(:validate)
 

data/lib/guise/version.rb

@@ -1,3 +1,3 @@
 module Guise
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/factories.rb

@@ -17,6 +17,14 @@ FactoryGirl.define do
     end
   end
 
+  factory :person do
+  end
+
+  factory :permission do
+    person
+    privilege 'Admin'
+  end
+
   factory :user_role do
     user
     name 'Technician'

data/spec/guise_spec.rb

@@ -22,6 +22,14 @@ describe Guise do
       expect(technicians).not_to include user
       expect(technicians).not_to include supervisor
     end
+
+    it 'handles non-standard table names and foreign key attributes' do
+      person = create(:person)
+      create(:permission, person: person)
+
+      expect(person).to have_many :permissions
+      expect(Person.admins).to include person
+    end
   end
 
   describe "#has_guise?" do
@@ -126,7 +134,7 @@ describe Guise do
       end
 
       it "unique per resource" do
-        should validate_uniqueness_of(:name).scoped_to(:person_id)
+        should validate_uniqueness_of(:name).scoped_to(:user_id)
       end
 
       it "is one of the guise names provided" do

data/spec/spec_helper.rb

@@ -21,12 +21,20 @@ ActiveRecord::Schema.define do
 
   create_table :user_roles, force: true do |t|
     t.string :name
-    t.integer :person_id
+    t.integer :user_id
+  end
+
+  create_table :people, force: true do |t|
+  end
+
+  create_table :privileges, force: true do |t|
+    t.integer :employee_id
+    t.string :privilege
   end
 end
 
 class User < ActiveRecord::Base
-  has_guises :Technician, :Supervisor, association: :user_roles, attribute: :name, foreign_key: :person_id
+  has_guises :Technician, :Supervisor, association: :user_roles, attribute: :name
 end
 
 class Technician < User
@@ -38,14 +46,22 @@ class Supervisor < User
 end
 
 class UserRole < ActiveRecord::Base
-  guise_for :User,
-            foreign_key: :person_id
+  guise_for :User
 end
 
 class TechnicianUserRole < UserRole
   scoped_guise_for :User
 end
 
+class Person < ActiveRecord::Base
+  has_guises :Admin, :Manager, :Reviewer, association: :permissions, attribute: :privilege, foreign_key: :employee_id, table_name: :privileges
+end
+
+class Permission < ActiveRecord::Base
+  self.table_name = :privileges
+
+  guise_for :Person, foreign_key: :employee_id
+end
 
 FactoryGirl.find_definitions
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guise
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Eduardo Gutierrez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord