trusty 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71584e6ca9a7eb11928889a8d9602bfd90f708d2
-  data.tar.gz: 242cee98e5ab2ada63c72ed10371c9e363dc47e3
+  metadata.gz: 59c014a94c8849d629bc952a1b2ff92501fba0ee
+  data.tar.gz: 780f15a4e4cb6edc59d50f7da54effb81f994e72
 SHA512:
-  metadata.gz: 5f5f25ff3503cda08da2beb3f7e3b2a8d662b18d4f6e269c2474e84437088147a7decf9814910fd5a39b0941733d8c995677508882ac36b9d82dae6d39f72aa5
-  data.tar.gz: a0f3ef3a5ad8bc885c260d6f4f706c3a70f0c587ad95ca778b1ebb6b1e59ff69ac25437e57a3c49b068a7e58dd288b45d271588dde41ad017abede1e8d69e16b
+  metadata.gz: 897b8770ae13243c1be08704619fb6ba8f90e56827d3823ff153140f8b011ef1e3ca36f99bc1b8ba7ed01ee76a8a8ba7dba89ad2e64736164b25aa97d7a03538
+  data.tar.gz: 591cf24333b58f913babbd3473d9a5fa3de3b1b3311dc5d84c7ea8468a0d7c01480ff918b6490fc84e8643992b19fd68bf39039947960c1d32d1abf69b890325

data/lib/trusty/omniauth/model_mapper.rb

@@ -6,7 +6,7 @@ module Trusty
       include MappingHelpers
 
       attr_reader :unique_identifiers, :required_criteria
-      
+
       def initialize(provider, options = {})
         @provider = provider
         @options  = options
@@ -14,32 +14,37 @@ module Trusty
         @unique_identifiers = @options.fetch(:unique_identifiers, []).map(&:to_s)
         @required_criteria  = stringify_keys @options.fetch(:required_criteria, {})
       end
-      
+
       def model
         @options[:model]
       end
-      
+
       def attribute_names
         # Remove required_criteria so that existing attributes are skipped
         @attribute_names ||= (@options[:attribute_names] || column_names).map(&:to_s) - required_criteria.keys
       end
-      
+
       def attributes(*filter_attribute_names)
         @attributes ||= @provider.attributes(*attribute_names).merge(stringify_keys @options[:attributes]).merge(required_criteria)
-        
+
         if filter_attribute_names.any?
           @attributes.slice(*filter_attribute_names)
         else
           @attributes.dup
         end
       end
-      
+
       def build_record(additional_attributes = {})
         model.new(attributes.merge(required_criteria).merge(additional_attributes), without_protection: true)
       end
-      
+
       def find_records(additional_criteria = {})
-        conditions = model.where( attributes(*unique_identifiers) )
+        unique_identifier_attributes = attributes(*unique_identifiers)
+        empty_attributes = unique_identifiers - unique_identifier_attributes.keys
+
+        raise "Missing unique attribute: #{empty_attributes.join(', ')}" if empty_attributes.any?
+
+        conditions = model.where( unique_identifier_attributes )
         conditions = conditions.where(additional_criteria) unless additional_criteria.empty?
         conditions.where(required_criteria)
       end
@@ -51,7 +56,7 @@ module Trusty
           record.update_attributes!(attributes, without_protection: true)
         end
       end
-      
+
       def column_names
         @column_names ||= if model.respond_to? :column_names
           model.column_names.map(&:to_sym)
@@ -68,4 +73,4 @@ module Trusty
         end
     end
   end
-end
+end

data/lib/trusty/omniauth/provider_mapper.rb

@@ -5,20 +5,22 @@ module Trusty
   module Omniauth
     class ProviderMapper
       include MappingHelpers
-      
+
       attr_reader :provider_name, :provider_attributes, :options
       attr_reader :provider_identity, :provider_user
-      
+
       # provider_attributes = OmniAuth data
-      # options = 
+      # options =
       # - :user_model = User model
       # - :user_attributes = Hash of attributes to merge into user_attributes
       # - :user_attributes_names = Array of attribute names to copy from Omniauth data (default: User.column_names)
+      # - :user_required_criteria = Hash of criteria to use to find users, and also to merge into attributes
+      # - :user_identifiers = Array of column names that identify a model uniquely with omniauth data
       # - :identity_model = Identity model
       # - :identity_attributes = Hash of attributes to merge into identity_attributes
       # - :identity_attribute_names = Array of attribute names to copy from Omniauth data (default: Identity.column_names)
       # - :identity_required_criteria = Hash of criteria to use to find identities, and also to merge into attributes
-      # - :unique_identifiers = Array of column names that identify a model uniquely with omniauth data
+      # - :identity_identifiers = Array of column names that identify a model uniquely with omniauth data
       # - :skip_raw_info (default: false) = Boolean whether to exclude OmniAuth "extra" data in identity_attributes[:raw_info]
       # - :skip_nils (default: true) = Boolean whether to remove attributes with nil values
       def initialize(provider_attributes, options = {})
@@ -30,28 +32,29 @@ module Trusty
           :skip_raw_info        => false,
           :skip_nils            => true
         }.merge(options)
-        
+
         @provider_identity = ModelMapper.new(self,
-          :model              => @options[:identity_model] || Identity,
+          :model              => @options[:identity_model] || ::Identity,
           :attributes         => @options[:identity_attributes],
           :attribute_names    => @options[:identity_attribute_names],
-          :unique_identifiers => @options[:unique_identifiers] || [:provider, :uid],
+          :unique_identifiers => @options[:identity_identifiers] || [:provider, :uid],
           :required_criteria  => @options[:identity_required_criteria]
         )
         @provider_user = ModelMapper.new(self,
-          :model              => @options[:user_model] || User,
+          :model              => @options[:user_model] || ::User,
           :attributes         => @options[:user_attributes],
           :attribute_names    => @options[:user_attribute_names],
-          :unique_identifiers => @options[:unique_identifiers] || [:email]
+          :unique_identifiers => @options[:user_identifiers] || [:email],
+          :required_criteria  => @options[:user_required_criteria]
         )
       end
-      
+
       # Query existing
 
       def find_identities_for_user(user)
         @provider_identity.find_records(user_id: user.id)
       end
-      
+
       # Matched identities based on omniauth unique identifiers (provider, uid)
       def matched_identities
         @matched_identities ||= @provider_identity.find_records
@@ -68,7 +71,7 @@ module Trusty
       def multiple_identities?
         matched_identities.size > 1
       end
-      
+
       # Matched users based on omniauth unique identifiers (email)
       def matched_users
         @matched_users ||= @provider_user.find_records
@@ -85,27 +88,27 @@ module Trusty
       def multiple_users?
         matched_users.size > 1
       end
-      
+
       def single_user
         @single_user ||= matched_users.first if single_user?
       end
-      
+
       def single_identity
         @single_identity ||= matched_identities.first if single_identity?
       end
-      
+
       # USER
-      
+
       def build_user(attributes = {})
         @provider_user.build_record(attributes)
       end
-      
+
       # IDENTITY
-      
+
       def build_identity(attributes = {})
         @provider_identity.build_record(attributes)
       end
-      
+
       def build_identity_for_user(user)
         # build_identity.tap do |identity|
         #   # this assumes there is an inverse relationship automatically created
@@ -114,23 +117,22 @@ module Trusty
         # end
         build_identity(user: user)
       end
-      
+
       def update_identity!(identity)
         @provider_identity.update_record!(identity)
       end
-      
+
       ###### General ######
-      
+
       def attributes(*filter_attribute_names)
-        puts "provider_attributes: #{provider_attributes.inspect}"
         unless @attributes
           info            = provider_attributes.fetch('info', {})
           credentials     = provider_attributes['credentials']
-          
+
           name            = clean(info['name'])       { [info['first_name'], info['last_name']].join(" ").strip }
           first_name      = clean(info['first_name']) { name.split(/\s+/, 2).first }
           last_name       = clean(info['last_name'])  { name.split(/\s+/, 2).last }
-          
+
           @attributes = {
             :provider       => provider_name,
             :uid            => clean(provider_attributes['uid']),
@@ -156,18 +158,18 @@ module Trusty
             :time_zone      => info['time_zone'] || Time.zone.name,
             :locale         => info['locale'] || I18n.locale
           }.with_indifferent_access
-          
+
           @attributes.reject!{|_,value| value.nil?} if options[:skip_nils]
           @attributes.delete(:raw_info) if options[:skip_raw_info]
         end
-        
+
         if filter_attribute_names.any?
           @attributes.slice(*filter_attribute_names)
         else
           @attributes.dup
         end
       end
-      
+
     end
   end
-end
+end

data/lib/trusty/version.rb

@@ -1,3 +1,3 @@
 module Trusty
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,10 +206,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Trusty allows you to manage environment variables and other common configuration
   challenges.
 test_files: []
-has_rdoc: