diff --git a/README.rdoc b/README.rdoc index ba7a09e..94560e5 100755 --- a/README.rdoc +++ b/README.rdoc @@ -48,6 +48,7 @@ Is attempt to automate many tasks and practices in building RIA using Dojo and R == CHANGE LOG: * 0.0.5 remove dependency from dojo_src, to extenrnalize control over it +* 0.0.7 add app_package customization (default left 'app') == LICENSE: diff --git a/lib/depo.rb b/lib/depo.rb index 1a70101..2035a0b 100755 --- a/lib/depo.rb +++ b/lib/depo.rb @@ -4,7 +4,7 @@ require 'active_support' module Depo - VERSION = '0.0.6' + VERSION = '0.0.7' autoload :Config, 'depo/config' autoload :Build, 'depo/build' autoload :DijitConventions, 'depo/dijit_conventions' diff --git a/lib/depo/config.rb b/lib/depo/config.rb index 6a8a538..9da0fa3 100755 --- a/lib/depo/config.rb +++ b/lib/depo/config.rb @@ -9,6 +9,7 @@ class Config < KungFigure::Base define_prop :profile_path,'tmp/dojo_build_profile.js' define_prop :default_page_lib,'app.pages' define_prop :enable_dojofy, true + define_prop :app_package, 'app' def dojo_version(*args) raise "dojo_version depricated." diff --git a/lib/depo/view_helpers.rb b/lib/depo/view_helpers.rb index e486f16..e05dc62 100644 --- a/lib/depo/view_helpers.rb +++ b/lib/depo/view_helpers.rb @@ -10,13 +10,17 @@ def djConfig Depo.config.env_dj_config(@opts[:env]) end + def app_package + @app_package||=Depo.config.app_package + end + #check if ext presented and add if not def add_ext(str,ext) ( str.strip=~/\.#{ext}$/ ) ? str.strip : "#{str.strip}.#{ext}" end def css - %Q[#{webroot}/app/themes/#{theme}/#{add_ext(@opts[:app],'css')}] + %Q[#{webroot}/#{app_package}/themes/#{theme}/#{add_ext(@opts[:app],'css')}] end def dojo(opts) @@ -33,7 +37,7 @@ def theme end def app_js - %Q[#{webroot}/app/pages/#{@opts[:app]}.js] + %Q[#{webroot}/#{app_package}/pages/#{@opts[:app]}.js] end end diff --git a/test/action_pack_test.rb b/test/action_pack_test.rb index 8182514..6f815bc 100755 --- a/test/action_pack_test.rb +++ b/test/action_pack_test.rb @@ -27,11 +27,12 @@ def get_template(v) class ActionPackTest < GeneratorTest def test_dojo_helper_development + Depo.config.app_package 'medhub' assert_equal ActionView.new.dojo(:app => 'app', :env => 'development'), ActionViewEnv.new.get_template({ :webroot => "/ria/src", - :app_js => "/ria/src/app/pages/app.js", + :app_js => "/ria/src/medhub/pages/app.js", :djConfig => "parseOnLoad:true,isDebug:true", - :css => "/ria/src/app/themes/tundra/app.css" + :css => "/ria/src/medhub/themes/tundra/app.css" }) Depo.clear_config! end diff --git a/test/config_test.rb b/test/config_test.rb index bd4622e..2203ddb 100755 --- a/test/config_test.rb +++ b/test/config_test.rb @@ -7,6 +7,8 @@ def test_roots author 'niquola@gmail.com' themes ['tundra','verdugo'] + app_package 'medhub' + environments { developmentDjConfig 'parseOnLoad:true;isDebug:true;' productionDjConfig 'parseOnLoad:true;isDebug:false;' @@ -41,6 +43,7 @@ def test_roots assert_equal('public/ria/src', config.src_path) assert_equal('public/ria/builds', config.builds_path) assert_equal('niquola@gmail.com', config.author) + assert_equal('medhub', config.app_package) assert_equal(['tundra','verdugo'],config.themes) assert_equal('parseOnLoad:true;isDebug:true;',config.environments.developmentDjConfig)