diff --git a/lib/mbsy.rb b/lib/mbsy.rb index 4828b65..6cea884 100644 --- a/lib/mbsy.rb +++ b/lib/mbsy.rb @@ -1,16 +1,10 @@ require 'cgi' require 'httparty' require 'json' -require 'mbsy/resources/base' -require 'mbsy/resources/ambassador' -require 'mbsy/resources/commission' -require 'mbsy/resources/balance' -require 'mbsy/resources/company' -require 'mbsy/resources/event' -require 'mbsy/resources/group' -require 'mbsy/resources/shortcode' -require 'mbsy/resources/social' -require 'mbsy/util/single_sign_on' + +require 'mbsy/resources' +require 'mbsy/utils' +require 'mbsy/deprecations' module Mbsy class << self diff --git a/lib/mbsy/deprecations.rb b/lib/mbsy/deprecations.rb new file mode 100644 index 0000000..2eae797 --- /dev/null +++ b/lib/mbsy/deprecations.rb @@ -0,0 +1,10 @@ +require_relative 'deprecations/resources' +require_relative 'deprecations/util' + +module Mbsy + def self.deprecate message + dep_method = caller_locations(1,1)[0].label + warn "[DEPRECATED] `#{dep_method}` is deprecated. Use #{message}." + yield + end +end diff --git a/lib/mbsy/deprecations/resources.rb b/lib/mbsy/deprecations/resources.rb new file mode 100644 index 0000000..8cbe4e9 --- /dev/null +++ b/lib/mbsy/deprecations/resources.rb @@ -0,0 +1,2 @@ +require_relative 'resources/company' +require_relative 'resources/balance' diff --git a/lib/mbsy/deprecations/resources/balance.rb b/lib/mbsy/deprecations/resources/balance.rb new file mode 100644 index 0000000..f37b6e0 --- /dev/null +++ b/lib/mbsy/deprecations/resources/balance.rb @@ -0,0 +1,12 @@ +module Mbsy + class Balance < Base + def self.update(mode, params={}) + Mbsy.deprecate '`add` or `deduct`' do + case mode + when :add then add(params) + when :deduct then deduct(params) + end + end + end + end +end diff --git a/lib/mbsy/deprecations/resources/company.rb b/lib/mbsy/deprecations/resources/company.rb new file mode 100644 index 0000000..158a1da --- /dev/null +++ b/lib/mbsy/deprecations/resources/company.rb @@ -0,0 +1,9 @@ +module Mbsy + class Company < Base + def self.get_details + Mbsy.deprecate 'details' do + details + end + end + end +end diff --git a/lib/mbsy/deprecations/util.rb b/lib/mbsy/deprecations/util.rb new file mode 100644 index 0000000..e69de29 diff --git a/lib/mbsy/resources.rb b/lib/mbsy/resources.rb new file mode 100644 index 0000000..5e5638e --- /dev/null +++ b/lib/mbsy/resources.rb @@ -0,0 +1,9 @@ +require_relative 'resources/base' +require_relative 'resources/ambassador' +require_relative 'resources/commission' +require_relative 'resources/balance' +require_relative 'resources/company' +require_relative 'resources/event' +require_relative 'resources/group' +require_relative 'resources/shortcode' +require_relative 'resources/social' diff --git a/lib/mbsy/resources/balance.rb b/lib/mbsy/resources/balance.rb index cde0bb5..1a2641e 100644 --- a/lib/mbsy/resources/balance.rb +++ b/lib/mbsy/resources/balance.rb @@ -1,14 +1,5 @@ module Mbsy class Balance < Base - def self.update(mode, params={}) - case mode - when :add - add(params) - when :deduct - deduct(params) - end - end - def self.add(params = {}) raise ArgumentError, "You must include :email" unless params[:email] raise ArgumentError, "You must include :amount" unless params[:amount] diff --git a/lib/mbsy/resources/company.rb b/lib/mbsy/resources/company.rb index 81fc943..23846d2 100644 --- a/lib/mbsy/resources/company.rb +++ b/lib/mbsy/resources/company.rb @@ -4,12 +4,6 @@ def self.details call('get') end - def self.get_details - warn '[DEPRECATED] `get_details` is deprecated.' + - 'Please use `details` instead.' - details - end - def self.stats call('stats') end diff --git a/lib/mbsy/utils.rb b/lib/mbsy/utils.rb new file mode 100644 index 0000000..092d087 --- /dev/null +++ b/lib/mbsy/utils.rb @@ -0,0 +1 @@ +require_relative 'util/single_sign_on'