metaruby 1.0.0 → 2.0.0

data/lib/metaruby/gui/model_selector.rb

@@ -18,11 +18,14 @@ module MetaRuby
             # @return [Qt::SortFilterProxyModel]
             attr_reader :model_filter
 
-            # (see {RubyConstantsItemModel#type_info)
+            # A mapping from a root model and the user-visible name for this
+            # root
+            #
+            # @return [Hash<Object,String>]
             attr_reader :type_info
 
             # The Qt item model that represents the object hierarchy
-            # @return [RubyConstantsItemModel]
+            # @return [ModelHierarchy]
             attr_reader :browser_model
 
             # @return [Qt::PushButton] a button allowing to filter models by
@@ -41,9 +44,7 @@ module MetaRuby
                 super
 
                 @type_info = Hash.new
-                @browser_model = RubyConstantsItemModel.new(type_info) do |mod|
-                    model?(mod)
-                end
+                @browser_model = ModelHierarchy.new
                 @type_filters = Hash.new
 
                 layout = Qt::VBoxLayout.new(self)
@@ -65,12 +66,13 @@ module MetaRuby
             #   objects of this type
             # @param [Integer] priority if an object's ancestry matches multiple
             #   types, only the ones of the highest priority will be retained
-            def register_type(model_base, name, priority = 0)
-                type_info[model_base] = RubyConstantsItemModel::TypeInfo.new(name, priority)
+            def register_type(root_model, name, priority = 0, categories: [], resolver: ModelHierarchy::Resolver.new)
+                @browser_model.add_root(root_model, priority, categories: categories, resolver: resolver)
+                type_info[root_model] = name
                 action = Qt::Action.new(name, self)
                 action.checkable = true
                 action.checked = true
-                type_filters[model_base] = action
+                type_filters[root_model] = action
                 btn_type_filter_menu.add_action(action)
                 connect(action, SIGNAL('triggered()')) do
                     update_model_filter
@@ -79,8 +81,13 @@ module MetaRuby
 
             # Update the view, reloading the underlying model
             def update
-                update_model_filter
                 reload
+                update_model_filter
+            end
+
+            # (see ModelHierarchy#find_resolver_from_model)
+            def find_resolver_from_model(model)
+                @browser_model.find_resolver_from_model(model)
             end
 
             # @api private
@@ -89,10 +96,10 @@ module MetaRuby
             def update_model_filter
                 type_rx = type_filters.map do |model_base, act|
                     if act.checked?
-                        type_info[model_base].name
+                        type_info[model_base]
                     end
                 end
-                type_rx = type_rx.compact.join("|")
+                type_rx = type_rx.compact.join(",|,")
 
                 model_filter.filter_role = Qt::UserRole # this contains the keywords (ancestry and/or name)
                 # This workaround a problem that I did not have time to
@@ -104,10 +111,38 @@ module MetaRuby
                 # The pattern has to match every element in the hierarchy. We
                 # achieve this by making the suffix part optional
                 name_rx = filter_box.text.downcase.gsub(/:+/, "/")
-                model_filter.filter_reg_exp = Qt::RegExp.new("(#{type_rx}).*;.*#{name_rx}")
+                name_rx = '[^;]*,[^,]*' + name_rx.split('/').join("[^,]*,[^;]*;[^;]*,") + '[^,]*,[^;]*'
+                regexp = Qt::RegExp.new("(,#{type_rx},)[^;]*;([^;]*;)*#{name_rx}")
+                regexp.case_sensitivity = Qt::CaseInsensitive
+                model_filter.filter_reg_exp = regexp
+                model_filter.invalidate
                 auto_open
             end
 
+            def filter_row_count(parent = Qt::ModelIndex.new)
+                model_filter.row_count(parent)
+            end
+
+            def model_items_from_filter(parent = Qt::ModelIndex.new)
+                (0...filter_row_count(parent)).map do |i|
+                    model_item_from_filter_row(i, parent)
+                end
+            end
+
+            def model_item_from_filter_row(row, parent = Qt::ModelIndex.new)
+                filter_index = model_filter.index(row, 0, parent)
+                model_index  = model_filter.map_to_source(filter_index)
+                return browser_model.item_from_index(model_index), filter_index
+            end
+
+            def dump_filtered_item_model(parent = Qt::ModelIndex.new, indent = "")
+                model_items_from_filter(parent).each_with_index do |(model_item, filter_index), i|
+                    data = model_item.data(Qt::UserRole).to_string
+                    puts "#{indent}[#{i}] #{model_item.text} #{data}"
+                    dump_filtered_item_model(filter_index, indent + "  ")
+                end
+            end
+
             # Auto-open in the current state
             #
             # @param [Integer] threshold the method opens items whose number of
@@ -135,20 +170,12 @@ module MetaRuby
                 end
             end
 
-            # Tests if an object if a model
-            def model?(obj)
-                type_info.any? do |model_base, _|
-                    obj.kind_of?(model_base) ||
-                        (obj.kind_of?(Module) && obj <= model_base)
-                end
-            end
-
             class ModelPathCompleter < Qt::Completer
                 def splitPath(path)
                     path.split('/')
                 end
                 def pathFromIndex(index)
-                    index.data(Qt::UserRole).split(";").last
+                    index.data(Qt::UserRole).to_string.split(";").last
                 end
             end
 
@@ -187,10 +214,11 @@ module MetaRuby
                 @model_list = Qt::TreeView.new(self)
                 @model_filter = Qt::SortFilterProxyModel.new
                 model_filter.filter_case_sensitivity = Qt::CaseInsensitive
-                model_filter.dynamic_sort_filter = true
                 model_filter.filter_role = Qt::UserRole
-                model_list.model = model_filter
+                model_filter.dynamic_sort_filter = true
                 model_filter.source_model = browser_model
+                model_filter.sort(0)
+                model_list.model = model_filter
 
                 @filter_box = Qt::LineEdit.new(self)
                 filter_box.connect(SIGNAL('textChanged(QString)')) do |text|
@@ -207,9 +235,8 @@ module MetaRuby
 
                 model_list.selection_model.connect(SIGNAL('currentChanged(const QModelIndex&, const QModelIndex&)')) do |index, _|
                     index = model_filter.map_to_source(index)
-                    mod = browser_model.info_from_index(index)
-                    if model?(mod.this)
-                        emit model_selected(Qt::Variant.from_ruby(mod.this, mod.this))
+                    if model = browser_model.find_model_from_index(index)
+                        emit model_selected(Qt::Variant.from_ruby(model, model))
                     end
                 end
             end
@@ -217,19 +244,15 @@ module MetaRuby
 
             # Reload the object model, keeping the current selection if possible
             def reload
-                if current = current_selection
-                    current_module = current.this
-                    current_path = []
-                    while current
-                        current_path.unshift current.name
-                        current = current.parent
-                    end
+                if current_model = current_selection
+                    current_path = @browser_model.find_path_from_model(current_model)
                 end
 
                 browser_model.reload
-
-                if current_path && !select_by_path(*current_path)
-                    select_by_module(current_module)
+                if current_path
+                    select_by_path(*current_path)
+                elsif current_model
+                    select_by_model(current_model)
                 end
             end
 
@@ -258,10 +281,10 @@ module MetaRuby
                 if !index
                     return
                 elsif !index.valid?
-                    if !options[:reset_filter]
+                    if !reset_filter
                         return index
                     end
-                    reset_filter
+                    self.reset_filter
                     model_filter.map_from_source(source_index)
                 else index
                 end
@@ -285,7 +308,7 @@ module MetaRuby
             #
             # @return [Boolean] true if the path resolved to something known,
             #   and false otherwise
-            def select_by_module(model)
+            def select_by_model(model)
                 if index = browser_model.find_index_by_model(model)
                     index = map_index_from_source(index)
                     model_list.current_index = index
@@ -300,7 +323,7 @@ module MetaRuby
                 index = model_list.selection_model.current_index
                 if index.valid?
                     index = model_filter.map_to_source(index)
-                    browser_model.info_from_index(index)
+                    browser_model.find_model_from_index(index)
                 end
             end
 

data/lib/metaruby/model_as_class.rb

@@ -72,13 +72,15 @@ module MetaRuby
         #   assigned on a Ruby constant
         #
         # @return [Module] a subclass of self
-        def new_submodel(name: nil, **submodel_options, &block)
+        def new_submodel(name: nil, register: true, **submodel_options, &block)
             Thread.current[FROM_NEW_SUBMODEL_TLS] = true
             model = self.class.new(self)
             model.permanent_model = false
+            model.instance_variable_set :@name, nil
+            model.name = name if name
             setup_submodel(model, **submodel_options, &block)
-            if name
-                model.name = name
+            if register
+                register_submodel(model)
             end
             model
         end
@@ -90,15 +92,7 @@ module MetaRuby
 
         # Called at the end of the definition of a new submodel
         def setup_submodel(submodel, register: true, **options, &block)
-            submodel.instance_variable_set :@name, nil
-
-            if register
-                register_submodel(submodel)
-            end
-
-            if block_given?
-                submodel.apply_block(&block)
-            end
+            submodel.apply_block(&block) if block
         end
 
         # Registers submodels when a subclass is created
@@ -108,7 +102,7 @@ module MetaRuby
 
             subclass.definition_location = 
                 if MetaRuby.keep_definition_location?
-                    call_stack
+                    caller_locations
                 else Array.new
                 end
             subclass.instance_variable_set :@name, nil
@@ -116,7 +110,9 @@ module MetaRuby
             subclass.permanent_model = subclass.accessible_by_name? &&
                 subclass.permanent_definition_context?
             if !from_new_submodel
+                subclass.instance_variable_set :@name, nil
                 setup_submodel(subclass)
+                register_submodel(subclass)
             end
         end
 

data/lib/metaruby/model_as_module.rb

@@ -121,13 +121,10 @@ module MetaRuby
         def new_submodel(name: nil, type: self.class, **submodel_options, &block)
             model = type.new
             model.extend ModelAsModule
-            model.name =
-                if name
-                    name.dup
-                end
+            model.name = name.dup if name
             model.definition_location = 
                 if MetaRuby.keep_definition_location?
-                    call_stack
+                    caller_locations
                 else Array.new
                 end
             setup_submodel(model, submodel_options, &block)

data/lib/metaruby/registration.rb

@@ -1,6 +1,5 @@
 require 'facets/module/spacename'
 require 'facets/module/basename'
-require 'facets/kernel/call_stack'
 require 'utilrb/object/attribute'
 require 'utilrb/module/attr_predicate'
 
@@ -11,9 +10,9 @@ module MetaRuby
     # returns the model that is parent of +self+
     module Registration
         # The place where this model got defined in the source code
-        # The tuple is (file,lineno,method), and can be obtained with
-        # facet's #call_stack
-        # @return [Array<(String,Integer,Symbol)>]
+        # This is an array of Thread::Backtrace::Locations
+        #
+        # @return [Array<Thread::Backtrace::Locations>]
         attr_accessor :definition_location
 
         # Tells {#clear_submodels} whether this model should be removed from
@@ -69,10 +68,14 @@ module MetaRuby
 
         # Call to register a model that is a submodel of +self+
         def register_submodel(klass)
+            if klass.singleton_class?
+                raise ArgumentError, "cannot register a singleton class"
+            end
+
             if !klass.definition_location
                 klass.definition_location = 
                     if MetaRuby.keep_definition_location?
-                        call_stack
+                        caller_locations
                     else Array.new
                     end
             end
@@ -108,12 +111,19 @@ module MetaRuby
                 if m = supermodel
                     m.deregister_submodels([self])
                 end
-                if Registration.accessible_by_name?(self)
-                    Registration.deregister_constant(self)
-                end
+                clear_registration_as_constant
             end
             clear_submodels
         end
+
+        # Removes any constant this model is registered as
+        def clear_registration_as_constant
+            # Deregister non-permanent models that are registered in the
+            # constant hierarchy
+            if Registration.accessible_by_name?(self)
+                Registration.deregister_constant(self)
+            end
+        end
         
         # Removes the constant that stores the given object in the Ruby constant
         # hierarchy
@@ -126,17 +136,13 @@ module MetaRuby
 
         # Recursively deregisters all non-permanent submodels
         def clear_submodels
-            children = each_submodel.find_all { |m| !m.permanent_model? }
-            if !children.empty?
-                deregister_submodels(children)
+            permanent, non_permanent = each_submodel.partition { |m| m.permanent_model? }
+            if !non_permanent.empty?
+                deregister_submodels(non_permanent)
             end
 
-            children.each do |m|
-                # Deregister non-permanent models that are registered in the
-                # constant hierarchy
-                if Registration.accessible_by_name?(m)
-                    Registration.deregister_constant(m)
-                end
+            non_permanent.each do |m|
+                m.clear_registration_as_constant
             end
 
             # This contains the permanent submodels
@@ -144,9 +150,9 @@ module MetaRuby
             # We can call #clear_submodels while iterating here as it is a
             # constraint that all models in #submodels are permanent (and
             # will therefore not be removed)
-            each_submodel { |m| m.clear_submodels }
+            permanent.each { |m| m.clear_submodels }
             # And this the non-permanent ones
-            children.each { |m| m.clear_submodels }
+            non_permanent.each { |m| m.clear_submodels }
             true
         end
 

data/lib/metaruby/test.rb

@@ -31,6 +31,9 @@ if ENV['TEST_ENABLE_PRY'] != '0'
     end
 end
 
+FlexMock.partials_are_based = true
+FlexMock.partials_verify_signatures = true
+
 module MetaRuby
     # This module is the common setup for all tests
     #

data/lib/metaruby/version.rb

@@ -1,4 +1,4 @@
 module MetaRuby
     # The metaruby library version
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utilrb
@@ -102,6 +102,7 @@ files:
 - bin/.gitattributes
 - lib/metaruby.rb
 - lib/metaruby/attributes.rb
+- lib/metaruby/backward/singleton_class_p.rb
 - lib/metaruby/dsls.rb
 - lib/metaruby/dsls/doc.rb
 - lib/metaruby/dsls/find_through_method_missing.rb
@@ -124,6 +125,7 @@ files:
 - lib/metaruby/gui/html/page_body.rhtml
 - lib/metaruby/gui/html/rock-website.css
 - lib/metaruby/gui/model_browser.rb
+- lib/metaruby/gui/model_hierarchy.rb
 - lib/metaruby/gui/model_selector.rb
 - lib/metaruby/gui/rendering_manager.rb
 - lib/metaruby/gui/ruby_constants_item_model.rb
@@ -155,9 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Modelling using the Ruby language as a metamodel
 test_files: []
-has_rdoc: