lib/dao.rb in dao-4.2.1 vs lib/dao.rb in dao-4.4.2

- old
+ new

@@ -1,28 +1,35 @@ +# -*- encoding : utf-8 -*- # built-ins # require 'enumerator' require 'set' + require 'fileutils' + require 'cgi' + require 'tmpdir' # dao libs # module Dao - Version = '4.2.1' unless defined?(Version) + Version = '4.4.2' unless defined?(Version) def version Dao::Version end def dependencies { - 'rails' => [ 'rails' , '~> 3.0' ], - 'map' => [ 'map' , '~> 4.4' ], - 'fattr' => [ 'fattr' , '~> 2.2' ], - 'tagz' => [ 'tagz' , '~> 9.0' ], - 'yajl' => [ 'yajl-ruby' , '~> 0.8' ], - 'unidecode' => [ 'unidecode' , '~> 1.0' ], - 'uuidtools' => [ 'uuidtools' , '~> 2.1' ] + 'rails' => [ 'rails' , ' >= 3.1' ] , + 'map' => [ 'map' , ' >= 5.4' ] , + 'fattr' => [ 'fattr' , ' >= 2.2' ] , + 'tagz' => [ 'tagz' , ' >= 9.3' ] , + 'multi_json' => [ 'multi_json' , ' >= 1.0.3' ] , + 'uuidtools' => [ 'uuidtools' , ' >= 2.1.2' ] , + 'wrap' => [ 'wrap' , ' >= 1.5.0' ] , + 'rails_current' => [ 'rails_current' , ' >= 1.6' ] , + 'rails_nav' => [ 'rails_nav' , ' >= 1.0.1' ] , + 'rails_helper' => [ 'rails_helper' , ' >= 1.3.0' ] } end def libdir(*args, &block) @libdir ||= File.expand_path(__FILE__).sub(/\.rb$/,'') @@ -59,28 +66,22 @@ gem(*dependency) require(lib) end end - #active_record - #action_mailer - #rails/test_unit %w[ action_controller active_resource active_support ].each do |framework| begin require "#{ framework }/railtie" rescue LoadError end end -#require 'rails/all' - require 'yajl/json_gem' - Dao.load %w[ blankslate.rb instance_exec.rb extractor.rb exceptions.rb @@ -88,19 +89,18 @@ slug.rb stdext.rb name.rb status.rb + path_map.rb errors.rb form.rb validations.rb data.rb result.rb params.rb - current.rb - mode.rb route.rb path.rb endpoint.rb api.rb @@ -110,10 +110,10 @@ rails.rb active_record.rb mongo_mapper.rb conducer.rb - image_cache.rb + upload.rb ] # protect against rails' too clever reloading # =begin