Merge pull request #156 from AuthorizeNet/future

Merge from future for 1.9.5 release

Author: Sunny Raj Rathod

.gitignore

@@ -1,5 +1,4 @@
 Gemfile.lock
-spec/credentials.yml
 .ruby-*
 .idea
 gemfiles/*.lock

.rubocop.yml

@@ -0,0 +1,19 @@
+AllCops:
+  TargetRubyVersion: 2.2
+  # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
+  # to ignore them, so only the ones explicitly set in this file are enabled.
+  Exclude:
+    - 'sample-code-ruby/**/*'
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Check quotes usage according to lint rule below.
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes
+  AutoCorrect: false
+
+Style/ConditionalAssignment:
+  Enabled: true
+  AutoCorrect: false

.scrutinizer.yml

@@ -2,3 +2,5 @@ checks:
     ruby:
        code_rating: true
        duplicate_code: true
+tools:
+    external_code_coverage: true

.travis.yml

@@ -12,11 +12,15 @@ gemfile:
   - gemfiles/rails_42.gemfile
   - gemfiles/rails_50.gemfile
   - gemfiles/rails_51.gemfile
+  - gemfiles/rails_52.gemfile
 
 before_script:
   - git submodule update --remote --recursive
 
 script:
   - bundle exec rake spec:ci
+  - bundle exec rake spec:aim
   - bundle exec rake spec:api
+  - bundle exec rake spec:cim
+  - bundle exec rake spec:reporting
   - bundle exec rake spec:testrunner

Appraisals

@@ -9,3 +9,7 @@ end
 appraise "rails-51" do
   gem 'rails', '~> 5.1', '>= 5.1.1'
 end
+
+appraise "rails-52" do
+  gem 'rails', '~> 5.2.0.beta2'
+end

README.md

@@ -1,10 +1,12 @@
 # Authorize.Net Ruby SDK
 
-[![Travis CI Status](https://travis-ci.org/AuthorizeNet/sdk-ruby.svg?branch=master)](https://travis-ci.org/AuthorizeNet/sdk-ruby)
-[![Coverage Status](https://coveralls.io/repos/github/AuthorizeNet/sdk-ruby/badge.svg?branch=master)](https://coveralls.io/github/AuthorizeNet/sdk-ruby?branch=master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/AuthorizeNet/sdk-ruby/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AuthorizeNet/sdk-ruby/?branch=master)
-[![Gem Version](https://badge.fury.io/rb/authorizenet.svg)](https://badge.fury.io/rb/authorizenet)
+[![Version         ][rubygems_badge]][rubygems]
+[![Travis CI       ][travis_badge]][travis]
+[![Coverage        ][coverage_badge]][coverage]
+[![Scrutinizer     ][scrutinizer_badge]][scrutinizer]
 
+Starting Release 1.8.6 November 2015 the Authorize.Net API has been [reorganized to be more merchant focused](https://developer.authorize.net/api/upgrade_guide/).
+AIM, ARB, CIM, Reporting and SIM have all been deprecated in favor of AuthorizeNet::API.
 
 ## Requirements
 * Ruby 2.2.2 or higher
@@ -108,4 +110,13 @@ For additional help in testing your own code, Authorize.Net maintains a [compreh
 
 
 ## License
-This repository is distributed under a proprietary license. See the provided [`LICENSE.txt`](/LICENSE.txt) file.
+This repository is distributed under a proprietary license. See the provided [`LICENSE.txt`](/LICENSE.txt) file.
+
+[rubygems_badge]: https://badge.fury.io/rb/authorizenet.svg
+[rubygems]: https://rubygems.org/gems/authorizenet
+[travis_badge]: https://travis-ci.org/AuthorizeNet/sdk-ruby.svg?branch=master
+[travis]: https://travis-ci.org/AuthorizeNet/sdk-ruby
+[coverage_badge]: https://scrutinizer-ci.com/g/AuthorizeNet/sdk-ruby/badges/coverage.png?b=master
+[coverage]: https://scrutinizer-ci.com/g/AuthorizeNet/sdk-ruby/?branch=master
+[scrutinizer_badge]: https://scrutinizer-ci.com/g/AuthorizeNet/sdk-ruby/badges/quality-score.png?b=master
+[scrutinizer]: https://scrutinizer-ci.com/g/AuthorizeNet/sdk-ruby/?branch=master

Rakefile

@@ -1,7 +1,7 @@
 require "rake"
 require "rspec/core/rake_task"
 
-task :default => :spec
+task default: :spec
 desc "Run all specs"
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
@@ -11,46 +11,46 @@ end
 namespace "spec" do
   desc "Run the CIM spec"
   RSpec::Core::RakeTask.new('cim') do |spec|
-    spec.pattern  = FileList['spec/cim_spec.rb']
+    spec.pattern = FileList['spec/cim_spec.rb']
     spec.rspec_opts = ['--options', 'spec/spec.opts']
   end
-  
+
   desc "Run the ARB spec"
   RSpec::Core::RakeTask.new('arb') do |spec|
     spec.pattern = FileList['spec/arb_spec.rb']
     spec.rspec_opts = ['--options', 'spec/spec.opts']
   end
-  
+
   desc "Run the AIM spec"
   RSpec::Core::RakeTask.new('aim') do |spec|
     spec.pattern = FileList['spec/aim_spec.rb']
     spec.rspec_opts = ['--options', 'spec/spec.opts']
   end
-  
+
   desc "Run the API spec"
   RSpec::Core::RakeTask.new('api') do |spec|
     spec.pattern = FileList['spec/api_spec.rb']
     spec.rspec_opts = ['--options', 'spec/spec.opts']
   end
-  
+
   desc "Run the CI Unit Test spec"
-   RSpec::Core::RakeTask.new('ci') do |spec|
-     spec.pattern = FileList['spec/authorize_net_spec.rb']
-     spec.rspec_opts = ['--options', 'spec/spec.opts']
-   end
-  
+  RSpec::Core::RakeTask.new('ci') do |spec|
+    spec.pattern = FileList['spec/authorize_net_spec.rb']
+    spec.rspec_opts = ['--options', 'spec/spec.opts']
+  end
+
   desc "Run the SIM spec"
   RSpec::Core::RakeTask.new('sim') do |spec|
     spec.pattern = FileList['spec/sim_spec.rb']
     spec.rspec_opts = ['--options', 'spec/spec.opts']
   end
-  
+
   desc "Run the Reporting spec"
   RSpec::Core::RakeTask.new('reporting') do |spec|
     spec.pattern = FileList['spec/reporting_spec.rb']
     spec.rspec_opts = ['--options', 'spec/spec.opts']
   end
-  
+
   desc "Run the Sample code Test Runner"
   RSpec::Core::RakeTask.new('testrunner') do |spec|
     spec.pattern = FileList['sample-code-ruby/spec/sample_code_spec.rb']
@@ -60,18 +60,18 @@ end
 
 desc "Builds the gem"
 task :gem do
-  %x"gem build authorizenet.gemspec"
+  `gem build authorizenet.gemspec`
 end
 
 desc "Builds the documentation"
 task :doc do
-  %x"rdoc -U -S --main=README.rdoc -A documented_accessor=RW README.rdoc lib/"
+  `rdoc -U -S --main=README.rdoc -A documented_accessor=RW README.rdoc lib/`
 end
 
 namespace "doc" do
   desc "Builds the documentation with graphical class hierarchy"
   task :graph do
-    %x"rdoc -U -d -S --main=README.rdoc -A documented_accessor=RW README.rdoc lib/"
+    `rdoc -U -d -S --main=README.rdoc -A documented_accessor=RW README.rdoc lib/`
   end
 end
 
@@ -82,7 +82,7 @@ end
 
 desc "Bundles the sample app."
 task :samples do
-  %x". sample_app_version && zip -r anet_ruby_samples-$VERSION.zip sample_app -x '*/.*' -x '*/Icon' -x '*/__MACOSX'"
+  `. sample_app_version && zip -r anet_ruby_samples-$VERSION.zip sample_app -x '*/.*' -x '*/Icon' -x '*/__MACOSX'`
 end
 
 desc "Bundles the sample app and gem."

authorizenet.gemspec

@@ -16,9 +16,11 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'activesupport', '>= 4.2.6'
   s.add_runtime_dependency 'nokogiri', '~> 1.6', '>= 1.6.4'
-  s.add_runtime_dependency "roxml", "= 3.3.1"
+  s.add_runtime_dependency 'roxml', '>= 3.3.1'
 
+  s.add_development_dependency('appraisal')
   s.add_development_dependency 'rake', '~> 0.8', '>= 0.8.7'
   s.add_development_dependency 'rspec', '~> 2.1'
-  s.add_development_dependency('appraisal')
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'scrutinizer-ocular'
 end

gemfiles/rails_52.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "coveralls", require: false
+gem "rails", "~> 5.2.0.beta2"
+
+gemspec path: "../"

lib/app/helpers/authorize_net_helper.rb

@@ -1,13 +1,12 @@
 # The Authorize.Net Rails Helper module. Provides methods to assist with integrating the various APIs.
 
 module AuthorizeNetHelper
-  
   # Generates a collection of hidden form fields (as a raw HTML string) for a AuthorizeNet::SIM::Transaction
   # (sim_transaction). You can specify any html_options that hidden_field_tag accepts, and the
   # hidden fields will be built with those options.
   def sim_fields(sim_transaction, html_options = {})
     fields = sim_transaction.form_fields.collect do |k, v|
-      if v.kind_of? Array
+      if v.is_a? Array
         v.collect { |val| hidden_field_tag(k, val, html_options) }
       else
         hidden_field_tag(k, v, html_options)
@@ -21,4 +20,4 @@ def sim_fields(sim_transaction, html_options = {})
       return field_str
     end
   end
-end
+end

lib/authorize_net.rb

@@ -2,7 +2,7 @@
 # the current runtime to see if Rails is present. If it is, we inject our helper into
 # ActiveSupport.
 
-#coverall
+# coverall
 # require 'coveralls'
 # Coveralls.wear!
 
@@ -16,7 +16,7 @@
 
 # TODO: Add local data validation where possible
 
-$:.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__)
 
 require "authorize_net/authorize_net"
 require "authorize_net/payment_methods/credit_card"
@@ -86,8 +86,8 @@
   if defined?(Rails::Railtie)
     module AuthorizeNet
       class Railtie < Rails::Railtie
-        initializer "authorize_net.load_path_initialize" do |app|
-          %w{ models controllers helpers }.each do |dir|
+        initializer "authorize_net.load_path_initialize" do |_app|
+          %w[models controllers helpers].each do |dir|
             path = File.join(File.dirname(__FILE__), 'app', dir)
             $LOAD_PATH << path
             ActiveSupport::Dependencies.autoload_paths << path
@@ -97,7 +97,7 @@ class Railtie < Rails::Railtie
       end
     end
   else
-    %w{ models controllers helpers }.each do |dir|
+    %w[models controllers helpers].each do |dir|
       path = File.join(File.dirname(__FILE__), 'app', dir)
       $LOAD_PATH << path
       ActiveSupport::Dependencies.load_paths << path

lib/authorize_net/addresses/address.rb

@@ -1,29 +1,25 @@
 module AuthorizeNet
-
   # Models an address.
   class Address
-    
     include AuthorizeNet::Model
-    
+
     attr_accessor :first_name, :last_name, :company, :street_address, :city, :state, :zip, :country, :phone, :fax, :customer_address_id
-    
+
     def to_hash
       hash = {
-        :first_name => @first_name,
-        :last_name => @last_name,
-        :company => @company,
-        :address => @street_address,
-        :city => @city,
-        :state => @state,
-        :zip => @zip,
-        :country => @country,
-        :phone => @phone,
-        :fax => @fax,
-        :customer_address_id => @customer_address_id
+        first_name: @first_name,
+        last_name: @last_name,
+        company: @company,
+        address: @street_address,
+        city: @city,
+        state: @state,
+        zip: @zip,
+        country: @country,
+        phone: @phone,
+        fax: @fax,
+        customer_address_id: @customer_address_id
       }
-      hash.delete_if {|k, v| v.nil?}
+      hash.delete_if { |_k, v| v.nil? }
     end
-    
   end
-
-end
+end

lib/authorize_net/addresses/shipping_address.rb

@@ -1,26 +1,22 @@
 module AuthorizeNet
-
   # Models a shipping address.
   class ShippingAddress < Address
-    
     include AuthorizeNet::Model
 
     def to_hash
       hash = {
-        :ship_to_first_name => @first_name,
-        :ship_to_last_name => @last_name,
-        :ship_to_company => @company,
-        :ship_to_address => @street_address,
-        :ship_to_city => @city,
-        :ship_to_state => @state,
-        :ship_to_zip => @zip,
-        :ship_to_country => @country,
-        :ship_to_phone => @phone,
-        :ship_to_fax => @fax
+        ship_to_first_name: @first_name,
+        ship_to_last_name: @last_name,
+        ship_to_company: @company,
+        ship_to_address: @street_address,
+        ship_to_city: @city,
+        ship_to_state: @state,
+        ship_to_zip: @zip,
+        ship_to_country: @country,
+        ship_to_phone: @phone,
+        ship_to_fax: @fax
       }
-      hash.delete_if {|k, v| v.nil?}
+      hash.delete_if { |_k, v| v.nil? }
     end
-    
   end
-
-end
+end