presta_shop 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9184be31c0226ec9a54ac046d76cb2db2976521
-  data.tar.gz: b670e96d7029f9e2bf0050471d4beb85ef942c66
+  metadata.gz: 58a45d67672ef4cf07a754d5a1203c903fda79c2
+  data.tar.gz: 376dfe2a83ba2dee386108991eeb74ca64adacf1
 SHA512:
-  metadata.gz: 5e97db2ce5574b95d60d73d7b14e324a16ac200ac01062f1691e7cff629eee35a7eeaff519e1c70a717e522e6e880880e749e88b84f7ecbaaf191a470189be4d
-  data.tar.gz: 426886939f70dca08aa7cff65a12ff219cd23a15bda4bde58ff7622548061a0d040219e85f5e3dc0d83dc7d446a95fce26f16c08e82ddf8e2c48522368fee9bc
+  metadata.gz: 3a006fd6d9a34251bb030d920adf029167b156b8e797fe1c2be7b54a80dde41279186831613f382bbd39040438d67877a9e9a8ffacb7c3aedf5643d0554bea73
+  data.tar.gz: 52be8e038fa3d80c1c1713229cfeeda05ff1d178044373ce0b377335dd57c548ac15d419f53b036d16e910e9bc05829c39c4c900157e58de9241152caed331c3

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.idea/
+/.idea/
+*.gem

data/lib/presta_shop/api.rb

@@ -28,6 +28,14 @@ module PrestaShop
     attr_reader :key
     attr_reader :client
 
+    class << self
+      def normalize_resource(resource)
+        resource = resource.to_s.pluralize.to_sym
+        resource = resource.to_s.singularize.to_sym if [:order_slips, :content_management_systems].include?(resource)
+        resource
+      end
+    end
+
     # Create a new instance
     # @param url [String] base URL of the Prestashop installation. Do not append "/api" to it, the gem does it internally.
     #   E.g. use "http://my.prestashop.com", not "http://my.prestashop.com/api"
@@ -62,7 +70,7 @@ module PrestaShop
       when Array then get_resources(resource, ids, params)
       when NilClass then get_resource_ids(resource, params)
       when /^schema$/, /^synopsis$/ then generate_resource_object(resource, nil, params.merge({schema: :synopsis}))
-      when /^blank$/ then generate_resource_object(resource, nil, params.merge({schema: :blank}))
+      when /^blank$/ then generate_resource_object(resource, nil, params.merge({schema: :blank}), resource_class(resource))
       else get_resource(resource, ids, params, true)
       end
     end
@@ -92,18 +100,27 @@ module PrestaShop
         api: self, resource_name: resource, schema: generate_resource_object(resource, nil, {schema: :synopsis}))
     end
 
+    def resource_languages
+      @resource_languages ||= resources.include?(:languages) ? get(:languages).zip({}).to_h : {}
+    end
+
+    def resource_language(language_id)
+      resource_languages.include?(language_id) ? resource_languages[language_id] ||= get(:languages, language_id).name : language_id
+    end
+
     def schema(resource)
       resource_requestor(resource).schema
     end
 
     def normalize_resource(resource)
-      resource = resource.to_s.pluralize.to_sym
-      resource = resource.to_s.singularize.to_sym if [:order_slips, :content_management_systems].include?(resource)
-      resource
+      self.class.normalize_resource(resource)
     end
 
     def build_query_params(params)
-      "?#{params.to_query}" unless params.none?
+      case
+      when params.include?(:schema) then "?#{params.to_query}"
+      when params.any? then "?date=1&#{params.map{ |k,v| ["filter[#{k}]", v] }.to_h.to_query}"
+      end
     end
 
     def extract_ids(args)
@@ -141,6 +158,7 @@ module PrestaShop
       xpath = XPATH_MAP.dig(resource, :find) || resource.to_s.singularize
       xml_response = Nokogiri::XML(client[resource][id][build_query_params(params)].get.body).remove_namespaces!.xpath("/prestashop/#{xpath}")
       resource_object = JSON.parse(Hash.from_xml(xml_response.to_s).values.first.to_json, object_class: object_class)
+      resource_object.xml = xml_response
       resource_object.schema_synopsis = object_schema
       resource_object
     end

data/lib/presta_shop/resource.rb

@@ -1,8 +1,8 @@
 module PrestaShop
   class Resource < OpenStruct
-    attr_reader :schema_synopsis
+    attr_reader :schema_synopsis, :xml
 
-    def initialize
+    def initialize(*args)
       super
       cast_attribute_data_types_from_schema_synopsis if self.schema_synopsis.present?
     end
@@ -12,6 +12,10 @@ module PrestaShop
       cast_attribute_data_types_from_schema_synopsis      
     end
 
+    def xml=(xml)
+      @xml = xml
+    end
+
     private
 
     def cast_attribute_data_types_from_schema_synopsis
@@ -27,15 +31,25 @@ module PrestaShop
         nested_schema_synopsis.try(:format) if nested_schema_synopsis.is_a? OpenStruct
       end
 
-      if self.dig(*nested_attribute).class == self.class
-        self.dig(*nested_attribute).marshal_dump.keys.each { |attribute| cast_attribute_from_schema(attribute, nested_attribute) }
-      elsif self.dig(*nested_attribute).class == Array
-        self.dig(*nested_attribute).each_with_index do |_, i|
+      nested_attribute_data = self.dig(*nested_attribute)
+      if nested_attribute_data.class == self.class
+        nested_attribute_data.marshal_dump.keys.each { |attribute| cast_attribute_from_schema(attribute, nested_attribute) }
+      elsif nested_attribute_data.class == Array && ( nested_attribute_data.none? && nested_attribute_data.first.class == self.class )
+        nested_attribute_data.each_with_index do |_, i|
           array_nested_attribute = nested_attribute + [i]
           self.dig(*array_nested_attribute).marshal_dump.keys.each { |attribute| cast_attribute_from_schema(attribute, array_nested_attribute) }
         end
+      elsif nested_attribute_data.class == Array
+        # resource = PrestaShop::API.normalize_resource(self.class.name.demodulize.underscore)
+        # xpath = PrestaShop::API::XPATH_MAP.dig(resource, :find) || resource.to_s.singularize
+
+        # builds an array of nested objects
+        # could be better, but will work for now
+        segment = nested.any? ? self.dig(*nested) : self
+        segment[attribute] = xml.xpath(nested_attribute.join('/')).collect do |element|
+          self.class.new(element.collect.to_h.merge({nested.last || :name => Hash.from_xml(element.to_s).values.first}))
+        end
       else
-        puts [self.class, self.id].inspect if value == '1' && format == 'isBool'
         segment = nested.any? ? self.dig(*nested) : self
         segment[attribute] = cast_value_from_schema_format(segment[attribute], format)
       end
@@ -56,6 +70,7 @@ module PrestaShop
       when 'isInt', 'isNullOrUnsignedId', 'isUnsignedId', 'isImageSize', 'isUnsignedInt'
         case value
         when nil, /null/i then nil
+        when /\D/ then value
         else value.to_i
         end
       when 'isSerializedArray'

data/lib/presta_shop/version.rb

@@ -1,3 +1,3 @@
 module PrestaShop
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presta_shop
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - chaunce