magic-report 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44873b50d04637fb2399066a73450da8572fcbdece144c679d024692e436d155
-  data.tar.gz: cc0e332d579ed96f7aa2fa511039c55b727887729e2c49481b6bb1dd00ce6ad0
+  metadata.gz: cbd4ccf10ed8cef125608351f7f2fa312b30e5fca6441b32d1b0294a54c4a09f
+  data.tar.gz: dc6218e4caabcb061dbd122eb6db83c7a9b9c0100f43fcd573d04d92a5732fb0
 SHA512:
-  metadata.gz: 65166e27d443bef84cd1fa581cf6da78fbc2359668190cc5c9cfc877fa1caf81274981c92f2f20da4ccdc3c1d5990ec463c08c6fd761ee912dd2f4716b90faa5
-  data.tar.gz: 37fb6590fa41adb3d48396ecaad42a9ae57893c64a109cf93281a7e64cbed5ea87d17b1494d28670a59dad2252afdf64bbf2d7ba444c3d3e3bc7c0f867b9e5a9
+  metadata.gz: 93eff1f5d40e1866f0a86b9de2e69abeb185b972cc7f1eb6aa21602f43def7b0c495c2fe098fd0834f572dd5dad2aa647c43eeb8b40a9e4715fda8ce71d89dfb
+  data.tar.gz: 470da3706587151d4efa0a9c33ff9a725a76f522c8b28d94a21ffe479ed54abe5f6e90f60588368497a5e106c8babeda3a0a0a68306fe8adcfc347e42e7c831a

data/lib/magic_report/report/class_helpers.rb

@@ -4,7 +4,7 @@ module MagicReport
   class Report
     module ClassHelpers
       def name_from_class
-        ::MagicReport::Utils.underscore(self.class.name).tr("/", ".")
+        ::MagicReport::Utils.underscore(self.class.name)
       end
 
       def fields_from_class

data/lib/magic_report/report.rb

@@ -67,8 +67,10 @@ module MagicReport
 
         klass = ::MagicReport::Utils.derive_class(opts, &block)
 
+        opts[:name] = ::MagicReport::Utils.underscore(opts[:name].to_s) if opts[:name]
+
         if (prefix = opts[:prefix])
-          opts[:prefix] = new.instance_exec(&prefix)
+          opts[:prefix] = new(name: ::MagicReport::Utils.underscore(name.to_s)).instance_exec(&prefix)
         end
 
         @has_one << Configuration::HasOne.new(klass: klass, opts: opts, key: coerced_attribute)
@@ -81,8 +83,10 @@ module MagicReport
 
         klass = ::MagicReport::Utils.derive_class(opts, &block)
 
+        opts[:name] = ::MagicReport::Utils.underscore(opts[:name].to_s) if opts[:name]
+
         if (prefix = opts[:prefix])
-          opts[:prefix] = new.instance_exec(&prefix)
+          opts[:prefix] = new(name: ::MagicReport::Utils.underscore(name.to_s)).instance_exec(&prefix)
         end
 
         @has_many << Configuration::HasMany.new(klass: klass, opts: opts, key: coerced_attribute)

data/lib/magic_report/utils.rb

@@ -3,10 +3,13 @@
 module MagicReport
   module Utils
     def underscore(klass)
+      return "ded" unless klass
+
       klass.gsub(/::/, "/")
         .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
         .gsub(/([a-z\d])([A-Z])/, '\1_\2')
         .tr("-", "_")
+        .tr("/", ".")
         .downcase
     end
 
@@ -15,6 +18,7 @@ module MagicReport
         raise "name option must be provided" unless opts[:name]
 
         cloned_klass = ::MagicReport::Report.clone
+        cloned_klass.define_singleton_method(:name) { opts[:name] }
         cloned_klass.class_eval(&block)
         cloned_klass
       else

data/lib/magic_report/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MagicReport
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic-report
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dan Pankratev