ofsys 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64ca6e42a259c053b017527ac7c03b56843c38f
-  data.tar.gz: aa6c22531224e1dc3ca59cae4bf64221762d6c08
+  metadata.gz: b156d499ef641aa42ea6c882af38fe9f405c9fd0
+  data.tar.gz: 6b802b28f90cca910ec164bda18cc9dd803ccd0e
 SHA512:
-  metadata.gz: a98e8a1fcb9732ffe3897a6b144ff92d527e0068fe454095e0e02ad996e3932b74d6f71a919a47e5a59933e5bc357ee0ccf0363a3771e8274f16da615e6ef8c9
-  data.tar.gz: e2b2880e9bef015d7223904fc4eeec6fe688be188236cf78e1bf24ca3076bf1dcd539eec8190913fb5ba8acd80bf4201127a564e2c2d521c9b6e734be464f277
+  metadata.gz: dedf529e253fd1b269ed9957e7860f61a18cddd14787206262669a7fe98929bc094152d73e124869c1e00af9a66a08d6eb73d4ae14185a9c826d593984aab943
+  data.tar.gz: 547075eee7f3c61667b8c4fdbe54e0f42fbeb87965e8fb69a80eb2365f2b005acf8e1ce08b95f54356bd54b3cd8429dc9c944d43afc2cffebc8f12431417c0dd

data/lib/ofsys/request/base.rb

@@ -5,6 +5,14 @@ module Ofsys
     class Base
       class FailedError < RuntimeError; end
 
+      class << self
+        @suppress_id_project = false
+
+        def suppress_id_project
+          @id_project = true
+        end
+      end
+
       def initialize(config = Ofsys.config)
         @id_key = config.id_key
         @key = config.key
@@ -41,6 +49,7 @@ module Ofsys
 
       def body(source_params)
         params = merge_auth(source_params)
+        params.merge!(idProject: @id_project) unless suppress_id_project?
         to_json(params)
       end
 
@@ -57,11 +66,14 @@ module Ofsys
           AuthKey: {
             Key: @key,
             idKey: @id_key
-          },
-          idProject: @id_project
+          }
         )
       end
 
+      def suppress_id_project?
+        self.class.instance_variable_get(:@suppress_id_project)
+      end
+
       def decode_result(body)
         result = to_hash(body)
         fail FailedError.new(body) unless result['Success']

data/lib/ofsys/request/relational_tables_delete.rb

@@ -2,6 +2,8 @@ module Ofsys
   module Request
     class RelationalTablesDelete < Ofsys::Request::Base
       ENDPOINT = "#{ENDPOINT_BASE}/relationaltables.ashx?method=Delete".freeze
+
+      suppress_id_project
     end
   end
 end

data/lib/ofsys/request/relational_tables_merge.rb

@@ -2,6 +2,8 @@ module Ofsys
   module Request
     class RelationalTablesMerge < Ofsys::Request::Base
       ENDPOINT = "#{ENDPOINT_BASE}/relationaltables.ashx?method=Merge".freeze
+
+      suppress_id_project
     end
   end
 end

data/lib/ofsys/version.rb

@@ -1,3 +1,3 @@
 module Ofsys
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/contacts_merge_spec.rb

@@ -52,7 +52,7 @@ describe Ofsys::Request::ContactsMerge do
 
   it 'performs correct request with passed data' do
     VCR.use_cassette('contacts_merge') do
-      expect(described_class.new.perform(data)).to include_partial_hash(result)
+      expect(described_class.new.perform(data)).to eq(result)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ofsys
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alexandr Borisov