solidus_api 2.4.2 → 2.5.0.beta1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
-- !ruby/object:Gem::Dependency
-  name: versioncake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.5.0.beta1
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -67,25 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: kaminari-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
 description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
@@ -93,7 +73,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -123,12 +102,10 @@ files:
 - app/controllers/spree/api/stock_items_controller.rb
 - app/controllers/spree/api/stock_locations_controller.rb
 - app/controllers/spree/api/stock_movements_controller.rb
-- app/controllers/spree/api/stock_transfers_controller.rb
 - app/controllers/spree/api/store_credit_events_controller.rb
 - app/controllers/spree/api/stores_controller.rb
 - app/controllers/spree/api/taxonomies_controller.rb
 - app/controllers/spree/api/taxons_controller.rb
-- app/controllers/spree/api/transfer_items_controller.rb
 - app/controllers/spree/api/users_controller.rb
 - app/controllers/spree/api/variants_controller.rb
 - app/controllers/spree/api/zones_controller.rb
@@ -153,7 +130,6 @@ files:
 - app/views/spree/api/errors/must_specify_api_key.json.jbuilder
 - app/views/spree/api/errors/not_found.json.jbuilder
 - app/views/spree/api/errors/unauthorized.json.jbuilder
-- app/views/spree/api/errors/variant_not_in_stock_transfer.json.jbuilder
 - app/views/spree/api/images/_image.json.jbuilder
 - app/views/spree/api/images/index.json.jbuilder
 - app/views/spree/api/images/show.json.jbuilder
@@ -200,6 +176,7 @@ files:
 - app/views/spree/api/shipments/_big.json.jbuilder
 - app/views/spree/api/shipments/_small.json.jbuilder
 - app/views/spree/api/shipments/cannot_ready_shipment.json.jbuilder
+- app/views/spree/api/shipments/estimated_rates.json.jbuilder
 - app/views/spree/api/shipments/mine.json.jbuilder
 - app/views/spree/api/shipments/show.json.jbuilder
 - app/views/spree/api/shipping_rates/_shipping_rate.json.jbuilder
@@ -214,7 +191,6 @@ files:
 - app/views/spree/api/stock_movements/_stock_movement.json.jbuilder
 - app/views/spree/api/stock_movements/index.json.jbuilder
 - app/views/spree/api/stock_movements/show.json.jbuilder
-- app/views/spree/api/stock_transfers/receive.json.jbuilder
 - app/views/spree/api/store_credit_events/mine.json.jbuilder
 - app/views/spree/api/stores/index.json.jbuilder
 - app/views/spree/api/stores/show.json.jbuilder
@@ -230,8 +206,6 @@ files:
 - app/views/spree/api/taxons/jstree.json.jbuilder
 - app/views/spree/api/taxons/new.json.jbuilder
 - app/views/spree/api/taxons/show.json.jbuilder
-- app/views/spree/api/transfer_items/_transfer_item.json.jbuilder
-- app/views/spree/api/transfer_items/show.json.jbuilder
 - app/views/spree/api/users/_user.json.jbuilder
 - app/views/spree/api/users/index.json.jbuilder
 - app/views/spree/api/users/new.json.jbuilder
@@ -293,12 +267,10 @@ files:
 - spec/requests/spree/api/stock_items_controller_spec.rb
 - spec/requests/spree/api/stock_locations_controller_spec.rb
 - spec/requests/spree/api/stock_movements_controller_spec.rb
-- spec/requests/spree/api/stock_transfers_controller_spec.rb
 - spec/requests/spree/api/store_credit_events_controller_spec.rb
 - spec/requests/spree/api/stores_controller_spec.rb
 - spec/requests/spree/api/taxonomies_controller_spec.rb
 - spec/requests/spree/api/taxons_controller_spec.rb
-- spec/requests/spree/api/transfer_items_controller_spec.rb
 - spec/requests/spree/api/unauthenticated_products_controller_spec.rb
 - spec/requests/spree/api/users_controller_spec.rb
 - spec/requests/spree/api/variants_controller_spec.rb
@@ -333,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.
@@ -370,12 +342,10 @@ test_files:
 - spec/requests/spree/api/stock_items_controller_spec.rb
 - spec/requests/spree/api/stock_locations_controller_spec.rb
 - spec/requests/spree/api/stock_movements_controller_spec.rb
-- spec/requests/spree/api/stock_transfers_controller_spec.rb
 - spec/requests/spree/api/store_credit_events_controller_spec.rb
 - spec/requests/spree/api/stores_controller_spec.rb
 - spec/requests/spree/api/taxonomies_controller_spec.rb
 - spec/requests/spree/api/taxons_controller_spec.rb
-- spec/requests/spree/api/transfer_items_controller_spec.rb
 - spec/requests/spree/api/unauthenticated_products_controller_spec.rb
 - spec/requests/spree/api/users_controller_spec.rb
 - spec/requests/spree/api/variants_controller_spec.rb

data/Gemfile

@@ -1,5 +0,0 @@
-eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
-
-gem 'solidus_core', path: '../core'
-
-gemspec

data/app/controllers/spree/api/stock_transfers_controller.rb

@@ -1,20 +0,0 @@
-module Spree
-  module Api
-    class StockTransfersController < Spree::Api::BaseController
-      def receive
-        authorize! :update, TransferItem
-        @stock_transfer = Spree::StockTransfer.accessible_by(current_ability, :update).find_by!(number: params[:id])
-        variant = Spree::Variant.accessible_by(current_ability, :show).find(params[:variant_id])
-        @transfer_item = @stock_transfer.transfer_items.find_by(variant: variant)
-        if @transfer_item.nil?
-          logger.error("variant_not_in_stock_transfer")
-          render "spree/api/errors/variant_not_in_stock_transfer", status: 422
-        elsif @transfer_item.update_attributes(received_quantity: @transfer_item.received_quantity + 1)
-          render 'spree/api/stock_transfers/receive', status: 200
-        else
-          invalid_resource!(@transfer_item)
-        end
-      end
-    end
-  end
-end

data/app/controllers/spree/api/transfer_items_controller.rb

@@ -1,42 +0,0 @@
-module Spree
-  module Api
-    class TransferItemsController < Spree::Api::BaseController
-      def create
-        authorize! :create, TransferItem
-        stock_transfer = Spree::StockTransfer.accessible_by(current_ability, :update).find_by(number: params[:stock_transfer_id])
-        @transfer_item = stock_transfer.transfer_items.build(transfer_item_params)
-        if @transfer_item.save
-          respond_with(@transfer_item, status: 201, default_template: :show)
-        else
-          invalid_resource!(@transfer_item)
-        end
-      end
-
-      def update
-        authorize! :update, TransferItem
-        @transfer_item = Spree::TransferItem.accessible_by(current_ability, :update).find(params[:id])
-        if @transfer_item.update_attributes(transfer_item_params)
-          respond_with(@transfer_item, status: 200, default_template: :show)
-        else
-          invalid_resource!(@transfer_item)
-        end
-      end
-
-      def destroy
-        authorize! :destroy, TransferItem
-        @transfer_item = Spree::TransferItem.accessible_by(current_ability, :destroy).find(params[:id])
-        if @transfer_item.destroy
-          respond_with(@transfer_item, status: 200, default_template: :show)
-        else
-          invalid_resource!(@transfer_item)
-        end
-      end
-
-      private
-
-      def transfer_item_params
-        params.require(:transfer_item).permit(permitted_transfer_item_attributes)
-      end
-    end
-  end
-end

data/app/views/spree/api/errors/variant_not_in_stock_transfer.json.jbuilder

@@ -1 +0,0 @@
-json.error(Spree.t(:item_not_in_stock_transfer))

data/app/views/spree/api/stock_transfers/receive.json.jbuilder

@@ -1,4 +0,0 @@
-json.(@stock_transfer, *stock_transfer_attributes)
-json.received_item do
-  json.partial!("spree/api/transfer_items/transfer_item", transfer_item: @transfer_item)
-end

data/app/views/spree/api/transfer_items/_transfer_item.json.jbuilder

@@ -1,5 +0,0 @@
-json.(transfer_item, *transfer_item_attributes)
-json.variant do
-  json.partial!("spree/api/variants/small", variant: transfer_item.variant)
-  json.(transfer_item.variant, *transfer_item_variant_attributes)
-end

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

@@ -1 +0,0 @@
-json.partial!("spree/api/transfer_items/transfer_item", transfer_item: @transfer_item)

data/spec/requests/spree/api/stock_transfers_controller_spec.rb

@@ -1,97 +0,0 @@
-require 'spec_helper'
-
-module Spree
-  describe Api::StockTransfersController do
-
-    let!(:stock_transfer) { create(:stock_transfer_with_items) }
-    let(:transfer_item)   { stock_transfer.transfer_items.first }
-
-    before do
-      stub_authentication!
-    end
-
-    context "as a normal user" do
-      describe "#receive" do
-        it "cannot receive transfer items from a stock transfer" do
-          post spree.receive_api_stock_transfer_path(stock_transfer), params: { variant_id: transfer_item.variant }
-          expect(response.status).to eq 401
-        end
-      end
-    end
-
-    context "as an admin" do
-      sign_in_as_admin!
-
-      describe "#receive" do
-        subject do
-          post spree.receive_api_stock_transfer_path(stock_transfer), params: { variant_id: variant_id }
-        end
-
-        context "valid parameters" do
-          let(:variant_id) { transfer_item.variant.to_param }
-
-          it "can receive a transfer items from a stock transfer" do
-            subject
-            expect(response.status).to eq 200
-          end
-
-          it "increments the received quantity for the transfer_item" do
-            expect { subject }.to change { transfer_item.reload.received_quantity }.by(1)
-          end
-
-          it "returns the received transfer item in the response" do
-            subject
-            expect(JSON.parse(response.body)["received_item"]["id"]).to eq transfer_item.id
-          end
-        end
-
-        context "transfer item does not have stock in source location after ship" do
-          let(:variant_id) { transfer_item.variant.to_param }
-          let(:user) { create :user }
-
-          before do
-            stock_transfer.finalize(user)
-            stock_transfer.ship(shipped_at: Time.current)
-            stock_transfer.source_location.stock_item(transfer_item.variant_id).set_count_on_hand(0)
-          end
-
-          it "can still receive item" do
-            expect { subject }.to change { transfer_item.reload.received_quantity }.by(1)
-          end
-        end
-
-        context "transfer item has been fully received" do
-          let(:variant_id) { transfer_item.variant.to_param }
-
-          before do
-            transfer_item.update_attributes!(expected_quantity: 1, received_quantity: 1)
-          end
-
-          it "returns a 422" do
-            subject
-            expect(response.status).to eq 422
-          end
-
-          it "returns a specific error message" do
-            subject
-            expect(JSON.parse(response.body)["errors"]["received_quantity"]).to eq ["must be less than or equal to 1"]
-          end
-        end
-
-        context "variant is not in the transfer order" do
-          let(:variant_id) { create(:variant).to_param }
-
-          it "returns a 422" do
-            subject
-            expect(response.status).to eq 422
-          end
-
-          it "returns a specific error message" do
-            subject
-            expect(JSON.parse(response.body)["error"]).to eq Spree.t(:item_not_in_stock_transfer)
-          end
-        end
-      end
-    end
-  end
-end

data/spec/requests/spree/api/transfer_items_controller_spec.rb

@@ -1,150 +0,0 @@
-require 'spec_helper'
-
-module Spree
-  describe Api::TransferItemsController do
-
-    let!(:stock_transfer) { create(:stock_transfer_with_items) }
-    let(:transfer_item)   { stock_transfer.transfer_items.first }
-
-    before do
-      stub_authentication!
-    end
-
-    context "as a normal user" do
-      describe "#create" do
-        it "cannot create a transfer item" do
-          post spree.api_stock_transfer_transfer_items_path(stock_transfer)
-          expect(response.status).to eq 401
-        end
-      end
-
-      describe "#update" do
-        it "cannot update a transfer item" do
-          put spree.api_stock_transfer_transfer_item_path(stock_transfer, transfer_item)
-          expect(response.status).to eq 401
-        end
-      end
-
-      describe "#destroy" do
-        it "cannot delete a transfer item" do
-          delete spree.api_stock_transfer_transfer_item_path(stock_transfer, transfer_item)
-          expect(response.status).to eq 401
-        end
-      end
-    end
-
-    context "as an admin" do
-      sign_in_as_admin!
-
-      describe "#create" do
-        subject do
-          create_params = {
-            transfer_item: {
-              variant_id: variant_id,
-              expected_quantity: 1
-            }
-          }
-          post spree.api_stock_transfer_transfer_items_path(stock_transfer), params: create_params
-        end
-
-        context "valid parameters" do
-          let(:variant)           { create(:variant) }
-          let(:variant_id)        { variant.id }
-
-          context "variant is available" do
-            before do
-              variant.stock_items.update_all(count_on_hand: 1)
-            end
-
-            it "can create a transfer item" do
-              subject
-              expect(response.status).to eq 201
-            end
-
-            it "creates a transfer item" do
-              expect { subject }.to change { Spree::TransferItem.count }.by(1)
-            end
-          end
-
-          context "variant is not available" do
-            before do
-              variant.stock_items.update_all(count_on_hand: 0)
-            end
-
-            it "returns an error status" do
-              subject
-              expect(response.status).to eq 422
-            end
-
-            it "does not create a transfer item" do
-              expect { subject }.to_not change { Spree::TransferItem.count }
-            end
-          end
-        end
-      end
-
-      describe "#update" do
-        subject do
-          update_params = { transfer_item: { received_quantity: received_quantity } }
-          put spree.api_stock_transfer_transfer_item_path(stock_transfer, transfer_item), params: update_params
-        end
-
-        context "valid parameters" do
-          let(:received_quantity) { 2 }
-
-          it "can update a transfer item" do
-            subject
-            expect(response.status).to eq 200
-          end
-
-          it "updates the transfer item" do
-            expect { subject }.to change { transfer_item.reload.received_quantity }.to(2)
-          end
-        end
-
-        context "invalid parameters" do
-          let(:received_quantity) { -5 }
-
-          it "returns a 422" do
-            subject
-            expect(response.status).to eq 422
-          end
-
-          it "does not update the transfer item" do
-            expect { subject }.to_not change { transfer_item.reload.received_quantity }
-          end
-        end
-      end
-
-      describe "#destroy" do
-        subject { delete spree.api_stock_transfer_transfer_item_path(stock_transfer, transfer_item) }
-
-        context "hasn't been finalized" do
-          it "can delete a transfer item" do
-            subject
-            expect(response.status).to eq 200
-          end
-
-          it "deletes the transfer item" do
-            expect { subject }.to change { Spree::TransferItem.count }.by(-1)
-          end
-        end
-
-        context "has been finalized" do
-          before do
-            stock_transfer.update_attributes(finalized_at: Time.current)
-          end
-
-          it "returns an error status code" do
-            subject
-            expect(response.status).to eq 422
-          end
-
-          it "does not delete the transfer item" do
-            expect { subject }.to_not change { Spree::TransferItem.count }
-          end
-        end
-      end
-    end
-  end
-end