spree_api 1.1.0.rc1 → 1.1.0.rc2

data/app/controllers/spree/api/v1/base_controller.rb

@@ -14,6 +14,15 @@ module Spree
 
         helper Spree::Api::ApiHelpers
 
+        def map_nested_attributes_keys(klass, attributes)
+          nested_keys = klass.nested_attributes_options.keys
+          attributes.inject({}) do |h, (k,v)|
+            key = nested_keys.include?(k.to_sym) ? "#{k}_attributes" : k
+            h[key] = v
+            h
+          end.with_indifferent_access
+        end
+
         private
 
         def check_for_api_key
@@ -39,7 +48,8 @@ module Spree
         end
 
         def invalid_resource!(resource)
-          render "spree/api/v1/errors/invalid_resource", :resource => resource, :status => 422
+          @resource = resource
+          render "spree/api/v1/errors/invalid_resource", :status => 422
         end
 
         def api_key

data/app/controllers/spree/api/v1/countries_controller.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Api
+    module V1
+      class CountriesController < Spree::Api::V1::BaseController
+        def index
+          @countries = Country.includes(:states).order('name ASC')
+        end
+
+        def show
+          @country = Country.find(params[:id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v1/orders_controller.rb

@@ -2,6 +2,8 @@ module Spree
   module Api
     module V1
       class OrdersController < Spree::Api::V1::BaseController
+        before_filter :map_nested_attributes, :only => [:create, :update]
+
         def index
           # should probably look at turning this into a CanCan step
           raise CanCan::AccessDenied unless current_api_user.has_role?("admin")
@@ -13,10 +15,19 @@ module Spree
         end
 
         def create
-          @order = Order.build_from_api(current_api_user, params[:order])
+          @order = Order.build_from_api(current_api_user, @nested_params)
           next!
         end
 
+        def update
+          authorize! :update, Order
+          if order.update_attributes(@nested_params)
+            render :show
+          else
+            invalid_resource!(order)
+          end
+        end
+
         def address
           order.build_ship_address(params[:shipping_address])
           order.build_bill_address(params[:billing_address])
@@ -36,6 +47,10 @@ module Spree
 
         private
 
+        def map_nested_attributes
+          @nested_params = map_nested_attributes_keys Order, params[:order]
+        end
+
         def order
           @order ||= Order.find_by_number!(params[:id])
         end

data/app/controllers/spree/api/v1/payments_controller.rb

@@ -0,0 +1,73 @@
+module Spree
+  module Api
+    module V1
+      class PaymentsController < Spree::Api::V1::BaseController
+        before_filter :find_order
+        before_filter :find_payment, :only => [:show, :authorize, :purchase, :capture, :void, :credit]
+
+        def index
+          @payments = @order.payments
+        end
+
+        def new
+          @payment_methods = Spree::PaymentMethod.where(:environment => Rails.env)
+        end
+
+        def create
+          @payment = @order.payments.build(params[:payment])
+          if @payment.save
+            render :show, :status => 201
+          else
+            invalid_resource!(@payment)
+          end
+        end
+
+        def show
+        end
+
+        def authorize
+          perform_payment_action(:authorize)
+        end
+
+        def purchase
+          perform_payment_action(:purchase)
+        end
+
+        def void
+          perform_payment_action(:void_transaction)
+        end
+
+        def credit
+          if params[:amount].to_f > @payment.credit_allowed
+            render "spree/api/v1/payments/credit_over_limit", :status => 422
+          else
+            perform_payment_action(:credit, params[:amount])
+          end
+        end
+
+        private
+
+        def find_order
+          @order = Order.find_by_number(params[:order_id])
+          authorize! :read, @order
+        end
+
+        def find_payment
+          @payment = @order.payments.find(params[:id])
+        end
+
+        def perform_payment_action(action, *args)
+          authorize! action, Payment
+
+          begin
+            @payment.send("#{action}!", *args)
+            render :show
+          rescue Spree::Core::GatewayError => e
+            @error = e.message
+            render "spree/api/v1/errors/gateway_error", :status => 422
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v1/products_controller.rb

@@ -6,6 +6,11 @@ module Spree
           @products = product_scope.page(params[:page])
         end
 
+        def search
+          @products = product_scope.search(params[:q]).result.page(params[:page])
+          render :index
+        end
+
         def show
           @product = find_product(params[:id])
         end

data/app/controllers/spree/api/v1/shipments_controller.rb

@@ -0,0 +1,31 @@
+module Spree
+  module Api
+    module V1
+      class ShipmentsController < BaseController
+        before_filter :find_order
+        before_filter :find_and_update_shipment, :only => [:ship, :ready]
+
+        def ready
+          @shipment.ready!
+          render :show
+        end
+
+        def ship
+          @shipment.ship!
+          render :show
+        end
+
+        private
+
+        def find_order
+          @order = Order.find_by_number!(params[:order_id])
+        end
+
+        def find_and_update_shipment
+          @shipment = @order.shipments.find_by_number!(params[:id])
+          @shipment.update_attributes(params[:shipment])
+        end
+      end
+    end
+  end
+end

data/app/helpers/spree/api/api_helpers.rb

@@ -17,7 +17,7 @@ module Spree
       end
 
       def variant_attributes
-        [:id, :name, :count_on_hand, :sku, :price, :weight, :height, :width, :depth, :is_master, :cost_price]
+        [:id, :name, :count_on_hand, :sku, :price, :weight, :height, :width, :depth, :is_master, :cost_price, :permalink]
       end
 
       def image_attributes
@@ -33,12 +33,24 @@ module Spree
       end
 
       def line_item_attributes
-        [:quantity, :price, :variant_id]
+        [:id, :quantity, :price, :variant_id]
       end
 
       def option_type_attributes
         [:id, :name, :presentation, :position]
       end
+
+      def payment_attributes
+        [:id, :source_type, :source_id, :amount, :payment_method_id, :response_code, :state, :avs_response, :created_at, :updated_at]
+      end
+
+      def payment_method_attributes
+        [:id, :name, :description]
+      end
+
+      def shipment_attributes
+        [:id, :tracking, :number, :cost, :shipped_at, :state]
+      end
     end
   end
 end

data/app/models/spree/order_decorator.rb

@@ -1,10 +1,10 @@
 Spree::Order.class_eval do
   def self.build_from_api(user, params)
     order = create
-    params[:line_items].each do |variant_id, quantity|
-      line_item_params = { :variant_id => variant_id, :quantity => quantity }
-      line_item = order.add_variant(Spree::Variant.find(variant_id), quantity)
+    params[:line_items_attributes].each do |line_item|
+      order.add_variant(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
     end
+
     order.user = user
     order.email = user.email
     order

data/app/views/spree/api/v1/countries/index.rabl

@@ -0,0 +1,2 @@
+collection @countries
+extends "spree/api/v1/countries/show"

data/app/views/spree/api/v1/countries/show.rabl

@@ -0,0 +1,5 @@
+object @country
+attributes :id, :iso_name, :iso, :iso3, :name, :numcode
+child :states => :states do
+  attributes :id, :name, :abbr, :country_id
+end

data/app/views/spree/api/v1/errors/gateway_error.rabl

@@ -0,0 +1,2 @@
+object false
+node(:error) { I18n.t(:gateway_error, :scope => "spree.api", :text => @error) }

data/app/views/spree/api/v1/errors/invalid_resource.rabl

@@ -1,3 +1,3 @@
 object false
 node(:error) { I18n.t(:invalid_resource, :scope => "spree.api") }
-node(:errors) { @product.errors }
+node(:errors) { @resource.errors }

data/app/views/spree/api/v1/line_items/new.rabl

@@ -1,3 +1,3 @@
 object false
-node(:attributes) { [*line_item_attributes] }
+node(:attributes) { [*line_item_attributes] - [:id] }
 node(:required_attributes) { [:variant_id, :quantity] }

data/app/views/spree/api/v1/line_items/show.rabl

@@ -1,5 +1,5 @@
 object @line_item
-attributes :quantity, :price
+attributes *line_item_attributes
 child :variant do
   extends "spree/api/v1/variants/variant"
 end

data/app/views/spree/api/v1/orders/address.rabl

@@ -0,0 +1,3 @@
+attributes :id, :firstname, :lastname, :address1, :address2,
+           :city, :zipcode, :country, :state, :phone, :state_name,
+           :company, :alternative_phone, :country_id, :state_id

data/app/views/spree/api/v1/orders/payment.rabl

@@ -0,0 +1,4 @@
+attributes :id, :amount, :payment_method_id
+child :payment_method => :payment_method do
+  attributes :id, :name, :environment
+end

data/app/views/spree/api/v1/orders/show.rabl

@@ -1,3 +1,26 @@
 object @order
 attributes *order_attributes
 extends "spree/api/v1/orders/#{@order.state}"
+
+child :billing_address => :bill_address do
+  extends "spree/api/v1/orders/address"
+end
+
+child :shipping_address => :ship_address do
+  extends "spree/api/v1/orders/address"
+end
+
+child :line_items => :line_items do
+  extends "spree/api/v1/line_items/show"
+end
+
+child :payments => :payments do
+  attributes :id, :amount, :state, :payment_method_id
+  child :payment_method => :payment_method do
+    attributes :id, :name, :environment
+  end
+end
+
+child :shipments => :shipments do
+  extends "spree/api/v1/shipments/show"
+end

data/app/views/spree/api/v1/payments/credit_over_limit.rabl

@@ -0,0 +1,2 @@
+object false
+node(:error) { I18n.t(:credit_over_limit, :limit => @payment.credit_allowed, :scope => 'spree.api') }

data/app/views/spree/api/v1/payments/index.rabl

@@ -0,0 +1,2 @@
+collection @payments
+attributes *payment_attributes

data/app/views/spree/api/v1/payments/new.rabl

@@ -0,0 +1,6 @@
+object false
+node(:attributes) { [*payment_attributes] }
+child @payment_methods => :payment_methods do
+  attributes *payment_method_attributes
+end
+

data/app/views/spree/api/v1/payments/show.rabl

@@ -0,0 +1,2 @@
+object @payment
+attributes *payment_attributes

data/app/views/spree/api/v1/shipments/show.rabl

@@ -0,0 +1,7 @@
+object @shipment
+attributes *shipment_attributes
+node(:order_id) { |shipment| shipment.order.number }
+child :shipping_method => :shipping_method do
+  attributes :name, :zone_id, :shipping_category_id
+end
+

data/config/locales/en.yml

@@ -6,6 +6,8 @@ en:
       unauthorized: "You are not authorized to perform that action."
       invalid_resource: "Invalid resource. Please fix errors and try again."
       resource_not_found: "The resource you were looking for could not be found."
+      gateway_error: "There was a problem with the payment gateway: %{text}"
+      credit_over_limit: "This payment can only be credited up to %{limit}. Please specify an amount less than or equal to this number."
 
       order:
         could_not_transition: "The order could not be transitioned. Please fix the errors and try again."

data/config/routes.rb

@@ -2,6 +2,10 @@ Spree::Core::Engine.routes.prepend do
   namespace :api do
     scope :module => :v1 do
       resources :products do
+        collection do
+          get :search
+        end
+
         resources :variants
         resources :images
       end
@@ -13,10 +17,28 @@ Spree::Core::Engine.routes.prepend do
       resources :orders do
         member do
           put :address
+          put :delivery
         end
 
         resources :line_items
+        resources :payments do
+          member do
+            put :authorize
+            put :purchase
+            put :void
+            put :credit
+          end
+        end
+
+        resources :shipments do
+          member do
+            put :ready
+            put :ship
+          end
+        end
       end
+
+      resources :countries, :only => [:index, :show]
     end
   end
 end

data/db/migrate/20120411123334_resize_api_key_field.rb

@@ -0,0 +1,5 @@
+class ResizeApiKeyField < ActiveRecord::Migration
+  def change
+    change_column :spree_users, :api_key, :string, :limit => 48
+  end
+end

data/lib/spree/api/engine.rb

@@ -13,6 +13,10 @@ module Spree
       end
       config.to_prepare &method(:activate).to_proc
 
+      def self.root
+        @root ||= Pathname.new(File.expand_path('../../../../', __FILE__))
+      end
+
     end
   end
 end

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

@@ -0,0 +1,35 @@
+module Spree
+  module Api
+    module TestingSupport
+      module Helpers
+        def json_response
+          JSON.parse(response.body)
+        end
+
+        def assert_unauthorized!
+          json_response.should == { "error" => "You are not authorized to perform that action." }
+          response.status.should == 401
+        end
+
+        def stub_authentication!
+          controller.stub :check_for_api_key
+          Spree::User.stub :find_by_api_key => current_api_user
+        end
+
+        # This method can be overriden (with a let block) inside a context
+        # For instance, if you wanted to have an admin user instead.
+        def current_api_user
+          @current_api_user ||= stub_model(Spree::User, :email => "spree@example.com")
+        end
+
+        def image(filename)
+          File.open(Spree::Api::Engine.root + "spec/fixtures" + filename)
+        end
+
+        def upload_image(filename)
+          fixture_file_upload(image(filename).path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Spree
+  module Api
+    module TestingSupport
+      module Setup
+        def sign_in_as_admin!
+          let!(:current_api_user) do
+            user = stub_model(Spree::User)
+            user.should_receive(:has_role?).any_number_of_times.with("admin").and_return(true)
+            user
+          end
+        end
+
+        # Default kaminari's pagination to a certain range
+        # Means that you don't need to create 25 objects to test pagination
+        def default_per_page(count)
+          before do
+            @current_default_per_page = Kaminari.config.default_per_page
+            Kaminari.config.default_per_page = 1
+          end
+
+          after do
+            Kaminari.config.default_per_page = @current_default_per_page
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -26,4 +26,16 @@ describe Spree::Api::V1::BaseController do
       json_response.should == { "error" => "Invalid API key (fake_key) specified." }
     end
   end
+
+  it "maps symantec keys to nested_attributes keys" do
+    klass = stub(:nested_attributes_options => { :line_items => {},
+                                                  :bill_address => {} })
+    attributes = { 'line_items' => { :id => 1 },
+                   'bill_address' => { :id => 2 },
+                   'name' => 'test order' }
+
+    mapped = subject.map_nested_attributes_keys(klass, attributes)
+    mapped.has_key?('line_items_attributes').should be_true
+    mapped.has_key?('name').should be_true
+  end
 end

data/spec/controllers/spree/api/v1/countries_controller_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+module Spree
+  describe Api::V1::CountriesController do
+    render_views
+
+    before do
+      stub_authentication!
+      @state = Factory(:state)
+      @country = @state.country
+    end
+
+    it "gets all countries" do
+      api_get :index
+      json_response.first['country']['iso3'].should eq @country.iso3
+    end
+
+    it "includes states" do
+      api_get :show, :id => @country.id
+      states = json_response['country']['states']
+      states.first['state']['name'].should eq @state.name
+    end
+  end
+end

data/spec/controllers/spree/api/v1/line_items_controller_spec.rb

@@ -11,7 +11,7 @@ module Spree
     end
 
     let(:product) { Factory(:product) }
-    let(:attributes) { [:quantity, :price, :variant] }
+    let(:attributes) { [:id, :quantity, :price, :variant] }
     let(:resource_scoping) { { :order_id => order.to_param } }
 
     before do

data/spec/controllers/spree/api/v1/orders_controller_spec.rb

@@ -36,7 +36,7 @@ module Spree
 
     it "can create an order" do
       variant = Factory(:variant)
-      api_post :create, :order => { :line_items => { variant.to_param => 5 } }
+      api_post :create, :order => { :line_items => [{ :variant_id => variant.to_param, :quantity => 5 }] }
       response.status.should == 200
       order = Order.last
       order.line_items.count.should == 1

data/spec/controllers/spree/api/v1/payments_controller_spec.rb

@@ -0,0 +1,162 @@
+require 'spec_helper'
+
+module Spree
+  describe Spree::Api::V1::PaymentsController do
+    let!(:order) { Factory(:order) }
+    let!(:payment) { Factory(:payment, :order => order) }
+    let!(:attributes) { [:id, :source_type, :source_id, :amount,
+                         :payment_method_id, :response_code, :state, :avs_response, 
+                         :created_at, :updated_at] }
+
+    let(:resource_scoping) { { :order_id => order.to_param } }
+    before do
+      stub_authentication!
+    end
+
+    context "as a user" do
+      context "when the order belongs to the user" do
+        before do
+          Order.any_instance.stub :user => current_api_user
+        end
+
+        it "can view the payments for their order" do
+          api_get :index
+          json_response.first.should have_attributes(attributes)
+        end
+
+        it "can learn how to create a new payment" do
+          api_get :new
+          json_response["attributes"].should == attributes.map(&:to_s)
+          json_response["payment_methods"].should_not be_empty
+          json_response["payment_methods"].first.should have_attributes([:id, :name, :description])
+        end
+
+        it "can create a new payment" do
+          api_post :create, :payment => { :payment_method_id => PaymentMethod.first.id, :amount => 50 }
+          response.status.should == 201
+          json_response.should have_attributes(attributes)
+        end
+
+        it "can view a pre-existing payment's details" do
+          api_get :show, :id => payment.to_param
+          json_response.should have_attributes(attributes)
+        end
+
+        it "cannot authorize a payment" do
+          api_put :authorize, :id => payment.to_param
+          assert_unauthorized!
+        end
+      end
+
+      context "when the order does not belong to the user" do
+        before do
+          Order.any_instance.stub :user => stub_model(User)
+        end
+
+        it "cannot view payments for somebody else's order" do
+          api_get :index, :order_id => order.to_param
+          assert_unauthorized!
+        end
+      end
+    end
+
+    context "as an admin" do
+      sign_in_as_admin!
+
+      it "can view the payments on any order" do
+        api_get :index
+        response.status.should == 200
+        json_response.first.should have_attributes(attributes)
+      end
+
+      context "for a given payment" do
+
+        it "can authorize" do
+          api_put :authorize, :id => payment.to_param
+          response.status.should == 200
+          payment.reload
+          payment.state.should == "pending"
+        end
+
+        it "returns a 422 status when authorization fails" do
+          fake_response = stub(:success? => false, :to_s => "Could not authorize card")
+          Spree::Gateway::Bogus.any_instance.should_receive(:authorize).and_return(fake_response)
+          api_put :authorize, :id => payment.to_param
+          response.status.should == 422
+          json_response["error"].should == "There was a problem with the payment gateway: Could not authorize card"
+          payment.reload
+          payment.state.should == "failed"
+        end
+
+        it "can purchase" do
+          api_put :purchase, :id => payment.to_param
+          response.status.should == 200
+          payment.reload
+          payment.state.should == "completed"
+        end
+
+        it "returns a 422 status when purchasing fails" do
+          fake_response = stub(:success? => false, :to_s => "Insufficient funds")
+          Spree::Gateway::Bogus.any_instance.should_receive(:purchase).and_return(fake_response)
+          api_put :purchase, :id => payment.to_param
+          response.status.should == 422
+          json_response["error"].should == "There was a problem with the payment gateway: Insufficient funds"
+
+          payment.reload
+          payment.state.should == "failed"
+        end
+
+        it "can void" do
+          api_put :void, :id => payment.to_param
+          response.status.should == 200
+          payment.reload
+          payment.state.should == "void"
+        end
+
+        it "returns a 422 status when voiding fails" do
+          fake_response = stub(:success? => false, :to_s => "NO REFUNDS")
+          Spree::Gateway::Bogus.any_instance.should_receive(:void).and_return(fake_response)
+          api_put :void, :id => payment.to_param
+          response.status.should == 422
+          json_response["error"].should == "There was a problem with the payment gateway: NO REFUNDS"
+
+          payment.reload
+          payment.state.should == "pending"
+        end
+
+        context "crediting" do
+          before do
+            payment.purchase!
+          end
+
+          it "can credit" do
+            api_put :credit, :id => payment.to_param
+            response.status.should == 200
+            payment.reload
+            payment.state.should == "completed"
+
+            # Ensur that a credit payment was created, and it has correct credit amount
+            credit_payment = Payment.where(:source_type => 'Spree::Payment', :source_id => payment.id).last
+            credit_payment.amount.to_f.should == -45.75
+          end
+
+          it "returns a 422 status when crediting fails" do
+            fake_response = stub(:success? => false, :to_s => "NO CREDIT FOR YOU")
+            Spree::Gateway::Bogus.any_instance.should_receive(:credit).and_return(fake_response)
+            api_put :credit, :id => payment.to_param
+            response.status.should == 422
+            json_response["error"].should == "There was a problem with the payment gateway: NO CREDIT FOR YOU"
+          end
+
+          it "cannot credit over credit_allowed limit" do
+            api_put :credit, :id => payment.to_param, :amount => 1000000
+            response.status.should == 422
+            json_response["error"].should == "This payment can only be credited up to 45.75. Please specify an amount less than or equal to this number."
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/spec/controllers/spree/api/v1/products_controller_spec.rb

@@ -39,6 +39,13 @@ module Spree
         end
       end
 
+      it "can search for products" do
+        Factory(:product, :name => "The best product in the world")
+        api_get :search, :q => { :name_cont => "best" }
+        json_response["products"].first.should have_attributes(attributes)
+        json_response["count"].should == 1
+      end
+
       it "gets a single product" do
         product.master.images.create!(:attachment => image("thinking-cat.jpg"))
         api_get :show, :id => product.to_param

data/spec/controllers/spree/api/v1/shipments_controller_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Spree::Api::V1::ShipmentsController do
+  let!(:shipment) { Factory(:shipment) }
+  let!(:attributes) { [:id, :tracking, :number, :cost, :shipped_at] }
+
+  before do
+    shipment.order.payment_state == 'paid'
+    stub_authentication!
+  end
+
+  context "working with a shipment" do
+    let!(:resource_scoping) { { :order_id => shipment.order.to_param, :id => shipment.to_param } }
+
+    it "can make a shipment ready" do
+      api_put :ready
+      json_response.should have_attributes(attributes)
+      json_response["shipment"]["state"].should == "ready"
+    end
+
+    context "can transition a shipment from ready to ship" do
+      before do
+        shipment.order.update_attribute(:payment_state, 'paid')
+        shipment.update!(shipment.order)
+      end
+
+      it "can transition a shipment from ready to ship" do
+        shipment.reload
+        api_put :ship, :order_id => shipment.order.to_param, :id => shipment.to_param, :shipment => { :tracking => "123123" }
+        json_response.should have_attributes(attributes)
+        json_response["shipment"]["state"].should == "shipped"
+      end
+    end
+  end
+end

data/spec/controllers/spree/api/v1/variants_controller_spec.rb

@@ -13,7 +13,8 @@ module Spree
     end
     let!(:attributes) { [:id, :name, :count_on_hand,
                          :sku, :price, :weight, :height,
-                         :width, :depth, :is_master, :cost_price] }
+                         :width, :depth, :is_master, :cost_price,
+                         :permalink] }
 
     before do
       stub_authentication!

data/spec/models/spree/order_spec.rb

@@ -7,7 +7,7 @@ module Spree
     it 'can build an order from API parameters' do
 
       Spree::Variant.should_receive(:find).and_return(stub_model(Variant, :id => 1))
-      order = Order.build_from_api(user, { :line_items => { 1 => 5 }})
+      order = Order.build_from_api(user, { :line_items_attributes => [{ :variant_id => 1, :quantity => 5 }]})
 
       order.user.should == user
       line_item = order.line_items.first

data/spec/spec_helper.rb

@@ -10,19 +10,12 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 require 'spree/core/testing_support/factories'
 
+require 'spree/api/testing_support/helpers'
+require 'spree/api/testing_support/setup'
+
 RSpec.configure do |config|
   config.backtrace_clean_patterns = [/gems\/activesupport/, /gems\/actionpack/, /gems\/rspec/]
 
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
+  config.include Spree::Api::TestingSupport::Helpers, :type => :controller
+  config.extend Spree::Api::TestingSupport::Setup, :type => :controller
 end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,14 @@
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/have_attributes_matcher.rb

@@ -0,0 +1,13 @@
+
+
+
+
+RSpec::Matchers.define :have_attributes do |expected_attributes|
+  match do |actual|
+    # actual is a Hash object representing an object, like this:
+    # { "product" => { "name" => "Product #1" } }
+    actual_attributes = actual.values.first.keys.map(&:to_sym)
+    expected_attributes.map(&:to_sym).all? { |attr| actual_attributes.include?(attr) }
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70247364495880 !ruby/object:Gem::Requirement
+  requirement: &70332729484720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: 1.1.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70247364495880
+  version_requirements: *70332729484720
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: &70247364495000 !ruby/object:Gem::Requirement
+  requirement: &70332729479800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: 1.1.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70247364495000
+  version_requirements: *70332729479800
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &70247364494060 !ruby/object:Gem::Requirement
+  requirement: &70332729477860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70247364494060
+  version_requirements: *70332729477860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70247364509720 !ruby/object:Gem::Requirement
+  requirement: &70332729346420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70247364509720
+  version_requirements: *70332729346420
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70247364509000 !ruby/object:Gem::Requirement
+  requirement: &70332729344960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247364509000
+  version_requirements: *70332729344960
 description: Spree's API
 email:
 - ryan@spreecommerce.com
@@ -79,16 +79,23 @@ files:
 - README.md
 - Rakefile
 - app/controllers/spree/api/v1/base_controller.rb
+- app/controllers/spree/api/v1/countries_controller.rb
 - app/controllers/spree/api/v1/images_controller.rb
 - app/controllers/spree/api/v1/line_items_controller.rb
 - app/controllers/spree/api/v1/orders_controller.rb
+- app/controllers/spree/api/v1/payments_controller.rb
 - app/controllers/spree/api/v1/products_controller.rb
+- app/controllers/spree/api/v1/shipments_controller.rb
 - app/controllers/spree/api/v1/variants_controller.rb
 - app/helpers/spree/api/api_helpers.rb
 - app/models/spree/line_item_decorator.rb
 - app/models/spree/option_value_decorator.rb
 - app/models/spree/order_decorator.rb
+- app/models/spree/payment_decorator.rb
 - app/models/spree/user_decorator.rb
+- app/views/spree/api/v1/countries/index.rabl
+- app/views/spree/api/v1/countries/show.rabl
+- app/views/spree/api/v1/errors/gateway_error.rabl
 - app/views/spree/api/v1/errors/invalid_api_key.rabl
 - app/views/spree/api/v1/errors/invalid_resource.rabl
 - app/views/spree/api/v1/errors/must_specify_api_key.rabl
@@ -106,10 +113,15 @@ files:
 - app/views/spree/api/v1/orders/invalid_shipping_method.rabl
 - app/views/spree/api/v1/orders/payment.rabl
 - app/views/spree/api/v1/orders/show.rabl
+- app/views/spree/api/v1/payments/credit_over_limit.rabl
+- app/views/spree/api/v1/payments/index.rabl
+- app/views/spree/api/v1/payments/new.rabl
+- app/views/spree/api/v1/payments/show.rabl
 - app/views/spree/api/v1/products/index.rabl
 - app/views/spree/api/v1/products/new.rabl
 - app/views/spree/api/v1/products/product.rabl
 - app/views/spree/api/v1/products/show.rabl
+- app/views/spree/api/v1/shipments/show.rabl
 - app/views/spree/api/v1/variants/index.rabl
 - app/views/spree/api/v1/variants/new.rabl
 - app/views/spree/api/v1/variants/show.rabl
@@ -117,24 +129,31 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20100107141738_add_api_key_to_spree_users.rb
+- db/migrate/20120411123334_resize_api_key_field.rb
 - lib/spree/api.rb
 - lib/spree/api/controller_setup.rb
 - lib/spree/api/engine.rb
+- lib/spree/api/testing_support/helpers.rb
+- lib/spree/api/testing_support/setup.rb
 - lib/spree/api/version.rb
 - lib/spree_api.rb
 - script/rails
 - spec/controllers/spree/api/v1/base_controller_spec.rb
+- spec/controllers/spree/api/v1/countries_controller_spec.rb
 - spec/controllers/spree/api/v1/images_controller_spec.rb
 - spec/controllers/spree/api/v1/line_items_controller_spec.rb
 - spec/controllers/spree/api/v1/orders_controller_spec.rb
+- spec/controllers/spree/api/v1/payments_controller_spec.rb
 - spec/controllers/spree/api/v1/products_controller_spec.rb
+- spec/controllers/spree/api/v1/shipments_controller_spec.rb
 - spec/controllers/spree/api/v1/variants_controller_spec.rb
 - spec/fixtures/thinking-cat.jpg
 - spec/models/spree/order_spec.rb
 - spec/models/spree/user_spec.rb
 - spec/spec_helper.rb
-- spec/support/api_helpers.rb
 - spec/support/controller_hacks.rb
+- spec/support/database_cleaner.rb
+- spec/support/have_attributes_matcher.rb
 - spree_api.gemspec
 homepage: ''
 licenses: []
@@ -150,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3641673168610111779
+      hash: -1673968369250392994
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,14 +184,18 @@ specification_version: 3
 summary: Spree's API
 test_files:
 - spec/controllers/spree/api/v1/base_controller_spec.rb
+- spec/controllers/spree/api/v1/countries_controller_spec.rb
 - spec/controllers/spree/api/v1/images_controller_spec.rb
 - spec/controllers/spree/api/v1/line_items_controller_spec.rb
 - spec/controllers/spree/api/v1/orders_controller_spec.rb
+- spec/controllers/spree/api/v1/payments_controller_spec.rb
 - spec/controllers/spree/api/v1/products_controller_spec.rb
+- spec/controllers/spree/api/v1/shipments_controller_spec.rb
 - spec/controllers/spree/api/v1/variants_controller_spec.rb
 - spec/fixtures/thinking-cat.jpg
 - spec/models/spree/order_spec.rb
 - spec/models/spree/user_spec.rb
 - spec/spec_helper.rb
-- spec/support/api_helpers.rb
 - spec/support/controller_hacks.rb
+- spec/support/database_cleaner.rb
+- spec/support/have_attributes_matcher.rb

data/spec/support/api_helpers.rb

@@ -1,68 +0,0 @@
-module ApiHelpers
-  def json_response
-    JSON.parse(response.body)
-  end
-
-  def assert_unauthorized!
-    json_response.should == { "error" => "You are not authorized to perform that action." }
-    response.status.should == 401
-  end
-
-  def stub_authentication!
-    controller.stub :check_for_api_key
-    Spree::User.stub :find_by_api_key => current_api_user
-  end
-
-  # This method can be overriden (with a let block) inside a context
-  # For instance, if you wanted to have an admin user instead.
-  def current_api_user
-    @current_api_user ||= stub_model(Spree::User, :email => "spree@example.com")
-  end
-
-  def image(filename)
-    path = Pathname.new(__FILE__) + "../../../spec/fixtures" + filename
-    File.open(path)
-  end
-
-  def upload_image(filename)
-    fixture_file_upload(image(filename).path)
-  end
-end
-
-module ApiTestSetup
-  def sign_in_as_admin!
-    let!(:current_api_user) do
-      user = stub_model(Spree::User)
-      user.should_receive(:has_role?).any_number_of_times.with("admin").and_return(true)
-      user
-    end
-  end
-
-  # Default kaminari's pagination to a certain range
-  # Means that you don't need to create 25 objects to test pagination
-  def default_per_page(count)
-    before do
-      @current_default_per_page = Kaminari.config.default_per_page
-      Kaminari.config.default_per_page = 1
-    end
-
-    after do
-      Kaminari.config.default_per_page = @current_default_per_page
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.include ApiHelpers, :type => :controller
-  config.extend ApiTestSetup, :type => :controller
-end
-
-RSpec::Matchers.define :have_attributes do |expected_attributes|
-  match do |actual|
-    # actual is a Hash object representing an object, like this:
-    # { "product" => { "name" => "Product #1" } }
-    actual_attributes = actual.values.first.keys.map(&:to_sym)
-    expected_attributes.map(&:to_sym).all? { |attr| actual_attributes.include?(attr) }
-  end
-end
-