metaruby 1.0.0.rc3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f6d60aa23a3e9e790ac1613c65fc2a0b446f0de
-  data.tar.gz: e22d9104e853727888c91504b5d25dbf29234e9a
+  metadata.gz: 209d7c5d2bfb1aef6d4370e9b87d5635f4cbe093
+  data.tar.gz: ebbba741e3cb1511ebf7f05a6e4e4d242b23ffda
 SHA512:
-  metadata.gz: e59cba378c250b744c75cd654c426cbbd801812df83e45a07fe2ba22ef15a903490d61d039ea67cdfc275e2dbf629739f1507f30ef16aacd79b52f8948be0c3f
-  data.tar.gz: 58bee189d56019dab2103b3944d3ec24001e044ce16dd76ca3101f9ff097652c44dbdabc6862affeed7f1a522fd7b839c54da0a016236c57447adb1591126de5
+  metadata.gz: 6fffccb4135deee4fa523fc09b79a9ab66eb8783ec7de35bc88a29876842909210795adca46afc8514b4ae28de51ed9c4045a0e8f54da06cf8948424629edc2c
+  data.tar.gz: 2b832a3185e0b0a4c657979a1b0a86f362541d4cb09364355b40c50d7bbcd86de4fe5356131f36af6d669ea8dd08f7d7faadb5710d303abff23d1ff488d0779c

data/.gitignore

@@ -2,3 +2,4 @@
 coverage/
 doc/
 .*.sw?
+pkg/

data/.travis.yml

@@ -4,6 +4,8 @@ rvm:
   - 2.0.0
   - 2.1.6
   - 2.2.2
+  - 2.3.0
+  - jruby-9.0.4.0
 script:
     - bundle exec rake
     - bundle exec rake test

data/README.md

@@ -1,6 +1,8 @@
-# Metamodelling in the Ruby type system
+[![Build Status](https://travis-ci.org/rock-core/tools-metaruby.svg?branch=master)](https://travis-ci.org/rock-core/tools-metaruby)
+[![Gem Version](https://badge.fury.io/rb/metaruby.svg)](http://badge.fury.io/rb/metaruby)
+[![Documentation](http://b.repl.ca/v1/yard-docs-blue.png)](http://rubydoc.info/gems/metaruby/frames)
 
-* https://gitorious.org/rock-toolchain/metaruby
+# Metamodelling in the Ruby type system
 
 MetaRuby is a library that allows to (ab)use the Ruby type system to create
 reflexive programs: create a specialized modelling API (a.k.a. "a DSL") at the

data/Rakefile

@@ -6,6 +6,7 @@ task :default
 Rake::TestTask.new(:test) do |t|
     t.libs << "lib"
     t.libs << "."
+    t.ruby_opts << '-w'
     t.test_files = FileList['test/suite.rb']
 end
 

data/lib/metaruby/{inherited_attribute.rb → attributes.rb}

@@ -36,35 +36,6 @@ module MetaRuby
     #       end
     #   end
     module Attributes
-        # Internal representation of inherited attributes
-        class InheritedAttribute < Struct.new(:single_value, :name, :accessor_name, :init)
-        end
-
-        # The set of inherited attributes defined on this object
-        # @return [Array<InheritedAttribute>]
-        attribute(:inherited_attributes) { Array.new }
-
-        # Tests for the existence of an inherited attribute by its name
-        #
-        # @param [String] name the attribute name
-        # @return [Boolean] true if there is an attribute defined with the given
-        #   name
-        def inherited_attribute_defined?(name)
-            inherited_attributes.any? { |ih| ih.name == name }
-        end
-
-        # Returns the inherited attribute definition that matches the given name
-        #
-        # @param [String] name the attribute name
-        # @return [InheritedAttribute] the attribute definition
-        # @raise [ArgumentError] if no attribute with that name exists
-        def inherited_attribute_by_name(name)
-            if attr = inherited_attributes.find { |ih| ih.name == name }
-                return attr
-            else raise ArgumentError, "#{self} has no inherited attribute called #{name}"
-            end
-        end
-
         def included(mod)
             mod.extend Attributes
         end
@@ -288,20 +259,19 @@ module MetaRuby
         #   B.enum_for(:each_mapped, 'name').to_a # => ["B"]
         #   B.enum_for(:each_mapped, 'name', false).to_a # => ["B", "A"]
         #
-        def inherited_attribute(name, attribute_name = name, options = Hash.new, &init) # :nodoc:
+        def inherited_attribute(name, attribute_name = name, yield_key: true, map: false, enum_with: :each, &init) # :nodoc:
             # Set up the attribute accessor
             attribute(attribute_name, &init)
             class_eval { private "#{attribute_name}=" }
 
             promote = method_defined?("promote_#{name}")
-            options[:enum_with] ||= :each
 
             class_eval <<-EOF, __FILE__, __LINE__+1
             def all_#{name}; each_#{name}.to_a end
             def self_#{name}; @#{attribute_name} end
             EOF
 
-            if options[:map]
+            if map
                 class_eval <<-EOF, __FILE__, __LINE__+1
                 def find_#{name}(key)
                     raise ArgumentError, "nil cannot be used as a key in find_#{name}" if !key
@@ -343,16 +313,16 @@ module MetaRuby
             EOF
 
             if !promote
-                if options[:map]
-                    class_eval(*Attributes.map_without_promotion(name, attribute_name, options))
+                if map
+                    class_eval(*Attributes.map_without_promotion(name, attribute_name, yield_key: yield_key, enum_with: enum_with))
                 else
-                    class_eval(*Attributes.nomap_without_promotion(name, attribute_name, options))
+                    class_eval(*Attributes.nomap_without_promotion(name, attribute_name, enum_with: enum_with))
                 end
             else
-                if options[:map]
-                    class_eval(*Attributes.map_with_promotion(name, attribute_name, options))
+                if map
+                    class_eval(*Attributes.map_with_promotion(name, attribute_name, yield_key: yield_key, enum_with: enum_with))
                 else
-                    class_eval(*Attributes.nomap_with_promotion(name, attribute_name, options))
+                    class_eval(*Attributes.nomap_with_promotion(name, attribute_name, enum_with: enum_with))
                 end
             end
         end
@@ -361,7 +331,7 @@ module MetaRuby
         #
         # Helper class that defines the iteration method for inherited_attribute
         # when :map is set and there is not promotion method
-        def self.map_without_promotion(name, attribute_name, options)
+        def self.map_without_promotion(name, attribute_name, yield_key: true, enum_with: :each)
             code, file, line =<<-EOF, __FILE__, __LINE__+1
             def each_#{name}(key = nil, uniq = true)
                 if !block_given?
@@ -384,7 +354,7 @@ module MetaRuby
                 elsif !uniq
                     for klass in ancestors
                         if klass.instance_variable_defined?(:@#{attribute_name})
-                            klass.#{attribute_name}.#{options[:enum_with]} do |el|
+                            klass.#{attribute_name}.#{enum_with} do |el|
                                 yield(el)
                             end
                         end
@@ -393,10 +363,10 @@ module MetaRuby
                     seen = Set.new
                     for klass in ancestors
                         if klass.instance_variable_defined?(:@#{attribute_name})
-                            klass.#{attribute_name}.#{options[:enum_with]} do |el| 
-                                unless seen.include?(el.first)
-                                    seen << el.first
-                                    yield(el)
+                            klass.#{attribute_name}.#{enum_with} do |el_key, el| 
+                                if !seen.include?(el_key)
+                                    seen << el_key
+                                    #{if yield_key then 'yield(el_key, el)' else 'yield(el)' end}
                                 end
                             end
                         end
@@ -413,7 +383,7 @@ module MetaRuby
         #
         # Helper class that defines the iteration method for inherited_attribute
         # when :map is not set and there is no promotion method
-        def self.nomap_without_promotion(name, attribute_name, options)
+        def self.nomap_without_promotion(name, attribute_name, enum_with: :each)
             code, file, line =<<-EOF, __FILE__, __LINE__+1
             def each_#{name}
                 if !block_given?
@@ -426,7 +396,7 @@ module MetaRuby
                 end
                 for klass in ancestors
                     if klass.instance_variable_defined?(:@#{attribute_name})
-                        klass.#{attribute_name}.#{options[:enum_with]} { |el| yield(el) }
+                        klass.#{attribute_name}.#{enum_with} { |el| yield(el) }
                     end
                 end
                 self
@@ -439,7 +409,7 @@ module MetaRuby
         #
         # Helper class that defines the iteration method for inherited_attribute
         # when :map is set and there is a promotion method
-        def self.map_with_promotion(name, attribute_name, options)
+        def self.map_with_promotion(name, attribute_name, yield_key: true, enum_with: :each)
             code, file, line =<<-EOF, __FILE__, __LINE__+1
             def each_#{name}(key = nil, uniq = true)
                 if !block_given?
@@ -469,11 +439,11 @@ module MetaRuby
                     promotions = []
                     for klass in ancestors
                         if klass.instance_variable_defined?(:@#{attribute_name})
-                            klass.#{attribute_name}.#{options[:enum_with]} do |k, v|
+                            klass.#{attribute_name}.#{enum_with} do |k, v|
                                 for p in promotions
                                     v = p.promote_#{name}(k, v)
                                 end
-                                yield(k, v)
+                                #{if yield_key then 'yield(k, v)' else 'yield(v)' end}
                             end
                         end
                         promotions.unshift(klass) if klass.respond_to?("promote_#{name}")
@@ -483,13 +453,13 @@ module MetaRuby
                     promotions = []
                     for klass in ancestors
                         if klass.instance_variable_defined?(:@#{attribute_name})
-                            klass.#{attribute_name}.#{options[:enum_with]} do |k, v|
+                            klass.#{attribute_name}.#{enum_with} do |k, v|
                                 unless seen.include?(k)
                                     for p in promotions
                                         v = p.promote_#{name}(k, v)
                                     end
                                     seen << k
-                                    yield(k, v)
+                                    #{if yield_key then 'yield(k, v)' else 'yield(v)' end}
                                 end
                             end
                         end
@@ -506,7 +476,7 @@ module MetaRuby
         #
         # Helper class that defines the iteration method for inherited_attribute
         # when :map is not set and there is a promotion method
-        def self.nomap_with_promotion(name, attribute_name, options)
+        def self.nomap_with_promotion(name, attribute_name, enum_with: :each)
             code, file, line =<<-EOF, __FILE__, __LINE__+1
             def each_#{name}
                 if !block_given?
@@ -520,7 +490,7 @@ module MetaRuby
                 promotions = []
                 for klass in ancestors
                     if klass.instance_variable_defined?(:@#{attribute_name})
-                        klass.#{attribute_name}.#{options[:enum_with]} do |value|
+                        klass.#{attribute_name}.#{enum_with} do |value|
                             for p in promotions
                                 value = p.promote_#{name}(value)
                             end

data/lib/metaruby/gui/exception_rendering.rb

@@ -194,7 +194,7 @@ module MetaRuby
                 each_exception_from(e) do |exception|
                     if !seen.include?(exception)
                         seen << exception
-                        html << render_single_exception(e, "#{id}-#{counter += 1}")
+                        html << render_single_exception(exception, "#{id}-#{counter += 1}")
                     end
                 end
                 html.join("\n")

data/lib/metaruby/gui/html/page.rb

@@ -71,7 +71,7 @@ module MetaRuby::GUI
                 @templates = Hash.new
                 @auto_id = 0
 
-                if page.kind_of?(Qt::WebPage)
+                if defined?(Qt::WebPage) && page.kind_of?(Qt::WebPage)
                     page.link_delegation_policy = Qt::WebPage::DelegateAllLinks
                     Qt::Object.connect(page, SIGNAL('linkClicked(const QUrl&)'), self, SLOT('pageLinkClicked(const QUrl&)'))
                 end

data/lib/metaruby/gui/html.rb

@@ -1,3 +1,4 @@
+require 'kramdown'
 require 'metaruby/gui/html/button'
 require 'metaruby/gui/html/page'
 require 'metaruby/gui/html/collection'

data/lib/metaruby/gui/ruby_constants_item_model.rb

@@ -156,7 +156,7 @@ module MetaRuby
                                        end
 
                     children_modules = children_modules.map do |child_name|
-                        next if !mod.const_defined_here?(child_name)
+                        next if !mod.const_defined?(child_name, false)
                         # Ruby issues a warning when one tries to access Config
                         # (it has been deprecated in favor of RbConfig). Ignore
                         # it explicitly

data/lib/metaruby/{class.rb → model_as_class.rb}

@@ -37,17 +37,15 @@ module MetaRuby
         #
         # @return [String] the assigned name
         def name=(name)
-            # This is dynamically defined. The reason is that there is no way to
-            # call 'super' to get the default Class#name, so we define our name
-            # only when it is explicitely assigned
-            def self.name
-                if @name then @name
-                else super
-                end
-            end
             @name = name
         end
 
+        def name
+            if @name then @name
+            else super
+            end
+        end
+
         # The model next in the ancestry chain, or nil if +self+ is root
         #
         # @return [Class]
@@ -78,10 +76,10 @@ module MetaRuby
             Thread.current[FROM_NEW_SUBMODEL_TLS] = true
             model = self.class.new(self)
             model.permanent_model = false
+            setup_submodel(model, **submodel_options, &block)
             if name
                 model.name = name
             end
-            setup_submodel(model, **submodel_options, &block)
             model
         end
 
@@ -92,6 +90,8 @@ 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
@@ -106,7 +106,12 @@ module MetaRuby
             from_new_submodel = Thread.current[FROM_NEW_SUBMODEL_TLS]
             Thread.current[FROM_NEW_SUBMODEL_TLS] = false
 
-            subclass.definition_location = call_stack
+            subclass.definition_location = 
+                if MetaRuby.keep_definition_location?
+                    call_stack
+                else Array.new
+                end
+            subclass.instance_variable_set :@name, nil
             super
             subclass.permanent_model = subclass.accessible_by_name? &&
                 subclass.permanent_definition_context?
@@ -120,6 +125,11 @@ module MetaRuby
             include model_as_module
         end
 
+        def self.extend_object(klass)
+            super
+            klass.instance_variable_set :@name, nil
+        end
+
         # Tests whether the given model-as-module is provided by self
         def provides?(model_as_module)
             self <= model_as_module

data/lib/metaruby/{module.rb → model_as_module.rb}

@@ -1,5 +1,3 @@
-require 'utilrb/module/const_defined_here_p'
-
 module MetaRuby
     # Extend in modules that are used as models
     #
@@ -60,7 +58,7 @@ module MetaRuby
         def self.create_and_register_submodel(namespace, name, base_model, *args, &block)
             ModelAsModule.validate_constant_name(name)
 
-            if namespace.const_defined_here?(name)
+            if namespace.const_defined?(name, false)
                 model = namespace.const_get(name)
                 base_model.setup_submodel(model, *args, &block)
             else 
@@ -96,14 +94,20 @@ module MetaRuby
         #
         # @return [String] the assigned name
         def name=(name)
-            def self.name
-                if @name then @name
-                else super
-                end
-            end
             @name = name
         end
 
+        def name
+            if @name then @name
+            else super
+            end
+        end
+
+        def self.extend_object(obj)
+            obj.instance_variable_set :@name, nil
+            super
+        end
+
         # Set or get the root model
         attr_accessor :supermodel
 
@@ -117,10 +121,15 @@ module MetaRuby
         def new_submodel(name: nil, type: self.class, **submodel_options, &block)
             model = type.new
             model.extend ModelAsModule
-            if name
-                model.name = name.dup
-            end
-            model.definition_location = call_stack
+            model.name =
+                if name
+                    name.dup
+                end
+            model.definition_location = 
+                if MetaRuby.keep_definition_location?
+                    call_stack
+                else Array.new
+                end
             setup_submodel(model, submodel_options, &block)
             model
         end
@@ -158,15 +167,34 @@ module MetaRuby
             class_eval(&block)
         end
 
+        # Tests whether self provides the given model
+        #
+        # @param [Module] model
+        def provides?(model)
+            self <= model
+        end
+
         # Declares that this model also provides this other given model
         def provides(model)
             include model
-            if model.root?
-                self.supermodel = model
-            else
-                self.supermodel = model.supermodel
+
+            model_root =
+                if model.root? then model
+                else model.supermodel
+                end
+
+            if !supermodel
+                self.supermodel = model_root
+                self.supermodel.register_submodel(self)
+            elsif supermodel != model_root
+                if model_root.provides?(supermodel)
+                    self.supermodel = model_root
+                elsif !supermodel.provides?(model_root)
+                    raise ArgumentError, "#{model}'s root is #{model_root} while #{self} is #{supermodel}, which are unrelated"
+                end
+                self.supermodel.register_submodel(self)
             end
-            self.supermodel.register_submodel(self)
+
             self.parent_models.merge(model.parent_models)
             self.parent_models << model
         end

data/lib/metaruby/registration.rb

@@ -27,16 +27,6 @@ module MetaRuby
         # @return [Array<WeakRef>] the set of models that are children of this one
         attribute(:submodels) { Array.new }
 
-        # Returns the model that is parent of this one
-        #
-        # The default implementation returns superclass if it is extended by
-        # this Registration module, and nil otherwise
-        def supermodel
-            if superclass.respond_to?(:register_submodel)
-                superclass
-            end
-        end
-
         # Returns whether a model is a submodel of self
         def has_submodel?(model)
             each_submodel.any? { |m| m == model }
@@ -80,7 +70,11 @@ module MetaRuby
         # Call to register a model that is a submodel of +self+
         def register_submodel(klass)
             if !klass.definition_location
-                klass.definition_location = call_stack
+                klass.definition_location = 
+                    if MetaRuby.keep_definition_location?
+                        call_stack
+                    else Array.new
+                    end
             end
 
             submodels << WeakRef.new(klass)

data/lib/metaruby/version.rb

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

data/lib/metaruby.rb

@@ -1,10 +1,10 @@
 require 'utilrb/object/attribute'
 require 'weakref'
 
-require 'metaruby/inherited_attribute'
+require 'metaruby/attributes'
 require 'metaruby/registration'
-require 'metaruby/module'
-require 'metaruby/class'
+require 'metaruby/model_as_module'
+require 'metaruby/model_as_class'
 
 require 'utilrb/logger'
 
@@ -20,5 +20,10 @@ module MetaRuby
     LIB_DIR = File.expand_path('metaruby', File.dirname(__FILE__))
 
     extend Logger::Root('MetaRuby', Logger::WARN)
+
+    class << self
+        attr_predicate :keep_definition_location?, true
+    end
+    self.keep_definition_location = true
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utilrb
@@ -101,7 +101,7 @@ files:
 - Rakefile
 - bin/.gitattributes
 - lib/metaruby.rb
-- lib/metaruby/class.rb
+- lib/metaruby/attributes.rb
 - lib/metaruby/dsls.rb
 - lib/metaruby/dsls/doc.rb
 - lib/metaruby/dsls/find_through_method_missing.rb
@@ -127,8 +127,8 @@ files:
 - lib/metaruby/gui/model_selector.rb
 - lib/metaruby/gui/rendering_manager.rb
 - lib/metaruby/gui/ruby_constants_item_model.rb
-- lib/metaruby/inherited_attribute.rb
-- lib/metaruby/module.rb
+- lib/metaruby/model_as_class.rb
+- lib/metaruby/model_as_module.rb
 - lib/metaruby/registration.rb
 - lib/metaruby/test.rb
 - lib/metaruby/version.rb
@@ -150,9 +150,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.3