activefacts-metamodel 1.9.5 → 1.9.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +7 -3
  3. data/Rakefile +2 -10
  4. data/activefacts-metamodel.gemspec +4 -2
  5. data/cql/Metamodel.cql +20 -5
  6. data/lib/activefacts/metamodel/extensions.rb +141 -9
  7. data/lib/activefacts/metamodel/metamodel.rb +428 -436
  8. data/lib/activefacts/metamodel/version.rb +1 -1
  9. data/lib/activefacts/support.rb +9 -13
  10. data/orm/Metamodel.csproj +13 -18
  11. data/orm/Metamodel.orm +4367 -3855
  12. metadata +26 -12
data/lib/activefacts/metamodel/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module ActiveFacts
2
2
  module Metamodel
3
- VERSION = "1.9.5"
3
+ VERSION = "1.9.6"
4
4
  end
5
5
  end
data/lib/activefacts/support.rb CHANGED
@@ -56,13 +56,9 @@ class Array
56
56
  end
57
57
 
58
58
  class String
59
- class Words
60
- def initialize words
61
- @words = words
62
- end
63
-
64
- def map(&b)
65
- @words.map(&b)
59
+ class Words < Array
60
+ def inspect
61
+ 'Words'+super
66
62
  end
67
63
 
68
64
  def to_s
@@ -70,7 +66,7 @@ class String
70
66
  end
71
67
 
72
68
  def titlewords
73
- @words.map do |word|
69
+ map do |word|
74
70
  word[0].upcase+word[1..-1].downcase
75
71
  end
76
72
  end
@@ -80,7 +76,7 @@ class String
80
76
  end
81
77
 
82
78
  def capwords
83
- @words.map do |word|
79
+ map do |word|
84
80
  word[0].upcase+word[1..-1]
85
81
  end
86
82
  end
@@ -91,7 +87,7 @@ class String
91
87
 
92
88
  def camelwords
93
89
  count = 0
94
- @words.map do |word|
90
+ map do |word|
95
91
  if (count += 1) == 1
96
92
  word
97
93
  else
@@ -105,7 +101,7 @@ class String
105
101
  end
106
102
 
107
103
  def snakewords
108
- @words.map do |w|
104
+ map do |w|
109
105
  w.downcase
110
106
  end
111
107
  end
@@ -115,11 +111,11 @@ class String
115
111
  end
116
112
 
117
113
  def to_a
118
- @words
114
+ self
119
115
  end
120
116
 
121
117
  def +(words)
122
- Words.new(@words + Array(words))
118
+ Words.new(self + Array(words))
123
119
  end
124
120
  end
125
121
 
data/orm/Metamodel.csproj CHANGED
@@ -56,10 +56,22 @@
56
56
  <Reference Include="System.Xml" />
57
57
  </ItemGroup>
58
58
  <ItemGroup>
59
+ <None Include="Metamodel.DCIL.xml">
60
+ <DependentUpon>Metamodel.orm</DependentUpon>
61
+ <AutoGen>True</AutoGen>
62
+ </None>
63
+ <None Include="Metamodel.DDIL.xml">
64
+ <DependentUpon>Metamodel.orm</DependentUpon>
65
+ <AutoGen>True</AutoGen>
66
+ </None>
59
67
  <None Include="Metamodel.orm">
60
68
  <Generator>ORMCustomTool</Generator>
61
69
  <LastGenOutput>Metamodel._ORMCustomToolReport.cs</LastGenOutput>
62
70
  </None>
71
+ <None Include="Metamodel.PostgreSQL.sql">
72
+ <DependentUpon>Metamodel.orm</DependentUpon>
73
+ <AutoGen>True</AutoGen>
74
+ </None>
63
75
  </ItemGroup>
64
76
  <ItemGroup>
65
77
  <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -78,27 +90,10 @@
78
90
  <Install>true</Install>
79
91
  </BootstrapperPackage>
80
92
  </ItemGroup>
81
- <ItemGroup Condition="Exists('Metamodel.orm')">
82
- <None Include="Metamodel.DCIL.xml">
83
- <AutoGen>True</AutoGen>
84
- <DependentUpon>Metamodel.orm</DependentUpon>
85
- <ORMGenerator>ConceptualDBtoDCL</ORMGenerator>
86
- </None>
87
- <None Include="Metamodel.DDIL.xml">
88
- <AutoGen>True</AutoGen>
89
- <DependentUpon>Metamodel.orm</DependentUpon>
90
- <ORMGenerator>DCILtoDDIL</ORMGenerator>
91
- </None>
92
- <None Include="Metamodel.PostgreSQL.sql">
93
- <AutoGen>True</AutoGen>
94
- <DependentUpon>Metamodel.orm</DependentUpon>
95
- <ORMGenerator>DDILtoPostgreSQL</ORMGenerator>
96
- </None>
97
- </ItemGroup>
98
93
  <ItemGroup>
99
94
  <Compile Include="Metamodel._ORMCustomToolReport.cs">
100
- <AutoGen>True</AutoGen>
101
95
  <DependentUpon>Metamodel.orm</DependentUpon>
96
+ <AutoGen>True</AutoGen>
102
97
  </Compile>
103
98
  </ItemGroup>
104
99
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />