solidus_frontend 2.2.2 → 2.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f80a15237e018ec72f6f3c37732bf4b48791274f
-  data.tar.gz: '05953613a4aae475826ac05522df13be3a0215e6'
+  metadata.gz: f61c60cecfffed07245862d52b42fd39e3de5738
+  data.tar.gz: e8c835cdbc995bdfd5a57b2659b991f9365e844f
 SHA512:
-  metadata.gz: 78f0d29ec7da1e242f51b99252446fd8ba8fd413ba5b6e3f7a0bfa9fbc4c4b87fb7d0c3d22519bf025313b55ac23509242ce8383aa3d71a81406f03a8142a965
-  data.tar.gz: 3cb69bb1575f3419018b6fff0cb0ce05622e2a10c79891a02d694432835257633ddab5b19fbbb5e5280b61bcc7eba166e419bf5ece5427fe6ea640ad00eee4c7
+  metadata.gz: 77d3a4a03b9097a2746e0694ecacb40e0b74aa44adc8821da3af032013de92de413df78a7ed6e3db33742190f963892c6ba11ec0d9f9cb5ee01e9587c7243906
+  data.tar.gz: 2be95640b389be196abb5dfba472a9e68d85e99235fac7be0e960d94b5c91f8189afcf75b99156c2a2a471d8211deaa9891fbf1aec394f6080bc9951d2c17471

data/app/assets/javascripts/spree/frontend/checkout/coupon-code.js.coffee

@@ -6,18 +6,18 @@ Spree.onCouponCodeApply = (e) ->
   couponStatus = $("#coupon_status")
   successClass = 'success'
   errorClass = 'alert'
-  url = Spree.url(Spree.routes.apply_coupon_code(Spree.current_order_id),
-    {
-      order_token: Spree.current_order_token,
-      coupon_code: couponCode
-    }
-  )
 
   couponStatus.removeClass([successClass,errorClass].join(" "))
 
+  data =
+    order_token: Spree.current_order_token,
+    coupon_code: couponCode
+
   req = Spree.ajax
-    method: "PUT",
-    url: url
+    method: "PUT"
+    url: Spree.routes.apply_coupon_code(Spree.current_order_id)
+    data: JSON.stringify(data)
+    contentType: "application/json"
 
   req.done (data) ->
     window.location.reload()

data/app/assets/stylesheets/spree/frontend/screen.css.scss

@@ -401,8 +401,8 @@ nav#taxonomies {
 }
 
 .errorExplanation {
-  @extend .flash.error;
   @extend .flash;
+  background-color: $c_red;
 
   p {
     font-weight: normal;
@@ -450,13 +450,18 @@ nav#taxonomies {
   }
 }
 
-span.price {
+%price_text {
   font-weight: bold;
   color: $link_text_color;
+}
+
+span.price {
+  @extend %price_text;
 
   &.selling {
     font-size: $product_detail_price_font_size;
   }
+
   &.diff {
     font-weight: bold;
   }
@@ -715,7 +720,7 @@ ul#products {
     tr[data-hook="item_total"] {
       td:last-child {
         strong {
-          @extend span.price;
+          @extend %price_text;;
         }
       }
     }
@@ -725,7 +730,7 @@ ul#products {
     };
 
     #summary-order-total {
-      @extend span.price;
+      @extend %price_text;;
       font-size: $base_font_size + 2;
     }
   }
@@ -772,7 +777,7 @@ ul#products {
 
   td.price, td.total {
     span {
-      @extend span.price;
+      @extend %price_text;;
     }
   }
 
@@ -947,8 +952,8 @@ table#cart-detail {
     tr {
 
       td[data-hook="cart_item_price"], td[data-hook="cart_item_total"] {
-        @extend span.price;
-        @extend span.price.selling;
+        @extend %price_text;
+        font-size: $product_detail_price_font_size;
       }
       td[data-hook="cart_item_quantity"] {
         .line_item_quantity {
@@ -977,7 +982,7 @@ div[data-hook="inside_cart_form"] {
     margin-top: 15px;
 
     span.order-total {
-      @extend span.price;
+      @extend %price_text;
     }
   }
 }

data/app/controllers/spree/checkout_controller.rb

@@ -171,8 +171,9 @@ module Spree
     end
 
     def before_address
-      # if the user has a default address, a callback takes care of setting
-      # that; but if he doesn't, we need to build an empty one here
+      @order.assign_default_user_addresses
+      # If the user has a default address, the previous method call takes care
+      # of setting that; but if he doesn't, we need to build an empty one here
       default = {country_id: Spree::Country.default.id}
       @order.build_bill_address(default) unless @order.bill_address
       @order.build_ship_address(default) if @order.checkout_steps.include?('delivery') && !@order.ship_address

data/app/controllers/spree/orders_controller.rb

@@ -13,7 +13,7 @@ module Spree
     skip_before_action :verify_authenticity_token, only: [:populate]
 
     def show
-      @order = Spree::Order.find_by_number!(params[:id])
+      @order = Spree::Order.find_by!(number: params[:id])
     end
 
     def update
@@ -44,7 +44,7 @@ module Spree
     def populate
       @order   = current_order(create_order_if_necessary: true)
       variant  = Spree::Variant.find(params[:variant_id])
-      quantity = params[:quantity].to_i
+      quantity = params[:quantity].present? ? params[:quantity].to_i : 1
 
       # 2,147,483,647 is crazy. See issue https://github.com/spree/spree/issues/2695.
       if !quantity.between?(1, 2_147_483_647)
@@ -93,7 +93,7 @@ module Spree
 
     def check_authorization
       cookies.permanent.signed[:guest_token] = params[:token] if params[:token]
-      order = Spree::Order.find_by_number(params[:id]) || current_order
+      order = Spree::Order.find_by(number: params[:id]) || current_order
 
       if order
         authorize! :edit, order, cookies.signed[:guest_token]

data/app/controllers/spree/store_controller.rb

@@ -11,7 +11,7 @@ module Spree
 
     def cart_link
       render partial: 'spree/shared/link_to_cart'
-      fresh_when(simple_current_order, template: 'spree/shared/_link_to_cart')
+      fresh_when(current_order, template: 'spree/shared/_link_to_cart')
     end
 
     private

data/app/controllers/spree/taxons_controller.rb

@@ -6,7 +6,7 @@ module Spree
     respond_to :html
 
     def show
-      @taxon = Spree::Taxon.find_by_permalink!(params[:id])
+      @taxon = Spree::Taxon.find_by!(permalink: params[:id])
       return unless @taxon
 
       @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))

data/app/views/spree/checkout/_payment.html.erb

@@ -21,7 +21,7 @@
               <% @wallet_payment_sources.each do |wallet_payment_source| %>
                 <%=
                   render(
-                    partial: "spree/checkout/existing_payment/#{wallet_payment_source.payment_source.payment_method.method_type}",
+                    partial: "spree/checkout/existing_payment/#{wallet_payment_source.payment_source.payment_method.partial_name}",
                     locals: {
                       wallet_payment_source: wallet_payment_source,
                       default: wallet_payment_source == @default_wallet_payment_source,
@@ -50,7 +50,7 @@
       <% @order.available_payment_methods.each do |method| %>
         <li id="payment_method_<%= method.id %>" class="<%= 'last' if method == @order.available_payment_methods.last %>" data-hook>
           <fieldset>
-            <%= render partial: "spree/checkout/payment/#{method.method_type}", locals: { payment_method: method } %>
+            <%= render partial: "spree/checkout/payment/#{method.partial_name}", locals: { payment_method: method } %>
           </fieldset>
         </li>
       <% end %>

data/app/views/spree/products/_cart_form.html.erb

@@ -34,7 +34,7 @@
         <div id="product-price">
           <h6 class="product-section-title"><%= Spree.t(:price) %></h6>
           <div>
-            <span class="price selling" itemprop="price">
+            <span class="price selling" itemprop="price" content="<%= @product.price_for(current_pricing_options).to_d %>">
               <%= display_price(@product) %>
             </span>
             <span itemprop="priceCurrency" content="<%= current_pricing_options.currency %>"></span>

data/app/views/spree/shared/_products.html.erb

@@ -32,7 +32,10 @@
           </div>
           <%= link_to truncate(product.name, length: 50), url, class: 'info', itemprop: "name", title: product.name %>
           <span itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-            <span class="price selling" itemprop="price"><%= display_price(product) %></span>
+            <span class="price selling" itemprop="price" content="<%= product.price_for(current_pricing_options).to_d %>">
+              <%= display_price(product) %>
+            </span>
+            <span itemprop="priceCurrency" content="<%= current_pricing_options.currency %>"></span>
           </span>
         <% end %>
       </li>

data/solidus_frontend.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
 
-  s.add_dependency 'canonical-rails', '~> 0.1.1'
+  s.add_dependency 'canonical-rails', '~> 0.2.0'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'sass-rails'
   s.add_dependency 'coffee-rails'

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -81,9 +81,9 @@ describe Spree::CheckoutController, type: :controller do
         }
       end
 
-      let!(:payment_method) { create(:payment_method) }
       before do
         # Must have *a* shipping method and a payment method so updating from address works
+        allow(order).to receive_messages available_payment_methods: [stub_model(Spree::PaymentMethod)]
         allow(order).to receive_messages ensure_available_shipping_rates: true
         order.line_items << FactoryGirl.create(:line_item)
       end
@@ -143,6 +143,13 @@ describe Spree::CheckoutController, type: :controller do
           order.update_columns(ship_address_id: create(:address).id, state: "address")
         end
 
+        context 'landing to address page' do
+          it "tries to associate user addresses to order" do
+            expect(order).to receive(:assign_default_user_addresses)
+            get :edit
+          end
+        end
+
         context "with a billing and shipping address" do
           subject do
             post :update, params: {
@@ -218,53 +225,6 @@ describe Spree::CheckoutController, type: :controller do
         end
       end
 
-      context "when in the payment state" do
-        let(:order) { create(:order_with_line_items) }
-        let(:payment_method) { create(:credit_card_payment_method) }
-
-        let(:params) do
-          {
-            state: 'payment',
-            order: {
-              payments_attributes: [
-                {
-                  payment_method_id: payment_method.id.to_s,
-                  source_attributes: attributes_for(:credit_card)
-                }
-              ]
-            }
-          }
-        end
-
-        before do
-          order.update_attributes! user: user
-          3.times { order.next! } # should put us in the payment state
-        end
-
-        context 'with a permitted payment method' do
-          it 'sets the payment amount' do
-            post :update, params: params
-            order.reload
-            expect(order.state).to eq('confirm')
-            expect(order.payments.size).to eq(1)
-            expect(order.payments.first.amount).to eq(order.total)
-          end
-        end
-
-        context 'with an unpermitted payment method' do
-          before { payment_method.update!(available_to_users: false) }
-
-          it 'sets the payment amount' do
-            expect {
-              post :update, params: params
-            }.to raise_error(ActiveRecord::RecordNotFound)
-
-            expect(order.state).to eq('payment')
-            expect(order.payments).to be_empty
-          end
-        end
-      end
-
       context "when in the confirm state" do
         before do
           order.update_attributes! user: user
@@ -370,39 +330,18 @@ describe Spree::CheckoutController, type: :controller do
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
       end
-    end
-
-    context "fails to transition to complete from confirm" do
-      let(:order) do
-        FactoryGirl.create(:order_with_line_items).tap(&:next!)
-      end
-
-      before do
-        allow(controller).to receive_messages current_order: order
-        allow(controller).to receive_messages check_authorization: true
-      end
 
       context "when the country is not a shippable country" do
-        before do
-          order.ship_address.tap do |address|
-            # A different country which is not included in the list of shippable countries
-            australia = create(:country, name: "Australia")
-            # update_columns to get around readonly restriction when testing
-            address.update_columns(country_id: australia.id, state_name: 'Victoria')
-          end
+        let(:foreign_address) { create(:address, country_iso_code: "CA") }
 
-          payment_method = FactoryGirl.create(:simple_credit_card_payment_method)
-          payment = FactoryGirl.create(:payment, payment_method: payment_method)
-          order.payments << payment
+        before do
+          order.update(shipping_address: foreign_address)
         end
 
         it "due to no available shipping rates for any of the shipments" do
-          expect(order.shipments.count).to eq(1)
-          order.shipments.first.shipping_rates.delete_all
-          order.update_attributes(state: 'confirm')
-          put :update, params: { state: order.state, order: {} }
+          put :update, params: { state: "address", order: {} }
           expect(flash[:error]).to eq(Spree.t(:items_cannot_be_shipped))
-          expect(response).to redirect_to(spree.checkout_state_path('confirm'))
+          expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
       end
     end
@@ -458,7 +397,7 @@ describe Spree::CheckoutController, type: :controller do
       end
 
       it "should set flash message for no inventory" do
-        expect(flash[:error]).to eq(Spree.t(:inventory_error_flash_for_insufficient_quantity, names: "'#{product.name}'" ))
+        expect(flash[:error]).to eq("Amazing Item became unavailable.")
       end
     end
   end

data/spec/controllers/spree/orders_controller_spec.rb

@@ -19,7 +19,7 @@ describe Spree::OrdersController, type: :controller do
         post :populate
         expect(cookies.signed[:guest_token]).not_to be_blank
 
-        order_by_token = Spree::Order.find_by_guest_token(cookies.signed[:guest_token])
+        order_by_token = Spree::Order.find_by(guest_token: cookies.signed[:guest_token])
         assigned_order = assigns[:order]
 
         expect(assigned_order).to eq order_by_token
@@ -68,6 +68,34 @@ describe Spree::OrdersController, type: :controller do
             Spree.t(:please_enter_reasonable_quantity)
           )
         end
+
+        context "when quantity is empty string" do
+          it "should populate order with 1 of given variant" do
+            expect do
+              post :populate, params: { variant_id: variant.id, quantity: '' }
+            end.to change { Spree::Order.count }.by(1)
+            order = Spree::Order.last
+            expect(response).to redirect_to spree.cart_path
+            expect(order.line_items.size).to eq(1)
+            line_item = order.line_items.first
+            expect(line_item.variant_id).to eq(variant.id)
+            expect(line_item.quantity).to eq(1)
+          end
+        end
+
+        context "when quantity is nil" do
+          it "should populate order with 1 of given variant" do
+            expect do
+              post :populate, params: { variant_id: variant.id, quantity: nil }
+            end.to change { Spree::Order.count }.by(1)
+            order = Spree::Order.last
+            expect(response).to redirect_to spree.cart_path
+            expect(order.line_items.size).to eq(1)
+            line_item = order.line_items.first
+            expect(line_item.variant_id).to eq(variant.id)
+            expect(line_item.quantity).to eq(1)
+          end
+        end
       end
     end
 

data/spec/features/checkout_spec.rb

@@ -75,11 +75,145 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
   end
 
+  context "displays default user addresses on address step" do
+    before do
+      stock_location.stock_items.update_all(count_on_hand: 1)
+    end
+
+    context "when user is logged in" do
+      let!(:user) do
+        create(:user, bill_address: saved_bill_address, ship_address: saved_ship_address)
+      end
+
+      let!(:order) do
+        order = Spree::Order.create!(
+          email: "spree@example.com",
+          store: Spree::Store.first || FactoryGirl.create(:store)
+        )
+
+        order.reload
+        order.user = user
+        order.update!
+        order
+      end
+
+      before do
+        allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)
+        allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: user)
+        allow_any_instance_of(Spree::OrdersController).to receive_messages(try_spree_current_user: user)
+
+        add_mug_to_cart
+        click_button "Checkout"
+        # We need an order reload here to get newly associated addresses.
+        # Then we go back to address where we are supposed to be redirected.
+        order.reload
+        visit spree.checkout_state_path(:address)
+      end
+
+      context "when user has default addresses saved" do
+        let(:saved_bill_address) { create(:address, firstname: 'Bill') }
+        let(:saved_ship_address) { create(:address, firstname: 'Steve') }
+
+        it "shows the saved addresses" do
+          within("#billing") do
+            expect(find_field('First Name').value).to eq 'Bill'
+          end
+
+          within("#shipping") do
+            expect(find_field('First Name').value).to eq 'Steve'
+          end
+        end
+      end
+
+      context "when user does not have default addresses saved" do
+        let(:saved_bill_address) { nil }
+        let(:saved_ship_address) { nil }
+
+        it 'shows an empty address' do
+          within("#billing") do
+            expect(find_field('First Name').value).to be_nil
+          end
+
+          within("#shipping") do
+            expect(find_field('First Name').value).to be_nil
+          end
+        end
+      end
+    end
+
+    context "when user is not logged in" do
+      context "and proceeds with guest checkout" do
+        it 'shows empty addresses' do
+          add_mug_to_cart
+          click_button "Checkout"
+
+          within("#billing") do
+            expect(find_field('First Name').value).to be_nil
+          end
+
+          within("#shipping") do
+            expect(find_field('First Name').value).to be_nil
+          end
+        end
+      end
+
+      context "and proceeds logging in" do
+        let!(:user) do
+          create(:user, bill_address: saved_bill_address, ship_address: saved_ship_address)
+        end
+
+        before do
+          add_mug_to_cart
+          click_button "Checkout"
+
+          # Simulate user login
+          Spree::Order.last.associate_user!(user)
+          allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: user)
+          allow_any_instance_of(Spree::OrdersController).to receive_messages(try_spree_current_user: user)
+
+          # Simulate redirect back to address after login
+          visit spree.checkout_state_path(:address)
+        end
+
+        context "when does not have saved addresses" do
+          let(:saved_bill_address) { nil }
+          let(:saved_ship_address) { nil }
+
+          it 'shows empty addresses' do
+            within("#billing") do
+              expect(find_field('First Name').value).to be_nil
+            end
+
+            within("#shipping") do
+              expect(find_field('First Name').value).to be_nil
+            end
+          end
+        end
+
+        # Regression test for https://github.com/solidusio/solidus/issues/1811
+        context "when does have saved addresses" do
+          let(:saved_bill_address) { create(:address, firstname: 'Bill') }
+          let(:saved_ship_address) { create(:address, firstname: 'Steve') }
+
+          it 'shows empty addresses' do
+            within("#billing") do
+              expect(find_field('First Name').value).to eq 'Bill'
+            end
+
+            within("#shipping") do
+              expect(find_field('First Name').value).to eq 'Steve'
+            end
+          end
+        end
+      end
+    end
+  end
+
   # Regression test for https://github.com/spree/spree/issues/2694 and https://github.com/spree/spree/issues/4117
   context "doesn't allow bad credit card numbers" do
-    let!(:payment_method) { create(:credit_card_payment_method) }
     before(:each) do
       order = OrderWalkthrough.up_to(:delivery)
+      allow(order).to receive_messages(available_payment_methods: [create(:credit_card_payment_method)])
 
       user = create(:user)
       order.user = user
@@ -180,8 +314,7 @@ describe "Checkout", type: :feature, inaccessible: true do
   end
 
   context "user has payment sources", js: true do
-    before { Spree::PaymentMethod.all.each(&:really_destroy!) }
-    let!(:bogus) { create(:credit_card_payment_method) }
+    let(:bogus) { create(:credit_card_payment_method) }
     let(:user) { create(:user) }
 
     let!(:credit_card) do
@@ -191,6 +324,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     before do
       user.wallet.add(credit_card)
       order = OrderWalkthrough.up_to(:delivery)
+      allow(order).to receive_messages(available_payment_methods: [bogus])
 
       allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)
       allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: user)

data/spec/features/products_spec.rb

@@ -36,7 +36,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   describe 'meta tags and title' do
-    let(:jersey) { Spree::Product.find_by_name('Ruby on Rails Baseball Jersey') }
+    let(:jersey) { Spree::Product.find_by(name: 'Ruby on Rails Baseball Jersey') }
     let(:metas) { { meta_description: 'Brand new Ruby on Rails Jersey', meta_title: 'Ruby on Rails Baseball Jersey Buy High Quality Geek Apparel', meta_keywords: 'ror, jersey, ruby' } }
 
     it 'should return the correct title when displaying a single product' do
@@ -78,13 +78,25 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     end
   end
 
+  describe 'schema.org markup' do
+    let(:product) { Spree::Product.available.first }
+
+    it 'has correct schema.org/Offer attributes' do
+      expect(page).to have_css("#product_#{product.id} [itemprop='price'][content='19.99']")
+      expect(page).to have_css("#product_#{product.id} [itemprop='priceCurrency'][content='USD']")
+      click_link product.name
+      expect(page).to have_css("[itemprop='price'][content='19.99']")
+      expect(page).to have_css("[itemprop='priceCurrency'][content='USD']")
+    end
+  end
+
   context "using Russian Rubles as a currency" do
     before do
       Spree::Config[:currency] = "RUB"
     end
 
     let!(:product) do
-      product = Spree::Product.find_by_name("Ruby on Rails Ringer T-Shirt")
+      product = Spree::Product.find_by(name: "Ruby on Rails Ringer T-Shirt")
       product.price = 19.99
       product.tap(&:save)
     end
@@ -135,7 +147,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   context "a product with variants" do
-    let(:product) { Spree::Product.find_by_name("Ruby on Rails Baseball Jersey") }
+    let(:product) { Spree::Product.find_by(name: "Ruby on Rails Baseball Jersey") }
     let(:option_value) { create(:option_value) }
     let!(:variant) { product.variants.create!(price: 5.59) }
 
@@ -168,7 +180,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   context "a product with variants, images only for the variants" do
-    let(:product) { Spree::Product.find_by_name("Ruby on Rails Baseball Jersey") }
+    let(:product) { Spree::Product.find_by(name: "Ruby on Rails Baseball Jersey") }
 
     before do
       image = File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __FILE__))
@@ -258,7 +270,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   it "should return the correct title when displaying a single product" do
-    product = Spree::Product.find_by_name("Ruby on Rails Baseball Jersey")
+    product = Spree::Product.find_by(name: "Ruby on Rails Baseball Jersey")
     click_link product.name
 
     within("div#product-description") do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.3.0.beta1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement