assert_generator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 053f7053120b5b24d0f18500bf92830d3148f34f183bf725f46a72f25fe0044f
-  data.tar.gz: c68c7498bd4c2155c8d059a1d29ec9b1cb7da6e0bf8d29d027dc1fd665a76dd1
+  metadata.gz: e6a39a9e34de7b0029e30b7f60040d90ff67291cd25dc86db0ec6e8be9012c5e
+  data.tar.gz: 12b754a1426058a33f4ebd6433ce4374ef1e435740aa97f8000f7db1ca85132e
 SHA512:
-  metadata.gz: 7f75eea249badbeac33e539f6ddc3a406319adec57d1f2e64d2fe9c4a5c52456e3c2a53d7618956049e19b52a7e1837ac574eb993126824dde7238197af889d2
-  data.tar.gz: 166520d9d86b9d56b83d4692c177c272f224bc31c2879b5b5139b59fb31fc6d4f8add9747c98a1998e92cd74020a73a418f901607a3fea5bc0bf3909253b9b7b
+  metadata.gz: 58a6244d7e2e978d9a1962f1a1ffd82d44e201403176fdb8e0c77347b207f63619db90bd9d36462bfe6b5fecc14238f0ae66e387ec22f24c1d07925daae74ba4
+  data.tar.gz: 66ba172a33d01d294da78df6c53e5f8e07dae7ee52f5767ddc8d1a7b73a39631572167db95f586a50f743b481d3d445cb2a7fc6c6ff5d39705bedc004ba50cd3

data/lib/assert_generator.rb

@@ -58,8 +58,14 @@ module AssertGenerator
         return self
       end
 
-      if defined?(ActiveRecord::Base) && source.is_a?(ActiveRecord::Base)
-        generate_asserts_ar(source, source_expr)
+      if source.respond_to?(:attributes)
+        # AR or something that quacks like it
+        generate_asserts_attributes(source, source_expr)
+        return self
+      end
+
+      if source.is_a?(Range)
+        generate_asserts_range(source, source_expr)
         return self
       end
 
@@ -72,7 +78,8 @@ module AssertGenerator
       self
     end
 
-    def generate_asserts_ar(h, p)
+    # Active Record, or anything else with an attributes hash
+    def generate_asserts_attributes(h, p)
       h.attributes.each do |k, v|
         generate_assert_drillable_item(v, ->(meth) { "#{p}.#{meth}" }, k)
       end
@@ -95,25 +102,31 @@ module AssertGenerator
       end
     end
 
+    def generate_asserts_range(a, p)
+      generate_assert_drillable_item(a.first, ->(_x) { "#{p}.first" }, p)
+      generate_assert_drillable_item(a.last, ->(_x) { "#{p}.last" }, p)
+    end
+
     def generate_assert_drillable_item(v, make_accessor, *accessor_params)
       accessor = make_accessor.call(*accessor_params)
+
       if drillable_object(v)
-        generate_asserts(v, accessor, nil, nil)
+        return generate_asserts(v, accessor, nil, nil)
+      end
+
+      if v.nil?
+        out "assert_nil #{accessor}"
+      elsif v.is_a?(true.class)
+        out "assert #{accessor}"
+      elsif v.is_a?(false.class)
+        out "refute #{accessor}"
+
+      elsif v.is_a?(DateTime) || (defined?(ActiveSupport::TimeWithZone) && v.is_a?(ActiveSupport::TimeWithZone))
+        generate_date_time_assert(v, accessor)
+      elsif v.is_a?(Date)
+        generate_date_assert(v, accessor)
       else
-        if v.nil?
-          out "assert_nil #{accessor}"
-        elsif v.is_a?(true.class)
-          out "assert #{accessor}"
-        elsif v.is_a?(false.class)
-          out "refute #{accessor}"
-
-        elsif v.is_a?(DateTime) || (defined?(ActiveSupport::TimeWithZone) && v.is_a?(ActiveSupport::TimeWithZone))
-          generate_date_time_assert(v, accessor)
-        elsif v.is_a?(Date)
-          generate_date_assert(v, accessor)
-        else
-          out "assert_equal #{v.inspect}, #{make_accessor.call(*accessor_params)}"
-        end
+        out "assert_equal #{v.inspect}, #{make_accessor.call(*accessor_params)}"
       end
     end
 
@@ -122,7 +135,7 @@ module AssertGenerator
     end
 
     def drillable_object(v)
-      v.is_a?(Enumerable) || (defined?(ActiveRecord::Base) && v.is_a?(ActiveRecord::Base))
+      v.is_a?(Enumerable) || v.respond_to?(:attributes)
     end
 
     def generate_date_assert(v, accessor)
@@ -131,7 +144,7 @@ module AssertGenerator
         if date_diff.to_i == 0
           out "assert_equal #{relative_dates}, #{accessor}"
         else
-          out "assert_equal #{relative_dates} + #{date_diff}.days, #{accessor}"
+          out "assert_equal #{relative_dates} #{date_diff.to_i < 0 ? '-' : '+'} #{date_diff.to_i.abs}.days, #{accessor}"
         end
       else
         out "assert_equal Date.new(#{v.year}, #{v.month}, #{v.day}), #{accessor}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assert_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Richard Parratt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler