hooch 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 087922e7a4513efd847e0321155931c9d6442c6a
-  data.tar.gz: 4dc2f8b767b6b8eb79f6b7bc7f81b824aca45fc1
+  metadata.gz: d9e66bf94543b7f6e7e5e759eff4e5e2796894a4
+  data.tar.gz: 1be8f61352c852e60eca3f02a73871e6a9edcd73
 SHA512:
-  metadata.gz: 1e2e952e4df0ba29f958e0fe58b8c96762f149bb7dbb6dbda6d8c02f17ba24ac4f10050f3ddb7646d5ff3e3d2ffacbd605b796f0ecc433898f2070919aa33ad1
-  data.tar.gz: c49766adf8ab37ce56a926e35c9cf25bfc785e9d813c0d374d96bcfefee08f5ed2f48fe29abff31d0633fc188ce7134b701090de888a94b844c4d2e98fa3ee89
+  metadata.gz: 275448fc8402520410d89412902126152d4fd3f40772c5f7e8e6b4fc8a9fb056b76675ea3f774e41a0935096f131a1b9d49c46c93922a2cb89c7efca35e3488f
+  data.tar.gz: 57a6d9f6ea03864adfa87e5b754ecea5707bab0bd4833105b41467f36f63fd909706fd1ec5df40074cfd8751beea87785505f8d125f6f25f9f5b1306f54211c7

data/app/assets/javascripts/hooch.js

@@ -140,33 +140,43 @@ var initHooch = function(){
       expand: function(){
         if(this.collapsers.length > 0){
 
-          this.hide_expanders();
           this.show_collapsers();
         }
+        this.hide_expanders();
         if(this.expand_class){
           this.$expandable.addClass(this.expand_class)
+          this.$expandable.removeClass(this.collapse_class)
         }else{
-          this.$expandable.show(10);
+          this.$expandable.show();
         }
+        this.state = 'expanded'
       },
       collapse: function(){
         if(this.collapsers.length > 0){
           this.hide_collapsers();
-          this.show_expanders();
         }
-        if(this.collapse_class){
+        this.show_expanders();
+        if(this.collapse_class || this.expand_class){
           this.$expandable.addClass(this.collapse_class)
+          this.$expandable.removeClass(this.expand_class)
         }else{
-          this.$expandable.hide(10);
+          this.$expandable.hide();
         }
+        this.state = 'collapsed'
       },
       toggle: function(){
-        this.$expandable.toggle(10);
+        if(this.state == 'collapsed'){
+          this.expand();
+        } else {
+          this.collapse();
+        }
       }
     }),
     Expander: Class.extend({
       init: function($expander,target){
         this.$expander = $expander;
+        this.target = target;
+        this.expand_class = $expander.data('expand-class')
         if($expander.data('fake-dropdown')){
           target.$expandable.on('click',function(){
             target.toggle();
@@ -176,18 +186,22 @@ var initHooch = function(){
           })
         }
         $expander.bind('click',function(){
-          if(target.collapsers.length > 0){
-            target.expand();
-          } else {
-            target.toggle();
-          }
+          target.toggle();
         })
       },
       hide: function(){
-        this.$expander.hide();
+        if(this.expand_class){
+          this.$expander.addClass(this.expand_class)
+        } else if(this.target.collapsers.length > 0) {
+          this.$expander.hide();
+        }
       },
       show: function(){
-        this.$expander.show();
+        if(this.expand_class){
+          this.$expander.removeClass(this.expand_class)
+        } else if(this.target.collapsers.length > 0) {
+          this.$expander.show();
+        }
       }
     }),
     Collapser: Class.extend({

data/jasmine/spec/hoochSpec.js

@@ -17,9 +17,51 @@ describe("hooch", function() {
     var remover_div = affix('[data-remover="true"][data-target="#my_div"]')
     var remover_target = affix('#my_div')
     $('[data-remover]').each(function(){new hooch.Remover($(this))})
-    expect($('#my_div').length).toEqual(1)
-    $('[data-remover]').click()
-    expect($('#my_div').length).toEqual(0)
+    expect($('#my_div').length).toEqual(1);
+    $('[data-remover]').click();
+    expect($('#my_div').length).toEqual(0);
   });
 
+  it('expands and collapses an element', function(){
+    var expander = affix('[data-expander="true"][data-expand-id="my_expander"]')
+    var expandable = affix('[data-expand-state="collapsed"][data-expand-id="my_expander"]')
+    $('[data-expand-state]').each(function(){new hooch.Expandable($(this))});
+    expect($('[data-expand-state]').css('display')).toEqual('none');
+    $('[data-expander]').click()
+    expect($('[data-expand-state]').css('display')).not.toEqual('none');
+    expect($('[data-expander]').css('display')).not.toEqual('none');
+    $('[data-expander]').click()
+    expect($('[data-expand-state]').css('display')).toEqual('none');
+  })
+
+  it('expands an element with a class and modifies trigger with a class', function(){
+    var expander = affix('[data-expander="true"][data-expand-id="my_expander"][data-expand-class="test-class-trigger"]')
+    var expandable = affix('[data-expand-state="collapsed"][data-expand-id="my_expander"][data-expand-class="test-class-content"]')
+    $('[data-expand-state]').each(function(){new hooch.Expandable($(this))});
+    expect($('[data-expand-state]').hasClass("test-class-content")).toBe(false);
+    expect($('[data-expander]').hasClass("test-class-trigger")).toBe(false);
+    $('[data-expander]').click()
+    expect($('[data-expand-state]').hasClass("test-class-content")).toBe(true);
+    expect($('[data-expander]').hasClass("test-class-trigger")).toBe(true);
+    $('[data-expander]').click()
+    expect($('[data-expand-state]').hasClass("test-class-content")).toBe(false);
+    expect($('[data-expander]').hasClass("test-class-trigger")).toBe(false);
+  })
+
+  it('expands and collapses an element with separate triggers', function(){
+    var expander = affix('[data-expander="true"][data-expand-id="my_expander"]')
+    var collapser = affix('[data-collapser="true"][data-expand-id="my_expander"]')
+    var expandable = affix('[data-expand-state="collapsed"][data-expand-id="my_expander"]')
+    $('[data-expand-state]').each(function(){new hooch.Expandable($(this))});
+    expect($('[data-expand-state]').css('display')).toEqual('none');
+    $('[data-expander]').click()
+    expect($('[data-expand-state]').css('display')).not.toEqual('none');
+    expect($('[data-collapser]').css('display')).not.toEqual('none');
+    expect($('[data-expander]').css('display')).toEqual('none');
+    $('[data-collapser]').click()
+    expect($('[data-expand-state]').css('display')).toEqual('none');
+    expect($('[data-collapser]').css('display')).toEqual('none');
+    expect($('[data-expander]').css('display')).not.toEqual('none');
+  })
+
 });

data/lib/hooch/hooch_helper.rb

@@ -20,8 +20,10 @@ module Hooch
       attrs = 'data-tab-id=' + id
     end
 
-    def expander(id)
+    def expander(id, expand_class: nil)
       attrs = "data-expander=true data-expand-id=" + id
+      attrs += "data-expand-class=" + expand_class if expand_class.present?
+      attrs
     end
 
     def collapser(id)

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails