spree_core 3.0.10 → 3.1.0.rc1

data/lib/spree/core/search/base.rb

@@ -17,7 +17,8 @@ module Spree
           curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
-            @products = @products.where("spree_prices.amount IS NOT NULL").where("spree_prices.currency" => current_currency)
+            @products = @products.where("spree_prices.amount IS NOT NULL").
+                                  where("spree_prices.currency" => current_currency)
           end
           @products = @products.page(curr_page).per(per_page)
         end
@@ -32,7 +33,7 @@ module Spree
 
         protected
           def get_base_scope
-            base_scope = Spree::Product.active
+            base_scope = Spree::Product.spree_base_scopes.active
             base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
             base_scope = get_products_conditions_for(base_scope, keywords)
             base_scope = add_search_scopes(base_scope)
@@ -69,7 +70,7 @@ module Spree
               else
                 base_scope = base_scope.merge(Spree::Product.ransack({scope_name => scope_attribute}).result)
               end
-            end if search
+            end if search.is_a?(Hash)
             base_scope
           end
 

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.0.10'
+    "3.1.0.rc1"
   end
 end

data/lib/spree/localized_number.rb

@@ -8,7 +8,9 @@ module Spree
       separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
       non_number_characters = /[^0-9\-#{separator}]/
 
-      # strip everything else first
+      # work on a copy, prevent original argument modification
+      number = number.dup
+      # strip everything else first, including thousands delimiter
       number.gsub!(non_number_characters, '')
       # then replace the locale-specific decimal separator with the standard separator if necessary
       number.gsub!(separator, '.') unless separator == '.'

data/lib/spree/permitted_attributes.rb

@@ -20,6 +20,7 @@ module Spree
       :stock_location_attributes,
       :stock_movement_attributes,
       :store_attributes,
+      :store_credit_attributes,
       :taxon_attributes,
       :taxonomy_attributes,
       :user_attributes,
@@ -57,7 +58,7 @@ module Spree
     @@product_properties_attributes = [:property_name, :value, :position]
 
     @@product_attributes = [
-      :name, :description, :available_on, :permalink, :meta_description,
+      :name, :description, :available_on, :discontinue_on, :permalink, :meta_description,
       :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
@@ -92,6 +93,8 @@ module Spree
     @@store_attributes = [:name, :url, :seo_title, :meta_keywords,
                          :meta_description, :default_currency, :mail_from_address]
 
+    @@store_credit_attributes = [:amount, :category_id, :memo]
+
     @@taxonomy_attributes = [:name]
 
     @@taxon_attributes = [
@@ -102,7 +105,7 @@ module Spree
     @@user_attributes = [:email, :password, :password_confirmation]
 
     @@variant_attributes = [
-      :name, :presentation, :cost_price, :lock_version,
+      :name, :presentation, :cost_price, :discontinue_on, :lock_version,
       :position, :track_inventory,
       :product_id, :product, :option_values_attributes, :price,
       :weight, :height, :width, :depth, :sku, :cost_currency,

data/lib/spree/testing_support/common_rake.rb

@@ -18,9 +18,6 @@ namespace :common do
     puts "Setting up dummy database..."
     system("bundle exec rake db:drop db:create db:migrate > #{File::NULL}")
 
-    puts "Precompiling assets..."
-    system("bundle exec rake assets:precompile > #{File::NULL}")
-
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
       puts 'Running extension installation generator...'
@@ -28,6 +25,9 @@ namespace :common do
     rescue LoadError
       puts 'Skipping installation no generator to run...'
     end
+
+    puts "Precompiling assets..."
+    system("bundle exec rake assets:precompile > #{File::NULL}")
   end
 
   task :seed do |_t|

data/lib/spree/testing_support/factories.rb

@@ -11,9 +11,9 @@ Dir["#{File.dirname(__FILE__)}/factories/**"].each do |f|
 end
 
 FactoryGirl.define do
-  sequence(:random_string)      { Faker::Lorem.sentence }
-  sequence(:random_description) { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
-  sequence(:random_email)       { Faker::Internet.email }
+  sequence(:random_string) { FFaker::Lorem.sentence }
+  sequence(:random_description) { FFaker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
+  sequence(:random_email) { FFaker::Internet.email }
 
   sequence(:sku) { |n| "SKU-#{n}" }
 end

data/lib/spree/testing_support/factories/address_factory.rb

@@ -10,7 +10,7 @@ FactoryGirl.define do
     phone '555-555-0199'
     alternative_phone '555-555-0199'
 
-    state { |address| address.association(:state) }
+    state { |address| address.association(:state) || Spree::State.last }
     country do |address|
       if address.state
         address.state.country

data/lib/spree/testing_support/factories/country_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :country, class: Spree::Country do
-    iso_name 'UNITED STATES'
-    name 'United States of America'
+    sequence(:iso_name) { |n| "ISO_NAME_#{n}" }
+    sequence(:name) { |n| "NAME_#{n}" }
     iso 'US'
     iso3 'USA'
     numcode 840

data/lib/spree/testing_support/factories/order_factory.rb

@@ -45,7 +45,7 @@ FactoryGirl.define do
         create(:shipment, order: order, cost: evaluator.shipment_cost)
         order.shipments.reload
 
-        order.update!
+        order.update_with_updater!
       end
 
       factory :completed_order_with_totals do
@@ -53,7 +53,7 @@ FactoryGirl.define do
 
         after(:create) do |order, evaluator|
           order.refresh_shipment_rates(evaluator.shipping_method_filter)
-          order.update_column(:completed_at, Time.now)
+          order.update_column(:completed_at, Time.current)
         end
 
         factory :completed_order_with_pending_payment do

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -20,4 +20,9 @@ FactoryGirl.define do
     association(:payment_method, factory: :check_payment_method)
     order
   end
+
+  factory :store_credit_payment, class: Spree::Payment, parent: :payment do
+    association(:payment_method, factory: :store_credit_payment_method)
+    association(:source, factory: :store_credit)
+  end
 end

data/lib/spree/testing_support/factories/payment_method_factory.rb

@@ -12,4 +12,12 @@ FactoryGirl.define do
   factory :simple_credit_card_payment_method, class: Spree::Gateway::BogusSimple do
     name 'Credit Card'
   end
+
+  factory :store_credit_payment_method, class: Spree::PaymentMethod::StoreCredit do
+    type          "Spree::PaymentMethod::StoreCredit"
+    name          "Store Credit"
+    description   "Store Credit"
+    active        true
+    auto_capture  true
+  end
 end

data/lib/spree/testing_support/factories/promotion_rule_factory.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :promotion_rule, class: Spree::PromotionRule do
+    association :promotion
+  end
+end

data/lib/spree/testing_support/factories/refund_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}"}
+  sequence(:refund_transaction_id) { |n| "fake-refund-transaction-#{n}" }
 
   factory :refund, class: Spree::Refund do
     amount 100.00
@@ -8,7 +8,15 @@ FactoryGirl.define do
     association(:reason, factory: :refund_reason)
   end
 
+  factory :default_refund_reason, class: Spree::RefundReason do
+    name 'Return processing'
+    active true
+    mutable false
+  end
+
   factory :refund_reason, class: Spree::RefundReason do
     sequence(:name) { |n| "Refund for return ##{n}" }
+    active true
+    mutable false
   end
 end

data/lib/spree/testing_support/factories/return_authorization_factory.rb

@@ -14,5 +14,7 @@ FactoryGirl.define do
 
   factory :return_authorization_reason, class: Spree::ReturnAuthorizationReason do
     sequence(:name) { |n| "Defect ##{n}" }
+    active true
+    mutable false
   end
 end

data/lib/spree/testing_support/factories/state_factory.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :state, class: Spree::State do
-    name 'Alabama'
-    abbr 'AL'
+    sequence(:name) { |n| "STATE_NAME_#{n}" }
+    sequence(:abbr) { |n| "STATE_ABBR_#{n}" }
     country do |country|
       if usa = Spree::Country.find_by_numcode(840)
         country = usa

data/lib/spree/testing_support/factories/store_credit_category_factory.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :store_credit_category, class: Spree::StoreCreditCategory do
+    name "Exchange"
+  end
+
+  factory :store_credit_gift_card_category, class: Spree::StoreCreditCategory do
+    name Spree::StoreCreditCategory::GIFT_CARD_CATEGORY_NAME
+  end
+end

data/lib/spree/testing_support/factories/store_credit_event_factory.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :store_credit_auth_event, class: Spree::StoreCreditEvent do
+    store_credit       { create(:store_credit) }
+    action             { Spree::StoreCredit::AUTHORIZE_ACTION }
+    amount             { 100.00 }
+    authorization_code { "#{store_credit.id}-SC-20140602164814476128" }
+  end
+end

data/lib/spree/testing_support/factories/store_credit_factory.rb

@@ -0,0 +1,17 @@
+FactoryGirl.define do
+  sequence(:store_credits_order_number) { |n| "R1000#{n}" }
+
+  factory :store_credit, class: Spree::StoreCredit do
+    user
+    created_by { create(:user) }
+    category { create(:store_credit_category) }
+    amount { 150.00 }
+    currency { 'USD' }
+    credit_type { create(:primary_credit_type) }
+  end
+
+  factory :store_credits_order_without_user, class: Spree::Order do
+    number { generate(:store_credits_order_number) }
+    bill_address
+  end
+end

data/lib/spree/testing_support/factories/store_credit_type_factory.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :primary_credit_type, class: Spree::StoreCreditType do
+    name      Spree::StoreCreditType::DEFAULT_TYPE_NAME
+    priority  { '1' }
+  end
+
+  factory :secondary_credit_type, class: Spree::StoreCreditType do
+    name      { 'Non-expiring' }
+    priority  { '2' }
+  end
+end

data/lib/spree/testing_support/factories/user_factory.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   sequence :user_authentication_token do |n|
-    "xxxx#{Time.now.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
+    "xxxx#{Time.current.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
   end
 
   factory :user, class: Spree.user_class do

data/lib/spree/testing_support/factories/zone_member_factory.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :zone_member, class: Spree::ZoneMember do
+    zone { |member| member.association(:zone) }
+    zoneable { |member| member.association(:zoneable) }
+  end
+end

data/lib/spree/testing_support/microdata.rb

@@ -0,0 +1,189 @@
+module Spree
+  module TestingSupport
+    module Microdata
+      # code extracted and modified from 'microdata' gem
+      class Document
+        attr_reader :items, :doc
+
+        def initialize(content)
+          @doc = Nokogiri::HTML(content)
+          @items = extract_items
+        end
+
+        def extract_items
+          itemscopes = @doc.search('//*[@itemscope and not(@itemprop)]')
+          return nil unless itemscopes
+
+          itemscopes.map do |itemscope|
+            Item.new(itemscope)
+          end
+        end
+      end
+
+      class Item
+        attr_reader :type, :properties, :id
+
+        def initialize(top_node)
+          @top_node = top_node
+          @type = extract_item_type
+          @id   = extract_item_id
+          @properties = {}
+          add_item_ref_properties(@top_node)
+          parse_elements(extract_elements(@top_node))
+        end
+
+        def to_hash
+          hash = {}
+          hash[:id] = id if id
+          hash[:type] = type if type
+          hash[:properties] = {}
+          properties.each do |name, values|
+            final_values = values.map do |value|
+              if value.reponds_to?(:to_hash)
+                value.to_hash
+              else
+                value
+              end
+            end
+            hash[:properties][name] = final_values
+          end
+          hash
+        end
+
+        private
+
+        def extract_elements(node)
+          node.search('./*')
+        end
+
+        def extract_item_id
+          (value = @top_node.attribute('itemid')) ? value.value : nil
+        end
+
+        def extract_item_type
+          (value = @top_node.attribute('itemtype')) ? value.value.split(' ') : nil
+        end
+
+        def parse_elements(elements)
+          elements.each { |element| parse_element(element) }
+        end
+
+        def parse_element(element)
+          item_scope = element.attribute('itemscope')
+          item_prop = element.attribute('itemprop')
+          internal_elements = extract_elements(element)
+          add_item_prop(element) if item_scope || item_prop
+          parse_elements(internal_elements) if internal_elements && !item_scope
+        end
+
+        # Add an 'itemprop' to the properties
+        def add_item_prop(item_prop)
+          properties = Itemprop.parse(item_prop, @page_url)
+          properties.each { |name, value| (@properties[name] ||= []) << value }
+        end
+
+        # Add any properties referred to by 'itemref'
+        def add_item_ref_properties(element)
+          item_ref = element.attribute('itemref')
+          if item_ref
+            item_ref.value.split(' ').each { |id| parse_elements(find_with_id(id)) }
+          end
+        end
+
+        # Find an element with a matching id
+        def find_with_id(id)
+          @top_node.search("//*[@id='#{id}']")
+        end
+      end
+
+      class Itemprop
+        NON_TEXTCONTENT_ELEMENTS = {
+          'a' => 'href',        'area' => 'href',
+          'audio' => 'src',     'embed' => 'src',
+          'iframe' => 'src',    'img' => 'src',
+          'link' => 'href',     'meta' => 'content',
+          'object' => 'data',   'source' => 'src',
+          'time' => 'datetime', 'track' => 'src',
+          'video' => 'src'
+        }.freeze
+        URL_ATTRIBUTES = ['data', 'href', 'src'].freeze
+
+        # A Hash representing the properties.
+        # Hash is of the form {'property name' => 'value'}
+        attr_reader :properties
+
+        # Create a new Itemprop object
+        # [element]  The itemprop element to be parsed
+        # [page_url] The url of the page, including filename, used to form
+        #            absolute urls
+        def initialize(element, page_url = nil)
+          @element = element
+          @page_url = page_url
+          @properties = extract_properties
+        end
+
+        # Parse the element and return a hash representing the properties.
+        # Hash is of the form {'property name' => 'value'}
+        # [element]  The itemprop element to be parsed
+        # [page_url] The url of the page, including filename, used to form
+        #            absolute urls
+        def self.parse(element, page_url = nil)
+          new(element, page_url).properties
+        end
+
+        private
+
+        def extract_properties
+          prop_names = extract_property_names
+          prop_names.each_with_object({}) do |name, memo|
+            memo[name] = extract_property
+          end
+        end
+
+        # This returns an empty string if can't form a valid
+        # absolute url as per the Microdata spec.
+
+        def make_absolute_url(url)
+          return url unless URI.parse(url).relative?
+          begin
+            URI.parse(@page_url).merge(url).to_s
+          rescue URI::Error
+            url
+          end
+        end
+
+        def non_textcontent_element?(element)
+          NON_TEXTCONTENT_ELEMENTS.has_key?(element)
+        end
+
+        def url_attribute?(attribute)
+          URL_ATTRIBUTES.include?(attribute)
+        end
+
+        def extract_property_names
+          itemprop_attr = @element.attribute('itemprop')
+          itemprop_attr ? itemprop_attr.value.split : []
+        end
+
+        def extract_property_value
+          element = @element.name
+          if non_textcontent_element?(element)
+            attribute = NON_TEXTCONTENT_ELEMENTS[element]
+            value = @element.attribute(attribute).value
+            url_attribute?(attribute) ? make_absolute_url(value) : value
+          else
+            @element.inner_text.strip
+          end
+        end
+
+        def extract_property
+          if @element.attribute('itemscope')
+            Item.new(@element)
+          else
+            extract_property_value
+          end
+        end
+      end
+    end
+  end
+end