rhoconnect 3.3.1.beta4 → 3.3.1

data/lib/rhoconnect/jobs/bulk_data_job.rb

@@ -137,7 +137,7 @@ module Rhoconnect
           sources_refs.each do |source_name,ref|
             s = ref[:source]
             stmt.execute(s.source_id,s.name,s.priority,s.partition_type.to_s,
-              s.sync_type.to_s,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many,s.get_value(:md_size),s.read_state.refresh_time)
+              s.sync_type.to_s,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many,s.get_value(:md_size).to_i,s.read_state.refresh_time)
           end
         end
       end
@@ -154,7 +154,7 @@ module Rhoconnect
       db.execute_batch(File.open(schema,'r').read)
       
       src_counter = 1
-      bulk_data.sources[0, -1].each do |source_name|
+      bulk_data.partition_sources[0, -1].each do |source_name|
         timer = start_timer("start importing sqlite data for #{source_name}")
         source = Source.load(source_name,{:app_id => bulk_data.app_id,
           :user_id => bulk_data.user_id})

data/lib/rhoconnect/server.rb

@@ -250,7 +250,7 @@ _INSTALL_ASYNC_GEMS
           puts warning_for_async_gems
         end
       else
-        settings.use_async_model = false
+        set :use_async_model, false
       end
     end
     

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.3.1.beta4'
+  VERSION = '3.3.1'
 end

data/lib/rhoconnect/web-console/models/stats.js

@@ -4,6 +4,51 @@ var Stats = Backbone.Model.extend({
 		var session = new Session();
 		this.set('api_token', session.getApiKey())
 	},
+	
+	get_sources: function(){
+		session = new Session();
+	    $.ajax({
+			type: 'GET',
+			url: 'get_sources',
+			data: {api_token : session.getApiKey()},
+			success: function(resp){
+				r = JSON.parse(resp)
+				var list  = "";
+				var list2 = "";
+				$.each(r, function(index,value){
+					list  += "<div class='accordion-inner'><a id='"+value+"' class='http_timing'>- "+value+"</a></div>";
+					list2 += "<div class='accordion-inner'><a id='"+value+"m' class='source_timing_display'>- "+value+"</a></div>";
+				})
+				$("#collapseTwo").append(list);
+				$("#collapseThree").append(list2);
+			},
+			error: function(resp){
+				$("#collapseTwo").after("<li>No Adapters Available</li>")
+				$("#collapseThree").after("<li>No Adapters Available</li>")
+			}
+		})
+	},
+	
+	get_http_routes: function(){
+		session = new Session();
+	    $.ajax({
+			type: 'GET',
+			url: 'get_http_routes',
+			data: {api_token : session.getApiKey()},
+			success: function(resp){
+				r = JSON.parse(resp)
+				var list  = "";
+				$.each(r, function(index,value){
+					value
+					list  += "<div class='accordion-inner'><a id='"+value+"' class='http_timing_key'>- "+value+"</a></div>";
+				})
+				$("#collapseFour").append(list);
+			},
+			error: function(resp){
+				$("#collapseFour").after("<li>No Routes Available</li>")
+			}
+		})
+	},
 		
 	user_stats: function(){
 		session = new Session();
@@ -43,12 +88,12 @@ var Stats = Backbone.Model.extend({
 		})
 	},
 	
-	source_timing: function(display_name){
+	source_timing: function(display_name,key){
 		session = new Session();
 	    $.ajax({
 			type: 'POST',
 			url: 'source_timing',
-			data: {api_token : session.getApiKey(),display_name : display_name},
+			data: {api_token : session.getApiKey(),display_name : display_name, key : key},
 			success: function(resp){
 				$('#stats_main').html(resp);
 			},
@@ -79,6 +124,25 @@ var Stats = Backbone.Model.extend({
 		        $('#stats-alert').css('display','block');
 			}
 		})
+	},
+	
+	http_timing_key: function(display_name){
+		session = new Session();
+	    $.ajax({
+			type: 'POST',
+			url: 'http_timing_key',
+			data: {api_token : session.getApiKey(),display_name : display_name},
+			success: function(resp){
+				$('#stats_main').html(resp);
+			},
+			error: function(resp){
+				if(resp.status == 422){
+					 new App.Views.Index()
+				}
+				$('#stats-alert')[0].innerHTML = "No Data Available";
+		        $('#stats-alert').css('display','block');
+			}
+		})
 	}
 	
 })

data/lib/rhoconnect/web-console/public/bootstrap-collapse.js

@@ -0,0 +1,157 @@
+/* =============================================================
+ * bootstrap-collapse.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSIBLE PLUGIN DEFINITION
+  * ============================== */
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSIBLE DATA-API
+  * ==================== */
+
+  $(function () {
+    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
+      var $this = $(this), href
+        , target = $this.attr('data-target')
+          || e.preventDefault()
+          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+        , option = $(target).data('collapse') ? 'toggle' : $this.data()
+      $(target).collapse(option)
+    })
+  })
+
+}(window.jQuery);