magento_remote 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e48a3c4c2d32aa637c541ef48cd02a9f649b96
-  data.tar.gz: 54fb6b0a3365a1ad50c5a881e9ba062d64b51f95
+  metadata.gz: 5236fc7f2136ea5ec063adc2ba9eb2cd7e444560
+  data.tar.gz: b4cf90268f8054076f04e1133ed5dca4fd2dd61f
 SHA512:
-  metadata.gz: 11a3b8a1c7949e820df26bc03c056762b3f0debc99ca0914868883393e55fd6a61253cf4a97b16205b69f043817b85812e488bbf9d194245ba0e0a91d781f225
-  data.tar.gz: 80f4368b469dc9455d3a3670f5d7994f3d1cf111e776083502e91122b1330cfc7dab9e892b95a3e5304646e6b4806c769745f6ebeae6d779cf386ebd985e0522
+  metadata.gz: 4bb0e436342195eb663d819eed4951e55a8473c3553805d17b8561b9e1b644fc68f4e7994f6897fb1e789c72b247e9c284a4e6ec1cf4d0a791eebbeb5ab1739e
+  data.tar.gz: 6938ad84956935e0b54325bdd9133dc0dbf98ac2c008cdcd713fd98066f3f450cf3062051433f4f22c3b0b4b0cba5c1be9bedece394d7c323f29c0cd74ef036c

data/lib/magento_remote/magento_mech.rb

@@ -1,6 +1,7 @@
 require 'mechanize'
 require 'logger'
 require 'json'
+require 'uri'
 
 # The Mech Driver, interacting with a Magento shop page.
 # Note that the Mech does not keep too much state, you have to
@@ -53,8 +54,9 @@ class MagentoMech
       fail "Empty obligatory parameter"
     end
 
-    url = "#{@base_uri}/checkout/cart/add?product=#{product_id}&qty=#{qty}"
-    result_page = @mech.post "#{@base_uri}/checkout/cart/add/uenc/#{form_token}/product/#{product_id}/?isajaxcart=true&groupmessage=1&minicart=1&ajaxlinks=1",
+    url = URI.join @base_uri, "checkout/cart/add/uenc/#{form_token}/"\
+      "product/#{product_id}/?isajaxcart=true&groupmessage=1&minicart=1&ajaxlinks=1"
+    result_page = @mech.post url,
       {product: product_id,
        qty: qty}
 
@@ -73,7 +75,7 @@ class MagentoMech
     if !form_token.nil?
       return ajax_add_to_cart(product_id, qty, form_token)
     end
-    url = "#{@base_uri}/checkout/cart/add?product=#{product_id}&qty=#{qty}"
+    url = URI.join @base_uri, "checkout/cart/add?product=#{product_id}&qty=#{qty}"
 
     # Check the returned page name
     result_page = @mech.get url
@@ -81,6 +83,8 @@ class MagentoMech
     # There are multiple reasons of failure:
     #   * product_id unknown
     #   * product out of stock
+    #   * product does not exist (unhandled response (Mechanize::ResponseCodeError)
+    #   )
 
     # There are multiple ways to detect failure:
     #   * contains a form with post action ending on product/#{product_id}/
@@ -115,16 +119,22 @@ class MagentoMech
         qty = qty.to_i - 1
       end
     end
-    while qty.to_i > 0 && !add_to_cart(product_id, qty)
+    while qty.to_i > 0 && !add_to_cart(product_id, qty, form_token)
       qty = qty.to_i - 1
     end
     qty.to_i + num_ordered
   end
 
+  # Login and get the current carts contents
+  def get_cart_content!
+    login
+    get_cart_content
+  end
+
   # Get the current carts contents
   # Returns [[name, qty], [name2, qty2] ... ]
   def get_cart_content
-    cart_page = @mech.get("#{@base_uri}/checkout/cart/")
+    cart_page = @mech.get(URI.join @base_uri, "checkout/cart/")
     name_links = cart_page.search('td h2 a')
     names = name_links.map &:text
     quantities_inputs = cart_page.search('.qty')
@@ -134,11 +144,11 @@ class MagentoMech
 
   # Login with given credentials
   def login_with username, password
-    login_page = @mech.get("#{@base_uri}/customer/account/login/")
+    login_page = @mech.get(URI.join @base_uri, "customer/account/login/")
 
     # Probably we could just send the POST directly.
-    form = login_page.form_with(:action => "#{@base_uri}/customer/account/loginPost/", :method => 'POST')
-    form.action = "#{@base_uri}/customer/account/loginPost/"
+    form = login_page.form_with(:action => "#", :method => 'POST')
+    form.action = URI.join @base_uri, "customer/account/loginPost/"
     form.fields.find{|f| f.name == 'login[username]'}.value = username
     form.fields.find{|f| f.name == 'login[password]'}.value = password
     @mech.submit(form)
@@ -270,6 +280,7 @@ class MagentoMech
   # Example:
   #   base uri is http://zentimental.net
   #   relative_url 'index.html' # => http://zentimental.net/index.html
+  #   # TODO use more, and use URI.join
   def relative_url path
     if @base_uri.end_with?('/') && !path.start_with?('/')
       @base_uri + '/' + path

data/lib/magento_remote/version.rb

@@ -1,3 +1,3 @@
 module MagentoRemote
-  VERSION = "0.2.4".freeze
+  VERSION = "0.2.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magento_remote
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Login to a magento shop and do stuff.