your_membership 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2114fa42d26afb1c73747800e9aba7e90513d97
-  data.tar.gz: bf1322fe1e0c1e8493b90d082062ae4e0d8af826
+SHA256:
+  metadata.gz: 0414125b59ee2d25c40031650648bc7c0b7cafe877f40df5509a49ea0b05f7d9
+  data.tar.gz: f72d79722d4dae7e6b1d93e2301a076ebba515ad7c2e50cc454fff04d22305a0
 SHA512:
-  metadata.gz: 58f41d9ba44581eb27c2e97d0927766fd21c6ca6772a098a44962b9f084c71b5f5c85c3cdb73afa32a6f7d9b71af7c4de88ae358c183754b30d0c5c5a363517c
-  data.tar.gz: 524ff0de4cc6d178a4e2823ed316e8a928768fcfcda3f4134d60ae9e9a0a8b93236626d6d703e5c317e46347a950e60cb43304a43ee63d00cacfeef751a57eea
+  metadata.gz: b7b76af5088d8cf1d24f09f041252efff15453112c1ef60559a53a570c67591c2bd4501fbc238570ca1ae9b2e7ee1aeff53c1fe207ea5fbde3ad0c285221b52a
+  data.tar.gz: 58ca1793293a33e92625f237c9480b72ce901d09863fa0dc43f82433a1a240dce653e9520f13138ea8682a23c4c9690ceb3d9d681b653bb7a935689824230915

data/CHANGELOG.md

@@ -4,6 +4,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.1.6] - 2021-02-17
+### Added
+- Allow httparty v0.18.x
+
+## [1.1.5] - 2018-03-21
+### Added
+- Allow httparty v0.16.x
+
+## [1.1.4] - 2017-08-18
+### Fixed
+- HTTParty monkey patch now handles nils properly.
+
+## [1.1.3] - 2017-03-13
+### Fixed
+- Allow YourMembership::Sa::Members.profile_create to pass along
+  a hashed password when one is present.
+
+## [1.1.2] - 2017-02-16
+### Added
+- Allow httparty v0.14.x
+
 ## [1.1.1] - 2016-03-23
 ### Fixed
 - Crash in `Profile#parse_custom_field_responses` when there are no

data/README.md

@@ -252,6 +252,11 @@ Thanks to grants and donations from people like you, ECHO is able to connect tra
 
 To find out more about ECHO, or to help with the work that is being done worldwide please visit http://www.echonet.org
 
+## Contributors
+npflood
+sbleon
+mmccarthy15
+
 ## Contributing
 
 If you find a problem with this library or would like to contribute an improvement please fork and submit a pull request.

data/lib/httparty/ym_xml_parser.rb

@@ -0,0 +1,29 @@
+require 'httparty/parser'
+
+module HTTParty
+  # Bug Fix for HTML encoded < and > in XML body. In order to parse the HTML
+  # encoded documents returned by the YourMembership API we need to HTML decode
+  # the <![CDATA[ tags.
+  #
+  # @api private
+  class YMXMLParser < HTTParty::Parser
+    # @api private
+    # @override
+    def body
+      decode(@body)
+    end
+
+    private
+
+    # @api private
+    def decode(body)
+      # <![CDATA[ = &lt;![CDATA[
+      # ]]> =  ]]&gt;
+      if !body.nil? && body.include?('&lt;![CDATA[')
+        body.gsub! '&lt;![CDATA[', '<![CDATA['
+        body.gsub! ']]&gt;', ']]>'
+      end
+      body
+    end
+  end
+end

data/lib/your_membership.rb

@@ -2,8 +2,6 @@ require "httparty"
 require "nokogiri"
 require "yaml"
 
-require "httparty/patch"
-
 require "your_membership/error"
 require "your_membership/config"
 require "your_membership/base"

data/lib/your_membership/base.rb

@@ -1,3 +1,5 @@
+require 'httparty/ym_xml_parser'
+
 module YourMembership
   # Base Class inherited by all Your Membership SDK Classes.
   class Base
@@ -22,6 +24,15 @@ module YourMembership
     end
     # rubocop:enable Style/ClassVars
 
+    # Fix bad XML from YM API by using custom parser.
+    # @api private
+    # @override HTTParty::ClassMethods#post
+    # @return [HTTParty::Response]
+    def self.post(path, options = {}, &block)
+      opt = options.merge(parser: ::HTTParty::YMXMLParser)
+      super(path, opt, &block)
+    end
+
     # A Guard Method that returns true if the response from the API can be processed and raises an exception if not.
     # @param [Hash] response
     # @return [Boolean] true if no errors found.

data/lib/your_membership/sa_members.rb

@@ -172,7 +172,8 @@ module YourMembership
         YourMembership::Sa::Auth.authenticate(
           YourMembership::Session.create,
           profile.data['Username'],
-          profile.data['Password']
+          profile.data['Password'],
+          profile.data['PasswordHash']
         )
       end
     end

data/lib/your_membership/version.rb

@@ -1,3 +1,3 @@
 module YourMembership
-  VERSION = "1.1.1"
+  VERSION = "1.1.6"
 end

data/spec/lib/httparty/ym_xml_parser_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+module HTTParty
+  RSpec.describe YMXMLParser do
+    it 'decodes HTML entities, eg. less-than, greater-than signs' do
+      body = <<~XML
+        <?xml version="1.0" encoding="utf-8" ?>
+        <YourMembership_Response>
+          <ErrCode>0</ErrCode>
+          <ExtendedErrorInfo>&lt;![CDATA[Text information here]]&gt;</ExtendedErrorInfo>
+          <Sa.Members.All.GetIDs>
+          <ServerGmtBias>-5</ServerGmtBias>
+          <ServerTime>2015-12-16 15:54:12</ServerTime>
+          <Members>
+            <ID>57EEB598-CB44-4D85-B0D6-377F393AF5B4</ID>
+            <ID>1C0CE647-FAA5-4EB0-ADF0-5B669B36378E</ID>
+          </Members>
+          </Sa.Members.All.GetIDs>
+        </YourMembership_Response>
+      XML
+      parser = described_class.new(body, :xml)
+      parsed = parser.parse
+      expect(parsed).to be_a(Hash)
+      ymr = parsed['YourMembership_Response']
+      expect(ymr['ErrCode']).to eq('0')
+      expect(ymr['ExtendedErrorInfo']).to eq('Text information here')
+    end
+  end
+end

data/spec/lib/your_membership/base_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module YourMembership
+  RSpec.describe Base do
+    describe '.post' do
+      it 'uses YMXMLParser' do
+        mock_parser = instance_double(
+          ::HTTParty::YMXMLParser,
+          parse: { 'YourMembership_Response' => { 'ErrCode' => 999 } }
+        )
+        allow(::HTTParty::YMXMLParser).to receive(:new).and_return(mock_parser)
+        # It doesn't matter which cassette we use for this test.
+        VCR.use_cassette 'sa_members_all_getids_timestamp_single' do
+          response = described_class.post('/')
+          expect(response).to be_an(::HTTParty::Response)
+          expect(response['YourMembership_Response']).to eq('ErrCode' => 999)
+        end
+      end
+    end
+  end
+end

data/spec/lib/your_membership/profile_spec.rb

@@ -77,6 +77,7 @@ describe YourMembership::Profile do
       }
     }
   end
+
   it "accepts and sets required parameters for new profiles" do
     profile = YourMembership::Profile.create_new('afirstname', 'alastname', 'amembertypecode', 'aemail', 'ausername', 'apassword', {})
     profile.data['FirstName'].should == 'afirstname'

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 require 'dotenv'
-require 'pry'
+require 'byebug'
 require 'vcr'
 require 'your_membership'
+require 'webmock/rspec'
 
 Dotenv.load(
   File.expand_path('../../.env.local', __FILE__),
@@ -98,4 +99,3 @@ YourMembership.configure(
   privateKey: ENV.fetch('YM_API_PRIVATE_KEY'),
   saPasscode: ENV.fetch('YM_API_SA_PASSCODE')
 )
-

data/your_membership.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "httparty", "~>0.13.1"
+  spec.add_dependency "httparty", ">=0.13.1", "<0.19"
   spec.add_dependency "nokogiri", "~>1.6"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", "<3"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "dotenv"
-  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "vcr"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: your_membership
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 platform: ruby
 authors:
 - Nate Flood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -42,18 +48,18 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -155,7 +161,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/httparty/patch.rb
+- lib/httparty/ym_xml_parser.rb
 - lib/your_membership.rb
 - lib/your_membership/base.rb
 - lib/your_membership/commerce.rb
@@ -184,6 +190,8 @@ files:
 - spec/fixtures/vcr_cassettes/sa_members_all_getids_timestamp_multiple.yml
 - spec/fixtures/vcr_cassettes/sa_members_all_getids_timestamp_none.yml
 - spec/fixtures/vcr_cassettes/sa_members_all_getids_timestamp_single.yml
+- spec/lib/httparty/ym_xml_parser_spec.rb
+- spec/lib/your_membership/base_spec.rb
 - spec/lib/your_membership/profile_spec.rb
 - spec/lib/your_membership/sa_members_spec.rb
 - spec/spec_helper.rb
@@ -207,8 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for interfacing with the YourMembership.com XML API
@@ -216,6 +223,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/sa_members_all_getids_timestamp_multiple.yml
 - spec/fixtures/vcr_cassettes/sa_members_all_getids_timestamp_none.yml
 - spec/fixtures/vcr_cassettes/sa_members_all_getids_timestamp_single.yml
+- spec/lib/httparty/ym_xml_parser_spec.rb
+- spec/lib/your_membership/base_spec.rb
 - spec/lib/your_membership/profile_spec.rb
 - spec/lib/your_membership/sa_members_spec.rb
 - spec/spec_helper.rb

data/lib/httparty/patch.rb

@@ -1,33 +0,0 @@
-require 'cgi'
-
-# Monkey Patch for the HTTParty Gem
-module HTTParty
-  # In order to parse the HTML encoded documents returned by the YourMembership
-  # API we need to HTML decode the <![CDATA[ tags. This is a bug workaround.
-  class Request
-    # This is the encode_body method from HTTParty's Request Class adding an additional method call to fix
-    # the CDATA elements that are improperly formatted in the YourMembership API's XML. This is done here to ensure that
-    # the fix is in place before the data is parsed.
-    def encode_body(body)
-      body = fix_cdata body
-      if ''.respond_to?(:encoding)
-        _encode_body(body)
-      else
-        body
-      end
-    end
-
-    # Bug Fix for HTML encoded < and > in XML body.
-    # @param body [String] an XML document that needs to be checked for this specific issue.
-    # @return [String] If the HTML encoding issue is found it is repaired and the document is returned.
-    def fix_cdata(body)
-      # <![CDATA[ = &lt;![CDATA[
-      # ]]> =  ]]&gt;
-      if body.include? '&lt;![CDATA['
-        body.gsub! '&lt;![CDATA[', '<![CDATA['
-        body.gsub! ']]&gt', ']]>'
-      end
-      body
-    end
-  end
-end