mondido 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b73782b64f901d62b9fcc7184b0d33bdd0b8725
-  data.tar.gz: 29235af408a637119820f4be5d9c15b987cf97cb
+  metadata.gz: 93e554b36550a73b880205fc196c92f9ec9408e2
+  data.tar.gz: 15a1bffcbeb8463d3f046c5864635d3e7d6f6d18
 SHA512:
-  metadata.gz: ee26bac5281ffc19e8a652e182e3a782caaa6c66f23da6d925f5e751655764279997d22b0acc25c2a04fbd519d27d1432210369a08c1910b912162a7266dfba3
-  data.tar.gz: 502839d93da661bb3230cc37b770817626b0b07486dff0535f0a21c30a47334256384071aeade6255c1a7ecb37a9c042e98890941a8c7ba790a7cc229ea5cfa2
+  metadata.gz: 3371cf5eabe76b51b111ebe6d62be90e52181eb453b8b3cf0a3da5cbcf4b9144951756b672151fb1b2a92d4318ad5c6febd557af669f5246def3b87acf4a9f2e
+  data.tar.gz: 2b7815803b5d38e2d51bea12a7be6c7a7fb6aae33869b48ecbd67ed4cd647742fe5de68e6087d6e1f94b53895cf1e4d3dd4114b4009a54621fd136eb47c3fe0a

data/lib/mondido/base_model.rb

@@ -35,6 +35,7 @@ module Mondido
       object = self.new(attributes)
       object.valid? # Will raise exception if validation fails
 
+      object.set_merchant_id! if object.respond_to? :set_merchant_id!
       object.set_hash! if object.respond_to? :set_hash!
 
       response = Mondido::RestClient.process(object)

data/lib/mondido/credentials.rb

@@ -24,7 +24,8 @@ module Mondido
     def self.setup
       config_file = File.join(Rails.root, 'config', 'mondido.yml')
       if File.exist?(config_file)
-        yaml = YAML.load(File.read(config_file))
+        template = ERB.new File.read(config_file)
+        yaml = YAML.load template.result(binding)
         @@merchant_id = yaml['merchant_id'] 
         @@secret = yaml['secret'] 
         @@password = yaml['password'] 

data/lib/mondido/credit_card/transaction.rb

@@ -27,7 +27,19 @@ module Mondido
                     :customer,
                     :subscription,
                     :payment_details,
-                    :hash
+                    :hash,
+                    :webhooks,
+                    :payment_request,
+                    :template_id,
+                    :error,
+                    :success_url,
+                    :error_url,
+                    :refund,
+                    :customer,
+                    :store_card,
+                    :href,
+                    :plan_id,
+                    :process
 
       validates :currency,
                 presence: { message: 'errors.currency.missing' },
@@ -63,9 +75,11 @@ module Mondido
       end
 
       def self.create(attributes={})
-        metadata = attributes[:metadata]        
-        metadata = metadata.to_json if metadata && metadata.respond_to?(:to_json)
-        attributes[:metadata] = metadata
+        ['metadata', 'webhooks'].each do |a|
+          attribute = attributes[:"#{a}"]
+          attribute = attribute.to_json if attribute && attribute.respond_to?(:to_json)
+          attributes[:"#{a}"] = attribute
+        end
         super(attributes)
       end
 
@@ -73,8 +87,22 @@ module Mondido
         super
       end
 
+      def set_merchant_id!
+        unless self.merchant_id
+          self.merchant_id = Mondido::Credentials.merchant_id
+        end
+      end
+
       def set_hash!
-        unhashed = [Mondido::Credentials.merchant_id, payment_ref, customer_ref, amount, currency, Mondido::Credentials.secret].map(&:to_s)
+        unhashed = [
+          Mondido::Credentials.merchant_id,
+          payment_ref,
+          customer_ref,
+          amount,
+          currency,
+          ( (test) ? "test" : "" ),
+          Mondido::Credentials.secret
+        ].map(&:to_s)
         self.hash = Digest::MD5.hexdigest(unhashed.join)
       end
 

data/lib/mondido/version.rb

@@ -1,3 +1,3 @@
 module Mondido
-  VERSION = "1.0.8"
+  VERSION = "1.1.0"
 end

data/spec/credit_card/transaction_spec.rb

@@ -66,6 +66,34 @@ describe Mondido::CreditCard::Transaction do
         expect(@transaction.payment_ref).to eq(@transaction_hash['payment_ref'])
       end
 
+      it 'generates the correct hash' do
+        transaction = Mondido::CreditCard::Transaction.new({
+          :merchant_id => Mondido::Credentials.merchant_id.to_s,
+          :payment_ref => "PaymentRefValue",
+          :customer_ref => "CustomerRefValue",
+          :amount => "10.00",
+          :currency => "sek",
+          :test => true,
+          :secret => Mondido::Credentials.secret.to_s
+        })
+
+        transaction.set_hash!
+
+        # Calculate hash
+        unhashed = [
+          Mondido::Credentials.merchant_id.to_s,
+          "PaymentRefValue",
+          "CustomerRefValue",
+          "10.00",
+          "sek",
+          "test",
+          Mondido::Credentials.secret
+        ].map(&:to_s)
+        hash = Digest::MD5.hexdigest(unhashed.join)
+
+        expect(transaction.hash).to eq(hash)
+      end
+
     end
 
     context 'invalid call' do

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mondido
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - Robert Falkén
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Library for making payments with Mondido, visit https://mondido.com to
@@ -60,6 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- lib/mondido.rb
 - lib/mondido/base_behaviour.rb
 - lib/mondido/base_model.rb
 - lib/mondido/config.rb
@@ -75,9 +77,6 @@ files:
 - lib/mondido/rest_client.rb
 - lib/mondido/version.rb
 - lib/mondido/webhook.rb
-- lib/mondido.rb
-- MIT-LICENSE
-- Rakefile
 - spec/credit_card/refund_spec.rb
 - spec/credit_card/stored_card_spec.rb
 - spec/credit_card/transaction_spec.rb
@@ -96,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: SDK for consuming the Mondido API

data/Rakefile

@@ -1,32 +0,0 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'MondidoSdk'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test