material_raingular 0.0.2.5 → 0.0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 125a7e255ed4e92d524c6e6e0b53bac6d66fffaf
-  data.tar.gz: 699bf72e9ee0574492759883f917b6f193b04b97
+  metadata.gz: 1d682da46b3c4eec8b890748878f6fe659630de5
+  data.tar.gz: 9ad820a90a90c83604ef0d3192e8024385af0587
 SHA512:
-  metadata.gz: d446c1e3b4eaff3dd36a496b00811efd454f43e7576592bbfedd0462558f755c4765ea371cd193b1196357989b19a7d89a90923a1f7e16d5998d99064679b0cc
-  data.tar.gz: 498591693acdcc0c493598fec41a64d403efd166569fec633833ac8cebd00ed4dfbc2a19fbe0d24065c9eb5aa37948c0e78573530b83b686c63f64017e55b8bc
+  metadata.gz: 3bc1fc38c5aa76ba7886b27dc5980219f2bb41d1104b953540226e866da88be660db80c6d5f270511c8dee6b99f7dac41066a4f0211dbe72560d3b43f13c5e94
+  data.tar.gz: 88593dbecd75b04f400b4139ffccc2face2a02ed746c8090612662b049c515563086fc4f02a31c76eaf1d45a9eddb35fd3211c8c4db741eee94a1e07729ffe8c

data/lib/assets/javascripts/directives/mdupdate.coffee

@@ -0,0 +1,64 @@
+class ElementUpdate
+  constructor: (scope,element,attributes,controllers,RailsUpdater) ->
+    [@ngModelCtrl,@ngCallbackCtrl,@ngTrackByCtrl] = controllers
+    @updater     = RailsUpdater.new(scope,controllers,attributes.ngModel,attributes.ngOverride)
+    @type        = attributes.type
+    @tagName     = element[0].tagName
+    @modelName   = attributes.ngModel
+    @isInput     = @tagName == 'INPUT'
+    @scope       = scope
+    @element     = element
+    @placeholder = attributes.placeholder
+    @bindInput()          if @isInput
+    @bindElement()    unless @isInput
+    @setPlaceholder() unless @placeholder
+  watcher: ->
+    eu = @
+    @scope.$watch @modelName, (updated,old) ->
+      eu.updater.update(updated) unless updated == old
+  bindInput: ->
+    eu = @
+    if @type == 'radio' || @type == 'date'
+      @element.bind 'input', (event) ->
+        return unless eu.ngModelCtrl.$valid
+          eu.updater.update(element.val())
+    else if @type == 'hidden'
+      @watcher()
+    else if @type == 'checkbox'
+      @element.bind 'click', (event) ->
+        eu.updater.update(element.val())
+    else
+      oldValue = null
+      @element.bind 'focus', ->
+        eu.scope.$apply ->
+          oldValue = eu.element.val()
+      @element.bind 'blur', (event) ->
+        delay = if @element.hasClass('autocomplete') then 300 else 0
+        $timeout ->
+          @scope.$apply ->
+            newValue = @element.val()
+            @updater.update(newValue) if (newValue != oldValue)
+        , delay
+
+  bindElement: ->
+    if @tagName == 'TEXTAREA'
+      @element.bind 'keyup', ->
+        $timeout.cancel(scope.debounce)
+        scope.debounce = $timeout ->
+          eu.updater.update(element.val())
+        ,750
+    else
+      @watcher()
+  setPlaceholder: ->
+    placeholder = ''
+    for word in @modelName.split('.').pop().split('_')
+      placeholder += word[0].toUpperCase() + word[1..-1].toLowerCase() + ' '
+    @element.attr('placeholder',placeholder)
+
+angular.module 'MdUpdate', ['Factories', 'FactoryName','RailsUpdater']
+  .directive 'mdUpdate', ($timeout, factoryName, $injector, RailsUpdater) ->
+    restrict: 'A'
+    require:  ['ngModel','?ngCallback','?ngTrackBy']
+
+    link: (scope, element, attributes, ngControllers) ->
+      new ElementUpdate(scope,element,attributes,ngControllers, RailsUpdater)

data/lib/assets/javascripts/directives/ngboolean.js.coffee

@@ -1,33 +1,10 @@
-angular.module 'NgBoolean', ['Factories', 'FactoryName']
+angular.module 'NgBoolean', ['Factories', 'FactoryName','RailsUpdater']
 
-  .directive 'ngBoolean', ($injector,factoryName) ->
+  .directive 'ngBoolean', ($injector,factoryName,RailsUpdater) ->
     restrict: 'A'
-    require:  'ngModel'
+    require:  ['ngModel','?ngCallback','?ngTrackBy']
 
-    link: (scope, element, attributes, ngModelCtrl) ->
-      model = attributes.ngModel
-      callFunction = model + ' = !' + model + ' ; update("' + model + '")'
-      callFunction += ';' + attributes.ngCallback if attributes.ngCallback
-      element.attr("call-function", callFunction)
+    link: (scope, element, attributes, ngControllers) ->
+      updater     = RailsUpdater.new(scope,ngControllers,attributes.ngModel,attributes.ngOverride)
       element.bind 'click', ->
-        scope.$eval(element.attr("call-function")) unless attributes.disabled
-      scope.update = (modelName)->
-        input = modelName.split(',')
-        trackby = input.pop() if input.length > 1
-        trackby = trackby.split(';') if trackby
-        trackby = [] unless trackby
-        data = input.splice(0,1)[0].split('.')
-        functions = input.join(',').split(')')
-        factory = factoryName(data[0])
-        object = {id: scope[data[0]]['id']}
-        object[data[0]] = {id: scope[data[0]]['id']}
-        object[data[0]][data[1]] = scope[data[0]][data[1]]
-        list = $injector.get(factory)
-        list.update object, (returnData) ->
-          for tracked in trackby
-            scope[data[0]][tracked] = returnData[tracked]
-          ngModelCtrl.$setViewValue(returnData[data[1]]) if ngModelCtrl.$modelValue == object[data[0]][data[1]]
-          callFunctions = []
-          for callFunction in functions
-            callFunctions.push(callFunction + ',' + JSON.stringify(returnData) + ')') if callFunction.length > 0
-          scope.$eval( callFunctions.join('') ) if callFunctions.join('').length > 0
+        updater.update(element.val())

data/lib/assets/javascripts/directives/ngcallback.coffee

@@ -0,0 +1,17 @@
+angular.module 'NgCallback', ['Factories', 'FactoryName']
+
+  .directive 'ngCallback', ->
+    restrict: 'A'
+    controller: ($scope,$element) ->
+      @evaluate = (returnData)->
+        for callback in $element[0].attributes['ng-callback'].value.split(';')
+          [match,func,args] = callback.match(/(.*)\((.*)\)/)
+          data = []
+          for arg in args.split(',')
+            data.push $scope.$eval(arg)
+          data.push returnData
+          if typeof $scope[func] == 'function'
+            $scope[func] data...
+          else if typeof window[func] == 'function'
+            window[func] data...
+      return

data/lib/assets/javascripts/directives/ngtrackby.coffee

@@ -0,0 +1,11 @@
+angular.module 'NgTrackBy', ['Factories', 'FactoryName']
+
+  .directive 'ngTrackBy', ->
+    restrict: 'A'
+
+    controller: ($scope,$element) ->
+      @evaluate = (returnData)->
+        parent = attributes['ng-model'].value.split('.')[0]
+        for model in $element[0].attributes['ng-track-by'].value.split(';')
+          $scope[parent][model] = returnData[model]
+      return

data/lib/assets/javascripts/directives/ngupdate.js.coffee

@@ -2,8 +2,9 @@ angular.module 'NgUpdate', ['Factories', 'FactoryName']
 
   .directive 'ngUpdate', ($timeout, $compile) ->
     restrict: 'A'
+    require: '?ngCallback'
 
-    link: (scope, element, attributes, ngModelCtrl) ->
+    link: (scope, element, attributes, ngCallbackCtrl) ->
       model = attributes.ngUpdate.split('"').join('\'')
       html = element[0].outerHTML
       html = angular.element(html)
@@ -17,7 +18,6 @@ angular.module 'NgUpdate', ['Factories', 'FactoryName']
           placeholder += word[0].toUpperCase() + word[1..-1].toLowerCase() + ' '
       callModel += ',' + attributes.ngTrackBy if attributes.ngTrackBy
       callFunction = 'update("' + callModel + '")'
-      callFunction += ';' + attributes.ngCallback if attributes.ngCallback
       if element[0].tagName == 'INPUT'
         html[0].setAttribute("ng-change-on-blur", callFunction) if attributes.type != 'radio' && attributes.type != 'checkbox' && attributes.type != 'hidden'
         html[0].setAttribute("ng-change", callFunction)     unless attributes.type != 'radio' && attributes.type != 'checkbox' && attributes.type != 'hidden'
@@ -27,7 +27,6 @@ angular.module 'NgUpdate', ['Factories', 'FactoryName']
         html[0].setAttribute("ng-change-debounce", callFunction)
       else
         callFunction = callModel + ' = !' + callModel + ' ; update("' + callModel + '")'
-        callFunction += ';' + attributes.ngCallback if attributes.ngCallback
         html[0].setAttribute("ng-click", callFunction)
       html[0].setAttribute('placeholder',placeholder)
       html[0].removeAttribute('ng-update')
@@ -60,83 +59,4 @@ angular.module 'NgUpdate', ['Factories', 'FactoryName']
           for callFunction in functions
             callFunctions.push(callFunction + ',' + JSON.stringify(returnData) + ')') if callFunction.length > 0
           $scope.$eval( callFunctions.join('') ) if callFunctions.join('').length > 0
-
-  .directive 'mdUpdate', ($timeout, factoryName, $injector) ->
-    restrict: 'A'
-    require:  'ngModel'
-
-    link: (scope, element, attributes, ngModelCtrl) ->
-      modelName = attributes.ngModel
-      watcher = ->
-        scope.$watch modelName, (updated,old) ->
-          update(updated) unless updated == old
-      equiv = (left,right) ->
-        return true if left == right
-        return true if (!!left && !!right) == false
-        false
-
-      update = (value) ->
-        override    = if attributes.ngOverride then attributes.ngOverride.split('.') else []
-        functions   = if attributes.ngCallback then attributes.ngCallback.split(';') else []
-        trackby     = if attributes.ngTrackBy  then attributes.ngTrackBy.split(';')  else []
-        data        = modelName.split('.')
-        factory     = factoryName(override[0] || data[0])
-        if override[1]
-          object = {id: scope.$eval(override[0]).id}
-          object[override[1]] = scope.$eval(override[1])
-        else
-          object = {id: scope[data[0]]['id']}
-          object[data[0]] = {id: scope[data[0]]['id']}
-          object[data[0]][data[1]] = scope[data[0]][data[1]]
-          object[data[0]].lock_version = scope[data[0]].lock_version
-        list = $injector.get(factory)
-
-        unless scope[data[0]].currently_updating
-          scope[data[0]].currently_updating = true
-          list.update object, (returnData) ->
-            scope[data[0]].currently_updating = false
-            for tracked in trackby
-              scope[data[0]][tracked] = returnData[tracked]
-            scope[data[0]][data[1]] = returnData[data[1]] if equiv(scope[data[0]][data[1]], object[data[0]][data[1]]) && !equiv(scope[data[0]][data[1]], returnData[data[1]])
-            scope[data[0]].errors   = returnData.errors
-            callFunctions = []
-            for callFunction in functions
-              [match,func,args] = callFunction.match(/(.*)\((.*)\)/)
-              if typeof scope[func] == 'function'
-                scope[func](args,returnData)
-              else if typeof window[func] == 'function'
-                window[func](args,returnData)
-      if element[0].tagName == 'INPUT'
-        if attributes.type == 'radio' || attributes.type == 'checkbox' || attributes.type == 'date'
-          element.bind 'input', (event) ->
-            return unless ngModelCtrl.$valid
-            update(element.val())
-        else if attributes.type == 'hidden'
-          watcher()
-        else
-          oldValue = null
-          element.bind 'focus', ->
-            scope.$apply ->
-              oldValue = element.val()
-          element.bind 'blur', (event) ->
-            delay = if element.hasClass('autocomplete') then 300 else 0
-            $timeout ->
-              scope.$apply ->
-                newValue = element.val()
-                update(newValue) if (newValue != oldValue)
-            , delay
-      else if element[0].tagName == 'TEXTAREA'
-        element.bind 'keyup', ->
-          $timeout.cancel(scope.debounce)
-          scope.debounce = $timeout ->
-            update(element.val())
-          ,750
-      else
-        watcher()
-      if element[0].attributes['placeholder']
-        placeholder = element[0].attributes['placeholder'].value
-      else
-        placeholder = ''
-        for word in modelName.split('.').pop().split('_')
-          placeholder += word[0].toUpperCase() + word[1..-1].toLowerCase() + ' '
-      element.attr('placeholder',placeholder)
+          ngCallbackCtrl.evaluate(returnData) if !!ngCallbackCtrl

data/lib/assets/javascripts/material_raingular.js.coffee

@@ -14,9 +14,10 @@
 # //= require dateconverter
 # //= require ajax_errors
 # //= require identifier_interceptor
+# //= require rails_updater
 
 angular.module('materialRaingular', ['AutoComplete', 'NgDownload', 'NgChangeOnBlur', 'NgDrag', 'NgAuthorize'
-                                    'NgRepeatList', 'NgUpdate', 'NgPopup', 'NgBoolean', 'Table', 'NgWatchShow'
-                                    'NgUpload', 'NgDestroy', 'NgCreate', 'Video','NgAuthorize', 'TextArea'
-                                    'NgSlide', 'NgMatches','NgFade','NgSwipe', 'NgLoad', 'NgWatchContent'
-                                    'ngRoute', 'ngMaterial', 'ngMessages', 'ngResource', 'materialFilters'])
+                                    'NgRepeatList', 'NgUpdate', 'NgPopup', 'NgBoolean', 'Table', 'NgWatchShow', 'NgTrackBy'
+                                    'NgUpload', 'NgDestroy', 'NgCreate', 'Video','NgAuthorize', 'TextArea', 'MdUpdate'
+                                    'NgSlide', 'NgMatches','NgFade','NgSwipe', 'NgLoad', 'NgWatchContent', 'RailsUpdater'
+                                    'ngRoute', 'ngMaterial', 'ngMessages', 'ngResource', 'materialFilters', 'NgCallback'])

data/lib/assets/javascripts/rails_updater.coffee

@@ -0,0 +1,34 @@
+class RailsUpdate
+  constructor: ($injector,factoryName,scope,controllers,model,override)->
+    @injector    = $injector
+    @factoryName = factoryName
+    @scope       = scope
+    @modelName   = (override || model).split('.')[0]
+    @atomName    = (override || model).split('.')[1]
+    @override    = !!override
+    @factory     = @injector.get(@factoryName(@modelName))
+    @object      = {id: scope[@modelName].id}
+    @ngModelCtrl = controllers.shift()
+    @controllers = controllers
+    return @
+  equiv: (left,right) ->
+    return true if left == right
+    return true if (!!left && !!right) == false
+    false
+  update: (value) ->
+    @value       = if @override then scope.$eval(@atomName) else value
+    @object[@atomName] = value
+    unless @scope[@modelName].currently_updating
+      @scope[@modelName].currently_updating = true
+      up = @
+      @factory.update @object, (returnData) ->
+        up.scope[up.modelName].currently_updating = false
+        unless up.equiv(up.ngModelCtrl.$viewValue,returnData[up.atomName])
+          up.ngModelCtrl.$setModelValue = returnData[up.atomName]
+          up.ngModelCtrl.$render()
+        for controller in up.controllers
+          controller.evaluate(returnData) if !!controller
+angular.module 'RailsUpdater',  ['Factories', 'FactoryName']
+  .factory 'RailsUpdater', ($injector,factoryName) ->
+    new: (scope,controllers,model,override)->
+      return new RailsUpdate($injector,factoryName,scope,controllers,model,override)

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.0.2.5"
+  VERSION = "0.0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.0.2.5
+  version: 0.0.2.6
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,9 +70,11 @@ files:
 - lib/assets/javascripts/ajax_errors.js.coffee
 - lib/assets/javascripts/dateconverter.coffee
 - lib/assets/javascripts/dateparser.coffee
+- lib/assets/javascripts/directives/mdupdate.coffee
 - lib/assets/javascripts/directives/ngauthorize.js.coffee
 - lib/assets/javascripts/directives/ngautocomplete.js.coffee
 - lib/assets/javascripts/directives/ngboolean.js.coffee
+- lib/assets/javascripts/directives/ngcallback.coffee
 - lib/assets/javascripts/directives/ngchangeonblur.js.coffee
 - lib/assets/javascripts/directives/ngcreate.js.coffee
 - lib/assets/javascripts/directives/ngdestroy.js.coffee
@@ -85,6 +87,7 @@ files:
 - lib/assets/javascripts/directives/ngrepeatlist.js.coffee
 - lib/assets/javascripts/directives/ngslide.js.coffee
 - lib/assets/javascripts/directives/ngswipe.js.coffee
+- lib/assets/javascripts/directives/ngtrackby.coffee
 - lib/assets/javascripts/directives/ngupdate.js.coffee
 - lib/assets/javascripts/directives/ngupload.js.coffee
 - lib/assets/javascripts/directives/ngwatchcontent.js.coffee
@@ -97,6 +100,7 @@ files:
 - lib/assets/javascripts/identifier_interceptor.js.coffee
 - lib/assets/javascripts/material_filters.coffee
 - lib/assets/javascripts/material_raingular.js.coffee
+- lib/assets/javascripts/rails_updater.coffee
 - lib/material_raingular.rb
 - lib/material_raingular/version.rb
 - lib/tasks/material_raingular.rake