solidus_api 2.5.2 → 2.6.0.rc1

data/app/views/spree/api/payments/source_views/_gateway.json.jbuilder

@@ -0,0 +1,6 @@
+attrs = [:id, :month, :year, :cc_type, :last_digits, :name]
+if @current_user_roles.include?("admin")
+  attrs += [:gateway_customer_profile_id, :gateway_payment_profile_id]
+end
+
+json.(payment_source, *attrs)

data/app/views/spree/api/payments/source_views/_storecredit.json.jbuilder

@@ -0,0 +1,3 @@
+json.(payment_source, :id, :memo, :created_at)
+json.created_by payment_source.created_by.email
+json.category payment_source.category, :id, :name

data/app/views/spree/api/payments/update_forbidden.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.error(I18n.t(:update_forbidden, state: @payment.state, scope: "spree.api.payment"))

data/app/views/spree/api/product_properties/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.product_properties(@product_properties) do |product_property|
   json.(product_property, *product_property_attributes)
 end

data/app/views/spree/api/product_properties/new.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes([*product_property_attributes])
 json.required_attributes([])

data/app/views/spree/api/product_properties/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.(@product_property, *product_property_attributes)

data/app/views/spree/api/products/_product.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 @product_attributes ||= product_attributes
 json.cache! [I18n.locale, @current_user_roles.include?('admin'), current_pricing_options, @product_attributes, @exclude_data, product] do
   json.(product, *@product_attributes)

data/app/views/spree/api/products/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.partial! 'spree/api/shared/pagination', pagination: @products
 json.products(@products) do |product|
   json.partial!("spree/api/products/product", product: product)

data/app/views/spree/api/products/new.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes([*product_attributes])
 json.required_attributes(required_fields_for(Spree::Product))

data/app/views/spree/api/products/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/products/product", product: @product)

data/app/views/spree/api/promotions/handler.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.success(@handler.success)
 json.error(@handler.error)
 json.successful(@handler.successful?)

data/app/views/spree/api/promotions/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.(@promotion, *promotion_attributes)

data/app/views/spree/api/properties/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.properties(@properties) do |property|
   json.(property, *property_attributes)
 end

data/app/views/spree/api/properties/new.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes([*property_attributes])
 json.required_attributes([])

data/app/views/spree/api/properties/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.(@property, *property_attributes)

data/app/views/spree/api/return_authorizations/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.return_authorizations(@return_authorizations) do |return_authorization|
   json.(return_authorization, *return_authorization_attributes)
 end

data/app/views/spree/api/return_authorizations/new.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes([*return_authorization_attributes])
 json.required_attributes(required_fields_for(Spree::ReturnAuthorization))

data/app/views/spree/api/return_authorizations/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.(@return_authorization, *return_authorization_attributes)

data/app/views/spree/api/shared/_pagination.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.count        pagination.count
 json.total_count  pagination.total_count
 json.current_page pagination.current_page

data/app/views/spree/api/shipments/_big.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! [I18n.locale, shipment] do
   json.(shipment, *shipment_attributes)
   json.selected_shipping_rate do
@@ -40,10 +42,12 @@ json.cache! [I18n.locale, shipment] do
     end
     json.payments(shipment.order.payments) do |payment|
       json.(payment, :id, :amount, :display_amount, :state)
-      json.source do
-        attrs = [:id]
-        (attrs << :cc_type) if payment.source.respond_to?(:cc_type)
-        json.(payment.source, *attrs)
+      if payment.source
+        json.source do
+          attrs = [:id]
+          (attrs << :cc_type) if payment.source.respond_to?(:cc_type)
+          json.(payment.source, *attrs)
+        end
       end
       json.payment_method { json.(payment.payment_method, :id, :name) }
     end

data/app/views/spree/api/shipments/_small.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! [I18n.locale, shipment] do
   json.(shipment, *shipment_attributes)
   json.order_id(shipment.order.number)

data/app/views/spree/api/shipments/cannot_ready_shipment.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.error(I18n.t(:cannot_ready, scope: "spree.api.shipment"))

data/app/views/spree/api/shipments/estimated_rates.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.shipping_rates @shipping_rates do |shipping_rate|
   json.(shipping_rate, :name, :cost, :shipping_method_id, :shipping_method_code)
   json.display_cost(shipping_rate.display_cost.to_s)

data/app/views/spree/api/shipments/mine.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.partial! 'spree/api/shared/pagination', pagination: @shipments
 json.shipments(@shipments) do |shipment|
   json.partial!("spree/api/shipments/big", shipment: shipment)

data/app/views/spree/api/shipments/show.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! [I18n.locale, @shipment] do
   json.(@shipment, *shipment_attributes)
   json.order_id(@shipment.order.number)

data/app/views/spree/api/shipping_rates/_shipping_rate.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.(shipping_rate, :id, :name, :cost, :selected, :shipping_method_id, :shipping_method_code)
 json.display_cost(shipping_rate.display_cost.to_s)

data/app/views/spree/api/states/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.states_required(@country.states_required) if @country
 json.states(@states) { |state| json.(state, *state_attributes) }
 if @states.respond_to?(:total_pages)

data/app/views/spree/api/states/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.(@state, *state_attributes)

data/app/views/spree/api/stock_items/_stock_item.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.(stock_item, *stock_item_attributes)
 json.variant do
   json.partial!("spree/api/variants/small", variant: stock_item.variant)

data/app/views/spree/api/stock_items/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.stock_items(@stock_items) do |stock_item|
   json.partial!("spree/api/stock_items/stock_item", stock_item: stock_item)
 end

data/app/views/spree/api/stock_items/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/stock_items/stock_item", stock_item: @stock_item)

data/app/views/spree/api/stock_locations/_stock_location.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.(stock_location, *stock_location_attributes)
 json.country do
   if stock_location.country

data/app/views/spree/api/stock_locations/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.stock_locations(@stock_locations) do |stock_location|
   json.partial!("spree/api/stock_locations/stock_location", stock_location: stock_location)
 end

data/app/views/spree/api/stock_locations/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/stock_locations/stock_location", stock_location: @stock_location)

data/app/views/spree/api/stock_movements/_stock_movement.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.(stock_movement, *stock_movement_attributes)
 json.stock_item do
   json.partial!("spree/api/stock_items/stock_item", stock_item: stock_movement.stock_item)

data/app/views/spree/api/stock_movements/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.stock_movements(@stock_movements) do |stock_movement|
   json.partial!("spree/api/stock_movements/stock_movement", stock_movement: stock_movement)
 end

data/app/views/spree/api/stock_movements/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/stock_movements/stock_movement", stock_movement: @stock_movement)

data/app/views/spree/api/store_credit_events/mine.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.store_credit_events(@store_credit_events) do |store_credit_event|
   json.(store_credit_event, *store_credit_history_attributes)
   json.order_number(store_credit_event.order.try(:number))

data/app/views/spree/api/stores/index.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.stores(@stores) { |store| json.(store, *store_attributes) }

data/app/views/spree/api/stores/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.(@store, *store_attributes)

data/app/views/spree/api/taxonomies/_nested.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.(taxonomy, *taxonomy_attributes)
 json.root do
   json.(taxonomy.root, *taxon_attributes)

data/app/views/spree/api/taxonomies/_taxonomy.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if params[:set] == "nested"
   json.partial!("spree/api/taxonomies/nested", taxonomy: taxonomy)
 else

data/app/views/spree/api/taxonomies/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.taxonomies(@taxonomies) do |taxonomy|
   json.partial!("spree/api/taxonomies/taxonomy", taxonomy: taxonomy)
 end

data/app/views/spree/api/taxonomies/jstree.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.data @taxonomy.root.name
 json.attr do
   json.id @taxonomy.root.id

data/app/views/spree/api/taxonomies/new.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes([*taxonomy_attributes])
 json.required_attributes(required_fields_for(Spree::Taxonomy))

data/app/views/spree/api/taxonomies/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/taxonomies/taxonomy", taxonomy: @taxonomy)

data/app/views/spree/api/taxons/_taxon.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.(taxon, *taxon_attributes)
 json.taxons(taxon.children) { |taxon| json.(taxon, *taxon_attributes) }

data/app/views/spree/api/taxons/_taxons.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.taxons(taxon.children) do |taxon|
   json.(taxon, *taxon_attributes)
   json.partial!("spree/api/taxons/taxons", taxon: taxon)

data/app/views/spree/api/taxons/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.partial! 'spree/api/shared/pagination', pagination: @taxons
 json.taxons(@taxons) do |taxon|
   json.(taxon, *taxon_attributes)

data/app/views/spree/api/taxons/jstree.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.array!(@taxon.children) do |taxon|
   json.data taxon.name
   json.attr do

data/app/views/spree/api/taxons/new.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes([*taxon_attributes])
 json.required_attributes(required_fields_for(Spree::Taxon))

data/app/views/spree/api/taxons/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/taxons/taxon", taxon: @taxon)

data/app/views/spree/api/users/_user.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.(user, *user_attributes)
 json.bill_address do
   if user.bill_address

data/app/views/spree/api/users/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.users(@users) do |user|
   json.partial!("spree/api/users/user", user: user)
 end

data/app/views/spree/api/users/new.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes([*user_attributes])
 json.required_attributes(required_fields_for(Spree.user_class))

data/app/views/spree/api/users/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/users/user", user: @user)

data/app/views/spree/api/variants/_big.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! [I18n.locale, Spree::StockLocation.accessible_by(current_ability), variant] do
   json.(variant, *variant_attributes)
   json.partial!("spree/api/variants/small", variant: variant)

data/app/views/spree/api/variants/_small.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.cache! [I18n.locale, variant] do
   json.(variant, *variant_attributes)
   json.display_price(variant.display_price.to_s)

data/app/views/spree/api/variants/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.partial! 'spree/api/shared/pagination', pagination: @variants
 json.variants(@variants) do |variant|
   json.partial!("spree/api/variants/big", variant: variant)

data/app/views/spree/api/variants/new.json.jbuilder

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 json.attributes([*variant_attributes])
 json.required_attributes([])

data/app/views/spree/api/variants/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/variants/big", variant: @variant)

data/app/views/spree/api/zones/_zone.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.(zone, :id, :name, :description)
 json.zone_members(zone.zone_members) do |zone_member|
   json.(zone_member, :id, :name, :zoneable_type, :zoneable_id)

data/app/views/spree/api/zones/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.zones(@zones) do |zone|
   json.partial!("spree/api/zones/zone", zone: zone)
 end

data/app/views/spree/api/zones/show.json.jbuilder

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 json.partial!("spree/api/zones/zone", zone: @zone)

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :users do
@@ -18,12 +20,6 @@ Spree::Core::Engine.routes.draw do
     end
 
     concern :order_routes do
-      member do
-        put :cancel
-        put :empty
-        put :apply_coupon_code
-      end
-
       resources :line_items
       resources :payments do
         member do
@@ -67,7 +63,13 @@ Spree::Core::Engine.routes.draw do
     get '/orders/mine', to: 'orders#mine', as: 'my_orders'
     get "/orders/current", to: "orders#current", as: "current_order"
 
-    resources :orders, concerns: :order_routes
+    resources :orders, concerns: :order_routes do
+      member do
+        put :cancel
+        put :empty
+        put :apply_coupon_code
+      end
+    end
 
     resources :zones
     resources :countries, only: [:index, :show] do

data/db/migrate/20100107141738_add_api_key_to_spree_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddApiKeyToSpreeUsers < ActiveRecord::Migration[4.2]
   def change
     unless defined?(User)

data/db/migrate/20120411123334_resize_api_key_field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ResizeApiKeyField < ActiveRecord::Migration[4.2]
   def change
     unless defined?(User)

data/db/migrate/20120530054546_rename_api_key_to_spree_api_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameApiKeyToSpreeApiKey < ActiveRecord::Migration[4.2]
   def change
     unless defined?(User)

data/db/migrate/20131017162334_add_index_to_user_spree_api_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIndexToUserSpreeApiKey < ActiveRecord::Migration[4.2]
   def change
     unless defined?(User)

data/lib/solidus_api.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spree_api'

data/lib/spree/api/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/engine'
 
 module Spree

data/lib/spree/api/responders/rabl_template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     module Responders

data/lib/spree/api/responders.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/api/responders/rabl_template'
 
 module Spree

data/lib/spree/api/testing_support/caching.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.before(:each, caching: true) do
     ActionController::Base.perform_caching = true

data/lib/spree/api/testing_support/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     module TestingSupport

data/lib/spree/api/testing_support/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Api
     module TestingSupport

data/lib/spree/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/core'
 
 require 'responders'

data/lib/spree_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/api'
 require 'spree/api/responders'
 require 'jbuilder'

data/script/rails

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree/api/engine', __FILE__)
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/spree/api/engine', __dir__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/solidus_api.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require_relative '../core/lib/spree/core/version.rb'
 
 Gem::Specification.new do |gem|
@@ -20,8 +21,8 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 2.2.2'
   gem.required_rubygems_version = '>= 1.8.23'
 
-  gem.add_dependency 'solidus_core', gem.version
-  gem.add_dependency 'responders'
   gem.add_dependency 'jbuilder', '~> 2.6'
   gem.add_dependency 'kaminari-activerecord', '~> 1.1'
+  gem.add_dependency 'responders'
+  gem.add_dependency 'solidus_core', gem.version
 end

data/spec/controllers/spree/api/base_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 class FakesController < Spree::Api::BaseController

data/spec/controllers/spree/api/resource_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree
@@ -59,10 +61,12 @@ module Spree
         it "returns widgets" do
           get :index, params: { token: admin_user.spree_api_key }, as: :json
           expect(response).to be_successful
-          expect(json_response['widgets']).to include(hash_including(
-            'name' => 'a widget',
-            'position' => 1
-          ))
+          expect(json_response['widgets']).to include(
+            hash_including(
+              'name' => 'a widget',
+              'position' => 1
+            )
+          )
         end
 
         context "specifying ids" do

data/spec/features/checkout_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Spree