Merge branch 'master' of github.com:slate-studio/openapi-rails

alexkravets · alexkravets · commit f8b231873e23 · 2017-01-08T07:56:53.000-08:00
# Conflicts:
#	lib/openapi.rb
diff --git a/lib/activerecord.rb b/lib/activerecord.rb
diff --git a/lib/mongoid.rb b/lib/mongoid.rb
@@ -0,0 +1,2 @@
+require 'openapi/mongoid/crud_actions'
+require 'openapi/mongoid/spec_builder'
diff --git a/lib/openapi-rails.rb b/lib/openapi-rails.rb
@@ -1 +1,3 @@
 require 'openapi'
+require 'mongoid' if defined?(Mongoid)
+require 'activerecord' if defined?(ActiveRecord)
diff --git a/lib/openapi.rb b/lib/openapi.rb
@@ -13,7 +13,6 @@
 require 'swagger/blocks/schema_node'
 require 'swagger/blocks/property_node'
 require 'swagger/blocks/items_node'
-require 'openapi/mongoid/spec_builder'
 
 require 'openapi/configuration'
 require 'openapi/routes_parser'
diff --git a/openapi-rails.gemspec b/openapi-rails.gemspec
@@ -26,8 +26,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'bson_ext'
   # Fast streaming JSON parsing and encoding library for Ruby
   s.add_dependency 'yajl-ruby'
-  # Ruby ODM framework for MongoDB
-  s.add_dependency 'mongoid'
   # Map incoming controller parameters to named scopes in resources
   s.add_dependency 'has_scope'
 end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+require 'openapi/mongoid/crud_actions'`
	`2`	`+require 'openapi/mongoid/spec_builder'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`require 'openapi'`
	`2`	`+require 'mongoid' if defined?(Mongoid)`
	`3`	`+require 'activerecord' if defined?(ActiveRecord)`