piggybak_variants 0.0.14 → 0.0.15

data/README.md

@@ -19,8 +19,13 @@ In the admin, define option configurations and option values for each option, th
 
 Finally, add `<%= variant_cart_form(@instance) %>` to your sellable item's show page to render the cart form.
 
-OPTION:  `<%= variant_cart_form(@instance, :controls => 'dropdowns) %>` to render dropdowns instead of radio buttons.
+OPTION:  `<%= variant_cart_form(@instance, :controls => 'dropdowns') %>` to render dropdowns instead of radio buttons.
 
+In your `config/environments/production.rb`, add the following line to allow pre-compilation of piggybak_variants.js:
+
+    config.assets.precompile += %w(piggybak_variants/piggybak_variants.js)
+
+So either add that line, or if you already have it enabled just add `piggybak_variants/piggybak_variants.js` to the array of values.
 
 TODO
 ========

data/app/assets/javascripts/piggybak_variants/piggybak_variants.js

@@ -1,67 +1,66 @@
-function refreshControls(all_selected, selected_key){
-	if(all_selected && variant_map[selected_key]) {
-		$('.variant_options form').show();
-		$('#sellable_id').val(variant_map[selected_key].id);
-		$('#variant_price span').html(variant_map[selected_key].price);
-	} else if(all_selected) { // if all selected and not available
-		$('.variant_options form').hide();
-		$('.unavailable').show();
-	} else { // if not all selected
-		$('.all_selected').show();
-		$('.variant_options form').hide();
-	}    
-};
-
-function extractRadioButtonValues(){
-  var all_selected = true;
-	var selected = new Array();
-	$.each($('.option'), function(i, j) {
-		var option_id = $(j).attr('id');
-		if($('input[name=' + option_id + ']:checked').length) {
-			selected.push($('input[name=' + option_id + ']:checked').val());
-		} else {
-			all_selected = false;	
+var piggybak_variants = {
+	refreshControls : function(data) {
+		if(data.all_selected) { // if all selected
+			var selected_key = data.selected.sort().join('_');
+			if(variant_map[selected_key]) {
+				$('.variant_options form').show();
+				$('#sellable_id').val(variant_map[selected_key].id);
+				$('#variant_price span').html(variant_map[selected_key].price);
+			} else { // if variant not available
+				$('.variant_options form').hide();
+				$('.unavailable').show();
+			}
+		} else { // if not all selected
+			$('.all_selected').show();
+			$('.variant_options form').hide();
 		}
-	});          
-	return {all_selected: all_selected, selected: selected};
-};
-     
-function extractDropdownValues(){     
-  var all_selected = true;
-  $('.variant_options select').each(function() { 
-      if ($(this).attr('value') == '') {
-        all_selected = false;
-      }
-  });
-  var selected = new Array();
-  $.each($('.option'), function(i, j) {
-   var option_id = $(j).attr('id');
-   var select_id = $(j).children("select").attr('id');
-   if($('select#' + select_id + ' option:selected')) {
-     selected.push($('select#' + select_id + ' option:selected').val());
-   } else {
-     all_selected = false; 
-   }
-  }); 
-  return {all_selected: all_selected, selected: selected};
-};  
-
-function toggleVariantForm(){
-  $('.unavailable, .all_selected').hide();
-  var selected_values = {};  
-  if ($('input[type=radio]').length > 0){
-     selected_values = extractRadioButtonValues();
-  }   
-  else{
-      selected_values = extractDropdownValues();
-  };
-	var selected_key = selected_values['selected'].sort().join('_');
-	refreshControls(selected_values['all_selected'], selected_key);
-};
+	},
+	extractRadioButtonValues: function() {
+		var all_selected = true;
+		var selected = new Array();
+		$.each($('.option'), function(i, j) {
+			var option_id = $(j).attr('id');
+			if($('input[name=' + option_id + ']:checked').length) {
+				selected.push($('input[name=' + option_id + ']:checked').val());
+			} else {
+				all_selected = false;	
+			}
+		});					
+		return { all_selected: all_selected, selected: selected };
+	},
+	extractDropdownValues: function() {
+		var all_selected = true;
+		// TODO: Nice to see if easier way to select by value, but select[value=""] doesn't work
+		$('.variant_options select').each(function() {
+			if ($(this).val() == '') {
+				all_selected = false;
+			}
+		});
+		if(!all_selected) {
+			return { all_selected: false, selected: '' };
+		}
+		
+		var selected = new Array();
+		$.each($('.variant_options .option select'), function(i, j) {
+			selected.push($(this).val());
+		});
+		return { all_selected: true, selected: selected};
+	},
+	toggleVariantForm : function() {
+		$('.unavailable, .all_selected').hide();
+		var data;
+		if ($('.variant_options input[type=radio]').length > 0){
+			data = piggybak_variants.extractRadioButtonValues();
+		} else { 
+			data = piggybak_variants.extractDropdownValues();
+		};
+		piggybak_variants.refreshControls(data);
+	}
+}
 
 $(function() {
-	$('.variant_options input[type=radio]').click(function() { toggleVariantForm(); });
-	$('.variant_options select').change(function() { toggleVariantForm(); });
-	toggleVariantForm();
+	$('.variant_options input[type=radio]').click(function() { piggybak_variants.toggleVariantForm(); });
+	$('.variant_options select').change(function() { piggybak_variants.toggleVariantForm(); });
+	piggybak_variants.toggleVariantForm();
 });
 

data/app/views/piggybak_variants/cart/_dropdowns_form.html.erb

@@ -9,7 +9,7 @@
 		<% options_for_klass(object.class).each do |option| -%>
 		<div class="option" id="option_<%= option.id %>">
 		<h4><%= option.name %></h4>
-		<%= select_tag option.name, options_for_select(option.option_values.map{ |o| [o.name, o.id, { name: "option_#{option.name}-#{o.id}"}] }), include_blank: true %>
+		<%= select_tag option.name, options_for_select(option.option_values.map{ |o| [o.name, o.id] }), include_blank: true %>
 		<br />
 		</div>
 		<% end -%>
@@ -17,10 +17,10 @@
 		<span class="unavailable">This combination is not available.</span>
 		<%= form_tag piggybak.cart_add_url do -%>
 		<input type="hidden" id="sellable_id" name="sellable_id" />
-		<!-- <div id="variant_price">Price: <span></span></div> -->
+		<div id="variant_price">Price: <span></span></div>
 		<label for="quantity">Quantity</label>
 		<%= text_field_tag :quantity, 1 %>
 		<%= submit_tag "Add to Cart", :id => "submit" %>
 		<% end -%>
 	</div>
-<% end -%>
+<% end -%>

data/lib/piggybak_variants/version.rb

@@ -1,3 +1,3 @@
 module PiggybakVariants
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak_variants
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1786782223975916753
+      hash: 4072402557057022978
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1786782223975916753
+      hash: 4072402557057022978
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23