web_merge 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9e843644bc9db35f9d1389bea871103ab51bed7
-  data.tar.gz: 6248fee37e9185572328502f649da3d3c7509157
+  metadata.gz: ae95c7b06804d65c4af0658a9d3276a5512c0164
+  data.tar.gz: 1ecfc7e14318902e71601e2a93172f383da15ebd
 SHA512:
-  metadata.gz: c1288858d31250371f38e56061306375aa0be294c10435e94cdf366cead7c265b9438bfe55e877248112743215f3754b69d08b3917d8683d3f46bfad4eaf5f1b
-  data.tar.gz: 2ea30ab2cc015612b5f4f9757284700f90ebd7befd77fae0d82202a6fb34740556deb723057ade35c0eb886dbb7231f7a28ebb5b00dd6ab1c7f4d8ff5d4129fd
+  metadata.gz: 03bcccc868d80c9a65c4cb052c33d6c2e3a78e980fb40ddf3a618ee7f439e3c24a7d6f2472e3845898fd53449ac498229891cb356d309d3e1c3491e6860c1a66
+  data.tar.gz: 7bc9f2ae4c2431ed0fffea3a47781fb7eeb1e695f190b9ad4e631ede4cd3ea6c435a378919e1807efaaac649c33671a6cd73071c41126650c2aec101f2ec9de5

data/CHANGELOG.md

@@ -1,10 +1,13 @@
-## 1.0.1
+## 1.0.2
 
 * Update regex for single line match.
+
+## 1.0.1
+
 * Add flatten option to request params.
 * Don't require file_path for update
 * Ability to Pass Options To Create Merge Document
 
 ## 1.0.0
 
-* Initial release
+* Initial release

data/lib/web_merge/api.rb

@@ -46,9 +46,15 @@ module WebMerge
     #   default: false.
     # options[:download] Will return the merged document in response
     #   default: false
+    # options[:flatten] Will return the merged document flattened (with no editing capabilities)
+    #   default: 0
     #
     def merge_document(doc_id, doc_key, field_mappings, options = {}, &block)
-      post("#{WebMerge::Constants::MERGE_ENDPOINT}/#{doc_id}/#{doc_key}?download=#{download(options)}&test=#{test(options)}", field_mappings, &block)
+      query = ""
+      if options.present?
+        query = "?" + URI.encode(options.map{|k,v| "#{k}=#{v}"}.join("&"))
+      end
+      post("#{WebMerge::Constants::MERGE_ENDPOINT}/#{doc_id}/#{doc_key}#{query}", field_mappings, &block)
     end
 
     #

data/lib/web_merge/document.rb

@@ -2,11 +2,11 @@ module WebMerge
   class Document
     include ::ActiveModel::Validations
 
-    attr_accessor :name, :type, :output, :output_name, :size_width, :size_height, :notification, :file_path
+    attr_accessor :name, :type, :flatten, :output, :output_name, :size_width, :size_height, :notification, :file_path
     attr_reader :id, :key, :size, :active, :url
 
     validates_presence_of :name, :type, :output
-    validates_presence_of :file_path
+    validates_presence_of :file_path, :on => :create
     validates :type, inclusion: { in: WebMerge::Constants::SUPPORTED_TYPES }
     validates :output, inclusion: { in: WebMerge::Constants::SUPPORTED_OUTPUTS }
 
@@ -97,11 +97,14 @@ module WebMerge
         type: type,
         output: output
       }
+
+      request_params["settings[flatten]"] = flatten if flatten
+
       [:output_name, :size_width, :size_height].each do |key|
         value = send(key)
         request_params.merge!(key => value) if value.present?
       end
-      merge_file_contents!(request_params)
+      merge_file_contents!(request_params) if file_path.present?
       merge_notification!(request_params) if notification.present?
       request_params
     end

data/lib/web_merge/notification.rb

@@ -5,7 +5,7 @@ module WebMerge
     attr_accessor :to, :from, :subject, :html, :security, :password
 
     validates_presence_of :to, :from
-    validates_format_of :to, :from, :with => /^(|(([A-Za-z0-9]+_+)|([A-Za-z0-9]+\-+)|([A-Za-z0-9]+\.+)|([A-Za-z0-9]+\++))*[A-Za-z0-9]+@((\w+\-+)|(\w+\.))*\w{1,63}\.[a-zA-Z]{2,6})$/i
+    validates_format_of :to, :from, :with => /\A(|(([A-Za-z0-9]+_+)|([A-Za-z0-9]+\-+)|([A-Za-z0-9]+\.+)|([A-Za-z0-9]+\++))*[A-Za-z0-9]+@((\w+\-+)|(\w+\.))*\w{1,63}\.[a-zA-Z]{2,6})\z/i
     validates_presence_of :password, if: :requires_password?
     validates :security, inclusion: { in: WebMerge::Constants::SECURITY_LEVELS }
 

data/lib/web_merge/version.rb

@@ -1,3 +1,3 @@
 module WebMerge
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_merge
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jeremy Clarke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: WebMerge REST API Wrapper