Don't merge - Checking difference between versions

.editorconfig

@@ -0,0 +1,22 @@
+# http://EditorConfig.org
+# https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+tab_width = 2
+
+[**.rb]
+max_line_length = 80
+
+[**.js, **.coffee]
+max_line_length = 120
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -38,15 +38,13 @@ spree_test
 testapp
 **/spec/dummy
 tmp
-vendor/rails
-vendor/extensions/google_base
 public/google_base.xml
 public/template_google_base.xml
 coverage/*
 var
 TAGS
 nbproject
-vendor/extensions/theme_default/app/stylesheets/*.css
+./vendor
 tags
 *.swp
 rerun.txt
@@ -55,3 +53,4 @@ test_app
 **/coverage
 */.sass-cache
 .localeapp
+guides

.travis.yml

@@ -19,6 +19,4 @@ script:
   - bundle exec rake test_app
   - bundle exec rake spec
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.1.5

CONTRIBUTING.md

@@ -8,8 +8,7 @@ When filing an issue on the Spree project, please provide these details:
 
 * A comprehensive list of steps to reproduce the issue.
 * What you're *expecting* to happen compared with what's *actually* happening.
-* The version of Spree *and* the version of Rails.
-* Your application's complete Gemfile, as text (*not as an image*)
+* Your application's complete `Gemfile.lock`, and `Gemfile.lock` as text in a [Gist](https://gist.github.com) (*not as an image*)
 * Any relevant stack traces ("Full trace" preferred)
 
 In 99% of cases, this information is enough to determine the cause and solution

README.md

@@ -1,7 +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
 -------
 
@@ -30,6 +26,8 @@ and perhaps combine it with your own custom backend admin instead of using
 spree_api.
 
 [![Code Climate](https://codeclimate.com/github/spree/spree.png)](https://codeclimate.com/github/spree/spree)
+[![Issue Stats](http://issuestats.com/github/spree/spree/badge/pr)](http://issuestats.com/github/spree/spree)
+[![Issue Stats](http://issuestats.com/github/spree/spree/badge/issue)](http://issuestats.com/github/spree/spree)
 
 Installation
 ------------
@@ -42,9 +40,9 @@ 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.
 
 ```shell
-gem install rails -v 4.0.2
+gem install rails -v 4.1.9
 gem install spree
-rails _4.0.2_ new my_store
+rails _4.1.9_ new my_store
 spree install my_store
 ```
 
@@ -69,11 +67,11 @@ Using stable builds and bleeding edge
 -------------
 
 To use a stable build of Spree, you can manually add Spree to your
-Rails 4.0.x application. To use the 2-1-stable branch of Spree, add this line to
+Rails 4.1.x application. To use the 2-3-stable branch of Spree, add this line to
 your Gemfile.
 
 ```ruby
-gem 'spree', github: 'spree/spree', branch: '2-1-stable'
+gem 'spree', github: 'spree/spree', branch: '2-3-stable'
 ```
 
 Alternatively, if you want to use the bleeding edge version of Spree, use this
@@ -91,7 +89,7 @@ If you wish to have authentication included also, you will need to add the
 `spree_auth_devise` gem as well. Either this:
 
 ```ruby
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-3-stable'
 ```
 
 Or this:
@@ -151,8 +149,6 @@ Browse Admin Interface
 
 http://localhost:nnnn/admin
 
-
-
 Working with the edge source (latest and greatest features)
 -----------------------------------------------------------
 
@@ -292,20 +288,33 @@ If you want to run the simplecov code coverage report
 COVERAGE=true bundle exec rspec spec
 ```
 
-If you're working on multiple facets of Spree, you may want
-to run this command at the root of the Spree project to
-generate test applications and run specs for all the facets:
+If you're working on multiple facets of Spree to test,
+please ensure that you have a postgres user:
+
+```shell
+createuser -s -r postgres
+```
+
+And also ensure that you have [PhantomJS](http://phantomjs.org/) installed as well:
+
+```shell
+brew update && brew install phantomjs
+```
+
+To execute all the tests, you may want to run this command at the
+root of the Spree project to generate test applications and run
+specs for all the facets:
 ```shell
 bash build.sh
 ```
 
 Further Documentation
 ------------
-Spree has a number of really useful guides online at [http://guides.spreecommerce.com](http://guides.spreecommerce.com). 
+Spree has a number of really useful guides online at [http://guides.spreecommerce.com](http://guides.spreecommerce.com).
 
 Contributing
 ------------
 
 Spree is an open source project and we encourage contributions. Please see the
-[contributors guidelines](http://spreecommerce.com/documentation/contributing_to_spree.html)
+[contributors guidelines](http://guides.spreecommerce.com/developer/contributing.html)
 before contributing.

Rakefile

@@ -13,6 +13,18 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+task :default => :test
+
+desc "Runs all tests in all Spree engines"
+task :test do
+  Rake::Task['test_app'].invoke
+  %w(api backend core frontend).each do |gem_name|
+    Dir.chdir("#{File.dirname(__FILE__)}/#{gem_name}") do
+      system("rspec --fail-fast") or exit!(1)
+    end
+  end
+end
+
 desc "Generates a dummy app for testing for every Spree engine"
 task :test_app do
   require File.expand_path('../core/lib/generators/spree/install/install_generator', __FILE__)

SPREE_VERSION

@@ -1 +1 @@
-2.2.0.beta
+2.3.11.beta

api/CHANGELOG.md

@@ -1,41 +1,43 @@
-## Spree 2.2.0 (unreleased) ##
+## Spree 2.3.2 (unreleased) ##
 
-*   ApiHelpers attributes can now be extended without overriding instance
-    methods. By using the same approach in PermittedAttributes. e.g.
+*   Support existing credit card feature on checkout.
 
-        Spree::Api::ApiHelpers.order_attributes.push :locked_at
-
-    Washington Luiz
-
-*   Admin users can set the order channel when importing orders. By sing the
-    channel attribute on Order model
-
-    Washington Luiz
+    Checkouts_controller#update now uses the same Order::Checkout#update_from_params
+    from spree frontend which help us to remove a lot of duplicated logic. As a
+    result of that `payment_source` params must be sent now outsite the `order` key.
 
-*   Cached products/show template, which can lead to drastically (65x) faster loading times on product requests. 806319709c4ce9a3d0026e00ec2d07372f51cdb8
+    Before you'd send a request like this:
 
-    Ryan Bigg
+        ```ruby
+        api_put :update, :id => order.to_param, :order_token => order.guest_token,
+          :order => {
+            :payments_attributes => [{ :payment_method_id => @payment_method.id.to_s }],
+            :payment_source => { @payment_method.id.to_s => { name: "Spree" } }
+          }
+        ```
 
-*   The parts that make up an order's response from /api/orders/:num are cached, which can lead to a 5x improvement of speed for this API endpoint. 80ffb1e739606ac02ac86336ac13a51583bcc225
+    Now it should look like this:
 
-    Ryan Bigg
+        ```ruby
+        api_put :update, :id => order.to_param, :order_token => order.guest_token,
+          :order => {
+            :payments_attributes => [{ :payment_method_id => @payment_method.id.to_s }]
+          },
+          :payment_source => {
+            @payment_method.id.to_s => { name: "Spree" }
+          }
+        ```
 
-* Cached variant objects which can lead to slightly faster loading times (4x) for each variant.
+    Josh Hepworth and Washington
 
-    Ryan Bigg
+*   api/orders/show now display credit cards as source under payment
 
-* Added a route to allow for /api/variants/:id requests
-
-    Ryan Bigg
-
-* Products response now contains a master variant separately from all the other variants. Previously all variants were grouped together.
-
-    Ryan Bigg
+    Washington Luiz
 
-* Added API endpoint to retrieve a user's orders: /api/orders/mine. #4022
+*   refactor the api to use a general importer in core gem.
 
-    Richard Nuno
+    Peter Berkenbosch
 
-* Order token can now be passed as a header: `X-Spree-Order-Token`. #4148
+* Shipment manifests viewed within the context of an order no longer return variant info. The line items for the order already contains this information. #4498
 
-    Lucjan Suski
+    * Ryan Bigg

api/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2013, Spree Commerce, Inc. and other contributors
+Copyright (c) 2007-2014, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

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

@@ -26,7 +26,7 @@ def address_params
         end
 
         def find_order
-          @order = Spree::Order.find_by!(number: params[:order_id])
+          @order = Spree::Order.find_by!(number: order_id)
         end
 
         def find_address
@@ -38,10 +38,6 @@ def find_address
             raise CanCan::AccessDenied
           end
         end
-
-        def order_token
-          request.headers["X-Spree-Order-Token"] || params[:order_token]
-        end
     end
   end
 end