humanity 0.2.0 → 0.2.1

data/lib/humanity/base.rb

@@ -30,11 +30,19 @@ module Humanity
 
     def update_roles!(role_names, source)
       prev_roles = self.roles
-      new_roles = role_names.map { |n| Role.find_or_create_by_name(n) }
+      new_roles = if Role.respond_to? :find_or_create_by
+        role_names.map { |n| Role.find_or_create_by(name: n) }
+      else
+        role_names.map { |n| Role.find_or_create_by_name(n) }
+      end
 
       # Create new roles and/or update source
       new_roles.each do |role|
-        assignment = Assignment.find_or_initialize_by_human_id_and_human_type_and_role_id(self.id, self.class.to_s, role.id)
+        assignment = if Assignment.respond_to? :find_or_initialize_by
+          Assignment.find_or_initialize_by(human_id: self.id, human_type: self.class.to_s, role_id: role.id)
+        else
+          Assignment.find_or_initialize_by_human_id_and_human_type_and_role_id(self.id, self.class.to_s, role.id)
+        end
         assignment.source = source
         assignments << assignment if assignment.changed?
       end
@@ -59,4 +67,4 @@ module Humanity
       name
     end
   end
-end
+end

data/lib/humanity/version.rb

@@ -1,3 +1,3 @@
 module Humanity
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,47 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: humanity
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Mix in Humanity and get common user model functionality
 email: adam.crownoble@biola.edu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/models/humanity/assignment.rb
 - app/models/humanity/role.rb
 - lib/humanity/version.rb
@@ -54,36 +45,26 @@ files:
 - lib/humanity.rb
 homepage: https://github.com/biola/humanity
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Common user functionality
 test_files: []
-