trusty 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ea62ba4eb9e305e64fb08259662e965019c41c
-  data.tar.gz: 18f69b12dccb7c65835b4330617866fb3aaeeb22
+  metadata.gz: 46c17b62a8a0ccd79f67284a397b97f5537b55f9
+  data.tar.gz: 0a6eb00f7db619fe5b4aa9f7781778c7b5637107
 SHA512:
-  metadata.gz: 349d5f579b16c8033a9d0b17a7db317f3d9918246a487618cc3c95ea4201018837a901180fecad9cabc4bb9f09dbf23e3829e9f3b95b11ca4588058d4d3834d3
-  data.tar.gz: f3e7f8332d13f5e807b5704d2c8f24bf28e278bed24da1603dc22b5b22563b756faf66ba0a7d33f36161fef12a8128ec4074378fe623d967111389809912faa4
+  metadata.gz: 50afc3a5dea7af42cd9c3aa2d5529f4e36dff23cd553199fe424617c4478baa45ebca1554db1390563b253b0102659dd473029f344e090e16c959473e5ec5161
+  data.tar.gz: 95ea11c6c51596d461cc56249e2298044c10fa78f2469747f22da9a6da3506531ed62add6e11fe4aa97c344e79a7f782151e6328c805b4dcd9ce90aab246b05e

data/lib/trusty/omniauth/model_mapper.rb

@@ -34,7 +34,7 @@ module Trusty
 
       def build_record(additional_attributes = {}, options = {})
         build_relation = (options[:relation] || relation)
-        build_relation.build(attributes.merge(required_criteria).merge(additional_attributes), without_protection: true)
+        build_relation.build(attributes.merge(required_criteria).merge(additional_attributes))
       end
 
       def find_records(additional_criteria = {})
@@ -68,6 +68,8 @@ module Trusty
                             elsif prepared_relation.respond_to? :metadata
                               # Mongoid
                               prepared_relation.metadata.klass
+                            else
+                              prepared_model
                             end
 
         prepared_relation ||= if prepared_model.respond_to? :default_scoped
@@ -76,6 +78,8 @@ module Trusty
                               elsif prepared_model.respond_to? :default_scope
                                 # Mongoid
                                 prepared_model.default_scope
+                              else
+                                prepared_relation
                               end
 
         prepared_column_names = if prepared_model.respond_to? :column_names

data/lib/trusty/omniauth/provider_mapper.rb

@@ -11,13 +11,13 @@ module Trusty
 
       # provider_attributes = OmniAuth data
       # options =
-      # - :user_model = User model
+      # - :user_model = User model class
       # - :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
       # - :user_identifiers = Array of column names that identify a model uniquely with omniauth data
-      # - :identity_model = Identity model
+      # - :identity_model = Identity model class
       # - :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
@@ -35,14 +35,15 @@ module Trusty
         }.merge(options)
 
         @provider_identity = ModelMapper.new(self,
-          :model              => @options[:identity_model] || ::Identity,
+          :model              => @options[:identity_model],
+          :relation           => @options[:identity_relation],
           :attributes         => @options[:identity_attributes],
           :attribute_names    => @options[:identity_attribute_names],
           :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],
           :relation           => @options[:user_relation],
           :attributes         => @options[:user_attributes],
           :attribute_names    => @options[:user_attribute_names],

data/lib/trusty/version.rb

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

metadata

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