origen 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb7e3006eff54d7d70809e8d54b0b976d1ecb01e
-  data.tar.gz: 1932c4799723ef86e1c7564863b310b0a6c271cf
+  metadata.gz: d5524389d795a57f92302534b5350ce902a13967
+  data.tar.gz: bb2943010e3ddf48ba8d6b8ba08a9af2d98b7af5
 SHA512:
-  metadata.gz: 76e2aaec740bca336ff8de376f0354abdfbbb5706391a5726af8355997fb63a870a84649e75782667d545791f246c032d446e781897ed8ec743182b42bb5bbac
-  data.tar.gz: dc7e62542c9d488e5b5629f3dd15bfacd51e0a8390c887ae653a61f14a33a3ea5615c4d9fddce5839dad7e59c3de6f39eda9cf046060e1bae1dbcd50b1bab6d5
+  metadata.gz: 51000c5a32e20f65504744a1bfc668568dbc2de57ffb8d59322e30f94949decec6d55054efd88d0bb7ddc887f4b5ba4a0c362fdd1360c8da3985189d8d4dcca7
+  data.tar.gz: 93649414847c8fbc8a43ea51c0feacc267e05690047959dd31a4a5099401f1c2ae61c90f1a9d569641be94058c9d33070849000c01293c9bd81aa3063dd6fd25

data/config/version.rb

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

data/lib/origen/pins/pin_collection.rb

@@ -325,9 +325,13 @@ module Origen
       end
 
       def assert(value, options = {})
-        value = value.data if value.respond_to?('data')
         each_with_index do |pin, i|
-          pin.assert(value[size - i - 1], options)
+          if !value.respond_to?('is_to_be_read?') || value[size - i - 1].is_to_be_read?
+            value = value.data if value.respond_to?('data')
+            pin.assert(value[size - i - 1], options)
+          else
+            pin.dont_care
+          end
         end
         self
       end

data/lib/origen/specs.rb

@@ -10,10 +10,11 @@ module Origen
     autoload :Version_History, 'origen/specs/version_history.rb'
     autoload :Creation_Info, 'origen/specs/creation_info.rb'
     autoload :Spec_Features, 'origen/specs/spec_features.rb'
+    autoload :Documentation, 'origen/specs/documentation.rb'
     require 'origen/specs/checkers'
     include Checkers
 
-    attr_accessor :_specs, :_notes, :_exhibits, :_doc_resources, :_overrides, :_power_supplies, :_mode_selects, :_version_history, :_creation_info, :_spec_features
+    attr_accessor :_specs, :_notes, :_exhibits, :_doc_resources, :_overrides, :_power_supplies, :_mode_selects, :_version_history, :_creation_info, :_spec_features, :_documentation
 
     # Detailed description for the ip block
     attr_accessor :description
@@ -129,6 +130,13 @@ module Origen
       !!show_specs(options)
     end
 
+    # Adds a new documentation notion to the block
+    def documentation(header_info, selection,  link)
+      _documentation
+      # Create a new documenation and place it in the 5-D hash
+      @_documentation[header_info[:section]][header_info[:subsection]][selection[:interface]][selection[:type]][selection[:subtype]][selection[:mode]][selection[:audience]] = Documentation.new(header_info, selection, link)
+    end
+
     # Adds a new feature to the block
     def spec_feature(id, attrs, device, text, internal_comment)
       # Welguisz:  No idea why this is here, but keeping it here because it follows other blocks
@@ -324,6 +332,53 @@ module Origen
       end
     end
 
+    def documentations(options = {})
+      options = {
+        section:    nil,
+        subsection: nil,
+        interface:  nil,
+        mode:       nil,
+        type:       nil,
+        sub_type:   nil,
+        audience:   nil
+      }.update(options)
+      return nil if @_documentation.nil?
+      return nil if @_documentation.empty?
+      doc_found = Hash.new do |h, k|
+        h[k] = Hash.new do |hh, kk|
+          hh[kk] = Hash.new do |hhh, kkk|
+            hhh[kkk] = Hash.new do |hhhh, kkkk|
+              hhhh[kkkk] = Hash.new do |hhhhh, kkkkk|
+                hhhhh[kkkkk] = Hash.new do |hhhhhh, kkkkkk|
+                  hhhhhh[kkkkkk] = {}
+                end
+              end
+            end
+          end
+        end
+      end
+      filter_hash(@_documentation, options[:section]).each do |_section, hash|
+        filter_hash(hash, options[:subsection]).each do |_subsection, hash_|
+          filter_hash(hash_, options[:interface]).each do |_interface, hash__|
+            filter_hash(hash__, options[:mode]).each do |_mode, hash___|
+              filter_hash(hash___, options[:type]).each do |_type, hash____|
+                filter_hash(hash____, options[:sub_type]).each do |_sub_type, hash_____|
+                  filter_hash(hash_____, options[:audience]).each do |_audience, doc|
+                    doc_found[_section][_subsection][_interface][_mode][_type][_sub_type][_audience] = doc
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+      if doc_found.empty?
+        return nil
+      else
+        return doc_found
+      end
+    end
+
     def overrides(options = {})
       options = {
         block:    nil,
@@ -456,6 +511,10 @@ module Origen
       @_spec_features = nil
     end
 
+    def delete_all_documentation
+      @_documentation = nil
+    end
+
     private
 
     def _specs
@@ -500,6 +559,22 @@ module Origen
       end
     end
 
+    def _documentation
+      @_documentation ||= Hash.new do |h, k|
+        h[k] = Hash.new do |hh, kk|
+          hh[kk] = Hash.new do |hhh, kkk|
+            hhh[kkk] = Hash.new do |hhhh, kkkk|
+              hhhh[kkkk] = Hash.new do |hhhhh, kkkkk|
+                hhhhh[kkkkk] = Hash.new do |hhhhhh, kkkkkk|
+                  hhhhhh[kkkkkk] = {}
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
     def _overrides
       @_overrides ||= Hash.new do |h, k|
         h[k] = Hash.new do |hh, kk|
@@ -535,11 +610,11 @@ module Origen
     end
 
     # Return a hash based on the filter provided
-    def filter_hash(hash, filter)
+    def filter_hash(hash, filter, debug = false)
       fail 'Hash argument is not a Hash!' unless hash.is_a? Hash
       filtered_hash = {}
       select_logic = case filter
-        when String then 'k[Regexp.new(filter)] && k.length == filter.length'
+        when String then 'k.nil? ? false : k[Regexp.new(filter)] && k.length == filter.length'
         when (Fixnum || Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
         when Regexp then 'k[filter]'
         when Symbol then
@@ -549,6 +624,7 @@ module Origen
       end
       # rubocop:disable UnusedBlockArgument
       filtered_hash = hash.select do |k, v|
+        # binding.pry if filter == 'SubSection A'
         [TrueClass, FalseClass].include?(select_logic.class) ? select_logic : eval(select_logic)
       end
       filtered_hash

data/lib/origen/specs/documentation.rb

@@ -0,0 +1,57 @@
+module Origen
+  module Specs
+    # This class is used to store documentation map that the user can change
+    class Documentation
+      # This is the Section Header for the Documentation Map.  Usually these are main headers
+      # Examples:
+      #  I. Overall DC Electricals
+      #  II. General AC Charactertistics
+      #  III. Power Sequencing
+      attr_accessor :section
+
+      # This is the subsection header for the Documentation Map.  These are found under main headers
+      # Examples
+      #  I. Overall DC electrical
+      #    A. Absolute Maximum Ratings
+      #    B. Recommend Operating Conditions
+      #    C. Output Driver
+      attr_accessor :subsection
+
+      # Exhibit References that should be referenced within the table title
+      attr_accessor :interface
+
+      # Mode is part of the 4-D Hash for the Tables.  Corresponds to Spec 4-D Hash
+      attr_accessor :mode
+
+      # Type is part of the 4-D Hash for the Tables.  Corresponds to Spec 4-D Hash
+      # Usual values
+      #
+      # * DC -> Direct Current
+      # * AC -> Alternate Current
+      # * Temp -> Temperature
+      # * Supply -> Supply
+      attr_accessor :type
+
+      # SubType is part of the 4-D Hash for the Tables. Corresponds to Spec 4-D Hash
+      attr_accessor :sub_type
+
+      # Audience is part of the 4-D Hash for the Tables.  Corresponds to Spec 4-D Hash
+      attr_accessor :audience
+
+      # DITA Formatted Text that appears before the table
+      attr_accessor :link
+
+      # Initialize the Class
+      def initialize(header_info = {}, selection = {}, link = nil)
+        @section = header_info[:section]
+        @subsection = header_info[:subsection]
+        @interface = selection[:interface]
+        @mode = selection[:mode]
+        @type = selection[:type]
+        @sub_type = selection[:sub_type]
+        @audience = selection[:audience]
+        @link = link
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -577,6 +577,7 @@ files:
 - lib/origen/specs/checkers.rb
 - lib/origen/specs/creation_info.rb
 - lib/origen/specs/doc_resource.rb
+- lib/origen/specs/documentation.rb
 - lib/origen/specs/exhibit.rb
 - lib/origen/specs/mode_select.rb
 - lib/origen/specs/note.rb