origen 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 089283af1ce99339ab19906613c9bbc22504dbb6
-  data.tar.gz: 28e3e45c29057a61901d4364bd29ae6d453c7525
+  metadata.gz: bf91c2d93123c2468f4a589452c0fdfe7d67a61d
+  data.tar.gz: b2e9a141ac6e26414bdaf5acb999333f2a17adb5
 SHA512:
-  metadata.gz: b04b45602912fecafd9c0f74c169b62573308461497d95cb826d30557d63eabb1ef65a6611cbdff4e2a148bd532d43b60f89cfee3a08e92735888d3020bc9e94
-  data.tar.gz: 2d2c539979ccf14b94eaf4b9af5bdca62411bfcc232a82c5fd2572465b0d8d6b16e437516d506c094b4fa20c5bd277ea07db80661d1a8fefce59d99e989033bf
+  metadata.gz: 00be19f14b139b84084e27ecbb12cf7523aa2c24c696914ee73a8116c567e5c3681045b3534be2655bea3c238ee3b88da7389dead05c52586ccea1c482b12840
+  data.tar.gz: 69dd93ca423515a88f77f4940ee0f09725bebb6617db15a13bbf585ddb9dfe2a410e5e0fd8187020872b07404e10b7a9d1a6f64d731e8021ca33a952fd91becf

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 5
-  BUGFIX = 3
+  BUGFIX = 4
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/controller.rb

@@ -46,7 +46,11 @@ module Origen
     end
 
     def inspect
-      "Controller: <#{self.class}:#{object_id}>"
+      if model
+        "<Model/Controller: #{model.class}:#{model.object_id}/#{self.class}:#{object_id}>"
+      else
+        "<Controller: #{self.class}:#{object_id}>"
+      end
     end
 
     def is_a?(*args)
@@ -61,7 +65,15 @@ module Origen
     def model
       @model ||= begin
         if self.class.path_to_model
-          eval(self.class.path_to_model)
+          m = eval(self.class.path_to_model)
+          if m
+            begin
+              m.send('_controller=', self)
+            rescue
+              # Model is not an Origen::Model
+            end
+          end
+          m
         end
       end
     end

data/lib/origen/model.rb

@@ -28,7 +28,11 @@ module Origen
     end
 
     def inspect
-      "Model: <#{self.class}:#{object_id}>"
+      if controller
+        "<Model/Controller: #{self.class}:#{object_id}/#{controller.class}:#{controller.object_id}>"
+      else
+        "<Model: #{self.class}:#{object_id}>"
+      end
     end
 
     def is_an_origen_model?
@@ -291,6 +295,10 @@ module Origen
 
     private
 
+    def _controller=(controller)
+      @controller = controller
+    end
+
     def _modes
       @_modes ||= {}
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport