supercharged 2.0.4 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5e8d7ac5853344d5679abd3e17acf7dc1b6279b6
+  data.tar.gz: 6960d5ece3a7b407c7b13ca86dd57715452b7bea
+SHA512:
+  metadata.gz: 602af557001d93eb89e6e76412b6e1a1beea04be1a75f98850710471a3ec073e15805fbbf1587bfedde64532b1d87d0877fa1fb23a19c6fb11456b6eef571c80
+  data.tar.gz: ac0b75823e466d61dd7c05c399b6e3cb008f739491a2059443a0f6dd9f7265140fdcf315f686c9a4d1fe85d4a4e002a33ddbbe40152c752a3e7e8e2fd8ca060d

data/README.md

@@ -36,6 +36,7 @@ Create config/initializers/supercharged.rb
 
 ```ruby
 ActiveMerchant::Billing::Base.integration_mode = Rails.env.production? ? :production : :test
+ActiveMerchant::Billing::Base.mode = Rails.env.production? ? :production : :test
 ```
 
 Add
@@ -81,7 +82,8 @@ supercharged controllers: {charges: :charges, gateway_notifications: :gateway_no
 Create model in app/models/charge.rb and inherit from Supercharged::Charge::Base
 
 ```ruby
-class Charge < Supercharged::Charge::Base
+class Charge < ActiveRecord::Base
+  include Supercharged::Charge::Base
   # your custom code here
 
   def approve(real_amount)

data/app/assets/javascripts/charge_form.js.coffee.erb

@@ -5,7 +5,7 @@ class @SuperchargedForm
 
     @amount_input = @form.find("[role='charge-amount']")
     @gateway_name_input = @form.find("[role='charge-gateway-name']")
-    @id_input = if @form.find("[role='charge-id']").length then @form.find("[role='charge-id']") else @form.find("[value='<%= Supercharged::ChargesHelper::FAKE_ORDER_ID %>']")
+    @id_input = @form.find("[role='payment-form-order']")
 
     @form.submit =>
       valid = @startPayment()
@@ -39,7 +39,7 @@ class @SuperchargedForm
       async: false,
       data: {charge: charge_attributes},
       success: (response) ->
-        options.success(response)
+        options.success(response.charge)
       error: (jqXHR, status, errorThrown)=>
         return unless jqXHR.status == 422
 

data/app/controllers/supercharged/charges_controller.rb

@@ -8,7 +8,7 @@ class Supercharged::ChargesController < ApplicationController
     charge.user = current_user
 
     if charge.save
-      render json: charge.as_json(only: [:id])
+      render json: { charge: charge.as_json(only: [:id]) }
     else
       render json: { errors: charge.errors }, status: :unprocessable_entity
     end

data/app/controllers/supercharged/gateway_notifications_controller.rb

@@ -9,10 +9,10 @@ class Supercharged::GatewayNotificationsController < ApplicationController
     @notification = GatewayNotification.create!(params: params, gateway: params[:gateway], raw_post: request.raw_post)
     @notification.logger = persistent_logger
 
-    error = if !@notification.complete?
-      "not_completed"
-    elsif !@notification.acknowledge
+    error = if !@notification.acknowledge
       "acknowledge_failed"
+    elsif !@notification.complete?
+      "not_completed"
     elsif !@notification.charge
       "charge_not_found"
     end
@@ -23,7 +23,7 @@ class Supercharged::GatewayNotificationsController < ApplicationController
       charge = @notification.charge
 
       if charge && !charge.error?
-        @notification.charge.failed!
+        @notification.charge.fail
         @notification.charge.update_attribute(:error, error)
       end
 

data/app/helpers/supercharged/charges_helper.rb

@@ -1,6 +1,5 @@
 module Supercharged::ChargesHelper
   # No order id while generating form. It will be added later via JS
-  # JS finds order input by this fake id because id and name will be integration specific
   FAKE_ORDER_ID = "[payment_order_id]"
 
   def charge_form_for(service_name, options = {}, &block)
@@ -12,10 +11,11 @@ module Supercharged::ChargesHelper
     options = with_default_html_options(options)
 
     account = options.delete(:account)
-    notify_url = gateways_result_url(service_name)
 
     payment_service_for(FAKE_ORDER_ID, account, options) do |service|
-      service.notify_url notify_url
+      service.notify_url gateways_result_url(service_name)
+      service.return_url root_url
+      service.cancel_return_url new_charge_url
       block.call(service)
     end
   end
@@ -40,9 +40,7 @@ module Supercharged::ChargesHelper
     {
       role: "charge-amount",
       required: true,
-      data: {
-        min_value: Charge.min_amount
-      }
+      min: Charge.new(user: current_user).min_amount
     }
   end
 

data/app/models/charge.rb

@@ -1,2 +1,3 @@
-class Charge < Supercharged::Charge::Base
+class Charge < ActiveRecord::Base
+  include Supercharged::Charge::Base
 end

data/app/models/gateway_notification.rb

@@ -12,7 +12,13 @@ class GatewayNotification < ActiveRecord::Base
   attr_accessor :raw_post, :logger
 
   def acknowledge
-    adapter.acknowledge
+    res = adapter.acknowledge
+
+    if charge_id.nil? && adapter.item_id
+      update_column(:charge_id, adapter.item_id)
+    end
+
+    res
   end
 
   def complete?
@@ -28,12 +34,14 @@ class GatewayNotification < ActiveRecord::Base
   end
 
   def approve
+    raise EmptyChargeIdError unless charge_id
+
     logger.info "real amount = #{real_amount}"
     charge.approve(real_amount) unless charge.ok?
   end
 
   def real_amount
-    params[service.mappings[:amount]]
+    adapter.gross
   end
 
   private
@@ -44,12 +52,9 @@ class GatewayNotification < ActiveRecord::Base
     raise "Unknown integration '#{gateway}'"
   end
 
-  def service
-    "ActiveMerchant::Billing::Integrations::#{gateway.classify}::Helper".classify.constantize
-  end
-
   def set_charge_id
-    self.charge_id = adapter.item_id || raise(EmptyChargeIdError)
+    self.charge_id ||= adapter.item_id
+    true
   end
 
 end

data/app/models/supercharged/charge/base.rb

@@ -1,51 +1,52 @@
 module Supercharged
   module Charge
-    class Base < ActiveRecord::Base
-      include ActiveModel::ForbiddenAttributesProtection
+    module Base
+      extend ActiveSupport::Concern
 
-      self.table_name = "charges"
-      self.abstract_class = true
+      included do
+        self.table_name = "charges"
 
-      belongs_to :user
-      has_many :gateway_input_notifications
-      has_many :gateway_responses
+        belongs_to :user
+        has_many :gateway_input_notifications
+        has_many :gateway_responses
 
-      validates :amount, presence: true, numericality: {
-        greater_than_or_equal_to: ->(model) {
-          model.class.min_amount
+        validates :amount, presence: true, numericality: {
+          greater_than_or_equal_to: :min_amount
         }
-      }
 
-      scope :latest, order("created_at DESC")
-      scope :by_gateway, ->(gateway_name) { where(gateway_name: gateway_name.to_s) }
+        scope :latest, ->{ order("created_at DESC") }
+        scope :by_gateway, ->(gateway_name) { where(gateway_name: gateway_name.to_s) }
 
-      state_machine :state, initial: :new do
-        # store_audit_trail
+        state_machine :state, initial: :new do
+          # store_audit_trail
 
-        state :new
-        state :rejected
-        state :ok
-        state :error
+          state :new
+          state :rejected
+          state :ok
+          state :error
 
-        event :set_ok do
-          transition [:new, :error, :pending] => :ok
-        end
+          event :set_ok do
+            transition [:new, :error, :pending] => :ok
+          end
 
-        event :failed do
-          transition [:new, :pending] => :error
-        end
+          event :set_failed do
+            transition [:new, :pending] => :error
+          end
 
-        event :reject do
-          transition [:new, :error, :pending] => :rejected
-        end
+          event :reject do
+            transition [:new, :error, :pending] => :rejected
+          end
 
-        event :set_pending do
-          transition [:new, :error] => :pending
+          event :set_pending do
+            transition [:new, :error] => :pending
+          end
         end
       end
 
-      def self.with_token(token)
-        where(gateway_token: token).first
+      module ClassMethods
+        def with_token(token)
+          where(gateway_token: token).first
+        end
       end
 
       # require implicit amount from gateway, not from user
@@ -54,7 +55,12 @@ module Supercharged
         set_ok!
       end
 
-      def self.min_amount
+      def fail
+        self.state_event = "set_failed"
+        save(validate: false)
+      end
+
+      def min_amount
         1
       end
 

data/config/routes.rb

@@ -15,7 +15,7 @@ module ActionDispatch::Routing
         end
       end
 
-      match "gateways/:gateway/result" => "#{controllers[:gateway_notifications]}#create", as: :gateways_result
+      post "gateways/:gateway/result" => "#{controllers[:gateway_notifications]}#create", as: :gateways_result
     end
 
   end

data/lib/supercharged/version.rb

@@ -1,3 +1,3 @@
 module Supercharged
-  VERSION = "2.0.4"
+  VERSION = "2.1.0"
 end

data/test/fake_app.rb

@@ -10,6 +10,7 @@ app = Class.new(Rails::Application)
 app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
 app.config.session_store :cookie_store, :key => "_fakeapp_session"
 app.config.active_support.deprecation = :log
+app.config.eager_load = false
 app.initialize!
 
 Rails.application.routes.draw do

data/test/supercharged/controllers/charges_controller_test.rb

@@ -2,14 +2,14 @@ require 'test_helper'
 
 describe Supercharged::ChargesController do
   describe "create action" do
-    context "authorized" do
+    describe "authorized" do
       let(:fake_user) { User.create! }
 
       before do
         Supercharged::ChargesController.any_instance.stubs(:current_user).returns(fake_user)
       end
 
-      context "correct conditions" do
+      describe "correct conditions" do
         it "response contains id in json" do
           post :create, charge: { amount: 100 }
 
@@ -20,7 +20,7 @@ describe Supercharged::ChargesController do
         end
       end
 
-      context "bad conditions" do
+      describe "bad conditions" do
         it "response contains errors in json" do
           post :create, charge: { amount: 0 }
 

data/test/supercharged/controllers/gateway_notifications_controller_test.rb

@@ -2,18 +2,18 @@ require 'test_helper'
 
 describe Supercharged::GatewayNotificationsController do
   describe "create" do
-    let(:charge) { Charge.create!({user_id: 1, amount: 10}, without_protection: true) }
+    let(:charge) { Charge.create!(user_id: 1, amount: 10) }
 
-    context "authorized" do
+    describe "authorized" do
       let(:fake_user) { stub(id: 1) }
 
       before do
         GatewayNotification.any_instance.stubs(:current_user).returns(fake_user)
       end
 
-      context "correct conditions" do
+      describe "correct conditions" do
         it "works with good notification" do
-          adapter = stub(item_id: 1, "complete?" => true, acknowledge: true, charge: charge)
+          adapter = stub(item_id: 1, "complete?" => true, acknowledge: true, charge: charge, gross: 100)
 
           GatewayNotification.any_instance.stubs(:adapter).returns(adapter)
 
@@ -26,7 +26,7 @@ describe Supercharged::GatewayNotificationsController do
         end
       end
 
-      context "bad conditions" do
+      describe "bad conditions" do
         it "completed = false" do
           adapter = stub(item_id: 1, "complete?" => false, acknowledge: true, charge: charge)
 
@@ -38,7 +38,7 @@ describe Supercharged::GatewayNotificationsController do
           charge.state_name.must_equal :error
           charge.error.must_equal "not_completed"
 
-          assert_response :bad_request
+          assert_response :found
         end
 
         it "acknowledge = false" do
@@ -52,12 +52,12 @@ describe Supercharged::GatewayNotificationsController do
           charge.state_name.must_equal :error
           charge.error.must_equal "acknowledge_failed"
 
-          assert_response :bad_request
+          assert_response :found
         end
       end
     end
 
-    context "without any payload params" do
+    describe "without any payload params" do
       it "returns bad_request" do
         post :create, gateway: "paypal"
 

data/test/supercharged/helpers/charges_helper_test.rb

@@ -2,7 +2,9 @@ require 'test_helper'
 
 class Supercharged::ChargesHelperTest < ActionView::TestCase
   def test_min_value
-    field = charge_form_amount_field(sample_service, { min: 500 })
+    self.stubs(:current_user).returns(User.new)
+    Charge.any_instance.stubs(:min_amount).returns(500)
+    field = charge_form_amount_field(sample_service)
     field.must_include 'min="500"'
   end
 

data/test/supercharged/models/charge_test.rb

@@ -21,7 +21,7 @@ describe Charge do
   end
 
   describe "states" do
-    subject { Charge.create!({user_id: 1, amount: 10}, without_protection: true) }
+    subject { Charge.create!(user_id: 1, amount: 10) }
 
     describe "initial state" do
       it "initial state is new" do

data/test/supercharged/models/geneway_notification_test.rb

@@ -4,18 +4,20 @@ describe GatewayNotification do
   describe "create" do
     it "raise EmptyChargeId if charge_id = nil" do
       ->{
-        GatewayNotification.create!(gateway: "webmoney")
+        notification = GatewayNotification.create!(gateway: "webmoney")
+        notification.approve
       }.must_raise GatewayNotification::EmptyChargeIdError
     end
 
-    it "charge id is inherited from adapter" do
+    it "populates params with result" do
       gateway_notification = GatewayNotification.new
 
       adapter = stub(item_id: 42)
       gateway_notification.stubs(:adapter).returns(adapter)
 
       gateway_notification.save!
+
       gateway_notification.charge_id.must_equal 42
     end
   end
-end
+end

data/test/test_helper.rb

@@ -3,7 +3,6 @@ ENV["RAILS_ENV"] = "test"
 require "minitest/autorun"
 require "minitest/spec"
 require "minitest/pride"
-require "minitest-spec-context"
 require "mocha/setup"
 
 require 'rails'
@@ -15,7 +14,6 @@ require "minitest/rails"
 
 require 'state_machine'
 require 'state_machine-audit_trail'
-require 'strong_parameters'
 
 require "supercharged"
 require "fake_app"

metadata

@@ -1,174 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: supercharged
 version: !ruby/object:Gem::Version
-  version: 2.0.4
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - divineforest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machine-audit_trail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: strong_parameters
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: minitest-spec-context
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -177,6 +128,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/javascripts/charge_form.js.coffee.erb
 - app/assets/javascripts/supercharged.js
 - app/controllers/supercharged/charges_controller.rb
@@ -192,13 +146,10 @@ files:
 - config/routes.rb
 - lib/generators/supercharged/migrations_generator.rb
 - lib/generators/supercharged/templates/install_migration.rb
+- lib/supercharged.rb
 - lib/supercharged/activemerchant.rb
 - lib/supercharged/helpers.rb
 - lib/supercharged/version.rb
-- lib/supercharged.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
 - test/fake_app.rb
 - test/supercharged/controllers/charges_controller_test.rb
 - test/supercharged/controllers/gateway_notifications_controller_test.rb
@@ -208,33 +159,26 @@ files:
 - test/test_helper.rb
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -682491328917340782
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -682491328917340782
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MVC solution for charges in rails
 test_files:
 - test/fake_app.rb