reality-mda 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f78f97e0eaef788e6dd8be60def7c86d705f5f
-  data.tar.gz: 67caf75f9efd96fe6482b2dca33d87350a884b48
+  metadata.gz: bc8f6a5a3a8ba9f669cf539e149b6e3afd96a431
+  data.tar.gz: c5a09d846dcaca79a22e0b351c0dd4e9a043b0ab
 SHA512:
-  metadata.gz: 5ab5e00f3d41cdc78532739a506d4af6cdd79a5e6ad42b9a40a4d0424937a47d58425864d1996bd2dc24e2858fdeb072108e2bd80dd506fa405cf0b6ce5ec896
-  data.tar.gz: 64543fe870c3aa17eb966a56e2e441ff43486cf5079a5ba2653fb9d3bfb46db3b536d07178c2e1d5e512b0da1674a63ed1f11a3065e7143ceb0e09a42b4bc566
+  metadata.gz: 3f9871559b74f2a9c8bda2a8f13d6962a52ce9c6a22974a0384326d422429f80d3463d8b1c8c4cc30e296b6b6f92629b689a2fa574e479f999533d37db2cabbc
+  data.tar.gz: 0383c196e7d77d18cf572ed114970ec3bfb1c3e107f5be01cf6ff9270e692ac1373c532c8d705f67bc4004bcf366b74db42d24b43f7f1dca5d52a813af9310bd

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 sudo: false
 rvm:
   - 2.3.1
-  - jruby-19mode
 jdk:
   - oraclejdk8
 git:

data/lib/reality/mda.rb

@@ -13,6 +13,9 @@
 #
 
 require 'reality/logging'
+require 'reality/facets'
+require 'reality/generators'
+require 'reality/model'
 require 'reality/naming'
 require 'reality/options'
 require 'reality/orderedhash'

data/lib/reality/mda/core.rb

@@ -70,6 +70,7 @@ module Reality #nodoc
 
         root_element = root_elements[0]
         define_build_container(module_type, root_element, template_set_container, options)
+        module_type
       end
 
       private

data/reality-mda.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{reality-mda}
-  s.version            = '1.4.0'
+  s.version            = '1.5.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'reality-model', '>= 1.1.0'
   s.add_dependency 'reality-orderedhash', '>= 1.0.0'
 
-  s.add_development_dependency 'reality-facets', '>= 1.3.0'
   s.add_development_dependency(%q<minitest>, ['= 5.9.1'])
   s.add_development_dependency(%q<test-unit>, ['= 3.1.5'])
 end

data/test/helper.rb

@@ -6,4 +6,34 @@ require 'reality/mda'
 
 class Reality::Mda::TestCase < Minitest::Test
   include Test::Unit::Assertions
+
+  def setup
+    FileUtils.mkdir_p self.working_dir
+
+    self.class.send(:remove_const, :TestModule) if self.class.const_defined?(:TestModule)
+    self.class.class_eval <<-RUBY
+      module TestModule
+      end
+    RUBY
+  end
+
+  def teardown
+    if passed?
+      FileUtils.rm_rf self.working_dir if File.exist?(self.working_dir)
+    else
+      $stderr.puts "Test #{self.class.name}.#{name} Failed. Leaving working directory #{self.working_dir}"
+    end
+  end
+
+  def local_dir(directory = SecureRandom.hex)
+    "#{working_dir}/#{directory}"
+  end
+
+  def working_dir
+    @working_dir ||= "#{workspace_dir}/#{SecureRandom.hex}"
+  end
+
+  def workspace_dir
+    @workspace_dir ||= ENV['TEST_TMP_DIR'] || File.expand_path("#{File.dirname(__FILE__)}/../tmp/workspace")
+  end
 end

data/test/mda/templates/helper.java.erb

@@ -0,0 +1 @@
+<%= icon_set.gwt.qualified_helper_name %>

data/test/mda/test_core.rb

@@ -0,0 +1,74 @@
+require File.expand_path('../../helper', __FILE__)
+
+class Reality::Mda::TestCore < Reality::Mda::TestCase
+  def test_define_system_using_defaults
+    module_type = Reality::Mda.define_system(TestModule) do |r|
+      r.model_element(:icon_set)
+      r.model_element(:icon, :icon_set)
+    end
+
+    assert_equal TestModule, module_type
+
+    assert_true TestModule.const_defined?(:Model), 'TestModule::Model defined'
+    assert_true TestModule.const_defined?(:FacetManager), 'TestModule::FacetManager defined'
+    assert_true TestModule.const_defined?(:TemplateSetManager), 'TestModule::TemplateSetManager defined'
+
+    # And the models
+    assert_true TestModule::Model.const_defined?(:IconSet), 'TestModule::Model::IconSet defined'
+    assert_true TestModule::Model.const_defined?(:Icon), 'TestModule::Model::Icon defined'
+
+    # And the Logging
+    assert_true TestModule.const_defined?(:Logger), 'TestModule::Logger defined'
+
+    TestModule::FacetManager.facet(:gwt) do |facet|
+      facet.enhance(TestModule::Model::IconSet) do
+        def self.facet_templates_directory
+          File.expand_path("#{File.dirname(__FILE__)}/templates")
+        end
+
+        def helper_name
+          "#{Reality::Naming.pascal_case(icon_set.name)}Helper"
+        end
+
+        def qualified_helper_name
+          "#{Reality::Naming.underscore(icon_set.name)}.helpers.#{helper_name}"
+        end
+
+        java_artifact(:assets, :helper)
+      end
+    end
+
+    assert_true TestModule::FacetManager::FacetDefinitions.const_defined?(:GwtIconSetFacet), 'TestModule::FacetManager::FacetDefinitions::GwtIconSetFacet defined'
+    assert_false TestModule::FacetManager::FacetDefinitions.const_defined?(:GwtIconFacet), 'TestModule::FacetManager::FacetDefinitions::GwtIconFacet defined'
+
+    # There is no icon_sets defined yet
+    assert_equal 0, TestModule.icon_sets.size
+
+    # Test model is hooked up correctly
+    TestModule.icon_set(:fa) do |s|
+      s.enable_facets(:gwt)
+      assert_equal 'fa.helpers.FaHelper', s.gwt.qualified_helper_name
+      s.icon(:map_marker)
+      s.icon(:cross)
+    end
+
+    assert_equal 1, TestModule.icon_sets.size
+
+    icon_set = TestModule.icon_set_by_name(:fa)
+
+    assert_equal :fa, icon_set.name
+    assert_equal 2, icon_set.icons.size
+
+    target_dir = self.local_dir
+
+    TestModule::TemplateSetManager.generator.generate(:icon_set, icon_set, target_dir, [:gwt_assets], nil)
+
+    generated_file = "#{target_dir}/main/java/fa/helpers/FaHelper.java"
+    assert_true File.exist?(generated_file)
+    assert_equal "fa.helpers.FaHelper\n",IO.read(generated_file)
+
+    assert_true TestModule.const_defined?(:Build), 'TestModule::Build defined'
+    assert_true TestModule::Build.const_defined?(:GenerateTask), 'TestModule::Build::GenerateTask defined'
+    assert_true TestModule::Build.const_defined?(:LoadDescriptor), 'TestModule::Build::LoadDescriptor defined'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reality-mda
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Peter Donald
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: reality-facets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +142,8 @@ files:
 - lib/reality/mda/core.rb
 - reality-mda.gemspec
 - test/helper.rb
+- test/mda/templates/helper.java.erb
+- test/mda/test_core.rb
 homepage: https://github.com/realityforge/reality-mda
 licenses: []
 metadata: {}