marxjs-rails 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b523f2834228073197ca46459233cef8df24fb9
-  data.tar.gz: 71a718fe44ada1b38ca575837bfae1a790efcbdd
+  metadata.gz: 8d3f8be1d5067aa18f227e452adc8ee4247cde1e
+  data.tar.gz: b5d1539c035c75feb6e341add95f509b655a6ffe
 SHA512:
-  metadata.gz: bdba4c2138fae9d68cf28315d971394d482f6f42a369b834cade1d8ca08aa41df4b68377322b26e534426afd579eb11407bf815299eb02fd07f8afc587eb96b1
-  data.tar.gz: aed5180e84c387b76572566e315559276000f16076c27f35b1175564e97a0985ffd047395a65355466c17f27f54e19b03b7106381ab5968c141fe9a566af18c5
+  metadata.gz: d06fb3e3f34f2532b967d7943d27776388a60bfa5cc0310cfb1b976652b210970c77a1b3ce03ba51c7bd4794b3bf1aa313a2e7d67db6c9aa6a8ae29da5c2148f
+  data.tar.gz: 23f1bd39d6675faba49704206f547c5c24d3ea9de0f7c161fd982598fb901f039754646fa87cc07a59ce2e3ad9e740a36de7ff4b8000a207d808bdfdf3faea1a

data/app/assets/javascripts/marx.js

@@ -1,6 +1,7 @@
 window.Marx = function(options) {
   var _this = this;
-  return $.getJSON("http://marxjs.com/characters", function(data) {
+  this._url = "http://marxjs.com";
+  return $.getJSON("" + this._url + "/characters", function(data) {
     _this.marx_json = data;
     return _this.initialize(options);
   });
@@ -34,9 +35,9 @@ $.extend(Marx.prototype, {
   create_controls: function() {
     var open_controls,
       _this = this;
-    $('body').append("<div class=\"marx-js-controls " + this.settings.position + "\">\n  <link rel=\"stylesheet\" href=\"http://marxjs.com/marx.css\">\n</div>");
+    $('body').append("<div class=\"marx-js-controls " + this.settings.position + "\">\n  <link rel=\"stylesheet\" href=\"" + this._url + "/marx.css\">\n</div>");
     this.$el = $('.marx-js-controls');
-    open_controls = this.settings.controls !== 'toggle-all' ? "<a href='#open-controls' class='open-controls'>MarxJS</a>" : "<div class=\"open-controls\">\n  <a href=\"#advanced-controls\" class=\"advanced-controls\" title=\"Show Advanced Controls\">Advanced Controls</a>\n  <a href=\"#standard-controls\" class=\"standard-controls\" title=\"Show Standard Controls\">Standard Controls</a>\n  <a href=\"#populate-whole-form\" class=\"populate-whole-form\" title=\"Populate Whole Form\">MarxJS</a>\n</div>";
+    open_controls = this.settings.controls !== 'toggle-all' ? "<a href='#open-controls' class='open-controls'>Marx.js</a>" : "<div class=\"open-controls\">\n  <a href=\"#advanced-controls\" class=\"advanced-controls\" title=\"Show Advanced Controls\">Advanced Controls</a>\n  <a href=\"#standard-controls\" class=\"standard-controls\" title=\"Show Standard Controls\">Standard Controls</a>\n  <a href=\"#populate-whole-form\" class=\"quick-populate\" title=\"Populate Whole Form\">Marx.js</a>\n</div>";
     this.$el.append(open_controls);
     this.$el.addClass('marx-js-collapsed');
     switch (this.settings.controls) {
@@ -60,16 +61,18 @@ $.extend(Marx.prototype, {
         this.add_standard_controls();
         this.add_advanced_controls();
         this.$('a.standard-controls').click(function(e) {
+          $('p.marx-notification').remove();
           _this.$('.marx-standard-controls').toggle();
           _this.$('.marx-advanced-controls').hide();
           return false;
         });
         this.$('a.advanced-controls').click(function(e) {
+          $('p.marx-notification').remove();
           _this.$('.marx-advanced-controls').toggle();
           _this.$('.marx-standard-controls').hide();
           return false;
         });
-        return this.$('a.populate-whole-form').click(function(e) {
+        return this.$('a.quick-populate').click(function(e) {
           _this.$('.marx-standard-controls').hide();
           _this.$('.marx-advanced-controls').hide();
           return _this.populate_whole_form(e);
@@ -118,10 +121,7 @@ $.extend(Marx.prototype, {
     this.$('.marx-advanced-controls').hide();
     this.$('.marx-standard-controls').append("<a href='#advanced' class='marx-toggle-advanced'>&laquo; Advanced</a>");
     return this.$('a.marx-toggle-advanced').click(function(e) {
-      var txt;
-      txt = $(e.target).hasClass('opened') ? "&laquo; Advanced" : "Close &raquo;";
-      _this.$(e.target).toggleClass('opened').html(txt);
-      return _this.$('.marx-advanced-controls').toggle();
+      return _this.toggle_advanced($(e.target));
     });
   },
   /*=========================
@@ -141,11 +141,8 @@ $.extend(Marx.prototype, {
     var _this = this;
     this.effected.inputs = 0;
     return $.each($("" + this.settings.form + " input"), function(i, input) {
-      var brother, movie, obj, strings, value;
+      var brother, movie, obj, rand, str, strings, value, year;
       if (!($(input).val() !== "" || $(input).hasClass('no-populate'))) {
-        if (['checkbox', 'radio', 'hidden'].indexOf($(input).attr('type') < 0)) {
-          _this.effected.inputs += 1;
-        }
         obj = _this.get_random();
         brother = JSON.parse(obj.brother);
         movie = JSON.parse(obj.movie);
@@ -161,22 +158,32 @@ $.extend(Marx.prototype, {
             case 'url':
               return "http://" + (movie.name.toLowerCase().replace(/\s/g, '')) + ".com";
             case 'date':
-              return "" + movie.year + "-01-01";
+              rand = Math.random();
+              year = movie.year.toString();
+              return "" + year + "-0" + (year.substr(Math.floor(rand * 4), 1)) + "-2" + (year.substr(Math.floor(rand * 4), 1));
             default:
-              return strings[Math.floor(Math.random() * strings.length)];
+              str = strings[Math.floor(Math.random() * strings.length)];
+              if ((str == null) || str === "") {
+                return "Marx";
+              } else {
+                return str;
+              }
           }
         })();
-        return $(input).attr('data-marx-d', true).val(value);
+        if (['checkbox', 'radio', 'hidden'].indexOf($(input).attr('type') < 0)) {
+          $(input).attr('data-marx-d', true).val(value).trigger('change').trigger('blur');
+          return _this.effected.inputs += 1;
+        }
       }
     });
   },
   populate_textareas: function() {
     var _this = this;
     this.effected.textareas = 0;
-    return $.getJSON("http://marxjs.com/quotes", function(data) {
+    return $.getJSON("" + this._url + "/quotes", function(data) {
       return $.each($("" + _this.settings.form + " textarea"), function(i, input) {
         _this.effected.textareas += 1;
-        return $(input).attr('data-marx-d', true).val(data[Math.floor(Math.random() * data.length)].body);
+        return $(input).attr('data-marx-d', true).val(data[Math.floor(Math.random() * data.length)].body).trigger('change').trigger('blur');
       });
     });
   },
@@ -194,7 +201,7 @@ $.extend(Marx.prototype, {
       var checked, clean_name;
       checked = Math.floor(Math.random() * 2) === 1 ? true : false;
       clean_name = name.replace(/\[/g, '\\[').replace(/\]/g, '\\]');
-      $("" + _this.settings.form + " input[name=" + clean_name + "]").attr('data-marx-d', true).attr('checked', checked);
+      $("" + _this.settings.form + " input[name=" + clean_name + "]").attr('data-marx-d', true).attr('checked', checked).trigger('change').trigger('blur');
       if (checked) {
         return _this.effected.check_boxes += 1;
       }
@@ -214,7 +221,7 @@ $.extend(Marx.prototype, {
       var clean_name, total;
       clean_name = name.replace(/\[/g, '\\[').replace(/\]/g, '\\]');
       total = $("" + _this.settings.form + " input[name=" + clean_name + "]").length;
-      $("" + _this.settings.form + " input[name=" + name + "]:eq(" + (Math.floor(Math.random() * total)) + ")").attr('data-marx-d', true).attr('checked', true);
+      $("" + _this.settings.form + " input[name=" + name + "]:eq(" + (Math.floor(Math.random() * total)) + ")").attr('data-marx-d', true).attr('checked', true).trigger('change').trigger('blur');
       return _this.effected.radio_buttons += 1;
     });
   },
@@ -228,10 +235,11 @@ $.extend(Marx.prototype, {
       rand = Math.floor(Math.random() * total);
       $opt = $(select).find("option:eq(" + rand + ")");
       if (($opt.attr('value') != null) && $opt.attr('value') !== "") {
-        return $opt.attr('selected', true);
+        $opt.attr('selected', true);
       } else {
-        return $opt.next('option').attr('selected', true);
+        $opt.next('option').attr('selected', true);
       }
+      return $(select).trigger('change').trigger('blur');
     });
   },
   toggle_hidden_fields: function() {
@@ -283,7 +291,7 @@ $.extend(Marx.prototype, {
     num = this.$('.ipsum input').val();
     $ipsum = $("<div class='marx-generated-ipsum " + this.settings.position + "'>\n  <h4>Marx Ipsum</h4>\n  <a href='#close' class='marx-ipsum-close'>X</a>\n  <div class='marx-container'></div>\n</div>");
     $('body').append($ipsum);
-    return $.getJSON("http://marxjs.com/monologues", function(data) {
+    return $.getJSON("" + this._url + "/monologues", function(data) {
       var i, max, monologues, _i;
       max = num > data.length ? data.length - 1 : num;
       monologues = data.sort(function() {
@@ -307,7 +315,20 @@ $.extend(Marx.prototype, {
   */
 
   toggle_controls: function(e) {
+    $('p.marx-notification').remove();
     this.$el.toggleClass('marx-js-collapsed');
+    if (this.settings.controls === 'toggle-advanced' && this.$el.hasClass('marx-js-collapsed')) {
+      if ($('.marx-advanced-controls').is(':visible')) {
+        this.toggle_advanced($('a.marx-toggle-advanced'));
+      }
+    }
+    return false;
+  },
+  toggle_advanced: function($link) {
+    var txt;
+    txt = $link.hasClass('opened') ? "&laquo; Advanced" : "Close &raquo;";
+    $link.toggleClass('opened').html(txt);
+    this.$('.marx-advanced-controls').toggle();
     return false;
   },
   popluate_selected_fields: function(e) {
@@ -370,7 +391,7 @@ $.extend(Marx.prototype, {
         });
         break;
       case 'random-image':
-        window.location = "http://marxjs.com/get-image";
+        window.location = "" + this._url + "/get-image";
         break;
       case 'generate-ipsum':
         this.generate_ipsum();

data/app/assets/stylesheets/marx.css

@@ -10,6 +10,7 @@
 
 .marx-js-controls {
   position: fixed;
+  z-index: 2000;
   background: #f6f6f6;
   -webkit-box-shadow: 0 0 8px rgba(0, 0, 0, 0.7);
   -moz-box-shadow: 0 0 8px rgba(0, 0, 0, 0.7);
@@ -96,14 +97,14 @@
     background-size: 32px 32px;
     color: #333;
     text-align: right; }
-    .marx-js-controls .open-controls a.populate-whole-form {
+    .marx-js-controls .open-controls a.quick-populate {
       padding: 10px; }
-    .marx-js-controls .open-controls a.populate-whole-form,
+    .marx-js-controls .open-controls a.quick-populate,
     .marx-js-controls .open-controls a.standard-controls, .marx-js-controls .open-controls a.advanced-controls {
       display: block;
       float: right;
       background-color: transparent; }
-      .marx-js-controls .open-controls a.populate-whole-form:hover,
+      .marx-js-controls .open-controls a.quick-populate:hover,
       .marx-js-controls .open-controls a.standard-controls:hover, .marx-js-controls .open-controls a.advanced-controls:hover {
         background-color: #ccc; }
     .marx-js-controls .open-controls a.standard-controls, .marx-js-controls .open-controls a.advanced-controls {

data/app/assets/stylesheets/marx.css.map

@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["../scss/marx.scss","../scss/mixins.scss"],
+"names": [],
+"file": "marx.css"
+}

data/lib/marxjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Marxjs
   module Rails
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marxjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Keith Raymond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - app/assets/images/standard.png
 - app/assets/javascripts/marx.js
 - app/assets/stylesheets/marx.css
+- app/assets/stylesheets/marx.css.map
 - lib/marxjs/rails.rb
 - lib/marxjs/rails/version.rb
 homepage: https://github.com/Sparkmasterflex/marxjs-rails