upgrade from 0.5.0 to 3.1.0

.gitignore

@@ -8,3 +8,5 @@ test/dummy_hooks/after_migrate.rb
 test/dummy
 capybara-*.html
 .rvmrc
+spec/dummy
+.byebug_history

Rakefile

@@ -1,5 +1,7 @@
 # encoding: UTF-8
+require 'bundler'
 require 'rubygems'
+require 'spree/testing_support/common_rake'
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -23,4 +25,10 @@ Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = %w{--format pretty}
 end
 
+desc 'Generates a dummy app for testing'
+task :test_app do
+  ENV['LIB_NAME'] = 'spree_variant_options'
+  Rake::Task['common:test_app'].invoke
+end
+
 task :default => [ :test, :cucumber ]

app/models/spree/app_configuration/variant_configuration.rb

@@ -1,6 +1,6 @@
 module SpreeVariantOptions
   class VariantConfiguration < Spree::Preferences::Configuration
-    preference :allow_select_outofstock, :boolean, :default => false
-    preference :default_instock, :boolean, :default => false
+    preference :allow_select_outofstock, :boolean, default: false
+    preference :default_instock, :boolean, default: false
   end
 end

app/models/spree/option_value_decorator.rb

@@ -1,22 +1,15 @@
 Spree::OptionValue.class_eval do
 
-  attr_accessible :image
-
-  default_scope order("#{quoted_table_name}.position")
-
   has_attached_file :image,
-    :styles        => { :small => '40x30#', :large => '140x110#' },
-    :default_style => :small,
-    :url           => "/spree/option_values/:id/:style/:basename.:extension",
-    :path          => ":rails_root/public/spree/option_values/:id/:style/:basename.:extension"
+    styles:         { small: '40x30#', large: '140x110#' },
+    default_style:  :small,
+    url:            "/spree/option_values/:id/:style/:basename.:extension",
+    path:           ":rails_root/public/spree/option_values/:id/:style/:basename.:extension"
 
-  include Spree::Core::S3Support
-  supports_s3 :image
+  validates_attachment :image, content_type: { content_type: /\Aimage\/.*\Z/ },
+    size: { in: 0..1.megabytes }
 
   def has_image?
-    image_file_name && !image_file_name.empty?
+    !!(image_file_name && !image_file_name.empty?)
   end
-
-  scope :for_product, lambda { |product| select("DISTINCT #{table_name}.*").where("spree_option_values_variants.variant_id IN (?)", product.variant_ids).joins(:variants)
-  }
 end

app/models/spree/product_decorator.rb

@@ -1,31 +1,23 @@
 Spree::Product.class_eval do
 
-  def option_values
-    @_option_values ||= Spree::OptionValue.for_product(self).order(:position).sort_by {|ov| ov.option_type.position }
-  end
+  has_many :option_values, -> { uniq }, through: :variants
 
   def grouped_option_values
-    @_grouped_option_values ||= option_values.group_by(&:option_type)
-  end
-
-  def variants_for_option_value(value)
-    @_variant_option_values ||= variants.includes(:option_values).all
-    @_variant_option_values.select { |i| i.option_value_ids.include?(value.id) }
+    option_types.includes(:option_values).order(:position)
   end
 
-  def variant_options_hash
-    return @_variant_options_hash if @_variant_options_hash
-    hash = {}
-    variants.includes(:option_values).each do |variant|
-      variant.option_values.each do |ov|
-        otid = ov.option_type_id.to_s
-        ovid = ov.id.to_s
-        hash[otid] ||= {}
-        hash[otid][ovid] ||= {}
-        hash[otid][ovid][variant.id.to_s] = variant.to_hash
+  def variants_option_value_details
+    variants.includes(option_values: :option_type).collect do |variant|
+      details = {
+        in_stock: variant.can_supply?,
+        variant_id: variant.id,
+        variant_price: variant.price_in(Spree::Config[:currency]).money,
+        option_types: {},
+      }
+      variant.option_values.each do |option_value|
+        details[:option_types][option_value.option_type.id] = option_value.id
       end
+      details
     end
-    @_variant_options_hash = hash
   end
-
 end