mojito_import 0.5.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab0b40cc7ef94c7a909350e1560e231d233fd0e88485868e3b81d1265bb1b9c
-  data.tar.gz: fe58eaed7d349207422ee1447d5eb9c6b11fda5ae5c34d3c5f58075f7df0a881
+  metadata.gz: 4e2ebb67aa976f2acedc64705b23572ede86d4e5fa2252972a81817ac50188a6
+  data.tar.gz: da5e7256e1be2f12c949b3246cd1258e80fe380f69e2daebfd8548fca311fea1
 SHA512:
-  metadata.gz: 3c263b634441f6fc62633b9342eb777c91134c81bcd715e7f718c12c030a121cc030d22bc4f7de2e18e3f314a1ccbfed0236d78308ee0c5d579d3bf7fa317f24
-  data.tar.gz: d02384dcd6863dbc06f3ead3fc053d3528935faed9ff217d1acbc5f6314a432e99149ca5509d5ebdb413a8b0ebf78e307bcd7574a4c4d2685988d8efa270a264
+  metadata.gz: 230a23804a9da9c33513d1b600a9876a6682533b3da662756ef6880ef89cf19c6e1f10f32646275c44931b95554ffd82aad0426f3b3f9bfc2849c5c76ebe0c1f
+  data.tar.gz: c79e4332592d103050ea6af75334ee3d5cb96577a66eca2f60a24c5247d98778a0c8812205566c87c723802526964934f0a46e36f3a90d101160705f243f3d1a

data/Gemfile.lock

@@ -0,0 +1,83 @@
+PATH
+  remote: .
+  specs:
+    mojito_import (0.8.0)
+      rest-client (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.2)
+    diff-lcs (1.3)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.11.1)
+    formatador (0.2.5)
+    guard (2.16.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.0.13)
+    method_source (0.9.2)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
+    nenv (0.3.0)
+    netrc (0.11.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (12.3.3)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    shellany (0.0.1)
+    thor (0.20.3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.17)
+  guard (~> 2.15)
+  mojito_import!
+  rake (~> 12.3)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.17.3

data/Guardfile

@@ -0,0 +1,50 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  directories %w(lib spec)
+  # We should also watch Guardfile
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Watch lib
+  watch(%r{^lib/(?<path>.+)\.rb$}) { |m| "spec/#{m[:path]}_spec.rb" }
+
+
+end

data/changelog.md

@@ -1,3 +1,19 @@
+* MojitoImport 0.9.1
+  * Manage more errors
+
+* MojitoImport 0.9.0
+  * Add history group
+  * Add operator identifier
+
+* MojitoImport 0.8.0
+  * new json schema !
+
+* MojitoImport 0.7.0
+  * iFrame with token auth
+
+* MojitoImport 0.6.0
+  * Dry run imports
+
 * MojitoImport 0.5.0
   * Initial release
   * Import sugar

data/lib/mojito_import.rb

@@ -1,3 +1,4 @@
 require "mojito_import/version"
 require "mojito_import/importer"
+require "mojito_import/session"
 require "mojito_import/report"

data/lib/mojito_import/importer.rb

@@ -55,7 +55,7 @@ module MojitoImport
       # RestClient::Resource.new( , verify_ssl: false, log: Logger.new(STDOUT)).post "https://mojito-import.test/api/v1/new_import", data.to_json, {content_type: :json, accept: :json, :Authorization => "Bearer #{access_token}"}
 
       remote_endpoint_url = "#{mojito_host}/api/v1/new_import"
-
+      Rails.logger.debug { "will contact : #{remote_endpoint_url}"}
       RestClient::Resource.new( remote_endpoint_url, verify_ssl: false, log: Logger.new(STDOUT)).post data.to_json, {content_type: :json, accept: :json, :Authorization => "Bearer #{access_token}"}
     end
   end

data/lib/mojito_import/report.rb

@@ -1,43 +1,70 @@
+require 'json'
+
 module MojitoImport
   class Report
-
-    attr_accessor :data_errors, :general_errors, :import_id
+    attr_accessor :object_errors, :request_errors, :object_updates, :import_id
 
     def initialize(import_id)
       self.import_id = import_id
-      self.data_errors = []
-      self.general_errors = []
+      self.object_errors = []
+      self.request_errors = []
+      self.object_updates = []
     end
 
-    def add_general_error(error)
-      general_errors << error
+    def to_json
+      {
+        "mojitoRequestId" => self.import_id,
+        "requestErrors" => self.request_errors,
+        "objectErrors" => self.object_errors,
+        "objectUpdates" => self.object_updates
+      }.to_json
     end
 
-    def add_data_error(mojito_id, field, error)
-    # reload!; report = MojitoImport::Report.new('1234'); report.add_data_error('123', 'name', 'your name sucks')
-    hash_element = data_errors.detect { |error_hash| error_hash["mojitoId"] == mojito_id }
-
-    if hash_element.nil?
-      new_error_hash = {
-        "mojitoId" => mojito_id,
-        field => [error]
-      }
-      data_errors << new_error_hash
-    else
-      hash_element[field] ||= []
-      hash_element[field] << error
+    def add_request_error(error)
+      request_errors << error
     end
-  end
 
-  def find_errors_for_object(mojito_id)
-    data_error = data_errors.detect{|data| data["mojitoId"] == mojito_id}
-    return if data_error.nil?
+    def add_object_update(mojito_id, field, from, to: nil)
 
-    data_error.except("mojitoId")
-  end
+      hash_element =
+        object_updates.detect { |error_hash| error_hash["mojitoObjectId"] == mojito_id }
 
+      update_hash = {"before" => from}
+      update_hash["after"] = to unless to.nil?
 
+      if hash_element.nil?
+        new_update_hash = { "mojitoObjectId" => mojito_id, field => update_hash }
+        object_updates << new_update_hash
+      else
+        hash_element[field] = update_hash
+      end
+    end
 
+    def add_object_error(mojito_id, error, field: nil)
 
-end
+      hash_element =
+        object_errors.detect { |error_hash| error_hash["mojitoObjectId"] == mojito_id }
+
+      if hash_element.nil?
+        hash_element = { "mojitoObjectId" => mojito_id, "general" => [], "fields" => { } }
+        object_errors << hash_element
+      end
+
+        if field.nil? # it's a general error
+          hash_element["general"] << error
+        else
+          # The field has to be initialized to an array
+          # Else we got an error when adding an error to a 2nd field
+          hash_element["fields"][field] ||= []
+          hash_element["fields"][field] << error
+        end
+    end
+
+    def find_errors_for_object(mojito_id)
+      object_error = object_errors.detect { |data| data["mojitoObjectId"] == mojito_id }
+      return if object_error.nil?
+
+      object_error.except("mojitoObjectId")
+    end
+  end
 end

data/lib/mojito_import/session.rb

@@ -0,0 +1,40 @@
+require "rest-client"
+module MojitoImport
+  class Session
+
+
+    def self.get_token(import_scenario_identifier, access_token, session_bucket, operator_identifier: nil, history_group: nil, use_dev_host: false, force_new: false)
+      data = { import_scenario_identifier: import_scenario_identifier, session_bucket: session_bucket, operator_identifier: operator_identifier, history_group: history_group, force_new: force_new }
+
+      mojito_host = use_dev_host ? 'http://www.mojito-import.test' : 'https://www.mojito-import.com'
+
+      request = RestClient::Resource.new(mojito_host, accept: :json,content_type: :json, Authorization: "Bearer #{access_token}", verify_ssl: false)
+
+      begin
+        path = "api/v1/import_session_token?access_token=#{access_token}"
+        response = request[path].post(data, timeout: 5) { |response, request, result|
+          case response.code
+          when 200, 201
+            token =  JSON.parse(response)["token"]
+            if token.blank?
+              return {"error when retrieving token" => response.body.inspect}
+            else
+              return token
+            end
+          when 500
+            return {"error when retrieving token" => response.body.inspect}
+          else
+            return "Unexpected response code : #{response.code} #{response.body.inspect}"
+          end
+        }
+      rescue Net::ReadTimeout => e
+        return "error when retrieving token got a Timeout from the server."
+      rescue Exception => e
+        return "Unkown error : #{e}"
+      end
+
+    end
+
+
+  end
+end

data/lib/mojito_import/version.rb

@@ -1,3 +1,3 @@
 module MojitoImport
-  VERSION = "0.5.0"
+  VERSION = "0.9.1"
 end

data/mojito_import.gemspec

@@ -32,5 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rest-client", "~> 2.0"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "guard", "~> 2.15"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mojito_import
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Thomas Darde
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - thomas@rougecardinal.fr
 executables: []
@@ -78,6 +92,8 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -87,6 +103,7 @@ files:
 - lib/mojito_import.rb
 - lib/mojito_import/importer.rb
 - lib/mojito_import/report.rb
+- lib/mojito_import/session.rb
 - lib/mojito_import/version.rb
 - mojito_import.gemspec
 homepage: https://www.mojito-import.com
@@ -96,7 +113,7 @@ metadata:
   homepage_uri: https://www.mojito-import.com
   source_code_uri: https://github.com/thomasdarde/mojito_import_gem
   changelog_uri: https://raw.githubusercontent.com/thomasdarde/mojito_import_gem/master/changelog.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,8 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Mojito Import, so fresh.
 test_files: []