openstax_salesforce 4.0.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1891856e6a19e2b9751c9982a4ff21edb8195877f9ae5c7f37a0c10b5a0671e6
-  data.tar.gz: 05e146e80fe6385684ba0058b824475c2bfdac63c4941c53efebfa72bf7435db
+  metadata.gz: 4af4bba63b1345bb56d81997d7aa50a8f6c54a8543231cf1404200e0aa9e57cf
+  data.tar.gz: 854d11cc4dbb4e5ba190ef12f4973c4c2712c3ec3c9790795d8660ca1bb5826f
 SHA512:
-  metadata.gz: 7bcee3d33ea59128302bc97e8ff9695cabefd98af6ba1b0388a12749b4e7692ed53446bd1791aa99c9ab43dde3f166f896879850bb3c7b7dca68a0e1b7a0df96
-  data.tar.gz: 32062d09ecb6b86ab30cd0964a5bc6f7aa76fa55f49bcf5888877f358c54ce784a46b790477152a78ccc0643d4c32462815f0f8519354c6b33429f5e412f7057
+  metadata.gz: 7f4506420c7f30b59896e6fba242aff72ef55dec86270fbbb0b4089d9b3bbe725c2be6c8b3584e5a36906b5b043f547b9cd4676e0cb093ed6e24a357f97650fd
+  data.tar.gz: 2f5a63de18f7deaaf7aa8d08608c3cd686af132ab542bf67bafff851c38d61dbd71e1571dd8f953664daff0beb3e7912b747a00a4c13f91664939cc8f87694f1

data/config/initializers/openstax_salesforce.rb

@@ -5,6 +5,10 @@
 OpenStax::Salesforce.configure do |config|
   salesforce_secrets = Rails.application.secrets.salesforce
 
+  if salesforce_secrets.nil?
+    raise "Add a `salesforce` section to your Rails secrets!"
+  end
+
   # Username, client id, instance url and private key for connecting to the Salesforce app
   config.username        = salesforce_secrets[:username]
   config.password        = salesforce_secrets[:password]

data/lib/openstax/salesforce/engine.rb

@@ -2,8 +2,10 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym 'OpenStax'
 end
 
-module OpenStax::Salesforce
-  class Engine < ::Rails::Engine
-    isolate_namespace OpenStax::Salesforce
+module OpenStax
+  module Salesforce
+    class Engine < ::Rails::Engine
+      isolate_namespace OpenStax::Salesforce
+    end
   end
 end

data/lib/openstax/salesforce/remote/lead.rb

@@ -1,5 +1,19 @@
 module OpenStax::Salesforce::Remote
   class Lead < ActiveForce::SObject
+
+    VALID_VERIFICATION_STATUSES = %w[pending_faculty confirmed_faculty rejected_faculty].freeze
+    VALID_ROLES = %w[
+      student
+      faculty
+      other
+      administrator
+      librarian
+      adjunct\ faculty
+      instructional\ designer
+      home\ school\ teacher
+    ].freeze
+    VALID_WHO_CHOOSES_BOOKS = %w[instructor committee coordinator].freeze
+
     field :name,                from: "Name"
     field :first_name,          from: "FirstName"
     field :last_name,           from: "LastName"
@@ -19,7 +33,38 @@ module OpenStax::Salesforce::Remote
     field :accounts_uuid,       from: "accounts_uuid_c__c"
     field :application_source,  from: "Application_Source__c"
     field :role,                from: "Role__c"
+    field :who_chooses_books,   from: "who_chooses_books__c"
+    field :verification_status, from: "FV_Status__c"
+    field :finalize_educator_signup,   from: "FV_Final__c", as: :boolean
+
+    validates(
+      :role,
+      allow_blank: true,
+      inclusion: {
+        in: VALID_ROLES,
+        message: "must be either #{VALID_ROLES.join(' or ')}"
+      }
+    )
+
+    validates(
+      :verification_status,
+      allow_blank: true,
+      inclusion: {
+        in: VALID_VERIFICATION_STATUSES,
+        message: "must be either #{VALID_VERIFICATION_STATUSES.join(' or ')}"
+      }
+    )
+
+    validates(
+      :who_chooses_books,
+      allow_blank: true,
+      inclusion: {
+        in: VALID_WHO_CHOOSES_BOOKS,
+        message: "must be either #{VALID_WHO_CHOOSES_BOOKS.join(' or ')}"
+      }
+    )
 
     self.table_name = 'Lead'
+
   end
 end

data/lib/openstax/salesforce/remote/school.rb

@@ -1,6 +1,10 @@
 module OpenStax::Salesforce::Remote
   class School < ActiveForce::SObject
-    field :name,                      from: "Name"
+    field :name,            from: 'Name'
+    field :type,            from: 'Type'
+    field :school_location, from: 'School_Location__c'
+    field :is_kip,          from: 'K_I_P__c',        as: :boolean
+    field :is_child_of_kip, from: 'child_of_kip__c', as: :boolean
 
     self.table_name = 'Account'
   end

data/lib/openstax/salesforce/spec_helpers.rb

@@ -131,27 +131,23 @@ module OpenStax::Salesforce::SpecHelpers
     end
 
     def ensure_books_exist(book_names)
-      book_names.each do |book_name|
-        if books.none? {|bb| bb.name == book_name}
-          book = Book.new(name: book_name)
-          book.save!
-          books.push(book)
-        end
+      @books = OpenStax::Salesforce::Remote::Book.where(name: book_names).to_a
+
+      (book_names - books.map(&:name)).each do |book_name|
+        OpenStax::Salesforce::Remote::Book.new(name: book_name).save!
       end
     end
 
     def ensure_schools_exist(school_names)
-      school_names.compact.each do |school_name|
-        if schools.none? {|ss| ss.name == school_name}
-          school = School.new(name: school_name)
-          school.save!
-          schools.push(school)
-        end
+      @schools = OpenStax::Salesforce::Remote::School.where(name: school_names).to_a
+
+      (school_names - schools.map(&:name)).each do |school_name|
+        OpenStax::Salesforce::Remote::School.new(name: school_name).save!
       end
     end
 
     def books
-      @books ||= Book.all
+      @books ||= OpenStax::Salesforce::Remote::Book.all
     end
 
     def book(name)
@@ -163,7 +159,7 @@ module OpenStax::Salesforce::SpecHelpers
     end
 
     def schools
-      @schools ||= School.all
+      @schools ||= OpenStax::Salesforce::Remote::School.all
     end
 
     def school_id(name)
@@ -173,5 +169,32 @@ module OpenStax::Salesforce::SpecHelpers
     def school(name)
       schools.find { |ss| ss.name == name }
     end
+
+    def setup_cassette
+      VCR.configure do |config|
+        config.define_cassette_placeholder('<salesforce_instance_url>') do
+          'https://example.salesforce.com'
+        end
+        config.define_cassette_placeholder('<salesforce_instance_url_lower>') do
+          'https://example.salesforce.com'
+        end
+        authentication = ActiveForce.sfdc_client.authenticate!
+        config.define_cassette_placeholder('<salesforce_instance_url>') do
+          authentication.instance_url
+        end
+        config.define_cassette_placeholder('<salesforce_instance_url_lower>') do
+          authentication.instance_url.downcase
+        end
+        config.define_cassette_placeholder('<salesforce_id>') do
+          authentication.id
+        end
+        config.define_cassette_placeholder('<salesforce_access_token>') do
+          authentication.access_token
+        end
+        config.define_cassette_placeholder('<salesforce_signature>') do
+          authentication.signature
+        end
+      end
+    end
   end
 end

data/lib/openstax/salesforce/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Salesforce
-    VERSION = '4.0.0'
+    VERSION = '4.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_salesforce
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.4.0
 platform: ruby
 authors:
 - JP Slavinsky
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: restforce
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +91,16 @@ dependencies:
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 description: Interface gem for accessing OpenStax's Salesforce instance
 email:
 - jps@kindlinglabs.com