spree_variant_options 0.3.0 → 0.4.0

data/test/support/factories.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
 
-  factory :product do
+  factory :product, :class => Spree::Product do
     name "Very Wearily Variantly"
     description "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh."
     available_on { Time.zone.now - 1.day }
@@ -13,15 +13,15 @@ FactoryGirl.define do
     after_create { |product|
       sizes = %w(Small Medium Large X-Large).map{|i| Factory.create(:option_value, :presentation => i) }
       colors = %w(Red Green Blue Yellow Purple Gray Black White).map{|i| 
-        Factory.create(:option_value, :presentation => i, :option_type => OptionType.find_by_name("color") || Factory.create(:option_type, :presentation => "Color")) 
+        Factory.create(:option_value, :presentation => i, :option_type => Spree::OptionType.find_by_name("color") || Factory.create(:option_type, :presentation => "Color")) 
       }
       product.variants = sizes.map{|i| colors.map{|j| Factory.create(:variant, :product => product, :option_values => [i, j]) }}.flatten
-      product.option_types = OptionType.where(:name => %w(size color))
+      product.option_types = Spree::OptionType.where(:name => %w(size color))
     }
   end
   
-  factory :variant do
-    product { Product.last || Factory.create(:product) }
+  factory :variant, :class => Spree::Variant do
+    product { Spree::Product.last || Factory.create(:product) }
     option_values { [OptionValue.last || Factory.create(:option_value)] }
     sequence(:sku) { |n| "ROR-#{1000 + n}" }
     sequence(:price) { |n| 19.99 + n }
@@ -29,16 +29,16 @@ FactoryGirl.define do
     count_on_hand 10
   end
   
-  factory :option_type do
+  factory :option_type, :class => Spree::OptionType do
     presentation "Size"
     name { presentation.downcase }
     #sequence(:position) {|n| n }
   end
   
-  factory :option_value do
+  factory :option_value, :class => Spree::OptionValue do
     presentation "Large"
     name { presentation.downcase }
-    option_type { OptionType.last || Factory.create(:option_type) }
+    option_type { Spree::OptionType.last || Factory.create(:option_type) }
     #sequence(:position) {|n| n }
   end
 

data/test/support/user_fix.rb

@@ -0,0 +1,5 @@
+Spree::User.class_eval do
+  
+  class DestroyWithOrdersError < StandardError; end
+  
+end

data/test/test_helper.rb

@@ -6,7 +6,6 @@ require "rails/test_help"
 require "shoulda"
 require "factory_girl"
 require "sqlite3"
-require "faker"
 begin; require "turn"; rescue LoadError; end
-  
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/unit/{option_value_test.rb → spree/option_value_test.rb}

@@ -1,9 +1,9 @@
 require 'test_helper'
 
-class OptionValueTest < ActiveSupport::TestCase
+class Spree::OptionValueTest < ActiveSupport::TestCase
 
   setup do
-    @images = Dir[File.expand_path("../../support/images/*", __FILE__)]
+    @images = Dir[File.expand_path("../../../support/images/*", __FILE__)]
   end
 
   should_have_attached_file :image
@@ -11,7 +11,7 @@ class OptionValueTest < ActiveSupport::TestCase
   context "a new option value" do
   
     setup do
-      @option_value = OptionValue.new
+      @option_value = Spree::OptionValue.new
     end
   
     should "not have an image" do
@@ -44,7 +44,7 @@ class OptionValueTest < ActiveSupport::TestCase
       end
       
       should "have small large and original images" do
-        dir = File.expand_path("../../dummy/public/system/images/#{@option_value.id}", __FILE__)
+        dir = File.expand_path("../../../dummy/public/system/images/#{@option_value.id}", __FILE__)
         %w(small large original).each do |size|
           assert File.exists?(File.join(dir, size, File.basename(@path)))
         end        

data/test/unit/{product_test.rb → spree/product_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ProductTest < ActiveSupport::TestCase
+class Spree::ProductTest < ActiveSupport::TestCase
 
   setup do
     @methods = %w(option_values grouped_option_values variant_options_hash)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_variant_options
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70264012210960 !ruby/object:Gem::Requirement
+  requirement: &70218045579800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.70.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264012210960
+  version_requirements: *70218045579800
 - !ruby/object:Gem::Dependency
   name: spree_sample
-  requirement: &70264012210180 !ruby/object:Gem::Requirement
+  requirement: &70218045579220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.70.0
+        version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70264012210180
+  version_requirements: *70218045579220
 - !ruby/object:Gem::Dependency
   name: dummier
-  requirement: &70264012209520 !ruby/object:Gem::Requirement
+  requirement: &70218045578360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70264012209520
+  version_requirements: *70218045578360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70264012208880 !ruby/object:Gem::Requirement
+  requirement: &70218045577460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: *70264012208880
+  version_requirements: *70218045577460
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70264012208400 !ruby/object:Gem::Requirement
+  requirement: &70218045576200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70264012208400
+  version_requirements: *70218045576200
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70264012207760 !ruby/object:Gem::Requirement
+  requirement: &70218045575120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70264012207760
+  version_requirements: *70218045575120
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70264012207300 !ruby/object:Gem::Requirement
+  requirement: &70218045574360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *70264012207300
+  version_requirements: *70218045574360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70264012206820 !ruby/object:Gem::Requirement
+  requirement: &70218045573380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70264012206820
+  version_requirements: *70218045573380
 description: Spree Variant Options is a simple spree extension that replaces the radio-button
   variant selection with groups of option types and values. Please see the documentation
   for more details.
@@ -116,37 +116,40 @@ files:
 - Rakefile
 - Versionfile
 - app/assets/images/store/out-of-stock.png
-- app/assets/javascripts/store/product.js
+- app/assets/javascripts/store/product_variant_options.js
 - app/assets/javascripts/store/variant_options.js
-- app/assets/stylesheets/store/variant_options.css
-- app/controllers/admin/option_values_controller.rb
+- app/assets/stylesheets/store/variant_options.css.erb
+- app/controllers/spree/admin/option_values_controller.rb
 - app/models/option_value_decorator.rb
 - app/models/product_decorator.rb
 - app/overrides/spree_variant_options.rb
-- app/views/admin/option_types/_option_value_fields.html.erb
-- app/views/admin/option_types/edit.html.erb
-- app/views/products/_variant_options.html.erb
+- app/views/spree/admin/option_types/_option_value_fields.html.erb
+- app/views/spree/admin/option_values/_table_header.html.erb
+- app/views/spree/products/_variant_options.html.erb
 - config/cucumber.yml
 - config/routes.rb
-- features/admin_option_types.feature
+- db/migrate/20120213174249_add_image_to_option_values.rb
+- features/spree/admin/option_types.feature
+- features/spree/variant_options.feature
 - features/step_definitions/option_values.rb
 - features/step_definitions/variant_options.rb
 - features/step_definitions/web_steps.rb
 - features/support/env.rb
 - features/support/paths.rb
 - features/support/selectors.rb
-- features/variant_options.feature
 - lib/generators/spree_variant_options/install_generator.rb
-- lib/generators/templates/db/migrate/add_image_to_option_values.rb
 - lib/spree_variant_options.rb
+- lib/spree_variant_options/engine.rb
 - lib/spree_variant_options/version.rb
 - spree_variant_options.gemspec
 - test/dummy_hooks/after_migrate.rb.sample
 - test/dummy_hooks/before_migrate.rb
 - test/dummy_hooks/templates/admin/all.css
 - test/dummy_hooks/templates/admin/all.js
+- test/dummy_hooks/templates/spree_user_error_fix.rb
 - test/dummy_hooks/templates/store/all.css
 - test/dummy_hooks/templates/store/all.js
+- test/dummy_hooks/templates/store/screen.css
 - test/support/factories.rb
 - test/support/helper_methods.rb
 - test/support/images/1.gif
@@ -159,9 +162,10 @@ files:
 - test/support/images/3.jpg
 - test/support/images/3.png
 - test/support/paperclip.rb
+- test/support/user_fix.rb
 - test/test_helper.rb
-- test/unit/option_value_test.rb
-- test/unit/product_test.rb
+- test/unit/spree/option_value_test.rb
+- test/unit/spree/product_test.rb
 homepage: https://github.com/citrus/spree_variant_options
 licenses: []
 post_install_message: 
@@ -176,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3966294049605257627
+      hash: -34473155772268830
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3966294049605257627
+      hash: -34473155772268830
 requirements: []
 rubyforge_project: spree_variant_options
 rubygems_version: 1.8.10
@@ -194,20 +198,22 @@ specification_version: 3
 summary: Spree Variant Options is a simple spree extension that replaces the radio-button
   variant selection with groups of option types and values.
 test_files:
-- features/admin_option_types.feature
+- features/spree/admin/option_types.feature
+- features/spree/variant_options.feature
 - features/step_definitions/option_values.rb
 - features/step_definitions/variant_options.rb
 - features/step_definitions/web_steps.rb
 - features/support/env.rb
 - features/support/paths.rb
 - features/support/selectors.rb
-- features/variant_options.feature
 - test/dummy_hooks/after_migrate.rb.sample
 - test/dummy_hooks/before_migrate.rb
 - test/dummy_hooks/templates/admin/all.css
 - test/dummy_hooks/templates/admin/all.js
+- test/dummy_hooks/templates/spree_user_error_fix.rb
 - test/dummy_hooks/templates/store/all.css
 - test/dummy_hooks/templates/store/all.js
+- test/dummy_hooks/templates/store/screen.css
 - test/support/factories.rb
 - test/support/helper_methods.rb
 - test/support/images/1.gif
@@ -220,6 +226,7 @@ test_files:
 - test/support/images/3.jpg
 - test/support/images/3.png
 - test/support/paperclip.rb
+- test/support/user_fix.rb
 - test/test_helper.rb
-- test/unit/option_value_test.rb
-- test/unit/product_test.rb
+- test/unit/spree/option_value_test.rb
+- test/unit/spree/product_test.rb

data/app/assets/javascripts/store/product.js

@@ -1,38 +0,0 @@
-var add_image_handlers = function() {
-  $("#main-image").data('selectedThumb', $('#main-image img').attr('src'));
-  $('ul.thumbnails li').eq(0).addClass('selected');
-  $('ul.thumbnails li a').click(function() {
-    $("#main-image").data('selectedThumb', $(this).attr('href'));
-    $('ul.thumbnails li').removeClass('selected');
-    $(this).parent('li').addClass('selected');
-    return false;
-  }).hover(function() {
-    $('#main-image img').attr('src', $(this).attr('href').replace('mini', 'product'));
-  }, function() {
-     $('#main-image img').attr('src', $("#main-image").data('selectedThumb'));
-  });
-};
- 
-var select_variant = function(vid, text) {
-  jQuery("#variant-thumbnails").empty();
-  jQuery("#variant-images span").html(text);
-  if (images[vid].length > 0) {
-    $.each(images[vid], function(i, link) {
-      jQuery("#variant-thumbnails").append('<li>' + link + '</li>');
-    });
-    jQuery("#variant-images").show();
-  } else {
-    jQuery("#variant-images").hide();
-  }
-  add_image_handlers();
-  var link = jQuery("#variant-thumbnails a")[0];
-  jQuery("#main-image img").attr({src: jQuery(link).attr('href')});
-  jQuery('ul.thumbnails li').removeClass('selected');
-  jQuery(link).parent('li').addClass('selected');
-}
- 
-jQuery(document).ready(function() {
-  add_image_handlers();
-  jQuery("#variant-thumbnails").empty();
-  jQuery("#variant-images").hide();
-});

data/app/controllers/admin/option_values_controller.rb

@@ -1,14 +0,0 @@
-class Admin::OptionValuesController < Admin::BaseController
-  
-  def update_positions
-    params[:positions].each do |id, index|
-      OptionValue.update_all(['position=?', index], ['id=?', id])
-    end
-    
-    respond_to do |format|
-      format.html { redirect_to edit_admin_option_type_url(params[:id]) }
-      format.js  { render :text => 'Ok' }
-    end
-  end
-
-end

data/app/views/admin/option_types/_option_value_fields.html.erb

@@ -1,8 +0,0 @@
-<tr class="option_value fields" id="<%= dom_id(f.object) %>">
-  <td><span class="handle"></span></td>
-  <td><%= f.text_field :name %></td>
-  <td><%= f.text_field :presentation %></td>
-  <td><%= image_tag f.object.image.url(:small) if f.object.has_image? %></td>
-  <td><%= f.file_field :image %></td>
-  <td class="actions"><%= link_to_remove_fields t("remove"), f %></td>
-</tr>

data/app/views/admin/option_types/edit.html.erb

@@ -1,33 +0,0 @@
-<%= render :partial => 'admin/shared/product_sub_menu' %>
-<h1><%= t("editing_option_type") %></h1>
-<%= render 'shared/error_messages', :target => @option_type %>
-<%= form_for(@option_type, :url => object_url, :html => { :method => :put, :multipart => true }) do |f| %>
-<fieldset>
-  <legend><%= t("editing_option_type") %></legend>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <h3><%= t("option_values") %></h3>
-  <table class="index sortable">
-    <thead>
-      <tr>
-        <th colspan="2"><%= t("name") %></th>
-        <th><%= t("display") %></th>
-        <th><%= t("preview") %></th>
-        <th><%= t("image") %></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody id="option_values">
-      <% if @option_type.option_values.empty? %> 
-        <tr id="none">
-          <td colspan="6"><%= @option_type.option_values.empty? ? t("none") : "" %></td>
-        </tr>
-      <% end %>
-      <%= f.fields_for :option_values do |option_value_form| %>
-        <%= render "option_value_fields", :f => option_value_form %>
-      <% end %>
-    </tbody>
-  </table>
-  <%= link_to_add_fields t("add_option_value"), "tbody#option_values", f, :option_values %>
-  <%= render :partial => 'admin/shared/edit_resource_links' %>
-</fieldset>
-<% end %>

data/lib/generators/templates/db/migrate/add_image_to_option_values.rb

@@ -1,14 +0,0 @@
-class AddImageToOptionValues < ActiveRecord::Migration
-  def self.up
-    add_column :option_values, :image_file_name,    :string
-    add_column :option_values, :image_content_type, :string
-    add_column :option_values, :image_file_size,    :integer
-    add_column :option_values, :image_updated_at,   :datetime
-  end
-  def self.down
-    remove_column :option_values, :image_file_name
-    remove_column :option_values, :image_content_type
-    remove_column :option_values, :image_file_size
-    remove_column :option_values, :image_updated_at
-  end
-end