goon_model_gen 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4283b78918a93a63233070c2e5d0d1ef100d4b214e672b50640f5b70c6aa08b3
-  data.tar.gz: f0bc7f7a08b1311a4b12d754d1bce760fbe59ac39e6bdbf48e215d63c3b9cf2e
+  metadata.gz: ae4ea6261885660b6956bce4d82aaa078edd6d727ab6a4e144568473cfdaed69
+  data.tar.gz: 3dbfdd5ac21c79fc6adf1bb9009d81de2584327b53f0c92bcaf4a1150dcc623c
 SHA512:
-  metadata.gz: 26af49ba18494c6722cd7421ab53598c70ad86a8ced5269ea1328989713678517f696f4886b6cac1fdad5c378e230d72a34e3c0cc399a0db04f7973a1227fb80
-  data.tar.gz: ad98807c4bfdfbf715b2b528ae5b193b3e205489d505ddca16956c74132113ef50329a8526aef636dff16498b25308a6c02a0f6710a6740488ee0d88b95e576f
+  metadata.gz: 515e715aaffaf9b359ede38fda8b35c12f9cb75eb7ef8fec5be2318175d9ec75233f32ef77e0200b2351302d9fbba9ebc2b6261eddc705a26605a049d07bdc3b
+  data.tar.gz: 4f8e860ed5ca58cbd6d7f8f1a7b96dc8cd98548426a1b6ae47679d27894425b5222b1c645caaa830d524f6cae11f56c4ecb3d76b559c25058973f87433b34ef5

data/lib/goon_model_gen/builder/store_builder.rb

@@ -30,7 +30,13 @@ module GoonModelGen
           types.select{|t| t.is_a?(Source::Struct) && t.id_name && t.id_type }.each do |t|
             store_type = pkg.new_struct(t.name + "Store")
             procs << Proc.new{ build_sentences('store', 'goon', t, store_type) }
-            store_type.memo[:model] = model_packages.detect_by(t.file.basename).lookup(t.name)
+            store_type.memo[:model] =
+              begin
+                pkg_name = Golang::Package.regularize_name(t.file.basename)
+                pkg = model_packages.detect_by(pkg_name)
+                raise "Package not found for #{t.file.basename}" unless pkg
+                pkg.lookup(t.name)
+              end
           end
         end
         return pkg, procs

data/lib/goon_model_gen/golang/package.rb

@@ -9,6 +9,12 @@ require "goon_model_gen/golang/file"
 module GoonModelGen
   module Golang
     class Package
+      class << self
+        def regularize_name(name)
+          name.gsub(/[\-\_]/, '').downcase
+        end
+      end
+
       attr_reader :path
       attr_reader :types
       attr_reader :files
@@ -25,7 +31,7 @@ module GoonModelGen
       end
 
       def name
-        @name ||= basename ? basename.gsub(/[\-\_]/, '').downcase : nil
+        @name ||= basename ? self.class.regularize_name(basename) : nil
       end
 
       def merge!(other)

data/lib/goon_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoonModelGen
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goon_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor