cashbox 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a2448650f0f71fb5c40df130c1d0a2b56b42da
-  data.tar.gz: b1d47e46020d7e98ae156e1eff9bc553ce8b25a5
+  metadata.gz: dcbb61459cfd4774c5682fa69e7fffd461de6b03
+  data.tar.gz: ddd2906f15529f2d362405cce87e144dbdf558c6
 SHA512:
-  metadata.gz: 9ca7f3b5751c6c26a4f261e0a6b3d2621b7753d8207f352af3fc9647a21116811539c0930d8caa57ae9a31a2c528bec8abcc9a90a98477698c4d5120fa107807
-  data.tar.gz: e8f94e7f0ba5774e96ec661cb3f3f7ba3a9356085c6a066dc764a6157e8766bdf2e5ea113bfbf0acb512cc36b9d670680762c32eac8147cc3f98fdffc7ecefd6
+  metadata.gz: f87715cb329840ec4b71234ed2669d807fa7ee9dcd2de74315f300f70660ebfb96bf3d50c1190afb17b05e7676fb6c704d6cb32e3a508d4536d94d1b48b7158a
+  data.tar.gz: 7415778dff6c81f13246622d7732b8fb40d9da6addd673914051419f28c0072afb66f3f749c7f01f45f9114189f65d22fb787ca18520df7b0cc89ff8846355bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cashbox (0.0.15)
+    cashbox (0.0.16)
       activesupport
       addressable
       hashie
@@ -84,4 +84,4 @@ DEPENDENCIES
   webmock (~> 2.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/cashbox.rb

@@ -45,7 +45,7 @@ module Cashbox
     autoload :Error
     autoload :Type
     autoload :Request
-    autoload :Repository
+    autoload :Rest
 
     autoload_under 'model' do
       autoload :Model

data/lib/cashbox/model/account.rb

@@ -1,7 +1,7 @@
 module Cashbox
   class Account < Model
     include Concern::Objectable
-    include Concern::Persistable
+    include Rest::ReadWrite
 
     property :id
     property :vid

data/lib/cashbox/model/address.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class Address < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :vid
     property :city

data/lib/cashbox/model/billing_plan.rb

@@ -1,7 +1,7 @@
 module Cashbox
   class BillingPlan < Model
-    include Cashbox::Concern::Objectable
-    include Cashbox::Concern::Persistable
+    include Concern::Objectable
+    include Rest::ReadWrite
 
     property :id
     property :vid

data/lib/cashbox/model/billing_plan_period.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class BillingPlanPeriod < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :cycles
     property :quantity

data/lib/cashbox/model/credit_card.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class CreditCard < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :vid
     property :account

data/lib/cashbox/model/description.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class Description < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :description
     property :language

data/lib/cashbox/model/direct_debit.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class DirectDebit < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :vid
     property :account

data/lib/cashbox/model/entitlement.rb

@@ -1,7 +1,7 @@
 module Cashbox
   class Entitlement < Model
-    include Cashbox::Concern::Objectable
-    include Cashbox::Concern::Persistable
+    include Concern::Objectable
+    include Rest::ReadWrite
 
     property :id
     property :description

data/lib/cashbox/model/invoice.rb

@@ -1,7 +1,7 @@
 module Cashbox
   class Invoice < Model
     include Concern::Objectable
-    include Concern::Persistable
+    include Rest::ReadWrite
 
     property :id
     property :vid

data/lib/cashbox/model/pay_pal.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class PayPal < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :cancel_url
     property :reference_id

data/lib/cashbox/model/payment_method.rb

@@ -1,7 +1,8 @@
 module Cashbox
   class PaymentMethod < Model
-    include Cashbox::Concern::Objectable
-    include Cashbox::Concern::Persistable
+    include Concern::Objectable
+    include Rest::ReadWrite
+    include Rest::Archive
 
     property :id
     property :vid

data/lib/cashbox/model/period.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class Period < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :cycles
     property :quantity

data/lib/cashbox/model/price.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class Price < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :amount, coerce: Float
     property :currency

data/lib/cashbox/model/product.rb

@@ -1,7 +1,7 @@
 module Cashbox
   class Product < Model
-    include Cashbox::Concern::Objectable
-    include Cashbox::Concern::Persistable
+    include Concern::Objectable
+    include Rest::ReadWrite
 
     property :id
     property :vid

data/lib/cashbox/model/product_description.rb

@@ -1,5 +1,5 @@
 module Cashbox
   class ProductDescription < Cashbox::Description
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
   end
 end

data/lib/cashbox/model/product_price.rb

@@ -1,5 +1,5 @@
 module Cashbox
   class ProductPrice < Cashbox::Price
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
   end
 end

data/lib/cashbox/model/subscription.rb

@@ -1,7 +1,9 @@
 module Cashbox
   class Subscription < Model
-    include Cashbox::Concern::Objectable
-    include Cashbox::Concern::Persistable
+    include Concern::Objectable
+    include Rest::ReadWrite
+    include Rest::Cancel
+    include Rest::Disentitle
 
     property :id
     property :vid

data/lib/cashbox/model/subscription_item.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class SubscriptionItem < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :id
     property :product, coerce: Cashbox::Product

data/lib/cashbox/model/transaction.rb

@@ -1,7 +1,8 @@
 module Cashbox
   class Transaction < Model
-    include Cashbox::Concern::Objectable
-    include Cashbox::Concern::Persistable
+    include Concern::Objectable
+    include Rest::ReadWrite
+    include Rest::Cancel
 
     property :id
     property :vid

data/lib/cashbox/model/transaction_item.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class TransactionItem < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :index_number
     property :item_type

data/lib/cashbox/model/transaction_status.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class TransactionStatus < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :created, coerce: Cashbox::Type.DateTime
     property :payment_method_type

data/lib/cashbox/model/transaction_status_pay_pal.rb

@@ -1,6 +1,6 @@
 module Cashbox
   class TransactionStatusPayPal < Model
-    include Cashbox::Concern::Objectable
+    include Concern::Objectable
 
     property :token
     property :auth_code

data/lib/cashbox/rest.rb

@@ -0,0 +1,13 @@
+require 'active_support/dependencies/autoload'
+
+module Cashbox::Rest
+  extend ActiveSupport::Autoload
+
+  eager_autoload do
+    autoload :Archive
+    autoload :Cancel
+    autoload :Disentitle
+    autoload :Helpers
+    autoload :ReadWrite
+  end
+end

data/lib/cashbox/rest/archive.rb

@@ -0,0 +1,16 @@
+require 'active_support/concern'
+
+module Cashbox::Rest
+  module Archive
+    extend ActiveSupport::Concern
+
+    included do
+      include Cashbox::Rest::Helpers
+
+      def archive
+        request = Cashbox::Request.new(:post, route(self.vid), { body: { active: false }.to_json })
+        self.class.cast(self, request.response)
+      end
+    end
+  end
+end

data/lib/cashbox/rest/cancel.rb

@@ -0,0 +1,16 @@
+require 'active_support/concern'
+
+module Cashbox::Rest
+  module Cancel
+    extend ActiveSupport::Concern
+
+    included do
+      include Cashbox::Rest::Helpers
+
+      def cancel
+        request = Cashbox::Request.new(:post, "#{route(self.vid)}/actions/cancel")
+        self.class.cast(self, request.response)
+      end
+    end
+  end
+end

data/lib/cashbox/rest/disentitle.rb

@@ -0,0 +1,16 @@
+require 'active_support/concern'
+
+module Cashbox::Rest
+  module Disentitle
+    extend ActiveSupport::Concern
+
+    included do
+      include Cashbox::Rest::Helpers
+
+      def disentitle
+        request = Cashbox::Request.new(:post, "#{route(self.vid)}/actions/cancel", { body: { disentitle: 'Yes' }.to_json })
+        self.class.cast(self, request.response)
+      end
+    end
+  end
+end

data/lib/cashbox/rest/helpers.rb

@@ -0,0 +1,36 @@
+require 'active_support/inflector'
+require 'addressable/uri'
+require 'active_support/concern'
+
+module Cashbox::Rest
+  module Helpers
+    extend ActiveSupport::Concern
+
+    included do
+      def route(id=nil)
+        self.class.route(id)
+      end
+    end
+
+    class_methods do
+      def route(id=nil)
+        class_name = self.name.split('::').last
+        tableized_class_name = ActiveSupport::Inflector.tableize(class_name)
+        [ '', tableized_class_name, id ].compact.join('/')
+      end
+
+      def cast(instance, hash)
+        case hash['object']
+        when 'List'
+          hash['data'].map do |data|
+            instance.class.new(data)
+          end
+        when 'Error'
+          raise Cashbox::Error.new(hash['message'])
+        else
+          instance.deep_merge!(hash)
+        end
+      end
+    end
+  end
+end

data/lib/cashbox/rest/read_write.rb

@@ -0,0 +1,66 @@
+require 'active_support/concern'
+
+module Cashbox::Rest
+  module ReadWrite
+    extend ActiveSupport::Concern
+
+    DEFAULT_LIMIT = 100.freeze
+
+    included do
+      include Cashbox::Rest::Helpers
+
+      def save
+        save!
+      rescue Exception
+        false
+      end
+
+      def save!
+        request = Cashbox::Request.new(:post, route(self.vid), { body: self.to_json })
+        self.class.cast(self, request.response)
+        true
+      end
+    end
+
+    class_methods do
+      def find(id)
+        request = Cashbox::Request.new(:get, route(id))
+        self.cast(self.new, request.response)
+      end
+
+      def first
+        where({ limit: 1 }).first
+      end
+
+      def all
+        where
+      end
+
+      def where(params = {})
+        Hashie.symbolize_keys!(params)
+        query(params, params.delete(:limit))
+      end
+
+      private
+
+      def query(params, max)
+        params = Hashie::Mash.new(params)
+
+        params.limit ||= DEFAULT_LIMIT
+        params.limit = params.limit.to_i
+        params.limit = max if max && max < params.limit
+
+        response = Cashbox::Request.new(:get, route, { query: params }).response
+        objects = cast(self.new, response)
+
+        if (response.next && (max.nil? || objects.count < max))
+          max -= objects.count if max
+          params = Addressable::URI.parse(response.next).query_values
+          objects.concat(query(params, max))
+        end
+
+        objects
+      end
+    end
+  end
+end

data/lib/cashbox/version.rb

@@ -1,3 +1,3 @@
 module Cashbox
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cashbox
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Jonathon Storer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,7 +172,6 @@ files:
 - codeship-steps.yml
 - lib/cashbox.rb
 - lib/cashbox/concern/objectable.rb
-- lib/cashbox/concern/persistable.rb
 - lib/cashbox/error.rb
 - lib/cashbox/model/account.rb
 - lib/cashbox/model/address.rb
@@ -198,8 +197,13 @@ files:
 - lib/cashbox/model/transaction_item.rb
 - lib/cashbox/model/transaction_status.rb
 - lib/cashbox/model/transaction_status_pay_pal.rb
-- lib/cashbox/repository.rb
 - lib/cashbox/request.rb
+- lib/cashbox/rest.rb
+- lib/cashbox/rest/archive.rb
+- lib/cashbox/rest/cancel.rb
+- lib/cashbox/rest/disentitle.rb
+- lib/cashbox/rest/helpers.rb
+- lib/cashbox/rest/read_write.rb
 - lib/cashbox/type.rb
 - lib/cashbox/version.rb
 homepage: https://github.com/legalshield/cashbox

data/lib/cashbox/concern/persistable.rb

@@ -1,25 +0,0 @@
-require 'active_support/concern'
-
-module Cashbox::Concern
-  module Persistable
-    extend ActiveSupport::Concern
-
-    included do
-      extend Forwardable
-      extend SingleForwardable
-
-      def_single_delegators :repository, :where, :all, :first, :find
-      def_instance_delegators :repository, :save, :save!, :destroy
-
-      def repository
-        @repository ||= Cashbox::Repository.new(self)
-      end
-    end
-
-    class_methods do
-      def repository
-        Cashbox::Repository.new(self.new)
-      end
-    end
-  end
-end

data/lib/cashbox/repository.rb

@@ -1,89 +0,0 @@
-require 'active_support/inflector'
-require 'addressable/uri'
-
-module Cashbox
-  class Repository
-    DEFAULT_LIMIT = 100.freeze
-
-    attr_reader :instance
-
-    def initialize(instance)
-      @instance = instance
-    end
-
-    def first
-      where({ limit: 1 }).first
-    end
-
-    def all
-      where
-    end
-
-    def find(id)
-      raise ArgumentError.new("Cannot find Resource with id 'nil'") unless id
-      cast(Cashbox::Request.new(:get, route(id)).response)
-    end
-
-    def where(query = {})
-      Hashie.symbolize_keys!(query)
-      _where(query, query.delete(:limit))
-    end
-
-    def save
-      save!
-    rescue Exception
-      false
-    end
-
-    def save!
-      request = Cashbox::Request.new(:post, route(@instance.vid), { body: @instance.to_json })
-      cast(request.response)
-      true
-    end
-
-    def destroy
-      request = Cashbox::Request.new(:post, "#{route(@instance.vid)}/actions/cancel")
-      cast(request.response)
-    end
-
-    private
-
-    def _where(query, max)
-      query = Hashie::Mash.new(query)
-
-      query.limit ||= DEFAULT_LIMIT
-      query.limit = query.limit.to_i
-      query.limit = max if max && max < query.limit
-
-      response = Cashbox::Request.new(:get, route, { query: query }).response
-      objects = cast(response)
-
-      if (response.next && (max.nil? || objects.count < max))
-        max -= objects.count if max
-        query = Addressable::URI.parse(response.next).query_values
-        objects.concat(_where(query, max))
-      end
-
-      objects
-    end
-
-    def route(id=nil)
-      class_name = @instance.class.name.split('::').last
-      tableized_class_name = ActiveSupport::Inflector.tableize(class_name)
-      [ '', tableized_class_name, id ].compact.join('/')
-    end
-
-    def cast(hash)
-      case hash['object']
-      when 'List'
-        hash['data'].map do |data|
-          @instance.class.new(data)
-        end
-      when 'Error'
-        raise Cashbox::Error.new(hash['message'])
-      else
-        @instance.deep_merge!(hash)
-      end
-    end
-  end
-end