activefacts-rmap 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6127c77cb2acadd6a25acbd42a0ceff08353fdd
-  data.tar.gz: 254d937ce5e28fdf4648c59d0ad3d718e47571bf
+  metadata.gz: c90516da204087884d794d7a74a10d2a28b4e179
+  data.tar.gz: 6ca131f3866bb26cb487b357f28cf463a76f4427
 SHA512:
-  metadata.gz: 7079737917e3dbf2313cc7c0ae0e9d6accdeffcf3bc993d76110a55c1d99f2d0fbc6ee10d269d2d4e0a421b7890d32d162249db025f02c3991de3e57ee129f8a
-  data.tar.gz: 5bb8a3ff2d7515a5d047f324f0c2b4e924fe88ab6fa322680f98e8a7340f665acc3b61a743ef53682b157158a9d42bf34aeef776177244c59066a411327c20d5
+  metadata.gz: b24c435653377dd8e767de80374fb738942c298949d15b4fd76109be7aa86386c5a08ae87d837eb78b7e901e25c7be7f49737ae9ae034fb06137061f30c8c412
+  data.tar.gz: 011ca97e825acbc4a29fdbfb53cb0eca7037bf092551fbe629944aa6249c0a04a1b79eb2fcdf0e364839d2c0f02216d1814bf3129749d7197f01d23b882b75cb

data/.gitignore

@@ -7,3 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.swp
+.DS_Store
+*.rej
+*.orig
+*.diff

data/Gemfile

@@ -2,6 +2,7 @@ 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-rmap"
   gem 'activefacts-metamodel', path: '/Users/cjh/work/activefacts/metamodel'
 end

data/activefacts-rmap.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   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 "activefacts-metamodel"
+  spec.add_runtime_dependency("activefacts-metamodel", ">= 1.8", "~> 1.8.0")
 end

data/lib/activefacts/rmap/columns.rb

@@ -159,7 +159,7 @@ module ActiveFacts
         # Add a role value constraint
         # REVISIT: Can add join-role-value-constraints here, if we ever provide a way to define them
         if references[-1].to_role && references[-1].to_role.role_value_constraint
-          constraints << references[-1].to_role.role_value_constraint
+          constraints << references[-1].to_role.base_role.role_value_constraint
         end
 
         vt = references[-1].is_self_value ? references[-1].from : references[-1].to

data/lib/activefacts/rmap/version.rb

@@ -1,5 +1,5 @@
 module Activefacts
   module RMap
-    VERSION = "1.7.1"
+    VERSION = "1.8.0"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-rmap
 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,30 +48,36 @@ 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: '0'
+        version: '1.8'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: Relational mapping for fact models. Part of the ActiveFacts suite.
 email:
 - clifford.heath@gmail.com