hash19 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24ad3203a40f611e4dd1377fec530dd5e84addcb
-  data.tar.gz: 5a3248058a8423c5c91b9c4a83a69a0b3616ea78
+  metadata.gz: f058551acfa9dac0dc06b4974aad7bee1c35e1e2
+  data.tar.gz: 576d2bce4e5b1af1ed7b627a61111f8c65a2cf84
 SHA512:
-  metadata.gz: 4aa7526345de10af58deaf60936dc9e0ed2badeffbb0e4d28bfb5bfd2547f766f5744123f2f992f39c22293e198ec0ee4f9576fbb875943f4e85d5dc5eded933
-  data.tar.gz: bb06e9787149d039bec360a156d770a5ab355cbb700299aa509bad05cb4f643ca3189c0449ea8283c8bce217e0b87443c43d943b3216a544a633813822f9029d
+  metadata.gz: 4e2014f2d9e025517a1a4f5d720ffaf15ce707b7183597113605c94080a083e8c1640a10bdc10ff0e6174a77a97bf75c2b99a76091262750d269c69437f57945
+  data.tar.gz: a6c4c73367b57840c60395efcca0e37050d229e8a48e11b278d66f3191f4ab82e2469402ef4dfff88ec5f2524f894eca9f391516377afb24ef36bafec655fdeb

data/lib/hash19/resolvers.rb

@@ -50,7 +50,7 @@ module Hash19
 
     def resolve_class(assoc_name)
       full_class_name = self.class.name
-      new_class = full_class_name.gsub(full_class_name.demodulize, assoc_name)
+      new_class = construct_association_class full_class_name, assoc_name
       new_class.split('::').inject(Object) do |mod, class_name|
         begin
           mod.const_get(class_name)
@@ -62,6 +62,11 @@ module Hash19
 
     private
 
+    def construct_association_class(parent, association)
+      *modules, class_name = parent.split('::')
+      (modules + [association]).join('::')
+    end
+
     def async_injections
       self.class.injections.select { |e| e[:async].nil? }
     end

data/lib/hash19/version.rb

@@ -1,3 +1,3 @@
 module Hash19
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spec/hash19/associations_spec.rb

@@ -30,7 +30,7 @@ describe 'Associations' do
       end
 
       expect { Computer::Laptop.new(model: 'MacBook Pro', year: 2013, keyboard: {keys: 101}) }.
-      to raise_error('Class:<Computer::Keyboard> not defined! Unable to resolve association:<keyboard>')
+          to raise_error('Class:<Computer::Keyboard> not defined! Unable to resolve association:<keyboard>')
     end
 
     it 'should support alternate key in payload for has_one' do
@@ -144,7 +144,7 @@ describe 'Associations' do
     it 'should be able to call the trigger on has_one association' do
       packet = UDPPacket.new(code: 500, error_id: 500)
       expect(packet.to_h).to eq('code' => 500, 'error_id' => 500, 'all_errors' => [{'error_id' => 500, 'desc' => 'fatal error'},
-       {'error_id' => 404, 'desc' => 'not found'}])
+                                                                                   {'error_id' => 404, 'desc' => 'not found'}])
     end
 
   end
@@ -157,7 +157,23 @@ describe 'Associations' do
       end
 
       jedi = Jedi.new(name: 'Obi Wan Kenobi')
-      expect(jedi.to_h).to eq({"name" => 'Obi Wan Kenobi'})
+      expect(jedi.to_h).to eq({'name' => 'Obi Wan Kenobi'})
+    end
+  end
+
+  context 'module and class with same name' do
+    module SecretAgentService
+      class SecretAgent < Testable
+        attributes :code
+        has_one :agency
+      end
+      class Agency < Testable
+        attributes :name
+      end
+    end
+    it 'should resolve class when association class and containing module have same name' do
+      mi6 = SecretAgentService::SecretAgent.new({code: '007', agency: {name: 'MI6'}})
+      expect(mi6.to_h).to eq({'code' => '007', 'agency' => {'name' => 'MI6'}})
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash19
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - RC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler