ensurance 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c2795f5ffad6f234f89476f098b2f896e3bd93ef0cf0ede2fa219650d44b8b8
-  data.tar.gz: 2f834914ad3001f3414a100ca4a4a2c4b43b0f459b3bf6fd7135f892913fd301
+  metadata.gz: 24900d5e0ba09dc7d49614c4127aa5e60d78f4e03c24679f41ae9a54333f2f26
+  data.tar.gz: 8894c3ecc01c1d5abd59e6d2aa4dd9a8bec1b04fced86d2f26d45c1a5f32350f
 SHA512:
-  metadata.gz: 3df2e840fec5e9049986bb4a173c0478e108822d5c2d8bdc127a7a3045daa96419b4a99ec8cdbd0a05431564519ab1cc8043ec59976ac41f7de9b48f7632e4b6
-  data.tar.gz: aba8cc1b92a9e1324d4065aa99f7084af3e49906d852f322fd74911e6ffefe223a536012051630cf64a553aae47920a816d2ede8a245cb5f374e88dcfb52bb48
+  metadata.gz: 89156b067f5f907fe599f0ed5a4f50bce5f2460c62afeb7457d25e4f0867f3886ac2da7779c77f3f1e568cb2762b02bb41ed1d0ada3c3372d83e1108970636af
+  data.tar.gz: 0dfde2a6f8fbd245c757bc4560c6cdf45aa7c30ad4356a47fb41565d1fd96b0e432c16cdefaec59e19666a161f1963c85d3a5743624e3fdca527a50de56ee8e8

data/Gemfile

@@ -1,7 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in ensurance.gemspec
 gemspec
-

data/Gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: .
   specs:
-    ensurance (0.1.5)
+    ensurance (0.1.11)
       activesupport (>= 3, < 6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
-      arel (~> 8.0)
-    activesupport (5.1.4)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
+      arel (>= 9.0)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
+    arel (9.0.0)
     awesome_print (1.8.0)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (0.9.0)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.10.3)
+    minitest (5.11.3)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     sqlite3 (1.3.13)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -60,4 +60,4 @@ DEPENDENCIES
   sqlite3 (>= 1.3.0, < 4)
 
 BUNDLED WITH
-   1.16.0
+   1.16.2

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "ensurance"
+require 'bundler/setup'
+require 'ensurance'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "ensurance"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/ensurance.gemspec

@@ -1,18 +1,17 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "ensurance/version"
+require 'ensurance/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ensurance"
+  spec.name          = 'ensurance'
   spec.version       = Ensurance::VERSION
-  spec.authors       = ["Ben Sharpe"]
-  spec.email         = ["bsharpe@gmail.com"]
+  spec.authors       = ['Ben Sharpe']
+  spec.email         = ['bsharpe@gmail.com']
 
-  spec.summary       = %q{Add ability to ensure ActiveRecord models}
-  spec.description   = %q{A handy shortcut for user = user.is_a?(User) ? user : User.find(user)}
-  spec.homepage      = "https://github.com/bsharpe/ensurance"
-  spec.license       = "MIT"
+  spec.summary       = 'Add ability to ensure ActiveRecord models'
+  spec.description   = 'A handy shortcut for user = user.is_a?(User) ? user : User.find(user)'
+  spec.homepage      = 'https://github.com/bsharpe/ensurance'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -26,18 +25,17 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport', '>= 3', '< 6'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "activerecord", '>= 3', '< 6'
-  spec.add_development_dependency "globalid", '>= 0.3.6', '< 2'
-  spec.add_development_dependency "sqlite3", '>= 1.3.0', '< 4'
-  spec.add_development_dependency "awesome_print", '>= 1.0', '< 2'
+  spec.add_development_dependency 'activerecord', '>= 3', '< 6'
+  spec.add_development_dependency 'awesome_print', '>= 1.0', '< 2'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'globalid', '>= 0.3.6', '< 2'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'sqlite3', '>= 1.3.0', '< 4'
 end
-

data/lib/ensurance.rb

@@ -1,9 +1,10 @@
-require "ensurance/version"
+require 'ensurance/version'
 require 'active_support'
 
 require 'ensurance/date_ensure'
 require 'ensurance/time_ensure'
 require 'ensurance/hash_ensure'
+require 'ensurance/array_ensure'
 
 module Ensurance
   extend ActiveSupport::Concern
@@ -27,10 +28,10 @@ module Ensurance
         return found
       end
 
-      @_ensure_by ||= [@_additional_ensure_by || self.primary_key].flatten.compact.uniq
+      @_ensure_by ||= [@_additional_ensure_by || primary_key].flatten.compact.uniq
 
       found = []
-      things = Array(thing)
+      things = [thing].flatten
       things.each do |thing|
         record = nil
         @_ensure_by.each do |ensure_field|
@@ -53,16 +54,14 @@ module Ensurance
       end
       found.compact!
 
-
       thing.is_a?(Array) ? found : found.first
     end
 
     def ensure!(thing = nil)
       return nil unless thing.present?
       result = self.ensure(thing)
-      raise ::ActiveRecord::RecordNotFound.new("#{self} not found") unless result
+      raise ActiveRecord::RecordNotFound, "#{self} not found" unless result
       result
     end
-
   end
 end

data/lib/ensurance/array_ensure.rb

@@ -0,0 +1,32 @@
+# NOTE: https://blog.daveallie.com/clean-monkey-patching/
+
+require 'active_support/core_ext/array'
+
+module Ensurance
+  module ArrayEnsure
+    def self.prepended(base)
+      base.singleton_class.prepend(ClassMethods)
+    end
+
+    module ClassMethods
+      def ensure(thing)
+        case thing.class.name
+        when 'NilClass'
+          nil
+        when 'String'
+          thing.split(',')
+        else
+          Array(thing)
+        end
+      end
+
+      def ensure!(thing)
+        result = self.ensure(thing)
+        raise ArgumentError, "Cannot Array.ensure(#{thing || 'nil'})" unless result
+        result
+      end
+    end
+  end
+end
+
+::Array.prepend(Ensurance::ArrayEnsure)

data/lib/ensurance/date_ensure.rb

@@ -9,21 +9,21 @@ module Ensurance
     end
 
     module ClassMethods
-      DATE_ENSURE_FORMATS = %w|%m/%d/%Y %Y/%m/%d|.freeze
+      DATE_ENSURE_FORMATS = %w[%m/%d/%Y %Y/%m/%d].freeze
       def ensure(thing)
         case thing.class.name
-        when "NilClass"
+        when 'NilClass'
           nil
-        when "Integer","Float"
+        when 'Integer', 'Float'
           Time.ensure(thing).to_date
-        when "Date"
+        when 'Date'
           thing
-        when "String"
+        when 'String'
           if thing.to_i.to_s == thing
             ::Time.at(thing.to_i).to_date
           elsif thing.to_f.to_s == thing
             ::Time.at(thing.to_f).to_date
-          elsif thing.index("/")
+          elsif thing.index('/')
             # Assume US Date format
             result = nil
             DATE_ENSURE_FORMATS.each do |f|
@@ -33,7 +33,7 @@ module Ensurance
               rescue ArgumentError
               end
             end
-            raise ArgumentError.new("Bad Date: #{thing}".yellow) unless result
+            raise ArgumentError, "Bad Date: #{thing}".yellow unless result
             result
           else
             ::Date.parse(thing)
@@ -42,7 +42,7 @@ module Ensurance
           if thing.respond_to?(:to_date)
             thing.to_date
           else
-            raise ArgumentError.new("Unknown Type for Date to ensure: #{thing.class.name}")
+            raise ArgumentError, "Unknown Type for Date to ensure: #{thing.class.name}"
           end
         end
       end
@@ -56,4 +56,4 @@ module Ensurance
   end
 end
 
-::Date.prepend(Ensurance::DateEnsure)
+::Date.prepend(Ensurance::DateEnsure)

data/lib/ensurance/hash_ensure.rb

@@ -12,23 +12,23 @@ module Ensurance
     module ClassMethods
       def ensure(thing)
         case thing.class.name
-        when "Hash","HashWithIndifferentAccess"
+        when 'Hash', 'HashWithIndifferentAccess'
           thing
-        when "String"
+        when 'String'
           JSON.parse(thing)
-        when "NilClass"
+        when 'NilClass'
           nil
-        when "ActionController::UnfilteredParameters", "ActionController::Parameters"
+        when 'ActionController::UnfilteredParameters', 'ActionController::Parameters'
           thing.permit!.to_h
         else
           if thing.respond_to?(:to_h)
             begin
               thing.to_h
             rescue TypeError
-              raise ArgumentError.new("Unhandled Type for Hash to ensure: #{thing.class}")
+              raise ArgumentError, "Unhandled Type for Hash to ensure: #{thing.class}"
             end
           else
-            raise ArgumentError.new("Unhandled Type for Hash to ensure: #{thing.class}")
+            raise ArgumentError, "Unhandled Type for Hash to ensure: #{thing.class}"
           end
         end
       end
@@ -42,4 +42,4 @@ module Ensurance
   end
 end
 
-::Hash.prepend( Ensurance::HashEnsure )
+::Hash.prepend(Ensurance::HashEnsure)

data/lib/ensurance/time_ensure.rb

@@ -11,15 +11,15 @@ module Ensurance
     module ClassMethods
       def ensure(thing)
         case thing.class.name
-        when "NilClass"
+        when 'NilClass'
           thing
-        when "Time"
+        when 'Time'
           thing
-        when "Date"
+        when 'Date'
           thing.beginning_of_day
-        when "Integer", "Float"
+        when 'Integer', 'Float'
           ::Time.at(thing)
-        when "String"
+        when 'String'
           if thing.to_i.to_s == thing
             ::Time.at(thing.to_i)
           elsif thing.to_f.to_s == thing
@@ -31,23 +31,20 @@ module Ensurance
           if thing.respond_to?(:to_time)
             thing.to_time
           else
-            raise ArgumentError.new("Unhandled Type for Time to ensure: #{thing.class}")
+            raise ArgumentError, "Unhandled Type for Time to ensure: #{thing.class}"
           end
         end
       end
 
-      def ensure!(thing)
+      def ensure!(_thing)
         def ensure!(thing)
           result = self.ensure(thing)
           raise ArgumentError, "Cannot Time.ensure(#{thing})" unless result
           result
         end
       end
-
     end
-
   end
 end
 
 ::Time.prepend(Ensurance::TimeEnsure)
-

data/lib/ensurance/version.rb

@@ -1,3 +1,3 @@
 module Ensurance
-  VERSION = "0.1.11"
-end
+  VERSION = '0.1.12'.freeze
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ensurance
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Ben Sharpe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,127 +31,127 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: globalid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 0.3.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 0.3.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: globalid
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '4'
 description: 'A handy shortcut for user = user.is_a?(User) ? user : User.find(user)'
 email:
 - bsharpe@gmail.com
@@ -171,6 +171,7 @@ files:
 - bin/setup
 - ensurance.gemspec
 - lib/ensurance.rb
+- lib/ensurance/array_ensure.rb
 - lib/ensurance/date_ensure.rb
 - lib/ensurance/hash_ensure.rb
 - lib/ensurance/time_ensure.rb