RubyGems - metaruby - Versions diffs - 1.0.0.rc1 → 1.0.0.rc2 - Mend

metaruby 1.0.0.rc1 → 1.0.0.rc2

Files changed (35) hide show

checksums.yaml +4 -4
data/.gitignore +3 -0
data/.travis.yml +5 -0
data/Gemfile +3 -0
data/Rakefile +9 -36
data/{.gemtest → bin/.gitattributes} +0 -0
data/lib/metaruby/class.rb +5 -0
data/lib/metaruby/gui/exception_view.rb +58 -15
data/lib/metaruby/gui/html/collection.rb +10 -3
data/lib/metaruby/gui/html/fragment.rhtml +5 -0
data/lib/metaruby/gui/html/list.rhtml +1 -1
data/lib/metaruby/gui/html/page.css +2 -0
data/lib/metaruby/gui/html/page.rb +39 -19
data/lib/metaruby/gui/html/page.rhtml +4 -1
data/lib/metaruby/gui/html/page_body.rhtml +3 -10
data/lib/metaruby/gui/model_browser.rb +55 -24
data/lib/metaruby/gui/model_selector.rb +6 -6
data/lib/metaruby/gui/ruby_constants_item_model.rb +12 -3
data/lib/metaruby/inherited_attribute.rb +6 -0
data/lib/metaruby/module.rb +2 -2
data/lib/metaruby/registration.rb +3 -3
data/lib/metaruby/test.rb +4 -20
data/lib/metaruby/version.rb +3 -0
data/lib/yard-metaruby.rb +117 -0
data/manifest.xml +1 -4
data/metaruby.gemspec +26 -0
metadata +50 -48
data/History.txt +0 -1
data/Manifest.txt +0 -40
data/test/suite.rb +0 -15
data/test/test_attributes.rb +0 -323
data/test/test_class.rb +0 -68
data/test/test_dsls.rb +0 -49
data/test/test_module.rb +0 -105
data/test/test_registration.rb +0 -182

data/lib/metaruby/gui/html/page.rhtml CHANGED

@@ -5,9 +5,12 @@
     <link rel="stylesheet" href="<%= prefix %><%= File.join(ressource_dir, 'page.css') %>" type="text/css" />
     <script type="text/javascript" src="<%= prefix %><%= File.join(ressource_dir, 'jquery.min.js') %>"></script>
     <script type="text/javascript" src="<%= prefix %><%= File.join(ressource_dir, 'jquery.selectfilter.js') %>"></script>
+    <% javascript.each do |js| %>
+        <script type="text/javascript" src="<%= prefix %><%= File.expand_path(js, ressource_dir) %>"></script>
+    <% end %>
     <title><%= page_name %></title>
 </html>
 <body>
-    <%= html_body(:ressource_dir => ressource_dir) %>
+    <%= html_body(ressource_dir: ressource_dir) %>
 </body>

data/lib/metaruby/gui/html/page_body.rhtml CHANGED

@@ -1,17 +1,10 @@
 <% if title %>
-<h1><%= title %></h1>
+    <h1><%= title %></h1>
 <% end %>
 <% fragments.each do |fragment| %>
-    <% if fragment.title %>
-<h2><%= fragment.title %></h2>
-    <% end %>
-<%= HTML.render_button_bar(fragment.buttons) %>
-    <% if fragment.id %>
-<div id="<%= fragment.id %>">
-    <% end %>
-<%= fragment.html %>
+    <%= html_fragment(fragment, ressource_dir: ressource_dir) %>
     <% if fragment.id %>
-</div>
+        </div>
     <% end %>
 <% end %>

data/lib/metaruby/gui/model_browser.rb CHANGED

@@ -32,8 +32,6 @@ module MetaRuby
             # @return [ExceptionView] view that allows to display errors to the
             #   user
             attr_reader :exception_view
-            # @return [Qt::PushButton] button that causes model reloading
-            attr_reader :btn_reload_models
             # @return [RenderingManager] the object that manages all the
             #   rendering objects available
             attr_reader :manager
@@ -46,12 +44,21 @@ module MetaRuby
             attr_reader :history
             # @return [Integer] the index of the current link in the history
             attr_reader :history_index
+            # @return [Qt::BoxLayout] the main layout
+            attr_reader :main_layout
+            # @return [Qt::Splitter] the toplevel splitter (between model
+            #   browser and exception view)
+            attr_reader :vertical_splitter
+            # @return [Qt::Splitter] the horizontal splitter between the model browser and
+            #   the model view
+            attr_reader :central_splitter
             # A Page object with a #link_to method that is suitable for the
             # model browser
             class Page < HTML::Page
                 def uri_for(object)
-                    if (obj_name = object.name) && (obj_name =~ /^[\w:]+$/)
+                    if object.respond_to?(:name) && (obj_name = object.name) && (obj_name =~ /^[\w:]+$/)
                         path = obj_name.split("::")
                         "/" + path.join("/")
                     else super
@@ -60,36 +67,52 @@ module MetaRuby
             end
-            def initialize(main = nil)
-                super
+            def initialize(main = nil, exception_view: nil)
+                super(main)
+                @available_renderers = Hash.new
+                @registered_exceptions = Array.new
+                @history = Array.new
+                @history_index = -1
                 @manager = RenderingManager.new
-                main_layout = Qt::VBoxLayout.new(self)
+                @main_layout = Qt::VBoxLayout.new(self)
+                @vertical_splitter = Qt::Splitter.new(Qt::Vertical, self)
+                main_layout.add_widget(vertical_splitter)
-                menu_layout = Qt::HBoxLayout.new
-                main_layout.add_layout(menu_layout)
-                central_layout = Qt::HBoxLayout.new
-                main_layout.add_layout(central_layout, 3)
-                splitter = Qt::Splitter.new(self)
-                central_layout.add_widget(splitter)
-                @exception_view = ExceptionView.new
-                main_layout.add_widget(exception_view, 1)
+                @central_splitter = Qt::Splitter.new(vertical_splitter)
+                @exception_view = (exception_view ||= ExceptionView.new)
+                exception_view.parent = vertical_splitter
+                connect(exception_view, SIGNAL('fileOpenClicked(const QUrl&)'), self, SLOT('fileOpenClicked(const QUrl&)'))
+                add_central_widgets(central_splitter)
-                @available_renderers = Hash.new
-                @registered_exceptions = Array.new
+                vertical_splitter.add_widget(central_splitter)
+                vertical_splitter.add_widget(exception_view)
+                setTabOrder(model_selector, display)
-                @btn_reload_models = Qt::PushButton.new("Reload", self)
-                menu_layout.add_widget(btn_reload_models)
-                menu_layout.add_stretch(1)
                 update_exceptions
+            end
-                @history = Array.new
-                @history_index = -1
+            def restore_from_settings(settings)
+                %w{central_splitter vertical_splitter}.each do |object_name|
+                    sizes = settings.value(object_name)
+                    if !sizes.null?
+                        sizes = sizes.to_list.map do |obj|
+                            obj.to_int
+                        end
+                        send(object_name).sizes = sizes
+                    end
+                end
+            end
-                add_central_widgets(splitter)
-                setTabOrder(model_selector, display)
-                setTabOrder(display, btn_reload_models)
+            def save_to_settings(settings)
+                %w{central_splitter vertical_splitter}.each do |object_name|
+                    sizes = send(object_name).sizes
+                    sizes = sizes.map { |o| Qt::Variant.new(o) }
+                    settings.set_value(object_name, Qt::Variant.new(sizes))
+                end
             end
             # Update the model selector after {register_type} got called
@@ -171,10 +194,13 @@ module MetaRuby
                     end
                 end
                 connect(page, SIGNAL('updated()'), self, SLOT('update_exceptions()'))
+                connect(page, SIGNAL('fileOpenClicked(const QUrl&)'), self, SLOT('fileOpenClicked(const QUrl&)'))
                 connect(manager, SIGNAL('updated()'), self, SLOT('update_exceptions()'))
                 @page = page
             end
+            signals 'fileOpenClicked(const QUrl&)'
             # Call to render the given model
             #
             # @param [Model] mod the model that should be rendered
@@ -257,6 +283,11 @@ module MetaRuby
                 else select_by_module(h)
                 end
             end
+            # Update the model list
+            def reload
+                model_selector.reload
+            end
         end
     end
 end

data/lib/metaruby/gui/model_selector.rb CHANGED

@@ -19,6 +19,9 @@ module MetaRuby
                 super
                 @type_info = Hash.new
+                @browser_model = RubyConstantsItemModel.new(type_info) do |mod|
+                    model?(mod)
+                end
                 @type_filters = Hash.new
                 layout = Qt::VBoxLayout.new(self)
@@ -141,6 +144,7 @@ module MetaRuby
                 model_filter.dynamic_sort_filter = true
                 model_filter.filter_role = Qt::UserRole
                 model_list.model = model_filter
+                model_filter.source_model = browser_model
                 @filter_box = Qt::LineEdit.new(self)
                 filter_box.connect(SIGNAL('textChanged(QString)')) do |text|
@@ -175,11 +179,7 @@ module MetaRuby
                     end
                 end
-                @browser_model = RubyConstantsItemModel.new(type_info) do |mod|
-                    model?(mod)
-                end
                 browser_model.reload
-                model_filter.source_model = browser_model
                 if current_path && !select_by_path(*current_path)
                     select_by_module(current_module)
@@ -229,7 +229,7 @@ module MetaRuby
             def select_by_path(*path)
                 if index = browser_model.find_index_by_path(*path)
                     index = map_index_from_source(index)
-                    model_list.selection_model.set_current_index(index, Qt::ItemSelectionModel::ClearAndSelect)
+                    model_list.current_index = index
                     true
                 end
             end
@@ -242,7 +242,7 @@ module MetaRuby
             def select_by_module(model)
                 if index = browser_model.find_index_by_model(model)
                     index = map_index_from_source(index)
-                    model_list.selection_model.set_current_index(index, Qt::ItemSelectionModel::ClearAndSelect)
+                    model_list.current_index = index
                     true
                 end
             end

data/lib/metaruby/gui/ruby_constants_item_model.rb CHANGED

@@ -29,6 +29,7 @@ module MetaRuby
             end
             def reload
+                begin_reset_model
                 @id_to_module = []
                 @filtered_out_modules = Set.new
@@ -41,8 +42,12 @@ module MetaRuby
                 @object_paths = Hash.new
                 generate_paths(object_paths, info, "")
+            ensure
+                end_reset_model
+            end
-                emit dataChanged(Qt::ModelIndex.new, Qt::ModelIndex.new)
+            def root_info
+                id_to_module.last
             end
             def generate_paths(paths, info, current)
@@ -176,7 +181,7 @@ module MetaRuby
                         type_info[type].name
                     end.sort.join(",")
                     paths = [compute_path(info)]
-                    paths.concat info.children.map { |child| compute_path(child) }
+                    paths.concat info.children.map { |child| compute_keyword_string(child) }
                     info.keyword_string = "#{types};#{paths.join(",")}"
                 end
             end
@@ -205,7 +210,7 @@ module MetaRuby
             def parent(child)
                 if info = info_from_index(child)
-                    if info.parent
+                    if info.parent && info.parent != root_info
                         return create_index(info.parent.row, 0, info.parent.id)
                     end
                 end
@@ -239,6 +244,10 @@ module MetaRuby
             def find_index_by_path(*path)
                 current = id_to_module.last
+                if path.first == current.name
+                    path.shift
+                end
                 path.each do |name|
                     current = id_to_module.find do |info|
                         info.name == name && info.parent == current

data/lib/metaruby/inherited_attribute.rb CHANGED

@@ -280,6 +280,12 @@ module MetaRuby
                     false
                 end
                 EOF
+            else
+                class_eval <<-EOF, __FILE__, __LINE__+1
+                def has_#{name}?(key)
+                    each_#{name}.any? { |obj| obj == key }
+                end
+                EOF
             end
             class_eval <<-EOF, __FILE__, __LINE__+1

data/lib/metaruby/module.rb CHANGED

@@ -1,5 +1,5 @@
-require 'utilrb/value_set'
 require 'utilrb/module/const_defined_here_p'
 module MetaRuby
     # Extend in modules that are used as models
     #
@@ -150,7 +150,7 @@ module MetaRuby
                 self.supermodel = model.supermodel
             end
             self.supermodel.register_submodel(self)
-            self.parent_models |= model.parent_models
+            self.parent_models.merge(model.parent_models)
             self.parent_models << model
         end
     end

data/lib/metaruby/registration.rb CHANGED

@@ -21,7 +21,7 @@ module MetaRuby
         # @return [Boolean]
         attr_predicate :permanent_model?, true
-        # [Set] the set of models that are children of this one
+        # @return [Set] the set of models that are children of this one
         attribute(:submodels) { Set.new }
         # Returns the model that is parent of this one
@@ -141,10 +141,10 @@ module MetaRuby
         #
         # This is usually not called directly. Use #clear_submodels instead
         #
-        # @param [Set] set the set of submodels to remove
+        # @param [ValueSet] set the set of submodels to remove
         def deregister_submodels(set)
             current_size = submodels.size
-            submodels.subtract(set)
+            submodels.subtract(set.to_value_set)
             if m = supermodel
                 m.deregister_submodels(set)
             end

data/lib/metaruby/test.rb CHANGED

@@ -3,7 +3,9 @@
 if ENV['TEST_ENABLE_COVERAGE'] == '1'
     begin
         require 'simplecov'
-        SimpleCov.start
+        SimpleCov.start do
+            add_filter "test"
+        end
     rescue LoadError
         require 'metaruby'
         MetaRuby.warn "coverage is disabled because the 'simplecov' gem cannot be loaded"
@@ -16,7 +18,7 @@ end
 require 'metaruby'
 require 'minitest/autorun'
 require 'minitest/spec'
-require 'flexmock/test_unit'
+require 'flexmock/minitest'
 if ENV['TEST_ENABLE_PRY'] != '0'
     begin
@@ -41,33 +43,15 @@ module MetaRuby
     #   end
     #
     module SelfTest
-        if defined? FlexMock
-            include FlexMock::ArgumentTypes
-            include FlexMock::MockContainer
-        end
         def setup
             # Setup code for all the tests
         end
         def teardown
-            if defined? FlexMock
-                flexmock_teardown
-            end
-            # Teardown code for all the tests
         end
     end
 end
-# Workaround a problem with flexmock and minitest not being compatible with each
-# other (currently). See github.com/jimweirich/flexmock/issues/15.
-if defined?(FlexMock) && !FlexMock::TestUnitFrameworkAdapter.method_defined?(:assertions)
-    class FlexMock::TestUnitFrameworkAdapter
-        attr_accessor :assertions
-    end
-    FlexMock.framework_adapter.assertions = 0
-end
 module Minitest
     class Spec
         include MetaRuby::SelfTest

data/lib/metaruby/version.rb ADDED

@@ -0,0 +1,3 @@
+module MetaRuby
+    VERSION = "1.0.0.rc2"
+end

data/lib/yard-metaruby.rb ADDED

@@ -0,0 +1,117 @@
+require 'pp'
+module MetaRuby
+    module YARD
+        include ::YARD
+        class InheritedAttributeHandler < YARD::Handlers::Ruby::AttributeHandler
+            handles method_call(:inherited_attribute)
+            namespace_only
+            def self.process(handler, name, attr_name, is_map, key_name = nil, return_type = nil)
+            end
+            def process
+                name = statement.parameters[0].jump(:tstring_content, :ident).source
+                if statement.parameters.size == 4
+                    attr_name = statement.parameters[1].jump(:tstring_content, :ident).source
+                else
+                    attr_name = name
+                end
+                options = statement.parameters.jump(:assoc)
+                is_map = false
+                if options != statement.parameters
+                    key = options[0].jump(:ident).source
+                    value = options[1].jump(:ident).source
+                    if key == "map" && value == "true"
+                        is_map = true
+                    end
+                end
+                key_type, value_type = nil
+                object = YARD::CodeObjects::MethodObject.new(namespace, attr_name, scope) do |o|
+                    o.dynamic = true
+                    o.aliases << "self_#{name}"
+                end
+                register(object)
+                key_name ||=
+                    if object.docstring.has_tag?('key_name')
+                        object.docstring.tag('key_name').text
+                    else
+                        'key'
+                    end
+                return_type ||=
+                    if object.docstring.has_tag?('return')
+                        object.docstring.tag('return').types.first
+                    elsif is_map
+                        'Hash<Object,Object>'
+                    else
+                        'Array<Object>'
+                    end
+                if return_type =~ /^\w+\<(.*)\>$/
+                    if is_map
+                        key_type, value_type = $1.split(',')
+                    else
+                        value_type = $1
+                    end
+                else
+                    key_type = "Object"
+                    value_type = "Object"
+                end
+                object = YARD::CodeObjects::MethodObject.new(namespace, "all_#{name}", scope)
+                object.dynamic = true
+                register(object)
+                object.docstring.replace("The union, along the class hierarchy, of all the values stored in #{name}\n@return [Array<#{value_type}>]")
+                if is_map
+                    object = YARD::CodeObjects::MethodObject.new(namespace, "find_#{name}", scope)
+                    object.dynamic = true
+                    register(object)
+                    object.parameters << [key_name]
+                    object.docstring.replace("
+Looks for objects registered in #{name} under the given key, and returns the first one in the ancestor chain
+(i.e. the one tha thas been registered in the most specialized class)
+@return [#{value_type},nil] the found object, or nil if none is registered under that key")
+                    object = YARD::CodeObjects::MethodObject.new(namespace, "has_#{name}?", scope)
+                    object.dynamic = true
+                    register(object)
+                    object.parameters << [key_name]
+                    object.docstring.replace("Returns true if an object is registered in #{name} anywhere in the class hierarchy\n@return [Boolean]")
+                    object.signature = "def has_#{name}?(key)"
+                    object = YARD::CodeObjects::MethodObject.new(namespace, "each_#{name}", scope)
+                    object.dynamic = true
+                    register(object)
+                    object.parameters << [key_name, "nil"] << ["uniq", "true"]
+                    object.docstring.replace("
+@overload each_#{name}(#{key_name}, uniq = true)
+  Enumerates all objects registered in #{name} under the given key
+  @yield [element]
+  @yieldparam [#{value_type}] element
+@overload each_#{name}(nil, uniq = true)
+  Enumerates all objects registered in #{name}
+  @yield [#{key_name}, element]
+  @yieldparam [#{key_type}] #{key_name}
+  @yieldparam [#{value_type}] element
+                    ")
+                else
+                    object = YARD::CodeObjects::MethodObject.new(namespace, "each_#{name}", scope)
+                    object.dynamic = true
+                    register(object)
+                    object.docstring.replace("Enumerates all objects registered in #{name}\n@return []\n@yield [element]\n@yieldparam [#{value_type}] element")
+                end
+                if is_map
+                    return key_type, value_type
+                else
+                    return value_type
+                end
+            end
+        end
+        YARD::Tags::Library.define_tag("Key for inherited_attribute(_, :map => true)", :key_name)
+    end
+end