activefacts-orm 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd75d822b0249191ccb0a194683892d77c927002
-  data.tar.gz: 083c5a576d145726ca942393ad5827b4d5c57c8f
+  metadata.gz: a5de13af34b48c190fde79e8245f046048e3073c
+  data.tar.gz: a29a24446d3aeb29679b3c4e642767c7c3532185
 SHA512:
-  metadata.gz: b0591d5466cbbdc9e212c827210c9a75bb5d90cd0c7b786977cac789eec5cbdc34379473bc9400556d6ef97a426821d270f365b18e6ef02b6057b4d442966d01
-  data.tar.gz: 045f05c2a13de02a8ec099bcf3d75c8de04cdee00a62bacdca0ffc09093a8f7690da3efc9ff9bab1eb1c230020d5e8683c49e90e46325c125a2357c39fc71120
+  metadata.gz: 9f7dc359de1cb3cba12b3bc36441a79bfb82bb4c941e2d2ad084a4fe22f59add83e0f4dc638d0f03fbf53e8db48562fe02ce38afcc8b14d3a0b76c5a26a9183b
+  data.tar.gz: 117f7b084216255697b4f3e31828bda52f4cc2a0bc01fbf22726e5f14c58d49117fe112126b316b807ca181a76a3d40606867382605d5b41602f830eabc706b3

data/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-if ENV['PWD'] =~ %r{\A/Users/cjh/work/activefacts}
+if ENV['PWD'] =~ %r{\A#{ENV['HOME']}/work}
+  $stderr.puts "Using work area gems for #{File.basename(File.dirname(__FILE__))} from activefacts-orm"
   gem 'activefacts-api', path: '/Users/cjh/work/activefacts/api'
   gem 'activefacts-metamodel', path: '/Users/cjh/work/activefacts/metamodel'
   # gem 'activefacts-metamodel', git: 'git://github.com/cjheath/activefacts-metamodel.git'

data/activefacts-orm.gemspec

@@ -19,10 +19,10 @@ Install the Natural ORM Architect from http://ormfoundation.org to produce input
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10.a"
+  spec.add_development_dependency "bundler", ">= 1.10", "~> 1.10.6"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_runtime_dependency(%q<activefacts-metamodel>, [">= 1.7.0", "~> 1.7"])
-  spec.add_runtime_dependency(%q<nokogiri>)
+  spec.add_runtime_dependency "activefacts-metamodel", ">= 1.8", "~> 1.8.0"
+  spec.add_runtime_dependency "nokogiri", ">= 1.6", "~> 1.6.6.2"
 end

data/lib/activefacts/input/orm.rb

@@ -332,7 +332,7 @@ module ActiveFacts
         facts = []
 
         trace :orm, "Reading sub-types" do
-          @x_subtypes.each{|x|
+          @x_subtypes.each do |x|
             id = x['id']
             name = (x['Name'] || x['_Name'] || '').gsub(/\s+/,' ').gsub(/-/,'_').strip
             name = nil if name.size == 0
@@ -385,7 +385,7 @@ module ActiveFacts
             n = 'aeioh'.include?(subtype_role.object_type.name.downcase[0]) ? 1 : 0
             @constellation.Reading(inheritance_fact, 2+n, :role_sequence => rs2, :text => "{0} is a {1}", :is_negative => false)
             @constellation.Reading(inheritance_fact, 3-n, :role_sequence => rs2, :text => "{0} is an {1}", :is_negative => false)
-          }
+          end
         end
       end
 
@@ -423,10 +423,7 @@ module ActiveFacts
 
       def complete_nested_types
         @nested_types.each do |nested_type|
-          # Create the phantom roles here. These will be used later when we create objectification steps,
-          # but for now there's nothing we import from NORMA which requires objectification steps.
-          # Consequently there's no need to index them against NORMA's phantom roles.
-          nested_type.create_implicit_fact_types
+          nested_type.create_link_fact_types
         end
       end
 

data/lib/activefacts/orm/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module ORM
-    VERSION = "1.7.1"
+    VERSION = "1.8.0"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-orm
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.10'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.a
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.10'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.a
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -42,50 +48,56 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: activefacts-metamodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.6.2
 description: |
   ORM format importer for the ActiveFacts fact modeling suite.
   Install the Natural ORM Architect from http://ormfoundation.org to produce input files.