Rails4へのVerUpのためのブランチ(v1.2.2)

.travis.yml

@@ -21,11 +21,5 @@ notifications:
     skip_join: true
     channels:
       - "irc.freenode.org#spree"
-branches:
-  only:
-    - 1-0-stable
-    - 1-1-stable
-    - master
 rvm:
-  - 1.8.7
-  - 1.9.3
+  - 1.9.3

README.md

@@ -1,6 +1,3 @@
-**THIS README IS FOR THE MASTER BRANCH OF SPREE AND REFLECTS THE WORK CURRENTLY EXISTING ON THE MASTER BRANCH. IF YOU ARE WISHING TO USE A NON-MASTER BRANCH OF
-SPREE, PLEASE CONSULT THAT BRANCH'S README AND NOT THIS ONE.**
-
 SUMMARY
 -------
 
@@ -32,9 +29,9 @@ Installation
 The fastest way to get started is by using the spree command line tool
 available in the spree gem which will add Spree to an existing Rails application.
 
-    $ gem install rails -v 3.2.7
+    $ gem install rails -v 3.2.9
     $ gem install spree
-    $ rails _3.2.7_ new my_store
+    $ rails _3.2.9_ new my_store
     $ spree install my_store
 
 This will add the Spree gem to your Gemfile, create initializers, copy migrations and
@@ -100,21 +97,21 @@ The source code is essentially a collection of gems.  Spree is meant to be run w
 
 1. Clone the Git repo
 
-        git clone git://github.com/spree/spree.git
-        cd spree
+        $ git clone git://github.com/spree/spree.git
+        $ cd spree
 
 2. Install the gem dependencies
 
-        bundle install
+        $ bundle install
 
 3. Create a sandbox Rails application for testing purposes (and automatically perform all necessary database setup)
 
-        bundle exec rake sandbox
+        $ bundle exec rake sandbox
 
 4. Start the server
 
-        cd sandbox
-        rails server
+        $ cd sandbox
+        $ rails server
 
 Performance
 -----------
@@ -134,14 +131,22 @@ Use Dedicated Spree Devise Authentication
 Add the following to your Gemfile
 
     $ gem 'spree_auth_devise', :git => 'git://github.com/spree/spree_auth_devise'
-    
+
 Then run `bundle install`. Authentication will then work exactly as it did in previous versions of Spree.
 
 If you're installing this in a new Spree 1.2+ application, you'll need to install and run the migrations with
 
     $ bundle exec rake spree_auth:install:migrations
     $ bundle exec rake db:migrate
 
+change the following line in `config/initializers/spree.rb`
+```ruby
+Spree.user_class = "Spree::LegacyUser"
+```
+to
+```ruby
+Spree.user_class = "Spree::User"
+```
 and then run `bundle exec rake spree_auth:admin:create` in order to set up the admin user for the application.
 
 Running Tests

Rakefile

@@ -87,5 +87,7 @@ end
 
 desc "Creates a sandbox application for simulating the Spree code in a deployed Rails app"
 task :sandbox do
-  exec("lib/sandbox.sh")
+  Bundler.with_clean_env do
+    exec("lib/sandbox.sh")
+  end
 end

SPREE_VERSION

@@ -1 +1 @@
-1.2.0.rc1
+1.2.2

api/app/controllers/spree/api/v1/addresses_controller.rb

@@ -4,10 +4,12 @@ module V1
       class AddressesController < Spree::Api::V1::BaseController
         def show
           @address = Address.find(params[:id])
+          authorize! :read, @address
         end
 
         def update
           @address = Address.find(params[:id])
+          authorize! :read, @address
           @address.update_attributes(params[:address])
           render :show, :status => 200
         end

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

@@ -6,7 +6,8 @@ class BaseController < ActionController::Metal
 
         attr_accessor :current_api_user
 
-        before_filter :check_for_api_key
+        before_filter :set_content_type
+        before_filter :check_for_api_key, :if => :requires_authentication?
         before_filter :authenticate_user
 
         rescue_from CanCan::AccessDenied, :with => :unauthorized
@@ -25,20 +26,39 @@ def map_nested_attributes_keys(klass, attributes)
 
         private
 
+        def set_content_type
+          content_type = case params[:format]
+          when "json"
+            "application/json"
+          when "xml"
+            "text/xml"
+          end
+          headers["Content-Type"] = content_type
+        end
+
         def check_for_api_key
           render "spree/api/v1/errors/must_specify_api_key", :status => 401 and return if api_key.blank?
         end
 
         def authenticate_user
-          unless @current_api_user = Spree.user_class.find_by_spree_api_key(api_key)
-            render "spree/api/v1/errors/invalid_api_key", :status => 401 and return
+          if requires_authentication? || api_key.present?
+            unless @current_api_user = Spree.user_class.find_by_spree_api_key(api_key)
+              render "spree/api/v1/errors/invalid_api_key", :status => 401 and return
+            end
+          else
+            # Effectively, an anonymous user
+            @current_api_user = Spree.user_class.new
           end
         end
 
         def unauthorized
           render "spree/api/v1/errors/unauthorized", :status => 401 and return
         end
 
+        def requires_authentication?
+          Spree::Api::Config[:requires_authentication]
+        end
+
         def not_found
           render "spree/api/v1/errors/not_found", :status => 404 and return
         end

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

@@ -3,7 +3,10 @@ module Api
     module V1
       class CountriesController < Spree::Api::V1::BaseController
         def index
-          @countries = Country.includes(:states).order('name ASC')
+          @countries = Country.
+                      ransack(params[:q]).result.
+                      includes(:states).order('name ASC').
+                      page(params[:page]).per(params[:per_page])
         end
 
         def show

api/app/controllers/spree/api/v1/images_controller.rb

@@ -7,20 +7,23 @@ def show
         end
 
         def create
+          authorize! :create, Image
           @image = Image.create(params[:image])
           render :show, :status => 201
         end
 
         def update
+          authorize! :update, Image
           @image = Image.find(params[:id])
           @image.update_attributes(params[:image])
           render :show, :status => 200
         end
 
         def destroy
+          authorize! :delete, Image
           @image = Image.find(params[:id])
           @image.destroy
-          render :text => nil
+          render :text => nil, :status => 204
         end
 
       end

api/app/controllers/spree/api/v1/line_items_controller.rb

@@ -26,7 +26,7 @@ def destroy
           authorize! :read, order
           @line_item = order.line_items.find(params[:id])
           @line_item.destroy
-          render :text => nil, :status => 200
+          render :text => nil, :status => 204
         end
 
         private

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

@@ -2,31 +2,25 @@ module Spree
   module Api
     module V1
       class OrdersController < Spree::Api::V1::BaseController
-        before_filter :map_nested_attributes, :only => [:create, :update]
         before_filter :authorize_read!, :except => [:index, :search, :create]
 
         def index
           # should probably look at turning this into a CanCan step
           raise CanCan::AccessDenied unless current_api_user.has_spree_role?("admin")
-          @orders = Order.page(params[:page]).per(params[:per_page])
+          @orders = Order.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         end
 
         def show
         end
 
-        def search
-          @orders = Order.ransack(params[:q]).result.page(params[:page])
-          render :index
-        end
-
         def create
-          @order = Order.build_from_api(current_api_user, @nested_params)
-          next!
+          @order = Order.build_from_api(current_api_user, nested_params)
+          next!(:status => 201)
         end
 
         def update
           authorize! :update, Order
-          if order.update_attributes(@nested_params)
+          if order.update_attributes(nested_params)
             order.update!
             render :show
           else
@@ -35,8 +29,8 @@ def update
         end
 
         def address
-          order.build_ship_address(params[:shipping_address])
-          order.build_bill_address(params[:billing_address])
+          order.build_ship_address(params[:shipping_address]) if params[:shipping_address]
+          order.build_bill_address(params[:billing_address]) if params[:billing_address]
           next!
         end
 
@@ -64,17 +58,17 @@ def empty
 
         private
 
-        def map_nested_attributes
-          @nested_params = map_nested_attributes_keys Order, params[:order]
+        def nested_params
+          map_nested_attributes_keys Order, params[:order] || {}
         end
 
         def order
           @order ||= Order.find_by_number!(params[:id])
         end
 
-        def next!
+        def next!(options={})
           if @order.valid? && @order.next
-            render :show, :status => 200
+            render :show, :status => options[:status] || 200
           else
             render :could_not_transition, :status => 422
           end

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

@@ -6,7 +6,7 @@ class PaymentsController < Spree::Api::V1::BaseController
         before_filter :find_payment, :only => [:show, :authorize, :purchase, :capture, :void, :credit]
 
         def index
-          @payments = @order.payments
+          @payments = @order.payments.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         end
 
         def new
@@ -29,6 +29,10 @@ def authorize
           perform_payment_action(:authorize)
         end
 
+        def capture
+          perform_payment_action(:capture)
+        end
+
         def purchase
           perform_payment_action(:purchase)
         end

api/app/controllers/spree/api/v1/product_properties_controller.rb

@@ -0,0 +1,64 @@
+module Spree
+  module Api
+    module V1
+      class ProductPropertiesController < Spree::Api::V1::BaseController
+        before_filter :find_product
+        before_filter :product_property, :only => [:show, :update, :destroy]
+
+        def index
+          @product_properties = @product.product_properties.
+                                ransack(params[:q]).result
+                                .page(params[:page]).per(params[:per_page])
+        end
+
+        def show
+        end
+
+        def new
+        end
+
+        def create
+          authorize! :create, ProductProperty
+          @product_property = @product.product_properties.new(params[:product_property])
+          if @product_property.save
+            render :show, :status => 201
+          else
+            invalid_resource!(@product_property)
+          end
+        end
+
+        def update
+          authorize! :update, ProductProperty
+          if @product_property  && @product_property.update_attributes(params[:product_property])
+            render :show, :status => 200
+          else
+            invalid_resource!(@product_property)
+          end
+        end
+
+        def destroy
+          authorize! :delete, ProductProperty
+          if(@product_property)
+            @product_property.destroy
+            render :text => nil, :status => 204
+          else
+            invalid_resource!(@product_property)
+          end
+
+        end
+
+        private
+          def find_product
+            @product = super(params[:product_id])
+          end
+
+          def product_property
+            if @product
+              @product_property ||= @product.product_properties.find_by_id(params[:id])
+              @product_property ||= @product.product_properties.joins(:property).where('spree_properties.name' => params[:id]).readonly(false).first
+            end
+          end
+      end
+    end
+  end
+end

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

@@ -3,12 +3,7 @@ module Api
     module V1
       class ProductsController < Spree::Api::V1::BaseController
         def index
-          @products = product_scope.page(params[:page])
-        end
-
-        def search
-          @products = product_scope.ransack(params[:q]).result.page(params[:page])
-          render :index
+          @products = product_scope.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         end
 
         def show
@@ -44,7 +39,7 @@ def destroy
           @product = find_product(params[:id])
           @product.update_attribute(:deleted_at, Time.now)
           @product.variants_including_master.update_all(:deleted_at => Time.now)
-          render :text => nil, :status => 200
+          render :text => nil, :status => 204
         end
       end
     end