spree_account_recurring 1.0.7 → 1.1.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 [name of plugin creator]
+Copyright (c) 2014 Vinsol
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -1,4 +1,4 @@
-Spree Account Recurring [![Code Climate](https://codeclimate.com/github/vinsol/spree-account-recurring.png)](https://codeclimate.com/github/vinsol/spree-account-recurring) [![Build Status](https://travis-ci.org/vinsol/spree-account-recurring.svg?branch=2-1-stable)](https://travis-ci.org/vinsol/spree-account-recurring)
+Spree Account Recurring [![Code Climate](https://codeclimate.com/github/vinsol/spree-account-recurring.png)](https://codeclimate.com/github/vinsol/spree-account-recurring) [![Build Status](https://travis-ci.org/vinsol/spree-account-recurring.svg?branch=2-2-stable)](https://travis-ci.org/vinsol/spree-account-recurring)
 =========================
 
 Spree extension to manage recurring payments/subscriptions using [Stripe Payment Gateway](https://stripe.com/).
@@ -10,11 +10,18 @@ Installation
 
 Install `spree_account_recurring` by adding the following to your `Gemfile`:
 
+```ruby
+gem 'spree_account_recurring'
+```
+
+For older version of Spree
+
 ```ruby
 # Spree 2.1.x
-gem 'spree_account_recurring', '~> 1.0'
+gem 'spree_account_recurring', '1.0.1'
 ```
 
+
 Bundle your dependencies and run the installation generator:
 
 ```shell
@@ -106,4 +113,4 @@ Credits
 
 [![vinsol.com: Ruby on Rails, iOS and Android developers](http://vinsol.com/vin_logo.png "Ruby on Rails, iOS and Android developers")](http://vinsol.com)
 
-Copyright (c) 2014 [vinsol.com](http://vinsol.com "Ruby on Rails, iOS and Android developers"), released under the New MIT License
+Copyright (c) 2014 [vinsol.com](http://vinsol.com "Ruby on Rails, iOS and Android developers"), released under the New MIT License

data/app/assets/javascripts/spree/backend/spree_account_recurring.js

@@ -0,0 +1 @@
+//= require spree/backend

data/app/assets/javascripts/spree/frontend/spree_account_recurring.js

@@ -0,0 +1 @@
+//= require spree/frontend

data/app/assets/javascripts/{store → spree/frontend}/stripe.js

@@ -20,6 +20,10 @@ $(document).ready(function(){
   // For errors that happen later.
   Spree.stripePaymentMethod.prepend("<div id='stripeError' class='errorExplanation' style='display:none'></div>")
 
+  $(".cardNumber").payment('formatCardNumber');
+  $(".cardExpiry").payment('formatCardExpiry');
+  $(".cardCode").payment('formatCardCVC');
+
   $('.continue').on('click', function(){
     $('#stripeError').hide();
     if(Spree.stripePaymentMethod.is(':visible')){

data/app/assets/stylesheets/spree/backend/spree_account_recurring.css

@@ -0,0 +1,3 @@
+/*
+ *= require spree/backend
+*/

data/app/assets/stylesheets/spree/frontend/spree_account_recurring.css

@@ -0,0 +1,3 @@
+/*
+ *= require spree/frontend
+*/

data/app/models/concerns/before_each.rb

@@ -0,0 +1,21 @@
+module BeforeEach
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def method_added(method)
+      method = method.to_s.gsub(/_with(out)?_before$/, '')
+      with_method, without_method = "#{method}_with_before", "#{method}_without_before"
+
+      return if method == 'before_each' or method_defined?(with_method)
+
+      define_method(with_method) do |*args, &block|
+        before_each
+        send(without_method, *args, &block)
+      end
+      alias_method_chain(method, :before)
+    end
+  end
+
+  def before_each
+  end
+end

data/app/models/concerns/spree/recurring/stripe_recurring/api_handler.rb

@@ -5,6 +5,7 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
+          include BeforeEach
           include PlanApiHandler
           include SubscriptionApiHandler
           include SubscriptionEventApiHandler

data/app/models/spree/recurring.rb

@@ -10,8 +10,6 @@ module Spree
     has_many :plans
     attr_readonly :type
     validates :type, :name, presence: true
-    validates :type, uniqueness: { message: 'of provider recurring already exists' }
-
     scope :active, -> { undeleted.where(active: true) }
 
     def self.display_name
@@ -25,9 +23,5 @@ module Spree
     def default_plan
       plans.default
     end
-
-    def has_preferred_keys?
-      preferred_secret_key.present? && preferred_public_key.present?
-    end
   end
 end

data/app/models/spree/recurring/stripe_recurring.rb

@@ -8,7 +8,9 @@ module Spree
       INTERVAL = { week: 'Weekly', month: 'Monthly', year: 'Annually' }
       CURRENCY = { usd: 'USD', gbp: 'GBP', jpy: 'JPY', eur: 'EUR', aud: 'AUD', hkd: 'HKD', sek: 'SEK', nok: 'NOK', dkk: 'DKK', pen: 'PEN', cad: 'CAD'}
 
-      after_initialize :set_api_key
+      def before_each
+        set_api_key
+      end
     end
   end
 end

data/app/models/spree/user_decorator.rb

@@ -1,13 +1,9 @@
 Spree::User.class_eval do
   has_many :subscriptions
 
-  def find_or_create_stripe_customer(token=nil)
+  def find_or_create_stripe_customer(token)
     return api_customer if stripe_customer_id?
-    customer = if token
-      Stripe::Customer.create(description: email, email: email, card: token)
-    else
-      Stripe::Customer.create(description: email, email: email)
-    end
+    customer = Stripe::Customer.create(description: email, email: email, card: token)
     update_column(:stripe_customer_id, customer.id)
     customer
   end

data/app/views/spree/admin/recurrings/_form.html.erb

@@ -5,7 +5,7 @@
     <div class="alpha four columns">
       <div id="preference-settings" data-hook class="field">
         <%= label_tag nil, Spree.t(:provider) %>
-        <%= select(:recurring, :type, Rails.application.config.spree.recurring_providers.collect {|pro| [pro.display_name, pro]}, {}, {disabled: !@recurring.new_record?, class: 'select2 fullwidth'}) %>
+        <%= select(:recurring, :type, Spree::Recurring.subclasses.collect {|pro| [pro.display_name, pro]}, {}, {disabled: !@recurring.new_record?, class: 'select2 fullwidth'}) %>
 
         <% unless @recurring.new_record? %>
           <%= preference_fields(@recurring, f) %>

data/app/views/spree/admin/recurrings/edit.html.erb

@@ -16,9 +16,7 @@
   <fieldset class="no-border-top">
     <%= render :partial => 'form', :locals => { :f => f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <% if @recurring.has_preferred_keys? %>
-        <%= button_link_to Spree.t(:manage_plans), admin_recurring_plans_url(@recurring) %>
-      <% end %>
+      <%= button_link_to Spree.t(:manage_plans), admin_recurring_plans_url(@recurring) %>
       <%= button Spree.t('actions.update'), 'icon-refresh' %>
     </div>
   </fieldset>

data/app/views/spree/subscriptions/new.html.erb

@@ -33,4 +33,4 @@
 <script type="text/javascript" src="https://js.stripe.com/v2/"></script>
 <script type="text/javascript">Stripe.setPublishableKey("<%= @plan.provider.preferred_public_key %>");</script>
 <script>Spree.stripePaymentMethod = $('#plan_' + <%= @plan.id %> + '_subscribe')</script>
-<%= javascript_include_tag "store/stripe" %>
+<%= javascript_include_tag "spree/frontend/stripe" %>

data/config/routes.rb

@@ -4,8 +4,12 @@ Spree::Core::Engine.routes.draw do
       resources :plans, except: :show
     end
 
-    resources :subscriptions, only: :index
-    resources :subscription_events, only: :index
+    resources :reports, only: :index do
+      collection do
+        resources :subscriptions, only: :index
+        resources :subscription_events, only: :index
+      end
+    end
   end
 
   resources :recurring_hooks, only: :none do

data/db/migrate/20140404114919_change_datatype_for_amount_in_spree_plans.rb

@@ -6,4 +6,4 @@ class ChangeDatatypeForAmountInSpreePlans < ActiveRecord::Migration
   def down
     change_column :spree_plans, :amount, :integer
   end
-end
+end

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

@@ -5,13 +5,13 @@ module SpreeAccountRecurring
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_account_recurring\n"
-        append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_account_recurring\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_account_recurring\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_account_recurring\n"
       end
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_account_recurring\n", :before => /\*\//, :verbose => true
-        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_account_recurring\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_account_recurring\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_account_recurring\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

data/lib/spree_account_recurring/engine.rb

@@ -1,18 +1,11 @@
 module SpreeAccountRecurring
   class Engine < Rails::Engine
     require 'spree/core'
-    require 'spree/core/environment_extension.rb'
-    require 'spree/core/environment.rb'
-    
     isolate_namespace Spree
     engine_name 'spree_account_recurring'
 
     config.autoload_paths += %W(#{config.root}/lib)
 
-    Spree::Core::Environment.class_eval do
-      attr_accessor :recurring_providers
-    end
-
     # use rspec for tests
     config.generators do |g|
       g.test_framework :rspec
@@ -25,9 +18,5 @@ module SpreeAccountRecurring
     end
 
     config.to_prepare &method(:activate).to_proc
-
-    initializer "spree.register.recurring_providers" do |app|
-      app.config.spree.recurring_providers = [Spree::Recurring::StripeRecurring]
-    end
   end
 end

metadata

@@ -1,94 +1,98 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: spree_account_recurring
-version: !ruby/object:Gem::Version
-  version: 1.0.7
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Priyank Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-04-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: spree_core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: stripe
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.10.1
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: stripe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 1
+        - 10
+        - 1
         version: 1.10.1
-- !ruby/object:Gem::Dependency
-  name: stripe_tester
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: stripe_tester
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
-description: Spree extension to manage recurring payments/subscriptions using Stripe
-  Payment Gateway.
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
+  type: :development
+  version_requirements: *id004
+description: Spree extension to manage recurring payments/subscriptions using Stripe Payment Gateway.
 email: info@vinsol.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - LICENSE
 - README.md
-- app/assets/javascripts/admin/spree_account_recurring.js
-- app/assets/javascripts/store/spree_account_recurring.js
-- app/assets/javascripts/store/stripe.js
-- app/assets/stylesheets/admin/spree_account_recurring.css
-- app/assets/stylesheets/store/spree_account_recurring.css
+- app/assets/javascripts/spree/backend/spree_account_recurring.js
+- app/assets/javascripts/spree/frontend/spree_account_recurring.js
+- app/assets/javascripts/spree/frontend/stripe.js
+- app/assets/stylesheets/spree/backend/spree_account_recurring.css
+- app/assets/stylesheets/spree/frontend/spree_account_recurring.css
 - app/controllers/concerns/spree/admin/ransack_date_search.rb
 - app/controllers/spree/admin/plans_controller.rb
 - app/controllers/spree/admin/recurrings_controller.rb
@@ -97,6 +101,7 @@ files:
 - app/controllers/spree/plans_controller.rb
 - app/controllers/spree/recurring_hooks_controller.rb
 - app/controllers/spree/subscriptions_controller.rb
+- app/models/concerns/before_each.rb
 - app/models/concerns/restrictive_destroyer.rb
 - app/models/concerns/spree/plan/api_handler.rb
 - app/models/concerns/spree/recurring/stripe_recurring/api_handler/plan_api_handler.rb
@@ -147,28 +152,38 @@ files:
 - db/migrate/20140404114919_change_datatype_for_amount_in_spree_plans.rb
 homepage: http://vinsol.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 53
+      segments: 
+      - 1
+      - 9
+      - 3
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Spree extension to manage recurring payments/subscriptions using Stripe Payment
-  Gateway.
+summary: Spree extension to manage recurring payments/subscriptions using Stripe Payment Gateway.
 test_files: []
+

data/app/assets/javascripts/admin/spree_account_recurring.js

@@ -1 +0,0 @@
-//= require admin/spree_backend

data/app/assets/javascripts/store/spree_account_recurring.js

@@ -1 +0,0 @@
-//= require store/spree_frontend

data/app/assets/stylesheets/admin/spree_account_recurring.css

@@ -1,3 +0,0 @@
-/*
- *= require admin/spree_backend
-*/

data/app/assets/stylesheets/store/spree_account_recurring.css

@@ -1,3 +0,0 @@
-/*
- *= require store/spree_frontend
-*/