schemard 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f93b6db46593a9933c132850585b4a7e03f55de2
-  data.tar.gz: 1b7fab78d73c880a2779ff067e1207f167db3ead
+  metadata.gz: 6c5211b57dd34605e75aade506df6064eb7eed9a
+  data.tar.gz: 331ec3318e0616d80d448c69df11d2611a77dba4
 SHA512:
-  metadata.gz: 0f68a074626339cb2f12d3c570fb137cab5a5812bedf176b09393eedcdd9d7dc22cd05143fd4f5c4acb841cb4f26f117bbcf118e3ea9da84b12532cfbb173d1b
-  data.tar.gz: 7277d6c3a2242440ec52e0c7601edddcc8b2db6bb59e07bac25b816b8f9c992203c662f74054d03d5145b43600ea8b97e649c6777ecff76719b498876b54bcd2
+  metadata.gz: a58160c570e363447459e1d883edd5999bf0568748ec771ea1b8d7298d3f59e96437573f161e9785799d6b1d980e1b68f07ee14fdf4e169475a6e564f20dae09
+  data.tar.gz: 384b99ab3d408844a9a73a0710d769f2dcb3014b8305cb90e1e1d471743d4ac62a95654b4245601bd9e9b1283c15bcad167bde5f56cd6149099d3761b32d9d81

data/lib/schemard/relation_generator.rb

@@ -33,10 +33,29 @@ module SchemaRD
       .each_with_object({}) do |model, hash|
         hash[model.table_name] = {}
 
-        relation_selector = ->(klass){ model._reflections.values.select{|r| r.is_a?(klass) } }
-        has_one_rels = relation_selector.call(ActiveRecord::Reflection::HasOneReflection)
-        has_many_rels = relation_selector.call(ActiveRecord::Reflection::HasManyReflection)
-        belongs_to_rels = relation_selector.call(ActiveRecord::Reflection::BelongsToReflection)
+        relation_selector = ->(type){
+          # Over ActiveRecord 4.2.7
+          if defined?(ActiveRecord::Reflection::HasOneReflection)
+            klasses = {
+              has_one: ActiveRecord::Reflection::HasOneReflection,
+              has_many: ActiveRecord::Reflection::HasManyReflection,
+              belongs_to: ActiveRecord::Reflection::BelongsToReflection
+            }
+            model._reflections.values.select{|r| r.is_a?(klasses[type]) }
+          else
+            klasses = {
+              has_one: ActiveRecord::Associations::HasOneAssociation,
+              has_many: ActiveRecord::Associations::HasManyAssociation,
+              belongs_to: ActiveRecord::Associations::BelongsToAssociation
+            }
+            model.reflections.values
+            .select{|r| r.is_a?(ActiveRecord::Reflection::AssociationReflection) }
+            .select{|r| r.association_class == klasses[type] }
+          end
+        }
+        has_one_rels = relation_selector.call(:has_one)
+        has_many_rels = relation_selector.call(:has_many)
+        belongs_to_rels = relation_selector.call(:belongs_to)
 
         if has_one_rels.present?
           hash[model.table_name]["has_one"] = has_one_rels.map{|r| r.klass.table_name }

data/lib/schemard.rb

@@ -2,5 +2,5 @@ require_relative 'schemard/web_server'
 require_relative 'schemard/controller'
 
 module SchemaRD
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemard
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ken TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler