trusty 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c014a94c8849d629bc952a1b2ff92501fba0ee
-  data.tar.gz: 780f15a4e4cb6edc59d50f7da54effb81f994e72
+  metadata.gz: a1ea62ba4eb9e305e64fb08259662e965019c41c
+  data.tar.gz: 18f69b12dccb7c65835b4330617866fb3aaeeb22
 SHA512:
-  metadata.gz: 897b8770ae13243c1be08704619fb6ba8f90e56827d3823ff153140f8b011ef1e3ca36f99bc1b8ba7ed01ee76a8a8ba7dba89ad2e64736164b25aa97d7a03538
-  data.tar.gz: 591cf24333b58f913babbd3473d9a5fa3de3b1b3311dc5d84c7ea8468a0d7c01480ff918b6490fc84e8643992b19fd68bf39039947960c1d32d1abf69b890325
+  metadata.gz: 349d5f579b16c8033a9d0b17a7db317f3d9918246a487618cc3c95ea4201018837a901180fecad9cabc4bb9f09dbf23e3829e9f3b95b11ca4588058d4d3834d3
+  data.tar.gz: f3e7f8332d13f5e807b5704d2c8f24bf28e278bed24da1603dc22b5b22563b756faf66ba0a7d33f36161fef12a8128ec4074378fe623d967111389809912faa4

data/lib/trusty/omniauth/model_mapper.rb

@@ -5,20 +5,18 @@ module Trusty
     class ModelMapper
       include MappingHelpers
 
-      attr_reader :unique_identifiers, :required_criteria
+      attr_reader :model, :relation, :column_names, :unique_identifiers, :required_criteria
 
       def initialize(provider, options = {})
         @provider = provider
-        @options  = options
+        @options  = options.dup
+
+        @model, @relation, @column_names = extract_orm_components(@options)
 
         @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
@@ -34,8 +32,9 @@ module Trusty
         end
       end
 
-      def build_record(additional_attributes = {})
-        model.new(attributes.merge(required_criteria).merge(additional_attributes), without_protection: true)
+      def build_record(additional_attributes = {}, options = {})
+        build_relation = (options[:relation] || relation)
+        build_relation.build(attributes.merge(required_criteria).merge(additional_attributes), without_protection: true)
       end
 
       def find_records(additional_criteria = {})
@@ -44,7 +43,7 @@ module Trusty
 
         raise "Missing unique attribute: #{empty_attributes.join(', ')}" if empty_attributes.any?
 
-        conditions = model.where( unique_identifier_attributes )
+        conditions = relation.where( unique_identifier_attributes )
         conditions = conditions.where(additional_criteria) unless additional_criteria.empty?
         conditions.where(required_criteria)
       end
@@ -57,20 +56,48 @@ module Trusty
         end
       end
 
-      def column_names
-        @column_names ||= if model.respond_to? :column_names
-          model.column_names.map(&:to_sym)
-        elsif model.respond_to? :fields
-          model.fields.map{|c| c[1].name.to_sym}
-        else
-          []
-        end
+    protected
+
+      def extract_orm_components(options)
+        prepared_model    = options[:model]
+        prepared_relation = options[:relation]
+
+        prepared_model ||=  if prepared_relation.respond_to? :model
+                              # ActiveRecord
+                              prepared_relation.model
+                            elsif prepared_relation.respond_to? :metadata
+                              # Mongoid
+                              prepared_relation.metadata.klass
+                            end
+
+        prepared_relation ||= if prepared_model.respond_to? :default_scoped
+                                # ActiveRecord
+                                prepared_model.default_scoped
+                              elsif prepared_model.respond_to? :default_scope
+                                # Mongoid
+                                prepared_model.default_scope
+                              end
+
+        prepared_column_names = if prepared_model.respond_to? :column_names
+                                  # ActiveRecord
+                                  prepared_model.column_names.map(&:to_sym)
+                                elsif prepared_model.respond_to? :attribute_names
+                                  # ActiveModel and Mongoid
+                                  prepared_model.attribute_names.map(&:to_sym)
+                                elsif prepared_model.respond_to? :fields
+                                  # Older Mongoid
+                                  prepared_model.fields.map{|c| c[1].name.to_sym}
+                                else
+                                  []
+                                end
+
+        [prepared_model, prepared_relation, prepared_column_names]
+      end
+
+      def stringify_keys(original_hash)
+        original_hash.each_with_object({}){|(key, value), hash| hash[key.to_s] = value}
       end
 
-      protected
-        def stringify_keys(original_hash)
-          original_hash.each_with_object({}){|(key, value), hash| hash[key.to_s] = value}
-        end
     end
   end
 end

data/lib/trusty/omniauth/provider_mapper.rb

@@ -12,6 +12,7 @@ module Trusty
       # provider_attributes = OmniAuth data
       # options =
       # - :user_model = User model
+      # - :user_relation = Relation to create new User on (optional, to call #build method on)
       # - :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
@@ -42,6 +43,7 @@ module Trusty
         )
         @provider_user = ModelMapper.new(self,
           :model              => @options[:user_model] || ::User,
+          :relation           => @options[:user_relation],
           :attributes         => @options[:user_attributes],
           :attribute_names    => @options[:user_attribute_names],
           :unique_identifiers => @options[:user_identifiers] || [:email],
@@ -99,23 +101,16 @@ module Trusty
 
       # USER
 
-      def build_user(attributes = {})
-        @provider_user.build_record(attributes)
+      # Option :relation - pass in relation to build Identity from
+      def build_user(attributes = {}, options = {})
+        @provider_user.build_record(attributes, options)
       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
-        #   # such as user.identities would now contain this identity for the user
-        #   identity.user = user
-        # end
-        build_identity(user: user)
+      # Option :relation - pass in relation to build Identity from
+      def build_identity(attributes = {}, options = {})
+        @provider_identity.build_record(attributes, options)
       end
 
       def update_identity!(identity)

data/lib/trusty/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler