lib/rom/sql/schema/associations_dsl.rb in rom-sql-0.9.1 vs lib/rom/sql/schema/associations_dsl.rb in rom-sql-1.0.0.beta1

@@ -1,5 +1,6 @@
+require 'dry/core/inflector'
 require 'rom/sql/association'
 
 module ROM
   module SQL
     class Schema < ROM::Schema
@@ -40,15 +41,15 @@
         def many_to_one(target, options = {})
           add(Association::ManyToOne.new(source, target, options))
         end
 
         def belongs_to(name, options = {})
-          many_to_one(dataset_name(name), options.merge(as: options[:as] || name))
+          many_to_one(dataset_name(name), {as: name}.merge(options))
         end
 
         def has_one(name, options = {})
-          one_to_one(dataset_name(name), options.merge(as: options[:as] || name))
+          one_to_one(dataset_name(name), {as: name}.merge(options))
         end
 
         def call
           AssociationSet.new(registry)
         end
@@ -58,10 +59,10 @@
         def add(association)
           registry[association.name] = association
         end
 
         def dataset_name(name)
-          Inflector.pluralize(name).to_sym
+          ::Dry::Core::Inflector.pluralize(name).to_sym
         end
       end
     end
   end
 end