magentwo 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76391fb49be2eacf141856ba17a36dda1edd5b08e0e7069be28ae7bedef35736
-  data.tar.gz: f6faa7a572b2a0c71007852272ad227032224786c8a42691cde861213a2591c5
+  metadata.gz: aa0539c40b51df6d70767268e48405720552c3760e5eb50bf0743de635428924
+  data.tar.gz: e95ee4c5eac328f66fcd5653b8b5c4530eaa396df8671b6a2b2c019583043fad
 SHA512:
-  metadata.gz: 8ca9a91c6c9e7cbd6df412e71fb418bf79adc68f40c10bb165ba8af3953f1717859f6562c01f5758c4669884cfd66fb14e657a6b00a6df43599624ee092e99f8
-  data.tar.gz: 985a28699825066decefabdbe438afcad4d4db0105ac12df34971c68c17a70c7cf7a427352a2101daa57d8d9f517f67ac5c133b06a0cfd693cff504d5dfc20ca
+  metadata.gz: 1924091ecf2d564e164f1dc380adaca6321016e6a6eecb9514e5a288c8be1619a6e38b60d27dd831d2e07e70b174586121367fd7c2dfbae4737cbae920d17aca
+  data.tar.gz: edd7edc4deb94fcd308dc004fcda0cb6b6e8dcd1c692afb7b76f2db028ab28db8f4a054e1fd6421ffb93e1a3aa615ec61cd02f09aff466a85b2ecde757032b62

data/lib/adapter.rb

@@ -1,6 +1,7 @@
 module Magentwo
   class Adapter < Magentwo::Connection
-    DateFields = %i(created_at dob  updated_at)
+    DateTimeFields = %i(created_at updated_at change_status_at)
+    DateFields = %i(dob)
     def call method, path, params
       http_method, params = case method
       when :put, :post, :delete then [method, params.to_json]
@@ -50,7 +51,10 @@ module Magentwo
 
     def date_transform item
       DateFields.each do |date_field|
-        item[date_field] = Time.parse item[date_field] if item[date_field]
+        item[date_field] = Date.parse item[date_field] if item[date_field]
+      end
+      DateTimeFields.each do |datetime_field|
+        item[datetime_field] = Time.parse item[datetime_field] if item[datetime_field]
       end
       item
     end

data/lib/dataset.rb

@@ -109,8 +109,8 @@ module Magentwo
       self.model.first self
     end
 
-    def all
-      self.model.all self
+    def all meta_data:false
+      self.model.all self, :meta_data => meta_data
     end
 
     #################
@@ -187,12 +187,11 @@ module Magentwo
 
       received_element_count = page_size
       current_page = 1
-      while(received_element_count == page_size) do
-        page = self.page(current_page, page_size).all
-
-        block.call(page)
-
-        received_element_count = page.count
+      total_count = nil
+      until(total_count && current_page*page_size > total_count) do
+        page = self.page(current_page, page_size).all meta_data:true
+        total_count = page[:total_count] unless total_count
+        block.call(page[:items])
         current_page += 1
       end
     end

data/lib/magentwo.rb

@@ -35,6 +35,19 @@ module Magentwo
     @@logger ||= Logger.new STDOUT, {:level => Logger::INFO}
   end
 
+  def self.log_level= level
+    new_log_level = case level
+    when :debug then Logger::DEBUG
+    when :info  then Logger::INFO
+    when :warn then Logger::WARN
+    when :error then Logger::ERROR
+    when :fatal then Logger::FATAL
+    else
+      raise ArgumentError, "invalid log_level"
+    end
+    self.logger= Logger.new STDOUT, {:level => new_log_level}
+  end
+
   def self.default_page_size
     @@default_page_size ||= 20
   end
@@ -60,5 +73,5 @@ require_relative 'dataset.rb'
 require_relative 'util/validator.rb'
 
 Magentwo::Models.each do |file_name|
-	require_relative("model/#{file_name}.rb")
+  require_relative("model/#{file_name}.rb")
 end

data/lib/model/base.rb

@@ -18,11 +18,13 @@ module Magentwo
 
     def save
       self.validate
+      self.check_presence self.class.unique_identifier
       response = Magentwo::Base.call :put, "#{self.class.base_path}/#{self.send(self.class.unique_identifier)}", self
       self.class.new response
     end
 
     def delete
+      self.check_presence self.class.unique_identifier
       Magentwo::Base.call :delete, "#{self.class.base_path}/#{self.send(self.class.unique_identifier)}", nil
     end
 
@@ -83,11 +85,18 @@ module Magentwo
         base_path
       end
 
-      def all ds=self.dataset
-        self.get(ds.to_query)
+      def all ds=self.dataset, meta_data:false
+        response = self.get(ds.to_query, :meta_data => meta_data)
+        items = (meta_data ? response[:items] : response)
         .map do |item|
           self.new item
         end
+        if meta_data
+          response[:items] = items
+          response
+        else
+          items
+        end
       end
 
       def first ds=self.dataset

data/lib/model/order.rb

@@ -11,6 +11,7 @@ module Magentwo
     end
 
     def customer
+      self.check_presence :customer_id
       Magentwo::Customer[self.customer_id]
     end
 
@@ -21,7 +22,7 @@ module Magentwo
       end
 
       def unique_identifier
-        Magentwo::Logger.error "orders do not container id on default requests, therefore they cannot be targeted on the API"
+        Magentwo::Logger.error "orders do not contain id on default requests, therefore they cannot be targeted on the API"
         nil
       end
     end

data/lib/model/sales_rule.rb

@@ -4,13 +4,18 @@ module Magentwo
     Attributes.each do |attr| attr_accessor attr end
 
     def generate quantity:1, length:16, format:(:alpha), delimiter:"-", delimiter_at_every:4
+      self.check_presence :rule_id
       Magentwo::Coupon.generate self.rule_id, quantity:quantity, length:length, format:format, delimiter:delimiter, delimiter_at_every:delimiter_at_every
     end
 
     def coupons
+      self.check_presence :rule_id
       Magentwo::Coupon.filter(:rule_id => self.rule_id).all
     end
 
+    def to_json
+      Hash["rule", self.to_h].to_json
+    end
 
     class << self
       def get_path

data/magentwo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'magentwo'
-  s.version     = '0.1.7'
+  s.version     = '0.1.8'
   s.date        = '2019-01-17'
   s.summary     = "Magento 2 API Wrapper"
   s.description = "Provides a simple Ruby Interface to interact with the Magento 2 API"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magentwo
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - André Mueß
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Magento 2 API Wrapper