expressly 2.0.35.rc1 → 2.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4103e82f0b1096f42f20a733d4507d1d05a16511
-  data.tar.gz: 572f5026e42d351e351c692a1be1a48a7cf738af
+  metadata.gz: 7fd45f6d990165a5a5c78853e51f465aa2d31b33
+  data.tar.gz: 8abf6111d847fb7ac908242dd7500b3ba9ba8468
 SHA512:
-  metadata.gz: e7ec99bd385a22a22b86d3b5324fab7b90a14a26ae86f5b2a4698e3af9c3a64086e3533e475863f59e6c399e99025f49258197eb959cbdadfe2a6352c2a49095
-  data.tar.gz: ce056d6097ab3b71b3f1a250604b81c57a3f845513aa6a7a7d3aaaef6867fdd5ddf3536bd893a45522b3ffd9c1738b2b6333db9db489ee9ec2d27322686f878e
+  metadata.gz: 3fca2dab19366b411754e975df3aeac5ab6f50220fd2d522d9435c7dc5ef6f1db1e3df1223108c13abfae9b80057bf2f85e6a6a9e80558eec512f386afe05c21
+  data.tar.gz: a36ff27710a7d95c6685fa708290c18f48e44833dbeac466ea9be5c9f23caf69f568f854011f3b649c1aa4fb848b1afb9d0b2af1b29012badd50b0eebefc8b95

data/.travis.yml

@@ -1,8 +1,11 @@
-rvm:
-  - 1.9.3
-  - 2.1.6
-  - 2.2.2
-
-addons:
-  code_climate:
-    repo_token: 4b7cb0837c0bcb22501262f1c463f02f189dbb510001c68e2e498db0e80f24bb
+rvm:
+- 1.9.3
+- 2.1.6
+- 2.2.2
+addons:
+  code_climate:
+    repo_token: 4b7cb0837c0bcb22501262f1c463f02f189dbb510001c68e2e498db0e80f24bb
+notifications:
+  hipchat:
+    rooms:
+      secure: a34ZhAhOnj1e+eZhQXDbFWZub6pUHNlnzAkk1c4aIVXTiGXshnON9lEI259ZkAFuVjNfQTlKHiuLBsWikpaWtzYFZhoKbNijRf1JTeClCI4gtlVN2/XI3HKVvRJXNqoeYxQ15MCIq/oFgIWMBRJucVeb9XkSO5O24QgPDaAuHiuIZTQNC2hHSjKek8eY9B1mwceQzxH8WUZiUo4MdFfVtWrHDaE+TPpso/6hcb1V9vPs17IIxBEr55nX2t3wXjvWNAvnk0A8AJcr2EZX7ORq0Ptn9pYW9uHTf+hQT6Qz+ZPrAjOubZSGjYHN/CH3jRUHbFY7f0ONZQxnA0A+3RgIPHx1fStt7cbPTbKSc+T7/Otxf8wOMyuv/NyHLqjPwd3LUHUwCi3MntrP55cP6m1dKu9yCc7C6GxFpiI7mjAog/VTxdxaeUk+A6UT8ZYhNzey8tCbx9SxioLOI2RyKpYduFle5MGDpAENldiThypRVuOUj8s/IH5s+KNS1bALOObFNi34/jcczF55UA3/yYkhpDEln6JXD3MH+AVEDLIQvTBkMyn3yhYst/Yn4TDJjWC3mqxDN7niJcVCUaGRJx1uqj97WD0UUI1jhqspWEvO1qtq039TE5B8PBAHUcYfNo9alLvBt0b422Yu0gzwryBtscJB/PIUxkkndfXlMy/gqWk=

data/README.rdoc

@@ -1,4 +1,4 @@
-{<img src="https://buyexpressly.com/assets/img/expressly-logo-sm-gray.png" alt="Expressly" />}[https://buyexpressly.com]
+{<img src="http://developer.buyexpressly.com/img/expressly-logo-sm-gray.png" alt="Expressly" />}[https://buyexpressly.com]
 
 = Expressly Plug-in Ruby SDK
 

data/app/controllers/expressly/api_controller.rb

@@ -5,19 +5,23 @@ module Expressly
     before_action :authenticate
     skip_before_action :authenticate, only: [:display_popup, :migrate]
 
-    def ping
-      render content_type: "application/json", json: { "expressly" => "Stuff is happening!" }
-    end
-
-    def ping_registered
-      render content_type: "application/json", json: { "registered" => true }
+    def registered
+      render content_type: "application/json", json: {
+          :registered => true,
+          :version => 'V2',
+          :lightbox => 'javascript',
+          :platformName => 'ExpresslyRubySdk',
+          :platformVersion => Expressly::Version::STRING
+      }
     end
 
     def customer_export
+      customer = provider.get_customer(params[:email]) or raise ActionController::RoutingError.new('Not Found')
+
       result = Expressly::CustomerExport.new({
         :metadata => config.merchant_metadata,
         :primary_email => params[:email],
-        :customer => provider.get_customer(params[:email])
+        :customer => customer
       })
       render content_type: "application/json", json: JSON.parse(result.to_json)
     end
@@ -32,31 +36,19 @@ module Expressly
       render content_type: "application/json", json: result
     end
 
-    def display_popup
-      provider.popup_handler(self, params[:campaign_customer_uuid])
-    end
-
     def migrate
       campaign_customer_uuid = params[:campaign_customer_uuid]
       begin
-
         import = config.expressly_provider.fetch_customer_data(campaign_customer_uuid)
         customer_reference = provider.customer_register(import.primary_email, import.customer)
         provider.customer_send_password_reset_email(customer_reference)
-        provider.customer_update_cart(customer_reference, import.cart)
-        provider.customer_login(customer_reference)
-        redirect_to provider.customer_migrated_redirect_url(true, customer_reference)
-
-        begin
-          config.expressly_provider.confirm_migration_success?(campaign_customer_uuid)
-        rescue StandardError => e
-          Expressly::logger.warn(self) {
-            "couldn't finalise migration campaign_customer_uuid=[#{campaign_customer_uuid}], email=[#{import.primary_email}], error=[#{e.message}]"
-          }
+        unless import.cart.nil?
+          provider.customer_update_cart(customer_reference, import.cart)
         end
+        provider.customer_login(customer_reference)
+        redirect_to "#{config.expressly_endpoint}/redirect/migration/#{campaign_customer_uuid}/success"
       rescue Expressly::ExpresslyError
-        # already migrated or invalid uuid so just redirect
-        redirect_to provider.customer_migrated_redirect_url(false)
+        redirect_to "#{config.expressly_endpoint}/redirect/migration/#{campaign_customer_uuid}/failed"
       end
     end
 

data/config/routes.rb

@@ -1,11 +1,7 @@
 Rails.application.routes.draw do
-  get 'expressly/api/ping'
-  get 'expressly/api/ping_registered'
-  get 'expressly/api/user/:email' => 'expressly/api#customer_export'
-  
-  post 'expressly/api/batch/invoice' => 'expressly/api#invoices'  
+  get 'expressly/api/registered'
+  get 'expressly/api/user/:email' => 'expressly/api#customer_export', :constraints => { :email => /[^\/]+/ }
+  post 'expressly/api/batch/invoice' => 'expressly/api#invoices'
   post 'expressly/api/batch/customer' => 'expressly/api#check_emails'  
-
   get 'expressly/api/:campaign_customer_uuid/migrate' => 'expressly/api#migrate'
-  get 'expressly/api/:campaign_customer_uuid' => 'expressly/api#display_popup'
 end

data/expressly.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = Expressly::Version::STRING
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc G. Smith"]
-  s.date = "2015-12-01"
+  s.date = "2017-04-11"
   s.description = "Expressly sdk to help with implementing the expressly e-commerce plug-in / module API"
   s.email = "marc@buyexpressly.com"
   s.extra_rdoc_files = [
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://developer.buyexpressly.com"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.2"
+  s.rubygems_version = "2.6.11"
   s.summary = "Expressly plug-in sdk"
 
   s.add_development_dependency(%q<bundler>, ["~> 0"])

data/lib/expressly.rb

@@ -52,7 +52,7 @@ module Expressly
       @merchant_plugin_provider = merchant_plugin_provider
       @merchant_plugin_endpoint = merchant_plugin_endpoint
       @expressly_endpoint = expressly_endpoint
-      @expressly_provider = Api.new(api_key, expressly_endpoint)
+      @expressly_provider = Api.new(@api_key, expressly_endpoint)
       @merchant_metadata = merchant_metadata
     end
   end

data/lib/expressly/api.rb

@@ -8,33 +8,6 @@ module Expressly
       @endpoint = endpoint
     end
 
-    def ping?
-      response = execute('/v1/merchant/ping', 'GET')
-      JSON.parse(response.body)['success']
-    end
-
-    def install(base_url)
-      api_key = Base64.strict_encode64("#{@merchant_uuid}:#{@secret_key}")
-      execute(
-        '/v2/plugin/merchant', 
-        'POST', 
-        "{\"apiBaseUrl\":\"#{base_url}\", \"apiKey\":\"#{api_key}\"}")
-    end
-
-    def uninstall?
-      response = execute(
-        "/v2/plugin/merchant/#{@merchant_uuid}", 
-        'DELETE')
-      JSON.parse(response.body)['success']
-    end
-
-    def fetch_migration_confirmation_html(campaign_customer_uuid)
-      response = execute(
-        "/v2/migration/#{campaign_customer_uuid}", 
-        'GET')
-      response.body
-    end
-
     def fetch_customer_data(campaign_customer_uuid)
       response = execute(
         "/v2/migration/#{campaign_customer_uuid}/user", 
@@ -42,14 +15,9 @@ module Expressly
       CustomerImport.from_json(JSON.parse(response.body))
     end
 
-    def confirm_migration_success?(campaign_customer_uuid)
-      response = execute(
-        "/v2/migration/#{campaign_customer_uuid}/success", 
-        'POST')
-      JSON.parse(response.body)['success']
-    end
+    def execute(method_uri, http_verb, body = nil, limit = 4)
+      raise 'too many HTTP redirects' if limit == 0
 
-    def execute(method_uri, http_verb, body = nil)
       uri = URI.parse("#{@endpoint}#{method_uri}")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = @endpoint.start_with?('https')
@@ -70,11 +38,15 @@ module Expressly
 
       response = http.request(request)
 
-      if response.code.to_i >= 300
-        handle_error(response)
+      case response
+        when Net::HTTPSuccess then
+          response
+        when Net::HTTPRedirection then
+          location = response['location']
+          execute(location, http_verb, body,limit - 1)
+        else
+          handle_error(response)
       end
-
-      response
     end
 
     def handle_error(response)

data/lib/expressly/domain.rb

@@ -427,9 +427,9 @@ module Expressly
     def add_order(order)
       order.freeze
       @orders << order
-      @pre_tax_total += order.pre_tax_total.to_f
-      @post_tax_total += order.post_tax_total.to_f
-      @tax += order.tax.to_f
+      @pre_tax_total += (order.pre_tax_total.to_f * 100).round / 100.0
+      @post_tax_total += (order.post_tax_total.to_f * 100).round / 100.0
+      @tax += (order.tax.to_f * 100).round / 100.0
     end
 
     def to_json(_state = nil)
@@ -471,9 +471,9 @@ module Expressly
         :itemCount => @item_count.to_i,
         :coupon => @coupon_code,
         :currency => @currency,
-        :preTaxTotal => @pre_tax_total.to_f,
-        :postTaxTotal => @post_tax_total.to_f,
-        :tax => @tax.to_f})
+        :preTaxTotal => (@pre_tax_total.to_f * 100).round / 100.0,
+        :postTaxTotal => (@post_tax_total.to_f * 100).round / 100.0,
+        :tax => (@tax.to_f * 100).round / 100.0})
     end
   end
 

data/lib/expressly/plugin_provider.rb

@@ -8,33 +8,6 @@ module Expressly
   class MerchantPluginProvider
     include AbstractInterface
     
-    ##
-    # The popup_handler is called when a prospective customer has clicked on a campaign promotion 
-    # and been directed to your shop. You are required to make a call to retrieve the expressly popup html
-    # and embed it on the landing page of your choice.
-    #
-    # The typical flow would be:
-    #
-    # 1. customer clicks a promotion link to https://yourshop.com/expressly/api/:campaign_customer_uuid
-    # 2. ApiController call popup_handler with itself as the first parameter and the uuid as the second parameter
-    # 3. The handler should through a mechanism of their choice should display an appropriate page on their site and embed the Expressly popup HTML
-    #
-    # The mechanics of how to acheive step 3 is up to the implementer. The Expressly popup HTML is retrieved with the following call:
-    # Expressly::default_configuration.expressly_provider.fetch_migration_confirmation_html(campaign_customer_uuid)
-    #
-    # === Args
-    #
-    # * +controller+ - an ApplicationController instance
-    # * +campaign_customer_uuid+ - the Expressly uuid identifying the customer to be migrated
-    #
-    # === Return
-    #
-    # N/A
-    #
-    def popup_handler(controller, campaign_customer_uuid)
-      MerchantPluginProvider.api_not_implemented(self)
-    end
-
     ##
     # The customer register is the first step of the migration process after they have confirmed that they want to proceed.
     # You should register the customer on you system when you receive this call. You should treat this as a new customer,
@@ -101,23 +74,6 @@ module Expressly
       MerchantPluginProvider.api_not_implemented(self)
     end
 
-    ##
-    # Once the customer is migrated they will need to be re-directed to the most appropriate location on your site.
-    # This could be the home page or the checkout.
-    #
-    # === Args
-    #
-    # * +success+ - if true then the customer was successfully migrated, if false then it failed and customer_reference will be nil
-    # * +customer_reference+ - the reference you returned in the customer_register call unless the migration failed, in which case it will be nil
-    #
-    # === Return
-    #
-    # N/A
-    #
-    def customer_migrated_redirect_url(success, customer_reference)
-      MerchantPluginProvider.api_not_implemented(self)
-    end
-
     ##
     # The provider should respond to this call by populating an Expressly::Customer instance with the details of
     # the customer that matches the email address passed to it.

data/lib/expressly/version.rb

@@ -1,8 +1,8 @@
 module Expressly
   module Version
     MAJOR = 2
-    MINOR = 0
-    PATCH = 35
+    MINOR = 1
+    PATCH = 0
     BUILD = 'rc1'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/expressly/api_spec.rb

@@ -10,30 +10,6 @@ module Expressly
 
   describe "Api" do
 
-    it "can ping" do
-      FakeWeb.register_uri(:get, "http://#{api_key}@localhost:8080/api/v1/merchant/ping",
-                           :body => '{"success":true,"msg":"61c8c55e-9365-11e5-ac6c-281878baaac8"}')
-      api.ping?.should == true
-    end
-
-    it "it can install" do
-      FakeWeb.register_uri(:post, "http://#{api_key}@localhost:8080/api/v2/plugin/merchant",
-                           :status => ["204", "No Content"])
-      api.install("http://localhost:3000")
-    end
-
-    it "it can uninstall" do
-      FakeWeb.register_uri(:delete, "http://#{api_key}@localhost:8080/api/v2/plugin/merchant/#{merchant_uuid}",
-                           :body => '{"success":true,"msg":"Merchant uninstalled"}')
-      api.uninstall?.should == true
-    end
-
-    it "it can fetch poup html" do
-      FakeWeb.register_uri(:get, "http://#{api_key}@localhost:8080/api/v2/migration/#{campaign_customer_uuid}",
-                           :body => '<b>pop</b>')
-      response = api.fetch_migration_confirmation_html(campaign_customer_uuid)
-      response.should == '<b>pop</b>'
-    end
 
     it "it can fetch customer data" do
       FakeWeb.register_uri(:get, "http://#{api_key}@localhost:8080/api/v2/migration/#{campaign_customer_uuid}/user",
@@ -71,15 +47,8 @@ module Expressly
       customer_import.customer.address_list[0].country.should == 'GB'
     end
 
-    it "it can report the migration was successful" do
-      FakeWeb.register_uri(:post, "http://#{api_key}@localhost:8080/api/v2/migration/#{campaign_customer_uuid}/success",
-                           :body => '{"success":true,"msg":"User registered as migrated"}')
-      response = api.confirm_migration_success?(campaign_customer_uuid)
-      response.should == true
-    end
-
     it "it can parse the expressly error payload" do
-      FakeWeb.register_uri(:get, "http://#{api_key}@localhost:8080/api/v1/merchant/ping",
+      FakeWeb.register_uri(:get, "http://#{api_key}@localhost:8080/api/v2/migration/xxxx/user",
                            :status => ["400", "Bad Request"],
                            :content_type => "application/json",
                            :body => '{' +
@@ -90,7 +59,7 @@ module Expressly
                                '"causes":["cause"],' +
                                '"actions":["action"]}')
       begin
-        api.ping?
+        api.fetch_customer_data('xxxx')
       rescue ExpresslyError => e
         e.id.should == 'tid'
         e.message.should == 'Bad Request'
@@ -102,11 +71,11 @@ module Expressly
     end
 
     it "if it can parse the expressly error payload it will throw an http error" do
-      FakeWeb.register_uri(:get, "http://#{api_key}@localhost:8080/api/v1/merchant/ping",
+      FakeWeb.register_uri(:get, "http://#{api_key}@localhost:8080/api/v2/migration/xxxx/user",
                            :status => ["400", "Bad Request"],
                            :body => 'WOW')
       begin
-        api.ping?
+        api.fetch_customer_data('xxxx')
       rescue HttpError => e
         e.code.should == "400"
         e.body.should == 'WOW'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressly
 version: !ruby/object:Gem::Version
-  version: 2.0.35.rc1
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Marc G. Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Expressly plug-in sdk