class2 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0646247304bc24095f0581f97b1bd1ca81638afd
-  data.tar.gz: af1db39469174d56a2da022c08f1bd00cb0d171b
+  metadata.gz: d28278c666d335e00c402bfe8a9fee27401b5a53
+  data.tar.gz: 3a9b9f915aef1ec7c1e667683e13d38012260014
 SHA512:
-  metadata.gz: b36794076c8fbdc3103417ef80168931bd03bfd671d64168c6add76aded76f445a75b2a73f4df8bc8c4d224926379bdb8cb74cfa3170b105d93bbc7f4f7544ea
-  data.tar.gz: 89269198476ad0561b081f0d93afabb5738a96981cb3618d6e52dca704927be9a6359afb64a210d14bd4e00f46ee123dfea7decae00041621d4f1735512c02b1
+  metadata.gz: ea280987e3fdf000a2c2e649170a9d83843e79628e3ed5b6ac8544176698c618d8f5c99cb64c23e51af4efe44a756194d292990aefc8b48caf2b552d7f4543b3
+  data.tar.gz: 6750ec3c675d3389b2e0be76e5d5891e587bed45fe97677a12b1c6fa4eadcfb0b81f0ccd08f104eebc92740775dedb3d48d91a441fa869ee2bdddc67e9c3c5cc

data/Changes

@@ -1,3 +1,8 @@
+2017-10-22  v0.2.4
+--------------------
+* Add class2 filename and linenum to generated classes
+* Bug fix: use the correct class name when instantiating a default nested instance
+
 2017-10-11  v0.2.3
 --------------------
 * Bug fix: don't try to convert to Float, Fixnum, Date, DateTime when nil

data/lib/class2.rb

@@ -106,18 +106,18 @@ class Class2
         object.each { |klass, attrs| make_class(namespace, klass, attrs, block) }
       end
 
-      make_method_name = lambda { |x| x.to_s.gsub(/[^\w]+/, "_") } # good enough
-
       name = name.to_s.classify
       return if namespace.const_defined?(name)
 
+      make_method_name = lambda { |x| x.to_s.gsub(/[^\w]+/, "_") } # good enough
+
       klass = Class.new do
         def initialize(attributes = nil)
           return unless attributes.is_a?(Hash)
           assign_attributes(attributes)
         end
 
-        class_eval <<-CODE
+        class_eval <<-CODE, __FILE__, __LINE__
           def hash
             to_h.hash
           end
@@ -178,7 +178,7 @@ class Class2
                      "nil"
                    end
 
-          class_eval <<-CODE
+          class_eval <<-CODE, __FILE__, __LINE__
             def #{method}
               @#{method} = #{retval} unless defined? @#{method}
               @#{method}
@@ -194,7 +194,7 @@ class Class2
           method = make_method_name[method]
           attr_writer method
 
-          retval = method == method.pluralize ? "[]" : "#{method.classify}.new"
+          retval = method == method.pluralize ? "[]" : "#{namespace}::#{method.classify}.new"
           class_eval <<-CODE
             def #{method}
               @#{method} ||= #{retval}

data/lib/class2/version.rb

@@ -1,3 +1,3 @@
 class Class2
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: class2
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Skye Shaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport