Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

.gitignore

@@ -3,3 +3,4 @@
 *.swp
 HTML
 .DS_Store
+coverage/

admin/.simplecov

@@ -0,0 +1,46 @@
+if ENV['COVERAGE'] == "1"
+
+  require 'simplecov-rcov'
+  class SimpleCov::Formatter::MergedFormatter
+    def format(result)
+       SimpleCov::Formatter::HTMLFormatter.new.format(result)
+       SimpleCov::Formatter::RcovFormatter.new.format(result)
+    end
+  end
+
+  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+
+  SimpleCov.start do
+    add_filter "/test/"
+    add_filter "/bin/"
+    add_filter "/scripts/"
+    add_filter "/tmp/"
+    add_filter "/vendor/"
+    add_filter "/spec/"
+  end
+
+  all_files = Dir['**/*.rb']
+  base_result = {}
+  all_files.each do |file|
+    absolute = File::expand_path(file)
+    lines = File.readlines(absolute, :encoding => 'UTF-8')
+    base_result[absolute] = lines.map do |l|
+      l.encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '')
+      l.encode!('UTF-8', 'UTF-16')
+      l.strip!
+      l.empty? || l =~ /^end$/ || l[0] == '#' ? nil : 0
+    end
+  end
+
+  SimpleCov.at_exit do
+    coverage_result = Coverage.result
+    covered_files = coverage_result.keys
+    covered_files.each do |covered_file|
+      base_result.delete(covered_file)
+    end
+    merged = SimpleCov::Result.new(coverage_result).original_result.merge_resultset(base_result)
+    result = SimpleCov::Result.new(merged)
+    result.format!
+  end
+
+end

admin/Gemfile

@@ -51,7 +51,7 @@ gem 'aasm', '3.0.16'
 gem 'postgres-copy', '0.6.0'
 gem 'aws-sdk', '1.29.1'
 gem 'bugsnag'
-gem 'gon', '5.0.1' # '5.0.3' has an issue with setting globals in an initializer
+gem 'gon'
 gem 'cocoon'
 gem 'haml-rails'
 gem 'resque'
@@ -108,3 +108,9 @@ group :development, :test do
   gem 'database_cleaner', '0.7.0'
   gem 'launchy'
 end
+
+group :test do
+  gem 'simplecov', '~> 0.7.1'
+  gem 'simplecov-rcov'
+end
+

admin/app/admin/promo_latest.rb

@@ -37,7 +37,7 @@ ActiveAdmin.register JamRuby::PromoLatest, :as => 'Latest' do
 
     def create 
       promo = PromoLatest.create_with_params(params[:jam_ruby_promo_latest])
-      redirect_to('/admin/admin/latests')
+      redirect_to('/admin/latests')
     end
 
     def edit
@@ -48,7 +48,7 @@ ActiveAdmin.register JamRuby::PromoLatest, :as => 'Latest' do
 
     def update
       resource.update_with_params(params[:jam_ruby_promo_latest]).save!
-      redirect_to('/admin/admin/latests')
+      redirect_to('/admin/latests')
     end
 
   end

admin/spec/spec_helper.rb

@@ -1,6 +1,5 @@
-
 ENV["RAILS_ENV"] ||= 'test'
-
+require 'simplecov'
 
 # provision database
 require 'active_record'

web/.simplecov

@@ -0,0 +1,47 @@
+if ENV['COVERAGE'] == "1"
+
+  require 'simplecov-rcov'
+  class SimpleCov::Formatter::MergedFormatter
+    def format(result)
+       SimpleCov::Formatter::HTMLFormatter.new.format(result)
+       SimpleCov::Formatter::RcovFormatter.new.format(result)
+    end
+  end
+
+  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+
+  SimpleCov.start do
+    add_filter "/test/"
+    add_filter "/bin/"
+    add_filter "/scripts/"
+    add_filter "/tmp/"
+    add_filter "/vendor/"
+    add_filter "/spec/"
+    add_filter "/features/"
+  end
+
+  all_files = Dir['**/*.rb']
+  base_result = {}
+  all_files.each do |file|
+    absolute = File::expand_path(file)
+    lines = File.readlines(absolute, :encoding => 'UTF-8')
+    base_result[absolute] = lines.map do |l|
+      l.encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '')
+      l.encode!('UTF-8', 'UTF-16')
+      l.strip!
+      l.empty? || l =~ /^end$/ || l[0] == '#' ? nil : 0
+    end
+  end
+
+  SimpleCov.at_exit do
+    coverage_result = Coverage.result
+    covered_files = coverage_result.keys
+    covered_files.each do |covered_file|
+      base_result.delete(covered_file)
+    end
+    merged = SimpleCov::Result.new(coverage_result).original_result.merge_resultset(base_result)
+    result = SimpleCov::Result.new(merged)
+    result.format!
+  end
+
+end

web/Gemfile

@@ -92,6 +92,8 @@ group :assets do
 end
 
 group :test, :cucumber do
+  gem 'simplecov', '~> 0.7.1'
+  gem 'simplecov-rcov'
   gem 'capybara'
 #if ENV['JAMWEB_QT5'] == '1'
 #  # necessary on platforms such as arch linux, where pacman -S qt5-webkit is your easiet option

web/app/assets/stylesheets/client/account.css.scss

@@ -124,8 +124,10 @@
       box-shadow: none !important;
       color: #666666;
       width: 100%;
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
       box-sizing: border-box;
-      -moz-box-sizing:border-box;
     }
   }
 

web/app/assets/stylesheets/client/content.css.scss

@@ -66,6 +66,9 @@
     .content-body {
         height:100%;
         width:100%;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
         box-sizing: border-box;
         padding-top: 29px;
 
@@ -96,21 +99,33 @@
     .filter-body {
         height:100%;
         width:100%;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
         box-sizing: border-box;
         padding-top: 49px;
     }
 
     .profile-head {
         position: absolute;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
         box-sizing: border-box;
         width:100%;
     }
     .profile-body {
         height:100%;
         width:100%;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
         box-sizing: border-box;
         padding-top: 157px;
         > * {
+          -webkit-box-sizing: border-box;
+          -moz-box-sizing: border-box;
+          -ms-box-sizing: border-box;
           box-sizing:border-box;
         }
     }
@@ -130,6 +145,9 @@
         width:100%;
         padding:0 25px;
         line-height:25px;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
         box-sizing:border-box;
 
         +.profile-wrapper {
@@ -139,6 +157,9 @@
     .profile-social-body {
         height:100%;
         width:100%;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
         box-sizing:border-box;
         padding-top:25px;
         .profile-social-body-wrapper {
@@ -192,7 +213,7 @@
 
 .content-wrapper, .dialog, .dialog-inner, .ftue-inner {
 
-    select, textarea,  input[type=text], input[type=password], div.friendbox {
+  select, textarea,  input[type=text], input[type=password], div.friendbox {
     font-family:"Raleway", arial, sans-serif;
     background-color:#c5c5c5;
     border:none;

web/app/assets/stylesheets/client/profile.css.scss

@@ -202,6 +202,9 @@
   position:relative;
   margin:10px 0px 10px 0px;
   padding-bottom:5px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
   box-sizing:border-box;
   
   .result-name {

web/app/assets/stylesheets/client/recordingManager.css.scss

@@ -10,6 +10,9 @@
   z-index:-1;
 
   .recording-manager-command {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
     box-sizing: border-box;
     width:33%;
     margin:5px 10px;

web/app/assets/stylesheets/custom.css.scss

@@ -5,8 +5,9 @@
 $grayMediumLight: #eaeaea;
 
 @mixin box_sizing {
-  -moz-box-sizing: border-box; 
-  -webkit-box-sizing: border-box; 
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
   box-sizing: border-box;
 }
 

web/app/assets/stylesheets/users/signinDialog.css.scss

@@ -51,6 +51,9 @@
   }
 
   input[type=text], input[type=password]{
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
     box-sizing: border-box;
   }
 }

web/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'simplecov'
 require 'rubygems'
 require 'spork'
 require 'omniauth'

websocket-gateway/.simplecov

@@ -0,0 +1,46 @@
+if ENV['COVERAGE'] == "1"
+
+  require 'simplecov-rcov'
+  class SimpleCov::Formatter::MergedFormatter
+    def format(result)
+       SimpleCov::Formatter::HTMLFormatter.new.format(result)
+       SimpleCov::Formatter::RcovFormatter.new.format(result)
+    end
+  end
+
+  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+
+  SimpleCov.start do
+    add_filter "/test/"
+    add_filter "/bin/"
+    add_filter "/scripts/"
+    add_filter "/tmp/"
+    add_filter "/vendor/"
+    add_filter "/spec/"
+  end
+
+  all_files = Dir['**/*.rb']
+  base_result = {}
+  all_files.each do |file|
+    absolute = File::expand_path(file)
+    lines = File.readlines(absolute, :encoding => 'UTF-8')
+    base_result[absolute] = lines.map do |l|
+      l.encode!('UTF-16', 'UTF-8', :invalid => :replace, :replace => '')
+      l.encode!('UTF-8', 'UTF-16')
+      l.strip!
+      l.empty? || l =~ /^end$/ || l[0] == '#' ? nil : 0
+    end
+  end
+
+  SimpleCov.at_exit do
+    coverage_result = Coverage.result
+    covered_files = coverage_result.keys
+    covered_files.each do |covered_file|
+      base_result.delete(covered_file)
+    end
+    merged = SimpleCov::Result.new(coverage_result).original_result.merge_resultset(base_result)
+    result = SimpleCov::Result.new(merged)
+    result.format!
+  end
+
+end

websocket-gateway/Gemfile

@@ -49,6 +49,8 @@ group :development do
 end
 
 group :test do
+    gem 'simplecov', '~> 0.7.1'
+    gem 'simplecov-rcov'
     gem 'cucumber'
     gem 'rspec'
     gem 'factory_girl'

websocket-gateway/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'simplecov'
 require 'active_record'
 require 'jam_db'
 require 'spec_db'