@@ -2,12 +2,6 @@ Encoding.default_external = "UTF-8" if defined?(Encoding)
22require 'json'
33require 'bundler/gem_tasks'
44
5- # returns the source filename for a given JSON build file
6- # (e.g., "ui.core.jquery.json" returns "core.js")
7- def source_file_for_build_file ( build_file )
8- "#{ build_file . sub ( 'ui.' , '' ) . sub ( '.jquery.json' , '' ) }
9- end
10-
115# returns the source filename for a named file in the 'dependencies'
126# array of a JSON build file
137# (e.g., if the JSON build file contains
2216#
2317# The only exception is "jquery", which doesn't follow the
2418# same naming conventions so it's a special case.
25- def source_file_for_dependency_entry ( dep_entry )
19+ def source_file_for_dependency_entry ( caller , dep_entry )
2620 return "jquery.js" if dep_entry == 'jquery'
2721
28- "#{ dep_entry . sub 'ui.' , '' }
22+ p = Pathname . new caller
23+ parent_path = p . parent
24+ parent_path . join ( dep_entry ) . to_s
2925end
3026
3127# return a Hash of dependency info, whose keys are jquery-ui
3228# source files and values are Arrays containing the source files
3329# they depend on
3430def map_dependencies
3531 dependencies = { }
36- Dir . glob ( "jquery-ui/*.jquery.json" ) . each do |build_file |
37- build_info = JSON . parse ( File . read build_file )
38- source_file_name = source_file_for_build_file ( File . basename ( build_file ) )
32+ Dir . glob ( "jquery-ui/ui/**/*.js" ) . each do |path |
33+ basename = File . basename path
34+ file = File . read path
35+
36+ matchdata = file . match ( /define\( .*\[ [\S \s ]+\] \, factory \) ;/m )
37+
38+ matchdata ||= file . match ( /define\( .*\[ [\S \s ]+\] (\, factory )?.*\) ;/m )
39+
40+ next if matchdata . nil?
41+
42+ deps_str = matchdata [ 0 ]
3943
40- deps = build_info [ 'dependencies' ] . keys
44+ deps = deps_str . match ( /\[ [\s \S ]*\] / ) [ 0 ]
45+
46+ deps = deps . gsub ( /\/ \/ .+\s / , "" )
47+
48+ deps = deps . gsub ( /[\r \n \t \" \[ \] \s ]/ , "" )
49+
50+ deps_paths = deps . split ( ',' )
4151
4252 # None of jquery.ui files should depend on jquery.js,
4353 # so we remove 'jquery' from the list of dependencies for all files
44- deps . reject! { |d | d == "jquery" }
54+ deps_paths . reject! { |d | d == "jquery" }
4555
46- deps . map! { |d | source_file_for_dependency_entry d }
56+ deps_paths . map! { |d | d + '.js' }
4757
48- dependencies [ source_file_name ] = deps
58+ deps_paths . map! { |d | source_file_for_dependency_entry path , d }
59+
60+ dependencies [ basename ] = deps_paths
4961 end
5062 dependencies
5163end
@@ -70,7 +82,7 @@ def get_js_dependencies(basename)
7082 end
7183 # Make sure we do not package assets with broken dependencies
7284 dependencies . each do |dep |
73- unless File . exist? ( "jquery-ui/ui/ #{ dep } )
85+ unless File . exist? ( "#{ dep } )
7486 fail "#{ basename } #{ dep }
7587 end
7688 end
@@ -107,13 +119,18 @@ task :javascripts => :submodule do
107119 target_dir = "app/assets/javascripts"
108120 target_ui_dir = "#{ target_dir }
109121 mkdir_p target_ui_dir
122+ mkdir_p target_ui_dir + '/effects'
123+ mkdir_p target_ui_dir + '/widgets'
124+ mkdir_p target_ui_dir + '/i18n'
110125
111- Dir . glob ( "jquery-ui/ui/*.js" ) . each do |path |
126+ Dir . glob ( "jquery-ui/ui/**/* .js" ) . each do |path |
112127 basename = File . basename ( path )
128+ clean_path = path . gsub ( '/ui' , '' )
113129 dep_modules = get_js_dependencies ( basename ) . map ( &method ( :remove_js_extension ) )
114- File . open ( "#{ target_ui_dir } #{ basename } , "w" ) do |out |
130+ File . open ( "#{ target_dir } #{ clean_path } , "w" ) do |out |
115131 dep_modules . each do |mod |
116- out . write ( "//= require jquery-ui/#{ mod } \n " )
132+ mod . gsub! ( '/ui' , '' )
133+ out . write ( "//= require #{ mod } \n " )
117134 end
118135 out . write ( "\n " ) unless dep_modules . empty?
119136 source_code = File . read ( path )
@@ -127,7 +144,7 @@ task :javascripts => :submodule do
127144 # https://github.com/joliss/jquery-ui-rails/issues/9
128145 Dir . glob ( "jquery-ui/ui/i18n/*.js" ) . each do |path |
129146 basename = File . basename ( path )
130- File . open ( "#{ target_ui_dir } #{ basename } , "w" ) do |out |
147+ File . open ( "#{ target_ui_dir } i18n/ #{ basename } , "w" ) do |out |
131148 source_code = File . read ( path )
132149 source_code . gsub! ( '@VERSION' , version )
133150 protect_copyright_notice ( source_code )
@@ -136,15 +153,23 @@ task :javascripts => :submodule do
136153 end
137154
138155 File . open ( "#{ target_ui_dir } , "w" ) do |out |
139- Dir . glob ( "jquery-ui/ui/effect *.js" ) . sort . each do |path |
140- asset_name = remove_js_extension ( File . basename ( path ) )
141- out . write ( "//= require jquery-ui/ #{ asset_name } \n " )
156+ Dir . glob ( "jquery-ui/ui/effects/ *.js" ) . sort . each do |path |
157+ clean_path = path . gsub ( '/ui' , '' )
158+ out . write ( "//= require #{ clean_path } \n " )
142159 end
143160 end
144161 File . open ( "#{ target_dir } , "w" ) do |out |
145162 Dir . glob ( "jquery-ui/ui/*.js" ) . sort . each do |path |
146- asset_name = remove_js_extension ( File . basename ( path ) )
147- out . write ( "//= require jquery-ui/#{ asset_name } \n " )
163+ clean_path = path . gsub ( '/ui' , '' )
164+ out . write ( "//= require #{ clean_path } \n " )
165+ end
166+ Dir . glob ( "jquery-ui/ui/effects/*.js" ) . sort . each do |path |
167+ clean_path = path . gsub ( '/ui' , '' )
168+ out . write ( "//= require #{ clean_path } \n " )
169+ end
170+ Dir . glob ( "jquery-ui/ui/widgets/*.js" ) . sort . each do |path |
171+ clean_path = path . gsub ( '/ui' , '' )
172+ out . write ( "//= require #{ clean_path } \n " )
148173 end
149174 end
150175end
0 commit comments