lib/rango/helpers/general.rb in rango-0.1.1.3 vs lib/rango/helpers/general.rb in rango-0.2.pre
- old
+ new
@@ -44,10 +44,10 @@
options = args.extract_options!
unless args.empty?
options[:size] = args[0] || 75
options[:omission] = args[1] || "..."
end
- options.reverse_merge!(:size => 75, :omission => "...")
+ options = {size: 75, omission: "..."}.merge(options)
text.scan(/(\S+)(\s+)/)[0..options[:size]].flatten.join << options[:omission] if text
end
end
end