recurly 3.0.0.beta.3 → 3.0.0.beta.4

data/lib/recurly/resources/user.rb

@@ -1,14 +1,18 @@
+# This file is automatically created by Recurly's OpenAPI generation process
+# and thus any edits you make by hand will be lost. If you wish to make a
+# change to this file, please create a Github issue explaining the changes you
+# need and we will usher them to the appropriate places.
 module Recurly
   module Resources
     class User < Resource
 
       # @!attribute [r] created_at
       #   @return [DateTime]
-      define_attribute :created_at, DateTime, {:read_only => true}
+      define_attribute :created_at, DateTime, { :read_only => true }
 
       # @!attribute [r] deleted_at
       #   @return [DateTime]
-      define_attribute :deleted_at, DateTime, {:read_only => true}
+      define_attribute :deleted_at, DateTime, { :read_only => true }
 
       # @!attribute email
       #   @return [String]
@@ -20,7 +24,7 @@ module Recurly
 
       # @!attribute [r] id
       #   @return [String]
-      define_attribute :id, String, {:read_only => true}
+      define_attribute :id, String, { :read_only => true }
 
       # @!attribute last_name
       #   @return [String]
@@ -28,7 +32,7 @@ module Recurly
 
       # @!attribute [r] object
       #   @return [String] Object type
-      define_attribute :object, String, {:read_only => true}
+      define_attribute :object, String, { :read_only => true }
 
       # @!attribute time_zone
       #   @return [String]

data/lib/recurly/schema/json_deserializer.rb

@@ -22,32 +22,30 @@ module Recurly
 
           schema_attr = self.schema.get_attribute(attr_name)
 
-          # if the Hash val is a recurly type, parse it into a Resource
-          val = if val.is_a?(Hash) && !schema_attr.is_primitive?
-                  schema_attr.recurly_class.from_json(val)
-                elsif val.is_a?(Array)
-                  val.map do |e|
-                    if e.is_a?(Hash) && !schema_attr.is_primitive?
-                      schema_attr.recurly_class.from_json(e)
-                    else
-                      e
+          if schema_attr
+            # if the Hash val is a recurly type, parse it into a Resource
+            val = if val.is_a?(Hash) && !schema_attr.is_primitive?
+                    schema_attr.recurly_class.from_json(val)
+                  elsif val.is_a?(Array)
+                    val.map do |e|
+                      if e.is_a?(Hash) && !schema_attr.is_primitive?
+                        schema_attr.recurly_class.from_json(e)
+                      else
+                        e
+                      end
                     end
+                  elsif val && schema_attr.type == DateTime && val.is_a?(String)
+                    DateTime.parse(val)
+                  else
+                    val
                   end
-                elsif attr_name.end_with?("_at") && val && val.is_a?(String)
-                  # TODO should use the schema to determine this probably
-                  DateTime.parse(val)
-                else
-                  val
-                end
 
-          writer = "#{attr_name}="
+            writer = "#{attr_name}="
 
-          # TODO maybe check for protected writer first?
-          begin
             resource.send(writer, val)
-          rescue => e
+          else
             # TODO ignoring these missing fields for now
-            puts e
+            puts "Missing #{attr_name}"
           end
         end
         resource

data/lib/recurly/schema/request_caster.rb

@@ -43,7 +43,7 @@ module Recurly
                            elem
                          end
                        end
-                     elsif v.is_a?(Hash) && schema_attr.type.is_a?(Symbol)
+                     elsif v.is_a?(Hash) && schema_attr && schema_attr.type.is_a?(Symbol)
                        cast(v, schema_attr.recurly_class.schema)
                      else
                        v

data/lib/recurly/schema/schema_validator.rb

@@ -37,14 +37,18 @@ module Recurly
       # Validates an individual attribute
       def validate_attribute!(schema_attr, val)
         unless schema_attr.type.is_a?(Symbol) || val.is_a?(schema_attr.type)
-          expected = case schema_attr.type
-                     when Array
-                       "Array of #{schema_attr.type.item_type}s"
-                     else
-                       schema_attr.type
-                     end
-
-          raise ArgumentError, "Attribute '#{schema_attr.name}' on the resource #{self.class.name} is type #{val.class} but should be a #{expected}"
+          # If it's safely castable, the json deserializer or server
+          # will take care of it for us
+          unless safely_castable?(val.class, schema_attr.type)
+            expected = case schema_attr.type
+                       when Array
+                         "Array of #{schema_attr.type.item_type}s"
+                       else
+                         schema_attr.type
+                       end
+
+            raise ArgumentError, "Attribute '#{schema_attr.name}' on the resource #{self.class.name} is type #{val.class} but should be a #{expected}"
+          end
         end
 
         # This is the convention for a recurly object
@@ -69,6 +73,25 @@ module Recurly
 
       private
 
+      def safely_castable?(from_type, to_type)
+        # TODO we can drop this switch when 2.3 support is dropped
+        int_class = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.4.0")
+                      :Integer
+                    else
+                      :Fixnum
+                    end
+        int_class = Kernel.const_get(int_class)
+
+        case [from_type, to_type]
+        when [Symbol, String]
+          true
+        when [int_class, Float]
+          true
+        else
+          false
+        end
+      end
+
       # This code is copied directly from the did_you mean gem which is based
       # directly on the Text gem implementation.
       #

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly
-  VERSION = "3.0.0.beta.3"
+  VERSION = "3.0.0.beta.4"
 end

data/recurly.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 0.12"
+  spec.add_dependency "faraday", ">= 0.8.11", "<= 1.0.0"
 
   spec.add_development_dependency "net-http-persistent", "~> 2.9.4"
   spec.add_development_dependency "bundler", "~> 1.14"

data/scripts/check-deps

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -e
+
+function check_for_command {
+  if ! hash eval "$1" 2>/dev/null; then
+    echo "✖ Could not find '$1'" 
+    exit 1
+  fi
+  echo "✓ Found $1"
+}
+
+check_for_command "ruby"
+check_for_command "bundle"
+
+RUBY_VERSION=$(ruby --version)
+RUBY_MAJOR=$(ruby --version | cut -d' ' -f2 | cut -d'.' -f1)
+RUBY_MINOR=$(ruby --version | cut -d' ' -f2 | cut -d'.' -f2)
+
+function unsupported_ruby_version {
+  echo "✖ Unsupported ruby version is ${RUBY_VERSION}"
+  exit 1
+}
+
+if [ "$RUBY_MAJOR" -lt "2" ] || [ "$RUBY_MINOR" -lt "3" ]; then
+  unsupported_ruby_version
+else
+  echo "✓ Version ${RUBY_VERSION} is compatible"
+fi

data/scripts/install-deps

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -e
+
+if ! hash brew 2>/dev/null; then
+  echo "✖ Homebrew not found. Please install: https://brew.sh/"
+  exit 1
+else
+  echo "✓ Found homebrew"
+fi
+
+if ! hash rbenv 2>/dev/null; then
+  read -p "✖ 'rbenv' not found. Would you like to install it? [Y/n] " -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy\n]$ ]]
+  then
+    brew install rbenv ruby-build && true
+    echo
+    echo "Please follow the rbenv instructions below before continuing:"
+    eval "$(rbenv init -)"
+    echo $(rbenv init)
+    read -p "Press enter to continue"
+    # Installs latest stable version
+    VERSION=$(rbenv install -l | grep -v - | tail -1)
+    rbenv install $VERSION
+    rbenv global $VERSION
+  else
+    exit 1
+  fi
+else
+  echo "✓ Found rbenv"
+fi
+
+if ! hash bundle 2>/dev/null; then
+  read -p "✖ 'bundle' not found. Would you like to install it? [Y/n] " -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy]$ ]]
+  then
+    gem install bundler
+  else
+    exit 1
+  fi
+else
+  echo "✓ Found bundle"
+fi

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.3
+  version: 3.0.0.beta.4
 platform: ruby
 authors:
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.11
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.11
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +137,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -146,22 +153,30 @@ files:
 - lib/recurly/errors/network_errors.rb
 - lib/recurly/pager.rb
 - lib/recurly/request.rb
+- lib/recurly/requests/account_acquisition_cost.rb
 - lib/recurly/requests/account_acquisition_updatable.rb
 - lib/recurly/requests/account_create.rb
 - lib/recurly/requests/account_update.rb
 - lib/recurly/requests/add_on_create.rb
+- lib/recurly/requests/add_on_pricing.rb
 - lib/recurly/requests/add_on_update.rb
 - lib/recurly/requests/address.rb
 - lib/recurly/requests/billing_info_create.rb
 - lib/recurly/requests/coupon_bulk_create.rb
 - lib/recurly/requests/coupon_create.rb
+- lib/recurly/requests/coupon_pricing.rb
 - lib/recurly/requests/coupon_redemption_create.rb
 - lib/recurly/requests/coupon_update.rb
+- lib/recurly/requests/external_refund.rb
+- lib/recurly/requests/invoice_address.rb
 - lib/recurly/requests/invoice_create.rb
 - lib/recurly/requests/invoice_refund.rb
+- lib/recurly/requests/invoice_updatable.rb
 - lib/recurly/requests/line_item_create.rb
 - lib/recurly/requests/line_item_refund.rb
 - lib/recurly/requests/plan_create.rb
+- lib/recurly/requests/plan_hosted_pages.rb
+- lib/recurly/requests/plan_pricing.rb
 - lib/recurly/requests/plan_update.rb
 - lib/recurly/requests/shipping_address_create.rb
 - lib/recurly/requests/shipping_address_update.rb
@@ -173,15 +188,22 @@ files:
 - lib/recurly/resource.rb
 - lib/recurly/resources/account.rb
 - lib/recurly/resources/account_acquisition.rb
+- lib/recurly/resources/account_acquisition_cost.rb
 - lib/recurly/resources/account_balance.rb
+- lib/recurly/resources/account_balance_amount.rb
 - lib/recurly/resources/account_mini.rb
 - lib/recurly/resources/account_note.rb
 - lib/recurly/resources/add_on.rb
 - lib/recurly/resources/add_on_mini.rb
+- lib/recurly/resources/add_on_pricing.rb
 - lib/recurly/resources/address.rb
 - lib/recurly/resources/billing_info.rb
+- lib/recurly/resources/billing_info_payment_method.rb
+- lib/recurly/resources/billing_info_updated_by.rb
 - lib/recurly/resources/coupon.rb
 - lib/recurly/resources/coupon_discount.rb
+- lib/recurly/resources/coupon_discount_pricing.rb
+- lib/recurly/resources/coupon_discount_trial.rb
 - lib/recurly/resources/coupon_mini.rb
 - lib/recurly/resources/coupon_redemption.rb
 - lib/recurly/resources/coupon_redemption_mini.rb
@@ -190,13 +212,17 @@ files:
 - lib/recurly/resources/custom_field_definition.rb
 - lib/recurly/resources/error.rb
 - lib/recurly/resources/error_may_have_transaction.rb
+- lib/recurly/resources/fraud_info.rb
 - lib/recurly/resources/invoice.rb
+- lib/recurly/resources/invoice_address.rb
 - lib/recurly/resources/invoice_collection.rb
 - lib/recurly/resources/invoice_mini.rb
 - lib/recurly/resources/line_item.rb
 - lib/recurly/resources/line_item_list.rb
 - lib/recurly/resources/plan.rb
+- lib/recurly/resources/plan_hosted_pages.rb
 - lib/recurly/resources/plan_mini.rb
+- lib/recurly/resources/plan_pricing.rb
 - lib/recurly/resources/settings.rb
 - lib/recurly/resources/shipping_address.rb
 - lib/recurly/resources/site.rb
@@ -205,6 +231,8 @@ files:
 - lib/recurly/resources/subscription_change.rb
 - lib/recurly/resources/tax_info.rb
 - lib/recurly/resources/transaction.rb
+- lib/recurly/resources/transaction_payment_gateway.rb
+- lib/recurly/resources/transaction_payment_method.rb
 - lib/recurly/resources/unique_coupon_code.rb
 - lib/recurly/resources/user.rb
 - lib/recurly/schema.rb
@@ -216,7 +244,9 @@ files:
 - lib/recurly/version.rb
 - recurly.gemspec
 - scripts/build
+- scripts/check-deps
 - scripts/clean
+- scripts/install-deps
 - scripts/test
 homepage: https://partner-docs.recurly.com
 licenses:
@@ -238,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: The ruby client for Recurly's Partner API