oxymoron 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bc0b4a2bc12a7d9377e2f4dc90ea3d045eb85ae
-  data.tar.gz: 43859c4cfa58dc84c60fc95d34eb5474d03969e6
+  metadata.gz: ba2cfcac8057d43bfb870dd02aaa0924f6488d8c
+  data.tar.gz: b3b9d2905e004ac1814eedc8d9ecfebc65493001
 SHA512:
-  metadata.gz: 92457106bff8e557875a22fea33e90393cbf8c03eabff082bcbfee16866b16ed9f266df74fee89609c88bce25396895668a4aff0adaa2edfa4386459bf77e338
-  data.tar.gz: 037d991888c83b6bc7ae5420c098ea8c72e92f6c184b453d83f540a2ae35f5ab1ff67e95a47ae4343ce2defa0a748ab4f331fce415caf13188a4838c039d4a96
+  metadata.gz: a7a46692f762bb48385842735922fa99b93ca67d7b1e4e9660328413471edc299587223d0376967bb2e72b3138c3520ea1fa8ab588f7c8f07a737880511c3b24
+  data.tar.gz: 1040515932287e6d02810f0a5e903b485d10fce8183d584369a4a082660113dfe577235c52e88ad9008abbd911c64e155870be020f37a3e5b585c8ba7f5100fb

data/README.md

@@ -2,6 +2,7 @@
 
 [Example application](https://github.com/storuky/oxymoron_app)
 
+[Basic forum based on Oxymoron](https://github.com/storuky/forum)
 ##Setup
 
 Add it to your Gemfile:
@@ -79,7 +80,7 @@ class ApplicationController < ActionController::Base
       false
     else
       index
-      'application' # или другой лейаут
+      'application' # or other layout
     end
   }
   

data/app/assets/javascripts/oxymoron/directives.js.erb

@@ -1,6 +1,5 @@
 <%= render_oxymoron_assets "directives/content_for.js"%>
 <%= render_oxymoron_assets "directives/fileupload.js"%>
-<%= render_oxymoron_assets "directives/checklist_model.js"%>
 <%= render_oxymoron_assets "directives/click_outside.js"%>
 
 angular.module("oxymoron.directives", ['oxymoron.directives.fileupload', 'oxymoron.directives.contentFor', 'oxymoron.directives.checklistModel', 'oxymoron.directives.clickOutside'])

data/app/assets/javascripts/oxymoron/services/sign.js

@@ -2,24 +2,33 @@ angular.module("oxymoron.services.sign", [])
   .service('Sign', ['$http', function ($http) {
     var Sign = this;
 
-    Sign.out = function () {
+    Sign.out = function (callback) {
       $http.delete(Routes.destroy_user_session_path())
         .success(function () {
-          window.location = "/";
+          if (callback)
+            callback()
+          else
+            window.location = "/";
         })
     }
 
-    Sign.in = function (form) {
-      $http.post(Routes.user_session_path(), {user: form})
+    Sign.in = function (user, callback) {
+      $http.post(Routes.user_session_path(), {user: user})
         .success(function () {
-          window.location.reload();
+          if (callback)
+            callback();
+          else
+            window.location.reload();
         })
     }
 
-    Sign.up = function (form) {
-      $http.post(Routes.user_registration_path(), {user: form})
+    Sign.up = function (user, callback) {
+      $http.post(Routes.user_registration_path(), {user: user})
         .success(function () {
-          window.location.reload();
+          if (callback)
+            callback();
+          else
+            window.location.reload();
         })
     }
   }])

data/lib/oxymoron/version.rb

@@ -1,3 +1,3 @@
 module Oxymoron
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxymoron
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Kononenko Paul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -104,7 +104,6 @@ files:
 - app/assets/javascripts/oxymoron/config/http.js
 - app/assets/javascripts/oxymoron/config/states.js.erb
 - app/assets/javascripts/oxymoron/directives.js.erb
-- app/assets/javascripts/oxymoron/directives/checklist_model.js
 - app/assets/javascripts/oxymoron/directives/click_outside.js
 - app/assets/javascripts/oxymoron/directives/content_for.js
 - app/assets/javascripts/oxymoron/directives/fileupload.js

data/app/assets/javascripts/oxymoron/directives/checklist_model.js

@@ -1,141 +0,0 @@
-angular.module("oxymoron.directives.checklistModel", [])
-  .directive('checklistModel', ['$parse', '$compile', function($parse, $compile) {
-    // contains
-    function contains(arr, item, comparator) {
-      if (angular.isArray(arr)) {
-        for (var i = arr.length; i--;) {
-          if (comparator(arr[i], item)) {
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-
-    // add
-    function add(arr, item, comparator) {
-      arr = angular.isArray(arr) ? arr : [];
-        if(!contains(arr, item, comparator)) {
-            arr.push(item);
-        }
-      return arr;
-    }  
-
-    // remove
-    function remove(arr, item, comparator) {
-      if (angular.isArray(arr)) {
-        for (var i = arr.length; i--;) {
-          if (comparator(arr[i], item)) {
-            arr.splice(i, 1);
-            break;
-          }
-        }
-      }
-      return arr;
-    }
-
-    // http://stackoverflow.com/a/19228302/1458162
-    function postLinkFn(scope, elem, attrs) {
-       // exclude recursion, but still keep the model
-      var checklistModel = attrs.checklistModel;
-      attrs.$set("checklistModel", null);
-      // compile with `ng-model` pointing to `checked`
-      $compile(elem)(scope);
-      attrs.$set("checklistModel", checklistModel);
-
-      // getter / setter for original model
-      var getter = $parse(checklistModel);
-      var setter = getter.assign;
-      var checklistChange = $parse(attrs.checklistChange);
-      var checklistBeforeChange = $parse(attrs.checklistBeforeChange);
-
-      // value added to list
-      var value = attrs.checklistValue ? $parse(attrs.checklistValue)(scope.$parent) : attrs.value;
-
-
-      var comparator = angular.equals;
-
-      if (attrs.hasOwnProperty('checklistComparator')){
-        if (attrs.checklistComparator[0] == '.') {
-          var comparatorExpression = attrs.checklistComparator.substring(1);
-          comparator = function (a, b) {
-            return a[comparatorExpression] === b[comparatorExpression];
-          };
-          
-        } else {
-          comparator = $parse(attrs.checklistComparator)(scope.$parent);
-        }
-      }
-
-      // watch UI checked change
-      scope.$watch(attrs.ngModel, function(newValue, oldValue) {
-        if (newValue === oldValue) { 
-          return;
-        } 
-
-        if (checklistBeforeChange && (checklistBeforeChange(scope) === false)) {
-          scope[attrs.ngModel] = contains(getter(scope.$parent), value, comparator);
-          return;
-        }
-
-        setValueInChecklistModel(value, newValue);
-
-        if (checklistChange) {
-          checklistChange(scope);
-        }
-      });
-
-      function setValueInChecklistModel(value, checked) {
-        var current = getter(scope.$parent);
-        if (angular.isFunction(setter)) {
-          if (checked === true) {
-            setter(scope.$parent, add(current, value, comparator));
-          } else {
-            setter(scope.$parent, remove(current, value, comparator));
-          }
-        }
-        
-      }
-
-      // declare one function to be used for both $watch functions
-      function setChecked(newArr, oldArr) {
-        if (checklistBeforeChange && (checklistBeforeChange(scope) === false)) {
-          setValueInChecklistModel(value, scope[attrs.ngModel]);
-          return;
-        }
-        scope[attrs.ngModel] = contains(newArr, value, comparator);
-      }
-
-      // watch original model change
-      // use the faster $watchCollection method if it's available
-      if (angular.isFunction(scope.$parent.$watchCollection)) {
-          scope.$parent.$watchCollection(checklistModel, setChecked);
-      } else {
-          scope.$parent.$watch(checklistModel, setChecked, true);
-      }
-    }
-
-    return {
-      restrict: 'A',
-      priority: 1000,
-      terminal: true,
-      scope: true,
-      compile: function(tElement, tAttrs) {
-        if ((tElement[0].tagName !== 'INPUT' || tAttrs.type !== 'checkbox') && (tElement[0].tagName !== 'MD-CHECKBOX') && (!tAttrs.btnCheckbox)) {
-          throw 'checklist-model should be applied to `input[type="checkbox"]` or `md-checkbox`.';
-        }
-
-        if (!tAttrs.checklistValue && !tAttrs.value) {
-          throw 'You should provide `value` or `checklist-value`.';
-        }
-
-        // by default ngModel is 'checked', so we set it if not specified
-        if (!tAttrs.ngModel) {
-          // local scope var storing individual checkbox model
-          tAttrs.$set("ngModel", "checked");
-        }
-
-        return postLinkFn;
-      }
-    };
-  }]);