magento 0.4.0 → 0.5.0

data/lib/magento/order.rb

@@ -1,5 +1,6 @@
 module Magento
   class Order < Model
     self.primary_key = :entity_id
+    self.entity_key = :entity
   end
 end

data/lib/magento/query.rb

@@ -85,7 +85,8 @@ module Magento
 
     def all
       result = request.get("#{endpoint}?#{query_params}").parse
-      RecordCollection.from_magento_response(result, model: model)
+      field  = model == Magento::Category ? 'children_data' : 'items'
+      RecordCollection.from_magento_response(result, model: model, iterable_field: field)
     end
 
     private

data/lib/magento/record_collection.rb

@@ -1,66 +1,36 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-
-module Magento
-  class RecordCollection
-    attr_accessor :items, :search_criteria, :total_count
-    extend Forwardable
-
-    def initialize
-      @items = []
-      @search_criteria = Magento::SearchCriterium
-    end
-
-    def_delegators :@search_criteria, :current_page, :filter_groups, :page_size
-
-    def_delegators :@items, :last, :each_index, :sample, :sort, :count, :[],
-                   :find_index, :select, :filter, :reject, :collect, :map,
-                   :first, :all?, :any?, :none?, :one?, :reverse_each, :take,
-                   :take_while, :drop, :drop_while, :cycle, :index, :sort_by,
-                   :empty?, :reverse, :length, :size, :each, :find
-
-    alias_method :per, :page_size
-
-    class << self
-      def from_magento_response(response, model:)
-        if model == Magento::Category
-          handle_category_response(response, model)
-        else
-          handle_response(response, model)
-        end
-      end
-
-      private
-
-      def handle_category_response(response, model)
-        collection = Magento::RecordCollection.new
-
-        collection.items = response['children_data']&.map do |item|
-          ModelMapper.from_hash(item).to_model(model)
-        end || []
-
-        collection.total_count = response['children_data']&.size || 0
-        collection
-      end
-
-      def handle_response(response, model)
-        collection = Magento::RecordCollection.new
-
-        collection.items = response['items']&.map do |item|
-          ModelMapper.from_hash(item).to_model(model)
-        end || []
-
-        collection.total_count = response['total_count'] if response['total_count']
-
-        if response['search_criteria']
-          collection.search_criteria = ModelMapper
-            .from_hash(response['search_criteria'])
-            .to_model(Magento::SearchCriterium)
-        end
-
-        collection
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module Magento
+  class RecordCollection
+    attr_reader :items, :search_criteria, :total_count
+    extend Forwardable
+
+    def initialize(items:, total_count: nil, search_criteria: nil)
+      @items           = items || []
+      @total_count     = total_count || @items.size
+      @search_criteria = search_criteria || Magento::SearchCriterium.new
+    end
+
+    def_delegators :@search_criteria, :current_page, :filter_groups, :page_size
+
+    def_delegators :@items, :count, :length, :size, :first, :last, :[],
+                   :find, :each, :each_with_index, :sample, :map, :select,
+                   :filter, :reject, :collect, :take, :take_while, :sort,
+                   :sort_by, :reverse_each, :reverse, :all?, :any?, :none?,
+                   :one?, :empty?
+
+    alias per page_size
+
+    class << self
+      def from_magento_response(response, model:, iterable_field: 'items')
+        Magento::RecordCollection.new(
+          items: response[iterable_field]&.map { |item| model.build(item) },
+          total_count: response['total_count'],
+          search_criteria: Magento::SearchCriterium.build(response['search_criteria'])
+        )
+      end
+    end
+  end
+end

data/lib/magento/request.rb

@@ -1,108 +1,79 @@
-# frozen_string_literal: true
-
-require 'uri'
-require 'http'
-
-module Magento
-  class Request
-    attr_reader :token, :store
-
-    def initialize(token: Magento.token, store: Magento.store)
-      @token = token
-      @store = store
-    end
-
-    def get(resource)
-      save_request(:get, url(resource))
-      handle_error http_auth.get(url(resource))
-    end
-
-    def put(resource, body)
-      save_request(:put, url(resource), body)
-      handle_error http_auth.put(url(resource), json: body)
-    end
-
-    def post(resource, body = nil, url_completa = false)
-      url = url_completa ? resource : url(resource)
-      save_request(:post, url, body)
-      handle_error http_auth.post(url, json: body)
-    end
-
-    def delete(resource)
-      save_request(:delete, url(resource))
-      handle_error http_auth.delete(url(resource))
-    end
-
-    private
-
-    def http_auth
-      HTTP.auth("Bearer #{token}")
-    end
-
-    def base_url
-      url = Magento.url.to_s.sub(%r{/$}, '')
-      "#{url}/rest/#{store}/V1"
-    end
-
-    def url(resource)
-      "#{base_url}/#{resource}"
-    end
-
-    def search_params(field:, value:, conditionType: :eq)
-      create_params(
-        filter_groups: {
-          '0': {
-            filters: {
-              '0': {
-                field: field,
-                conditionType: conditionType,
-                value: value
-              }
-            }
-          }
-        }
-      )
-    end
-
-    def field_params(fields:)
-      create_params(fields: fields)
-    end
-
-    def create_params(filter_groups: nil, fields: nil, current_page: 1)
-      CGI.unescape(
-        {
-          searchCriteria: {
-            currentPage: current_page,
-            filterGroups: filter_groups
-          }.compact,
-          fields: fields
-        }.compact.to_query
-      )
-    end
-
-    def handle_error(resp)
-      return resp if resp.status.success?
-
-      begin
-        msg = resp.parse['message']
-        errors = resp.parse['errors']
-      rescue StandardError
-        msg = 'Failed access to the magento server'
-        errors = []
-      end
-
-      raise Magento::NotFound.new(msg, resp.status.code, errors, @request) if resp.status.not_found?
-
-      raise Magento::MagentoError.new(msg, resp.status.code, errors, @request)
-    end
-
-    def save_request(method, url, body = nil)
-      begin
-        body = body[:product].reject { |e| e == :media_gallery_entries }
-      rescue StandardError
-      end
-
-      @request = { method: method, url: url, body: body }
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'uri'
+require 'http'
+
+module Magento
+  class Request
+    attr_reader :token, :store
+
+    def initialize(token: Magento.token, store: Magento.store)
+      @token = token
+      @store = store
+    end
+
+    def get(resource)
+      save_request(:get, url(resource))
+      handle_error http_auth.get(url(resource))
+    end
+
+    def put(resource, body)
+      save_request(:put, url(resource), body)
+      handle_error http_auth.put(url(resource), json: body)
+    end
+
+    def post(resource, body = nil, url_completa = false)
+      url = url_completa ? resource : url(resource)
+      save_request(:post, url, body)
+      handle_error http_auth.post(url, json: body)
+    end
+
+    def delete(resource)
+      save_request(:delete, url(resource))
+      handle_error http_auth.delete(url(resource))
+    end
+
+    private
+
+    def http_auth
+      HTTP.auth("Bearer #{token}")
+    end
+
+    def base_url
+      url = Magento.url.to_s.sub(%r{/$}, '')
+      "#{url}/rest/#{store}/V1"
+    end
+
+    def url(resource)
+      "#{base_url}/#{resource}"
+    end
+
+    def handle_error(resp)
+      return resp if resp.status.success?
+
+      begin
+        msg = resp.parse['message']
+        errors = resp.parse['errors']
+        if resp.parse['parameters'].is_a? Hash
+          resp.parse['parameters'].each { |k, v| msg.sub! "%#{k}", v }
+        end
+      rescue StandardError
+        msg = 'Failed access to the magento server'
+        errors = []
+      end
+
+      raise Magento::NotFound.new(msg, resp.status.code, errors, @request) if resp.status.not_found?
+
+      raise Magento::MagentoError.new(msg, resp.status.code, errors, @request)
+    end
+
+    def save_request(method, url, body = nil)
+      begin
+        body = body[:product].reject { |e| e == :media_gallery_entries }
+      rescue StandardError
+      end
+
+      @request = { method: method, url: url, body: body }
+    end
+  end
+end

data/lib/magento/shared/billing_address.rb

@@ -0,0 +1,4 @@
+module Magento
+  class BillingAddress
+  end
+end

data/lib/magento/shared/currency.rb

@@ -0,0 +1,4 @@
+module Magento
+  class Currency
+  end
+end

data/lib/magento/shared/search_criterium.rb

@@ -1,5 +1,6 @@
-module Magento
-  class SearchCriterium
-    attr_accessor :current_page, :filter_groups, :page_size
-  end
-end
+module Magento
+  class SearchCriterium
+    include Magento::ModelParser
+    attr_accessor :current_page, :filter_groups, :page_size
+  end
+end

data/lib/magento/shared/sort_order.rb

@@ -0,0 +1,4 @@
+module Magento
+  class SortOrder
+  end
+end

data/lib/magento/shared/status_history.rb

@@ -0,0 +1,4 @@
+module Magento
+  class StatusHistory
+  end
+end

data/lib/magento/version.rb

@@ -1,3 +1,3 @@
-module Magento
-  VERSION = '0.4.0'
+module Magento
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magento
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Wallas Faria
@@ -53,6 +53,7 @@ files:
 - lib/magento/country.rb
 - lib/magento/customer.rb
 - lib/magento/errors.rb
+- lib/magento/guest_cart.rb
 - lib/magento/model.rb
 - lib/magento/model_mapper.rb
 - lib/magento/order.rb
@@ -62,9 +63,11 @@ files:
 - lib/magento/request.rb
 - lib/magento/shared/address.rb
 - lib/magento/shared/available_regions.rb
+- lib/magento/shared/billing_address.rb
 - lib/magento/shared/bundle_product_option.rb
 - lib/magento/shared/category_link.rb
 - lib/magento/shared/configurable_product_option.rb
+- lib/magento/shared/currency.rb
 - lib/magento/shared/custom_attribute.rb
 - lib/magento/shared/extension_attribute.rb
 - lib/magento/shared/filter.rb
@@ -79,6 +82,8 @@ files:
 - lib/magento/shared/search_criterium.rb
 - lib/magento/shared/shipping.rb
 - lib/magento/shared/shipping_assignment.rb
+- lib/magento/shared/sort_order.rb
+- lib/magento/shared/status_history.rb
 - lib/magento/shared/stock_item.rb
 - lib/magento/shared/tier_price.rb
 - lib/magento/shared/total.rb