rearmed 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe46727111f0be87f94d4723c3d197f16726f41
-  data.tar.gz: 91214ba423916acb587ad450806921c2cf3df20b
+  metadata.gz: 270b7582528a427dfcd54ea2cbe616af8bc67717
+  data.tar.gz: e97b0352883c108aa366ec3078bf188349e1b907
 SHA512:
-  metadata.gz: 7f8fb8b6fe0e0282856f7d54ea4a46391eba309ef3be1019dbf78fc448c2f8f26c9d8af357a1af80fcff1a84d3f9c8c3bb1ebed3d238658bc04fb9c3868d560f
-  data.tar.gz: e7079c6bbe93c6b46210f334d9e33b318db215edbc9fed5d36a04bd34186a5e8fd1ef1621078898a0f66e843074c78ed4e671794b142205b17d81b70bc836b87
+  metadata.gz: f4785d8f2332220c02dbe2d904ef328ff4554b98f6711c5e095a071beb52c6000ae540228c53f732beb9987e435c7d8c5820fb317d959fa4815b2f6e8247cf00
+  data.tar.gz: 9f77a7b3b1e35f8027b00d676076e7e90ce33b88e34efdaa82b927c57b1caaa5e69bb8aa108b8b29c9f220911c45879d29f0dfa6d6df29d6d151cca0efec22dc

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 CHANGELOG
 ---------
 
+- 
+- **1.2.0 - September 3, 2016**
+  - Add Minitest patches `assert_changed` & `assert_not_changed`
+  - Remove `dedupe` in favor of new `find_duplicates`
+  - Add ActiveRecord `newest`
+- **1.1.1 - August 20, 2016**
+  - Add Array `not_empty?`
 - **1.1.0 - July 8, 2016**
   - Add ActiveRecord `find_or_create`, `reset_table`, `reset_auto_increment`, `depupe`
   - Add `starts_with?`, `begins_with?`, `ends_with?` aliases

data/README.md

@@ -1,7 +1,7 @@
 # Rearmed Ruby
 <a href='https://ko-fi.com/A5071NK' target='_blank'><img height='32' style='border:0px;height:32px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=a' border='0' alt='Buy Me a Coffee' /></a> 
 
-A collection of helpful methods and monkey patches for Objects, Strings, Enumerables, Arrays, Hash, Dates, & Rails
+A collection of helpful methods and monkey patches for Objects, Strings, Enumerables, Arrays, Hash, Dates, Minitest & Rails
 
 The difference between this library and others is that all monkey patching is performed in an opt-in way because you shouldnt be using methods you dont know about anyways. 
 
@@ -32,9 +32,10 @@ Rearmed.enabled_patches = {
     pluck_to_hash: false,
     pluck_to_struct: false,
     find_or_create: false,
+    find_duplicates: false,
+    newest: false,
     reset_table: false,
     reset_auto_increment: false,
-    dedupe: false,
     find_relation_each: false,
     find_in_relation_batches: false,
   },
@@ -66,6 +67,10 @@ Rearmed.enabled_patches = {
   },
   date: {
     now: false
+  },
+  minitest: {
+    assert_changed: false,
+    assert_not_changed: false
   }
 }
 
@@ -157,6 +162,19 @@ Post.pluck_to_struct(:name, :category, :id)
 Post.find_or_create(name: 'foo', content: 'bar') # use this instead of the super confusing first_or_create method
 Post.find_or_create!(name: 'foo', content: 'bar')
 
+Post.find_duplicates # return active record relation of all records that have duplicates. By default it skips the primary_key, created_at, updated_at, & deleted_at columns
+Post.find_duplicates(:name) # find duplicates based on the name attribute
+Post.find_duplicates(:name, :category) # find duplicates based on the name & category attribute
+Post.find_duplicates(self.column_names.reject{|x| ['id','created_at','updated_at','deleted_at'].include?(x)})
+
+# It also can delete duplicates. Valid values for keep are :first & :last. Valid values for delete_method are :destroy & :delete. soft_delete is only used if you are using acts_as_paranoid on your model.
+Post.find_duplicates(:name, :category, delete: true)
+Post.find_duplicates(:name, :category, delete: {keep: :first, delete_method: :destroy, soft_delete: true}) # these are the default settings for delete: true
+
+Post.newest # get the newest post, by default ordered by :created_at
+Post.newest(:updated_at) # different sort order
+Post.newest(:published_at, :created_at) # multiple columns to sort on
+
 Post.reset_table # delete all records from table and reset autoincrement column (id), works with mysql/mariadb/postgresql/sqlite
 # or with options
 Post.reset_table(delete_method: :destroy) # to ensure all callbacks are fired
@@ -165,13 +183,6 @@ Post.reset_auto_increment # reset mysql/mariadb/postgresql/sqlite auto-increment
 # or with options
 Post.reset_auto_increment(value: 1, column: :id) # column option is only relevant for postgresql
 
-Post.dedupe # remove all duplicate records, defaults to all of the models column_names except timestamps
-# or with options
-Post.dedupe(delete_method: :destroy) # to ensure all callbacks are fired
-Post.dedupe(columns: [:name, :content, :category_id]
-Post.dedupe(skip_timestamps: false) # skip timestamps defaults to true (created_at, updated_at, deleted_at)
-Post.dedupe(keep: :last) # Keep the last duplicate instead of the first duplicate by default
-
 Post.find_in_relation_batches # this returns a relation instead of an array
 Post.find_relation_each # this returns a relation instead of an array
 ```
@@ -197,6 +208,21 @@ my_hash.compact # See Hash methods above
 my_hash.compact!
 ```
 
+### Minitest Method
+```ruby
+assert_changed 'user.name' do
+  user.name = "Bob"
+end
+
+assert_not_changed -> { user.name } do
+  user.update(user_params)
+end
+
+assert_not_changed lambda{ user.name } do
+  user.update(user_params)
+end
+```
+
 # Contributing / Todo
 If you want to request a method please raise an issue and we can discuss the implementation. 
 
@@ -204,6 +230,7 @@ If you want to contribute here are a couple of things you could do:
 
 - Add Tests for Rails methods
 - Get the `natural_sort` method to accept a block
+- Get the `assert_changed` and `assert_not_changed` method to accept a String with the variable name similar to Rails ``
 
 
 # Credits

data/lib/generators/rearmed/setup_generator.rb

@@ -19,9 +19,10 @@ Rearmed.enabled_patches = {
     pluck_to_hash: false,
     pluck_to_struct: false,
     find_or_create: false,
+    find_duplicates: false,
+    newest: false,
     reset_table: false,
     reset_auto_increment: false,
-    dedupe: false,
     find_relation_each: false,
     find_in_relation_batches: false,
   },
@@ -53,6 +54,10 @@ Rearmed.enabled_patches = {
   },
   date: {
     now: false
+  },
+  minitest: {
+    assert_changed: false,
+    assert_not_changed: false
   }
 }
 

data/lib/rearmed.rb

@@ -3,28 +3,40 @@ module Rearmed
   @enabled_patches = {
     rails_4: {
       or: false,
-      link_to_confirm: false,
-      find_relation_each: false,
-      find_in_relation_batches: false
+      link_to_confirm: false
     },
     rails_3: {
-      hash_compact: false,
       pluck: false,
       update_columns: false,
       all: false
     },
+    rails: {
+      pluck_to_hash: false,
+      pluck_to_struct: false,
+      find_or_create: false,
+      find_duplicates: false,
+      reset_table: false,
+      reset_auto_increment: false,
+      find_relation_each: false,
+      find_in_relation_batches: false,
+    },
     string: {
-      to_bool: false,
       valid_integer: false,
-      valid_float: false
+      valid_float: false,
+      to_bool: false,
+      starts_with: false,
+      begins_with: false,
+      ends_with: false
     },
     hash: {
       only: false,
-      dig: false
+      dig: false,
+      compact: false
     },
     array: {
       dig: false,
-      delete_first: false
+      delete_first: false,
+      not_empty: false
     },
     enumerable: {
       natural_sort: false,
@@ -36,6 +48,10 @@ module Rearmed
     },
     date: {
       now: false
+    },
+    minitest: {
+      assert_changed: false,
+      assert_not_changed: false
     }
   }
 

data/lib/rearmed/apply_patches.rb

@@ -7,3 +7,4 @@ require 'rearmed/monkey_patches/rails'
 require 'rearmed/monkey_patches/rails_3'
 require 'rearmed/monkey_patches/rails_4'
 require 'rearmed/monkey_patches/date'
+require 'rearmed/monkey_patches/minitest'

data/lib/rearmed/monkey_patches/minitest.rb

@@ -0,0 +1,35 @@
+if defined?(Minitest::Assertions)
+
+  enabled = Rearmed.enabled_patches[:minitest] == true
+
+  Minitest::Assertions.module_eval do
+
+    if enabled || Rearmed.dig(Rearmed.enabled_patches, :minitest, :assert_changed)
+      def assert_changed(expression, &block)
+        if expression.respond_to?(:call)
+          e = expression
+        else
+          e = lambda{ block.binding.eval(expression) }
+        end
+        old = e.call
+        block.call
+        refute_equal old, e.call
+      end
+    end
+
+    if enabled || Rearmed.dig(Rearmed.enabled_patches, :minitest, :assert_not_changed)
+      def assert_not_changed(expression, &block)
+        if expression.respond_to?(:call)
+          e = expression
+        else
+          e = lambda{ block.binding.eval(expression) }
+        end
+        old = e.call
+        block.call
+        assert_equal old, e.call
+      end
+    end
+
+  end
+
+end

data/lib/rearmed/monkey_patches/rails.rb

@@ -3,6 +3,20 @@ enabled = Rearmed.enabled_patches[:rails] == true
 if defined?(ActiveRecord)
 
   ActiveRecord::Base.class_eval do
+    if enabled || Rearmed.dig(Rearmed.enabled_patches, :rails, :newest)
+      def self.newest(*columns)
+        if columns.empty? || !columns.to_s.include?('created_at')
+          columns << 'created_at'
+        end
+
+        the_order = {}
+        columns.each do |x|
+          the_order[x.to_s] = :desc
+        end
+        self.order(the_order).limit(1).first
+      end
+    end
+
     if enabled || Rearmed.dig(Rearmed.enabled_patches, :rails, :reset_table)
       def self.reset_table(opts={})
         if opts[:delete_method] && opts[:delete_method].to_sym == :destroy
@@ -46,7 +60,7 @@ if defined?(ActiveRecord)
           self.connection.execute("ALTER TABLE #{self.table_name} AUTO_INCREMENT = #{opts[:value]}")
         when :postgresql
           opts[:value] = 1 if opts[:value].blank?
-          self.connection.execute("ALTER SEQUENCE #{self.table_name}_#{opts[:column].to_s || 'id'}_seq RESTART WITH #{opts[:value]}")
+          self.connection.execute("ALTER SEQUENCE #{self.table_name}_#{opts[:column].to_s || self.primary_key}_seq RESTART WITH #{opts[:value]}")
         when :sqlite3
           opts[:value] = 0 if opts[:value].blank?
           self.connection.execute("UPDATE SQLITE_SEQUENCE SET SEQ=#{opts[:value]} WHERE NAME='#{self.table_name}'")
@@ -54,33 +68,59 @@ if defined?(ActiveRecord)
       end
     end
 
-    if enabled || Rearmed.dig(Rearmed.enabled_patches, :rails, :dedupe)
-      def self.dedupe(opts={})
-        if !opts[:columns]
-          opts[:columns] = self.column_names.reject{|x| x == 'id'}
+    if enabled || Rearmed.dig(Rearmed.enabled_patches, :rails, :find_duplicates)
+      def self.find_duplicates(*args)
+        options = {}
+
+        unless args.empty?
+          if args.last.is_a?(Hash)
+            options = args.pop
+          end
+
+          unless args.empty?
+            if args.count == 1 && args.first.is_a?(Array)
+              args = args.first
+            end
+
+            options[:columns] = args
+          end
         end
         
-        if opts[:skip_timestamps] != false
-          opts[:columns].reject!{|x| ['created_at','updated_at','deleted_at'].include?(x)}
-        end
+        options[:columns] ||= self.column_names.reject{|x| [self.primary_key, :created_at, :updated_at, :deleted_at].include?(x)}
+        
+        ids = self.select("MIN(#{self.primary_key}) as #{self.primary_key}").group(options[:columns]).pluck(self.primary_key)
 
-        self.all.group_by{|model| opts[:columns].map{|x| model[x]}}.values.each do |duplicates|
-          (opts[:keep] && opts[:keep].to_sym == :last) ? duplicates.pop : duplicates.shift
-          if opts[:delete_method] && opts[:delete_method].to_sym == :destroy
+        if options[:delete]
+          if options[:delete] == true
+            options[:delete] = {keep: :first, delete_method: :destroy, soft_delete: true}
+          else
+            options[:delete][:delete_method] ||= :destroy
+            options[:delete][:keep] ||= :first
+            if options[:delete][:soft_delete] != false
+              options[:delete][:soft_delete] = true
+            end
+          end
+
+          duplicates = self.where.not(self.primary_key => ids)
+
+          if options[:delete][:delete_method].to_sym == :delete
+            if x.respond_to?(:delete_all!)
+              duplicates.delete_all!
+            else
+              duplicates.delete_all
+            end
+          else
             duplicates.each do |x|
-              if x.respond_to?(:really_destroy!)
+              if !options[:delete][:soft_delete] && x.respond_to?(:really_destroy!)
                 x.really_destroy!
               else
                 x.destroy!
               end
             end
-          else
-            if defined?(ActsAsParanoid) && self.try(:paranoid?)
-              self.unscoped.where(id: duplicates.collect(&:id)).delete_all!
-            else
-              self.unscoped.where(id: duplicates.collect(&:id)).delete_all
-            end
           end
+          return nil
+        else
+          return self.where.not(self.primary_key => ids)
         end
       end
     end

data/lib/rearmed/version.rb

@@ -1,3 +1,3 @@
 module Rearmed
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/test/tc_rearmed.rb

@@ -25,7 +25,8 @@ class TestRearmed < MiniTest::Test
       enumerable: true,
       rails_3: true,
       rails_4: true,
-      rails: true
+      rails: true,
+      minitest: true
     }
     require 'rearmed/apply_patches'
   end
@@ -174,27 +175,60 @@ class TestRearmed < MiniTest::Test
     eql(str.in?('a real string'), false)
   end
 
+  def test_minitest
+    str = 'first'
+    assert_changed "str" do
+      str = 'second'
+    end
+
+    str = 'first'
+    assert_changed ->{ str } do
+      str = 'second'
+    end
+
+    name = 'first'
+    assert_changed lambda{ name } do
+      name = 'second'
+    end
+
+    name = 'first'
+    assert_not_changed 'name' do
+      name = 'first'
+    end
+
+    name = 'first'
+    assert_not_changed ->{ name } do
+      name = 'first'
+    end
+
+    name = 'first'
+    assert_not_changed lambda{ name } do
+      name = 'first'
+    end
+  end
+
   def test_general_rails
     # THE MOST IMPORTANT TESTS HERE WOULD BE dedupe, reset_auto_increment, reset_table
     
-    #Post.reset_table # delete all records from table and reset autoincrement column (id), works with mysql/mariadb/postgresql/sqlite
-    # or with options
-    #Post.reset_table(delete_method: :destroy) # use destroy_all to ensure all callbacks are fired
-
-    #Post.reset_auto_increment # reset mysql/mariadb/postgresql/sqlite auto-increment column
-    # or with options
-    #Post.reset_auto_increment(value: 1, column: :id)
-
-    #Post.dedupe # remove all duplicate records, defaults to the models column_names list
-    # or with options
-    #Post.dedupe(columns: [:name, :content, :category_id])
-    #Post.dedupe(skip_timestamps: true)
     #Post.pluck_to_hash(:name, :category, :id)
     #Post.pluck_to_struct(:name, :category, :id)
 
     #Post.find_or_create(name: 'foo', content: 'bar') # use this instead of the super confusing first_or_create method
     #Post.find_or_create!(name: 'foo', content: 'bar')
 
+    #Post.find_duplicates # return active record relation of all records that have duplicates
+    #Post.find_duplicates(:name) # find duplicates based on the name attribute
+    #Post.find_duplicates([:name, :category]) # find duplicates based on the name & category attribute
+    #Post.find_duplicates(name: 'A Specific Name')
+
+    #Post.reset_table # delete all records from table and reset autoincrement column (id), works with mysql/mariadb/postgresql/sqlite
+    ## or with options
+    #Post.reset_table(delete_method: :destroy) # to ensure all callbacks are fired
+
+    #Post.reset_auto_increment # reset mysql/mariadb/postgresql/sqlite auto-increment column, if contains records then defaults to starting from next available number
+    ## or with options
+    #Post.reset_auto_increment(value: 1, column: :id) # column option is only relevant for postgresql
+
     #Post.find_in_relation_batches # this returns a relation instead of an array
     #Post.find_relation_each # this returns a relation instead of an array
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rearmed
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A collection of helpful methods and monkey patches for Objects, Strings,
-  Enumerables, Arrays, Hash, Dates, & Rails
+  Enumerables, Arrays, Hash, Dates, Minitest & Rails
 email: westonganger@gmail.com
 executables: []
 extensions: []
@@ -70,6 +70,7 @@ files:
 - lib/rearmed/monkey_patches/date.rb
 - lib/rearmed/monkey_patches/enumerable.rb
 - lib/rearmed/monkey_patches/hash.rb
+- lib/rearmed/monkey_patches/minitest.rb
 - lib/rearmed/monkey_patches/object.rb
 - lib/rearmed/monkey_patches/rails.rb
 - lib/rearmed/monkey_patches/rails_3.rb
@@ -100,6 +101,6 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A collection of helpful methods and monkey patches for Objects, Strings,
-  Enumerables, Arrays, Hash, Dates, & Rails
+  Enumerables, Arrays, Hash, Dates, Minitest & Rails
 test_files:
 - test/tc_rearmed.rb