spree_waiting_list 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15dae9099c865761e580d173e4d8b9bb90f11c06
-  data.tar.gz: 7f0ea04d18d3b35b04905a6c8a61b26e8fcaff8d
+  metadata.gz: 0bcdbd84392afec13a97c161b05d47be675a7b2f
+  data.tar.gz: 9831bea09887d8aef48fa3060275e0f861590a68
 SHA512:
-  metadata.gz: 62a050860113e0990cfed8ae802c73a0a5cd546eff0e602d5c26154f67b775e097250c70b56b2a2810a0bd7cdaf63b9d0aa50705da223d3b9d213ab2c49a8e95
-  data.tar.gz: e865eeb42643a5f748575226f9bb29cc48396c3d94735efc6427a59cd21d1c1fa2a773e265401a13214c719cec3aeef594c20d819429675799c33a8dce56e281
+  metadata.gz: 43b5cce15046ee7cebc9813303e2acf390375017ba3e2b642d0a06f7585f02f636f98290a74780e7bfa2606846ea710e184d520fc7c96dc98604879ab2cb6f8b
+  data.tar.gz: 889d873ba751c12893b601f0cadf992d4ec7e47b9c072585ed5cac325d16efd060e1787882d2eabb7d7914005c8a829761915f3a0a8f1aa7c3c68d79637d563b

data/LICENSE

@@ -1,23 +1,23 @@
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-    * Neither the name of the Rails Dog LLC nor the names of its 
-      contributors may be used to endorse or promote products derived from this 
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+    * Neither the name of the Rails Dog LLC nor the names of its 
+      contributors may be used to endorse or promote products derived from this 
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,6 +1,6 @@
 Spree Waiting List
 ================
-[![Code Climate](https://codeclimate.com/github/DynamoMTL/spree_waiting_list/badges/gpa.svg)](https://codeclimate.com/github/DynamoMTL/spree_waiting_list) [![Build Status](https://travis-ci.org/DynamoMTL/spree_waiting_list.svg?branch=master)](https://travis-ci.org/DynamoMTL/spree_waiting_list) [![Gem Version](https://badge.fury.io/rb/spree_waiting_list.svg)](http://badge.fury.io/rb/spree_waiting_list)
+[![Build Status](https://travis-ci.org/DynamoMTL/spree_waiting_list.svg?branch=master)](https://travis-ci.org/DynamoMTL/spree_waiting_list) [![Code Climate](https://codeclimate.com/github/DynamoMTL/spree_waiting_list/badges/gpa.svg)](https://codeclimate.com/github/DynamoMTL/spree_waiting_list) [![Test Coverage](https://codeclimate.com/github/DynamoMTL/spree_waiting_list/badges/coverage.svg)](https://codeclimate.com/github/DynamoMTL/spree_waiting_list) [![Gem Version](https://badge.fury.io/rb/spree_waiting_list.svg)](http://badge.fury.io/rb/spree_waiting_list)
 
 A waiting list extension for Spree.
 
@@ -26,10 +26,11 @@ bundle exec rails g spree_waiting_list:install
 Testing
 -------
 
-First bundle your dependencies, then run `rake`. `rake` will default to building the dummy app if it does not exist, then it will run specs. The dummy app can be regenerated by using `rake test_app`.
+First bundle your dependencies, then run `rake`. `rake` will default to building the dummy app if it does not exist, then it will run specs. The dummy app should be regenerated by using `rake test_app`.
 
 ```shell
 bundle
+bundle exec rake test_app
 bundle exec rspec spec
 ```
 

data/app/controllers/spree/stock_requests_controller.rb

@@ -12,10 +12,11 @@ module Spree
 
       respond_to do |format|
         if @stock_request.save
-          format.html { redirect_to root_path, :notice => Spree.t(:successful_stock_request) }
+          format.html { redirect_to root_path, notice: Spree.t(:successful_stock_request) }
           format.js
+          format.json { render json: { status: 201, message: Spree.t(:successful_stock_request) } }
         else
-          format.html { render :action => 'new'}
+          format.html { render action: 'new'}
           format.json { render json: @stock_request.errors, status: :unprocessable_entity }
         end
       end

data/app/mailers/spree/user_mailer_decorator.rb

@@ -1,11 +1,11 @@
-Spree::UserMailer.class_eval do
-  def back_in_stock(stock_request)
-    @request = stock_request
-    @product = stock_request.product
-    @variant = stock_request.variant
-
-    mail(:subject => Spree.t(:back_in_stock_subject, :product_name => @product.name),
-         :from    => from_address,
-         :to      => stock_request.email)
-  end
+Spree::UserMailer.class_eval do
+  def back_in_stock(stock_request)
+    @request = stock_request
+    @product = stock_request.product
+    @variant = stock_request.variant
+
+    mail(:subject => Spree.t(:back_in_stock_subject, :product_name => @product.name),
+         :from    => from_address,
+         :to      => stock_request.email)
+  end
 end

data/app/models/spree/variant_decorator.rb

@@ -1,12 +1,13 @@
 module Spree
-
   Variant.class_eval do
     has_many :stock_requests
 
+    def waiting_list
+      stock_requests.notified(false)
+    end
+
     def notify_waiting_list
-      stock_requests.notified(false).each &:notify!
-      product.notify_waiting_list
+      waiting_list.each &:notify!
     end
   end
-
 end

data/app/views/spree/admin/reports/stock_requests.html.haml

@@ -1,27 +1,27 @@
-- content_for :page_title do
-  = Spree.t(:stock_requests)
-- content_for :page_actions do
-  %li= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, :class => 'button'
-- content_for :table_filter_title do
-  = Spree.t(:date_range)
-- content_for :table_filter do
-  = render :partial => 'spree/admin/shared/stock_report_criteria', :locals => {}
-%table.admin-report{"data-hook" => "stock_requests"}
-  %thead
-    %tr
-      %th= sort_link @search, :email
-      %th= Spree.t(:product)
-      %th= Spree.t(:variant)
-      %th= sort_link @search, :status
-      %th= sort_link @search, :created_at, Spree.t(:requested)
-  %tbody
-    - @stock_requests.each do |stock_request|
-      - next if stock_request.product.nil?
-      %tr{:class => "cycle('even', 'odd')"}
-        %td= stock_request.email
-        %td= link_to stock_request.product.name, edit_admin_product_path(stock_request.product)
-        %td= stock_request.variant.options_text if stock_request.variant
-        %td= stock_request.status.titleize
-        %td
-          = time_ago_in_words(stock_request.created_at)
+- content_for :page_title do
+  = Spree.t(:stock_requests)
+- content_for :page_actions do
+  %li= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, :class => 'button'
+- content_for :table_filter_title do
+  = Spree.t(:date_range)
+- content_for :table_filter do
+  = render :partial => 'spree/admin/shared/stock_report_criteria', :locals => {}
+%table.admin-report{"data-hook" => "stock_requests"}
+  %thead
+    %tr
+      %th= sort_link @search, :email
+      %th= Spree.t(:product)
+      %th= Spree.t(:variant)
+      %th= sort_link @search, :status
+      %th= sort_link @search, :created_at, Spree.t(:requested)
+  %tbody
+    - @stock_requests.each do |stock_request|
+      - next if stock_request.product.nil?
+      %tr{:class => "cycle('even', 'odd')"}
+        %td= stock_request.email
+        %td= link_to stock_request.product.name, edit_admin_product_path(stock_request.product)
+        %td= stock_request.variant.options_text if stock_request.variant
+        %td= stock_request.status.titleize
+        %td
+          = time_ago_in_words(stock_request.created_at)
           = Spree.t(:ago)

data/app/views/spree/admin/shared/_stock_report_criteria.html.haml

@@ -1,10 +1,10 @@
-= search_form_for @search, :url => spree.stock_requests_admin_reports_path  do |s|
-  .date-range-filter.field.align-center
-    = label_tag nil, Spree.t(:start), :class => 'inline'
-    = s.text_field :created_at_gt, :class => 'datepicker datepicker-from'
-    %span.range-divider
-      %i.icon-arrow-right
-    = s.text_field :created_at_lt, :class => 'datepicker datepicker-to'
-    = label_tag nil, Spree.t(:end), :class => 'inline'
-  .actions.filter-actions
+= search_form_for @search, :url => spree.stock_requests_admin_reports_path  do |s|
+  .date-range-filter.field.align-center
+    = label_tag nil, Spree.t(:start), :class => 'inline'
+    = s.text_field :created_at_gt, :class => 'datepicker datepicker-from'
+    %span.range-divider
+      %i.icon-arrow-right
+    = s.text_field :created_at_lt, :class => 'datepicker datepicker-to'
+    = label_tag nil, Spree.t(:end), :class => 'inline'
+  .actions.filter-actions
     = button Spree.t(:search), 'icon-search'

data/app/views/spree/stock_requests/create.js.erb

@@ -1 +1 @@
-alert('You have been added to the waiting list!');
+alert('You have been added to the waiting list!');

data/app/views/spree/user_mailer/back_in_stock.text.erb

@@ -1 +1 @@
-<%= link_to @product.name, @product %> is back in stock
+<%= link_to @product.name, @product %> is back in stock

data/lib/generators/spree_waiting_list/install/install_generator.rb

@@ -1,31 +1,31 @@
-module SpreeWaitingList
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-
-      class_option :auto_run_migrations, :type => :boolean, :default => false
-
-      def add_javascripts
-        # append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_waiting_list\n"
-        # append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_waiting_list\n"
-      end
-
-      def add_stylesheets
-        # inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_waiting_list\n", :before => /\*\//, :verbose => true
-        # inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_waiting_list\n", :before => /\*\//, :verbose => true
-      end
-
-      def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=spree_waiting_list'
-      end
-
-      def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
-        if run_migrations
-          run 'bundle exec rake db:migrate'
-        else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!'
-        end
-      end
-    end
-  end
-end
+module SpreeWaitingList
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      class_option :auto_run_migrations, :type => :boolean, :default => false
+
+      def add_javascripts
+        # append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_waiting_list\n"
+        # append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_waiting_list\n"
+      end
+
+      def add_stylesheets
+        # inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_waiting_list\n", :before => /\*\//, :verbose => true
+        # inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_waiting_list\n", :before => /\*\//, :verbose => true
+      end
+
+      def add_migrations
+        run 'bundle exec rake railties:install:migrations FROM=spree_waiting_list'
+      end
+
+      def run_migrations
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask 'Would you like to run the migrations now? [Y/n]')
+        if run_migrations
+          run 'bundle exec rake db:migrate'
+        else
+          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+        end
+      end
+    end
+  end
+end

data/lib/spree_waiting_list/engine.rb

@@ -1,21 +1,21 @@
-module SpreeWaitingList
-  class Engine < Rails::Engine
-    require 'spree/core'
-    isolate_namespace Spree
-    engine_name 'spree_waiting_list'
-
-    # use rspec for tests
-    config.generators do |g|
-      g.test_framework :rspec
-    end
-
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
-      end
-    end
-
-    config.to_prepare &method(:activate).to_proc
-
-  end
-end
+module SpreeWaitingList
+  class Engine < Rails::Engine
+    require 'spree/core'
+    isolate_namespace Spree
+    engine_name 'spree_waiting_list'
+
+    # use rspec for tests
+    config.generators do |g|
+      g.test_framework :rspec
+    end
+
+    def self.activate
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+    end
+
+    config.to_prepare &method(:activate).to_proc
+
+  end
+end

data/lib/spree_waiting_list/factories.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
   factory :stock_request, class: Spree::StockRequest do
-    variant
+    variant { |s| s.association(:base_variant) }
     email 'test@home.org'
   end
 

data/lib/spree_waiting_list.rb

@@ -1,3 +1,3 @@
-require 'spree_core'
-require 'spree_waiting_list/engine'
+require 'spree_core'
+require 'spree_waiting_list/engine'
 require 'haml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_waiting_list
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Joshua Nussbaum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Add a waiting list to your spree store