Merge pull request #16 from NiceMLT/newrspec2

Updates rspec and creates requester class

Author: NiceMLT

Gemfile

@@ -34,8 +34,8 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 gem 'httparty'
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'rspec'
+  gem 'sinatra'
+  gem 'rspec-rails', '~> 3.7'
 end
 
 group :development do

Gemfile.lock

@@ -85,6 +85,7 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.5.5)
+    mustermann (1.0.2)
     nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
@@ -93,6 +94,8 @@ GEM
     pg (0.18.1)
     powerpack (0.1.1)
     rack (2.0.4)
+    rack-protection (2.0.1)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.1.0)
@@ -124,10 +127,6 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rdoc (4.3.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
     rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -136,6 +135,14 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
     rubocop (0.32.1)
       astrolabe (~> 1.3)
@@ -158,6 +165,11 @@ GEM
     sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    sinatra (2.0.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.1)
+      tilt (~> 2.0)
     spring (2.0.2)
       activesupport (>= 4.2)
     sprockets (3.7.1)
@@ -196,10 +208,11 @@ DEPENDENCIES
   jquery-rails
   pg (~> 0.18)
   rails (= 5.1.0)
-  rspec
+  rspec-rails (~> 3.7)
   rubocop
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  sinatra
   spring
   turbolinks
   uglifier (>= 1.3.0)

app/controllers/subscriptions_controller.rb

@@ -1,29 +1,23 @@
 class SubscriptionsController < ApiController
 
+  before_action :create_session, only: %i[create]
+
   # GET /subscriptions/new
   def new
     @subscription = Subscription.new
   end
 
   # POST /subscriptions
   def create
-    if authed_payment_session
-      new_sub_request = HTTParty.get('https://gist.github.com/freezepl/2a75c29c881982645156f5ccf8d1b139/validate')
-      new_sub_response = JSON.parse(new_sub_request)
-
-      if new_sub_response == response_ok
-        subscription = Subscription.new(subscription_params)
-        return 'subscription created and payment successful'
-      elsif new_sub_response == response_fail
-        return 'subscription not created due to insufficient funds'
-      elsif new_sub_response == response_timeout
-        sleep 15
-        # do that stuff again
-      elsif new_sub_response == response_503
-        return 'Service Unavailable'
-      end
-    else
-      return 'Invalid session'
+    requester = Requester.new
+    if requester.paid?
+      subscription = Subscription.new(subscription_params)
+      return 'subscription created and payment successful'
+    elsif requester.insufficient_funds?
+      return 'subscription not created due to insufficient funds'
+    elsif requester.error?
+      sleep 15
+      # retry
     end
   end
 
@@ -45,6 +39,10 @@ def show_all_for_user
 
   private
 
+  def create_session
+    HTTParty.get('https://gist.github.com/freezepl/2a75c29c881982645156f5ccf8d1b139/')
+  end
+
   def subscription_params
     params[:subscription].permit(:user_id, :paid, :billing_date, :amount, :cc_number, :cc_expiration, :cc_code)
   end

app/models/subscription.rb

@@ -2,7 +2,7 @@ class Subscription < ActiveRecord::Base
 
 has_many :subscriptions
 
-validates :cc_number, format: { with: ^(?:4[0-9]{12}(?:[0-9]{3})?|[25][1-7][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\d{3})\d{11})$, on: :create }
+# validates :cc_number, format: { with: ^(?:4[0-9]{12}(?:[0-9]{3})?|[25][1-7][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\d{3})\d{11})$, on: :create }
 
   def as_json
     {

bin/fake-server

@@ -0,0 +1,7 @@
+class ChangeIntegersToStrings < ActiveRecord::Migration[5.1]
+  def change
+    change_column :subscriptions, :cc_number, :string
+    change_column :subscriptions, :cc_expiration, :string
+    change_column :subscriptions, :cc_code, :string
+  end
+end

db/migrate/20180405164805_change_integers_to_strings.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180405124010) do
+ActiveRecord::Schema.define(version: 20180405164805) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -20,9 +20,9 @@
     t.string "paid"
     t.datetime "billing_date"
     t.integer "cost"
-    t.integer "cc_number"
-    t.integer "cc_expiration"
-    t.integer "cc_code"
+    t.string "cc_number"
+    t.string "cc_expiration"
+    t.string "cc_code"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string "payment_id"

db/schema.rb

@@ -1,23 +1,23 @@
+require 'rails_helper'
+
 RSpec.describe Subscription, :type => :model do
 
-  before(:each) do
-      @user = User.create(name: "Steve NoJobs", email: "steve@nojobs.com")
-      @subscription = Subscription.create(user_id: user.id, paid: true, billing_date: "March 1, 2018", cc_number: 4011100110011001, cc_expiration: 0519, cc_code: 0123)
-   end
+  let(:user) { User.create!(name: "Steve NoJobs", email: "steve@nojobs.com") }
+  let(:subscription) { Subscription.create!(user_id: user.id, paid: true, billing_date: "March 1, 2018", cc_number: "4011100110011001", cc_expiration: "0519", cc_code: "0123") }
 
   it "should know it's billing_date" do
     expect(subscription.billing_date).to eq("March 1, 2018")
   end
 
   it "should know it's cc_number" do
-    expect(subscription.cc_number).to eq(4011100110011001)
+    expect(subscription.cc_number).to eq("4011100110011001")
   end
 
   it "should know it's cc_expiration" do
-    expect(subscription.cc_number).to eq(0519)
+    expect(subscription.cc_expiration).to eq("0519")
   end
 
   it "should know it's cc_code" do
-    expect(subscription.cc_number).to eq(0123)
+    expect(subscription.cc_code).to eq("0123")
   end
 end

spec/models/subscription_spec.rb

@@ -0,0 +1,57 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+require 'spec_helper'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+
+# Checks for pending migrations and applies them before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+end

spec/rails_helper.rb

@@ -1,4 +1,4 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause
 # this file to always be loaded, without a need to explicitly require it in any
@@ -66,10 +66,6 @@
   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
   config.disable_monkey_patching!
 
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.