Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

app/helpers/wechats_helper.rb

@@ -0,0 +1,20 @@
+#coding=utf-8
+#
+
+module WechatsHelper
+  def include_wechat_jsfile
+    if Rails.env.production?
+       javascript_include_tag '/javascripts/wechat/build/app.min.js'
+    else
+       wechat_path = File.join(Rails.root, "public", "javascripts", "wechat")
+       srcs = Rails.application.config.wechat_srcs
+       paths = []
+       srcs.each do |src|
+         Dir.glob(wechat_path+ "/#{src}"  ) do |path|
+           paths << path[File.join(Rails.root, "public").to_s.size, path.size]
+         end
+       end
+       javascript_include_tag *paths
+    end
+  end
+end

app/views/wechats/user_activities.html.erb

@@ -10,7 +10,7 @@
   <meta content='True' name='HandheldFriendly' />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
-  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
+  <%= stylesheet_link_tag '/stylesheets/weui/weixin.css' %>
 
   <script type="text/javascript">
     window.g_debug = false; //调试标志,如果在本地请置为true
@@ -28,31 +28,7 @@
 
 <!--<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>-->
 <script src="/javascripts/wechat/build/angular.all.min.js"></script>
-<script src="/javascripts/wechat/build/app.min.js?version=20160715-1953"></script>
-  <!-- <script src ="/javascripts/wechat/app.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/factory.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/filter.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/alert.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/form_validate.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/input_auto.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/loading_spinner.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/reg.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/invite_code.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/login.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/activity.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/new_class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/edit_class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/blog.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/course_notice.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/discussion.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/homework.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/issue.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/journals.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/class_list.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/myresource.js?version=20160715&#45;1737"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/send_class_list.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/routes.js"></script> -->
+<%=  include_wechat_jsfile %>
 </body>
 
 </html>

config/application.rb

@@ -66,6 +66,7 @@ module RedmineApp
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+    config.assets.digest = true
 
     config.action_mailer.perform_deliveries = false
 
@@ -82,6 +83,8 @@ module RedmineApp
       end
     end
 
+    config.wechat_srcs = ['app.js','others/factory.js','others/filter.js', 'controllers/*.js', 'directives/*.js', 'others/routes.js']
+
     config.before_initialize do
     end
 
@@ -93,4 +96,4 @@ module RedmineApp
     end
 
   end
-end
+end

lib/tasks/wechat.rake

@@ -0,0 +1,31 @@
+#coding=utf-8
+#
+
+def compress(srcs, outfile)
+  wechat_path = File.join(Rails.root, "public", "javascripts", "wechat")
+  out_buffer = ''
+
+  srcs.each do |src|
+    Dir.glob("#{wechat_path}/#{src}").each do |path|
+      puts "assets #{path}"
+      out_buffer = out_buffer + "\n//#{File.basename(path)}\n" + Uglifier.compile(File.read(path))
+    end
+  end
+
+  File.open(File.join(wechat_path, "build/#{outfile}"), 'w+') {|f| f.write(out_buffer)}
+end
+
+
+namespace :wechat do
+  desc "assets javascript file"
+  task :assets => :environment do
+    srcs = Rails.application.config.wechat_srcs
+    compress(srcs, 'app.min.js')
+  end
+
+  desc "minify angularjs"
+  task :minify => :environment do
+    srcs = ['../jquery-1.3.2.js','angular.js', 'angular-route.js', 'angular-sanitize.min.js']
+    compress(srcs, 'angular.all.min.js')
+  end
+end