groupdocs 1.1.0 → 1.2.0

data/lib/groupdocs/signature/role.rb

@@ -39,14 +39,10 @@ module GroupDocs
     attr_accessor :canDelegate
 
     # Human-readable accessors
-    alias_method :can_edit,      :canEdit
-    alias_method :can_edit=,     :canEdit=
-    alias_method :can_sign,      :canSign
-    alias_method :can_sign=,     :canSign=
-    alias_method :can_annotate,  :canAnnotate
-    alias_method :can_annotate=, :canAnnotate=
-    alias_method :can_delegate,  :canDelegate
-    alias_method :can_delegate=, :canDelegate=
+    alias_accessor :can_edit,     :canEdit
+    alias_accessor :can_sign,     :canSign
+    alias_accessor :can_annotate, :canAnnotate
+    alias_accessor :can_delegate, :canDelegate
 
     #
     # Returns true if role can edit.

data/lib/groupdocs/signature/shared/entity_fields.rb

@@ -8,6 +8,8 @@ module GroupDocs
     #
     module EntityFields
 
+      extend Api::Helpers::Accessor
+
       # @attr [String] id
       attr_accessor :id
       # @attr [String] name
@@ -36,26 +38,16 @@ module GroupDocs
       attr_accessor :recipients
 
       # Human-readable accessors
-      alias_method :owner_id,           :ownerId
-      alias_method :owner_id=,          :ownerId=
-      alias_method :owner_guid,         :ownerGuid
-      alias_method :owner_guid=,        :ownerGuid=
-      alias_method :reminder_time,      :reminderTime
-      alias_method :reminder_time=,     :reminderTime=
-      alias_method :step_expire_time,   :stepExpireTime
-      alias_method :step_expire_time=,  :stepExpireTime=
-      alias_method :owner_should_sign,  :ownerShouldSign
-      alias_method :owner_should_sign=, :ownerShouldSign=
-      alias_method :ordered_signature,  :orderedSignature
-      alias_method :ordered_signature=, :orderedSignature=
-      alias_method :email_subject,      :emailSubject
-      alias_method :email_subject=,     :emailSubject=
-      alias_method :email_body,         :emailBody
-      alias_method :email_body=,        :emailBody=
-      alias_method :documents_count,    :documentsCount
-      alias_method :documents_count=,   :documentsCount=
-      alias_method :documents_pages,    :documentsPages
-      alias_method :documents_pages=,   :documentsPages=
+      alias_accessor :owner_id,          :ownerId
+      alias_accessor :owner_guid,        :ownerGuid
+      alias_accessor :reminder_time,     :reminderTime
+      alias_accessor :step_expire_time,  :stepExpireTime
+      alias_accessor :owner_should_sign, :ownerShouldSign
+      alias_accessor :ordered_signature, :orderedSignature
+      alias_accessor :email_subject,     :emailSubject
+      alias_accessor :email_body,        :emailBody
+      alias_accessor :documents_count,   :documentsCount
+      alias_accessor :documents_pages,   :documentsPages
 
       #
       # Converts each recipient to GroupDocs::Signature::Recipient object.

data/lib/groupdocs/signature/template.rb

@@ -37,8 +37,7 @@ module GroupDocs
     attr_accessor :templateExpireTime
 
     # Human-readable accessors
-    alias_method :template_expire_time,  :templateExpireTime
-    alias_method :template_expire_time=, :templateExpireTime=
+    alias_accessor :template_expire_time, :templateExpireTime
 
     #
     # Adds recipient to template.

data/lib/groupdocs/storage/file.rb

@@ -98,6 +98,8 @@ module GroupDocs
       attr_accessor :access
       # @attr [String] path
       attr_accessor :path
+      # @attr [String] local_path
+      attr_accessor :local_path
 
       # Compatibility with response JSON
       alias_method :adj_name=, :name=
@@ -175,7 +177,7 @@ module GroupDocs
         response = Api::Request.new do |request|
           request[:access] = access
           request[:method] = :DOWNLOAD
-          request[:path] = "/storage/{{client_id}}/files/#{id}"
+          request[:path] = "/storage/{{client_id}}/files/#{guid}"
         end.execute!
 
         filepath = "#{path}/#{name}"

data/lib/groupdocs/storage/folder.rb

@@ -105,13 +105,19 @@ module GroupDocs
       # @option options [Integer] :count How many items to list
       # @option options [String] :order_by Field name to sort by
       # @option options [Boolean] :order_asc Set to true to return in ascending order
+      # @option options [String] :filter Filter by name
+      # @option options [Array<Symbol>] :file_types Array of file types to return
+      # @option options [Boolean] :extended Set to true to return extended information
       # @param [Hash] access Access credentials
       # @option access [String] :client_id
       # @option access [String] :private_key
       # @return [Array<GroupDocs::Storage::Folder, GroupDocs::Storage::File>]
       #
       def list!(options = {}, access = {})
-        options[:order_by].capitalize! if options[:order_by]
+        if options[:order_by]
+          options[:order_by] = accessor_to_variable(options[:order_by].capitalize).to_s.delete(?@)
+        end
+
         full_path = prepare_path("#{path}/#{name}")
 
         api = Api::Request.new do |request|

data/lib/groupdocs/subscription.rb

@@ -75,16 +75,11 @@ module GroupDocs
     attr_accessor :CurrencyCode
 
     # Human-readable accessors
-    alias_method :id,               :Id
-    alias_method :id=,              :Id=
-    alias_method :name,             :Name
-    alias_method :name=,            :Name=
-    alias_method :pricing_plan_id,  :PricingPlanId
-    alias_method :pricing_plan_id=, :PricingPlanId=
-    alias_method :price,            :Price
-    alias_method :price=,           :Price=
-    alias_method :currency_code,    :CurrencyCode
-    alias_method :currency_code=,   :CurrencyCode=
+    alias_accessor :id,              :Id
+    alias_accessor :name,            :Name
+    alias_accessor :pricing_plan_id, :PricingPlanId
+    alias_accessor :price,           :Price
+    alias_accessor :currency_code,   :CurrencyCode
 
     # Compatibility with response JSON
     alias_method :ref_id=, :id=
@@ -97,8 +92,7 @@ module GroupDocs
       attr_accessor camel
 
       # Human-readable accessors
-      alias_method :"#{snake}",  :"#{camel}"
-      alias_method :"#{snake}=", :"#{camel}="
+      alias_accessor snake, camel.to_sym
 
       #
       # Converts hash to subscription plan limit.

data/lib/groupdocs/subscription/limit.rb

@@ -11,14 +11,10 @@ module GroupDocs
     attr_accessor :Description
 
     # Human-readable accessors
-    alias_method :id,           :Id
-    alias_method :id=,          :Id=
-    alias_method :min,          :Min
-    alias_method :min=,         :Min=
-    alias_method :max,          :Max
-    alias_method :max=,         :Max=
-    alias_method :description,  :Description
-    alias_method :description=, :Description=
+    alias_accessor :id,          :Id
+    alias_accessor :min,         :Min
+    alias_accessor :max,         :Max
+    alias_accessor :description, :Description
 
   end # Subscription::Limit
 end # GroupDocs

data/lib/groupdocs/user.rb

@@ -62,12 +62,9 @@ module GroupDocs
     attr_accessor :customEmailMessage
 
     # Human-readable accessors
-    alias_method :first_name,            :firstname
-    alias_method :first_name=,           :firstname=
-    alias_method :last_name,             :lastname
-    alias_method :last_name=,            :lastname=
-    alias_method :custom_email_message,  :customEmailMessage
-    alias_method :custom_email_message=, :customEmailMessage=
+    alias_accessor :first_name,           :firstname
+    alias_accessor :last_name,            :lastname
+    alias_accessor :custom_email_message, :customEmailMessage
 
     #
     # Converts access rights to human-readable format flag.

data/lib/groupdocs/version.rb

@@ -1,3 +1,3 @@
 module GroupDocs
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end # GroupDocs

data/spec/groupdocs/api/helpers/accessor_helper_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe GroupDocs::Api::Helpers::Accessor do
+  describe '.alias_accessor' do
+    it 'aliases accessor to new name' do
+      klass = GroupDocs::Api::Entity
+      klass.class_eval <<-RUBY
+        attr_accessor :guid
+        alias_accessor :guiD, :guid
+      RUBY
+      subject = klass.new
+      subject.should have_alias(:guiD,  :guid)
+      subject.should have_alias(:guiD=, :guid=)
+    end
+  end
+end

data/spec/groupdocs/api/helpers/mime_helper_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe GroupDocs::Api::Helpers::MIME do
+  subject do
+    GroupDocs::Signature.new
+  end
+
+  describe '#mime_type' do
+    it 'returns first MIME type of file' do
+      types = ['application/ruby']
+      ::MIME::Types.should_receive(:type_for).with(__FILE__).and_return(types)
+      types.should_receive(:first).and_return('application/ruby')
+      subject.send(:mime_type, __FILE__)
+    end
+  end
+end

data/spec/groupdocs/api/helpers/rest_helper_spec.rb

@@ -16,6 +16,10 @@ describe GroupDocs::Api::Helpers::REST do
     it 'includes "Content-length: 0"' do
       subject.should include(content_length: 0)
     end
+
+    it 'includes Groupdocs-Referrer with SDK version' do
+      subject.should include(groupdocs_referrer: "ruby/#{GroupDocs::VERSION}")
+    end
   end
 
   describe '#prepare_request' do

data/spec/groupdocs/api/request_spec.rb

@@ -4,11 +4,9 @@ describe GroupDocs::Api::Request do
 
   subject { described_class.new(method: :GET, path: '/folders') }
 
-  it { should respond_to(:resource)  }
-  it { should respond_to(:response)  }
-  it { should respond_to(:response=) }
-  it { should respond_to(:options)   }
-  it { should respond_to(:options=)  }
+  it { should respond_to(:resource)    }
+  it { should have_accessor(:response) }
+  it { should have_accessor(:options)  }
 
   describe '#initialize' do
     it 'allows passing options' do

data/spec/groupdocs/datasource/field_spec.rb

@@ -4,12 +4,9 @@ describe GroupDocs::DataSource::Field do
 
   it_behaves_like GroupDocs::Api::Entity
 
-  it { should respond_to(:name)   }
-  it { should respond_to(:name=)  }
-  it { should respond_to(:type)    }
-  it { should respond_to(:type=)   }
-  it { should respond_to(:values)  }
-  it { should respond_to(:values=) }
+  it { should have_accessor(:name)   }
+  it { should have_accessor(:type)   }
+  it { should have_accessor(:values) }
 
   describe '#type=' do
     it 'saves type in machine readable format if symbol is passed' do

data/spec/groupdocs/datasource_spec.rb

@@ -31,21 +31,14 @@ describe GroupDocs::DataSource do
     end
   end
 
-  it { should respond_to(:id)                }
-  it { should respond_to(:id=)               }
-  it { should respond_to(:descr)             }
-  it { should respond_to(:descr=)            }
-  it { should respond_to(:questionnaire_id)  }
-  it { should respond_to(:questionnaire_id=) }
-  it { should respond_to(:created_on)        }
-  it { should respond_to(:created_on=)       }
-  it { should respond_to(:modified_on)       }
-  it { should respond_to(:modified_on=)      }
-  it { should respond_to(:fields)            }
-  it { should respond_to(:fields=)           }
-
-  it { should have_alias(:description, :descr)   }
-  it { should have_alias(:description=, :descr=) }
+  it { should have_accessor(:id)               }
+  it { should have_accessor(:descr)            }
+  it { should have_accessor(:questionnaire_id) }
+  it { should have_accessor(:created_on)       }
+  it { should have_accessor(:modified_on)      }
+  it { should have_accessor(:fields)           }
+
+  it { should alias_accessor(:description, :descr) }
 
   describe '#created_on' do
     it 'returns converted to Time object Unix timestamp' do

data/spec/groupdocs/document/annotation/reply_spec.rb

@@ -56,31 +56,20 @@ describe GroupDocs::Document::Annotation::Reply do
     end
   end
 
-  it { should respond_to(:annotation)      }
-  it { should respond_to(:annotation=)     }
-  it { should respond_to(:text)            }
-  it { should respond_to(:text=)           }
-  it { should respond_to(:guid)            }
-  it { should respond_to(:guid=)           }
-  it { should respond_to(:annotationGuid)  }
-  it { should respond_to(:annotationGuid=) }
-  it { should respond_to(:userGuid)        }
-  it { should respond_to(:userGuid=)       }
-  it { should respond_to(:userName)        }
-  it { should respond_to(:userName=)       }
-  it { should respond_to(:text)            }
-  it { should respond_to(:text=)           }
-  it { should respond_to(:repliedOn)       }
-  it { should respond_to(:repliedOn=)      }
-
-  it { should have_alias(:annotation_guid, :annotationGuid)   }
-  it { should have_alias(:annotation_guid=, :annotationGuid=) }
-  it { should have_alias(:user_guid, :userGuid)               }
-  it { should have_alias(:user_guid=, :userGuid=)             }
-  it { should have_alias(:user_name, :userName)               }
-  it { should have_alias(:user_name=, :userName=)             }
+  it { should have_accessor(:annotation)     }
+  it { should have_accessor(:text)           }
+  it { should have_accessor(:guid)           }
+  it { should have_accessor(:annotationGuid) }
+  it { should have_accessor(:userGuid)       }
+  it { should have_accessor(:userName)       }
+  it { should have_accessor(:text)           }
+  it { should have_accessor(:repliedOn)      }
+
+  it { should alias_accessor(:annotation_guid, :annotationGuid) }
+  it { should alias_accessor(:user_guid, :userGuid)             }
+  it { should alias_accessor(:user_name, :userName)             }
   # Reply#replied_on is overwritten
-  it { should have_alias(:replied_on=, :repliedOn=)           }
+  it { should have_alias(:replied_on=, :repliedOn=) }
 
 
   describe '#initialize' do

data/spec/groupdocs/document/annotation/reviewer_spec.rb

@@ -45,13 +45,9 @@ describe GroupDocs::Document::Annotation::Reviewer do
     end
   end
 
-  it { should respond_to(:emailAddress)  }
-  it { should respond_to(:emailAddress=) }
-  it { should respond_to(:FullName)      }
-  it { should respond_to(:FullName=)     }
-
-  it { should have_alias(:email_address, :emailAddress)   }
-  it { should have_alias(:email_address=, :emailAddress=) }
-  it { should have_alias(:full_name, :FullName)           }
-  it { should have_alias(:full_name=, :FullName=)         }
+  it { should have_accessor(:emailAddress) }
+  it { should have_accessor(:FullName)     }
+
+  it { should alias_accessor(:email_address, :emailAddress) }
+  it { should alias_accessor(:full_name, :FullName)         }
 end

data/spec/groupdocs/document/annotation_spec.rb

@@ -11,46 +11,28 @@ describe GroupDocs::Document::Annotation do
     described_class.new(document: document)
   end
 
-  it { should respond_to(:document)            }
-  it { should respond_to(:document=)           }
-  it { should respond_to(:id)                  }
-  it { should respond_to(:id=)                 }
-  it { should respond_to(:guid)                }
-  it { should respond_to(:guid=)               }
-  it { should respond_to(:sessionGuid)         }
-  it { should respond_to(:sessionGuid=)        }
-  it { should respond_to(:documentGuid)        }
-  it { should respond_to(:documentGuid=)       }
-  it { should respond_to(:creatorGuid)         }
-  it { should respond_to(:creatorGuid=)        }
-  it { should respond_to(:replyGuid)           }
-  it { should respond_to(:replyGuid=)          }
-  it { should respond_to(:createdOn)           }
-  it { should respond_to(:createdOn=)          }
-  it { should respond_to(:type)                }
-  it { should respond_to(:type=)               }
-  it { should respond_to(:access)              }
-  it { should respond_to(:access=)             }
-  it { should respond_to(:box)                 }
-  it { should respond_to(:box=)                }
-  it { should respond_to(:replies)             }
-  it { should respond_to(:replies=)            }
-  it { should respond_to(:annotationPosition)  }
-  it { should respond_to(:annotationPosition=) }
-
-  it { should have_alias(:session_guid, :sessionGuid)                 }
-  it { should have_alias(:session_guid=, :sessionGuid=)               }
-  it { should have_alias(:document_guid, :documentGuid)               }
-  it { should have_alias(:document_guid=, :documentGuid=)             }
-  it { should have_alias(:creator_guid, :creatorGuid)                 }
-  it { should have_alias(:creator_guid=, :creatorGuid=)               }
-  it { should have_alias(:reply_guid, :replyGuid)                     }
-  it { should have_alias(:reply_guid=, :replyGuid=)                   }
+  it { should have_accessor(:document)           }
+  it { should have_accessor(:id)                 }
+  it { should have_accessor(:guid)               }
+  it { should have_accessor(:sessionGuid)        }
+  it { should have_accessor(:documentGuid)       }
+  it { should have_accessor(:creatorGuid)        }
+  it { should have_accessor(:replyGuid)          }
+  it { should have_accessor(:createdOn)          }
+  it { should have_accessor(:type)               }
+  it { should have_accessor(:access)             }
+  it { should have_accessor(:box)                }
+  it { should have_accessor(:replies)            }
+  it { should have_accessor(:annotationPosition) }
+
+  it { should alias_accessor(:session_guid, :sessionGuid)   }
+  it { should alias_accessor(:document_guid, :documentGuid) }
+  it { should alias_accessor(:creator_guid, :creatorGuid)   }
+  it { should alias_accessor(:reply_guid, :replyGuid)       }
   # Annotation#created_on is overwritten
-  it { should have_alias(:created_on=, :createdOn=)                   }
-  it { should have_alias(:annotation_position, :annotationPosition)   }
-  it { should have_alias(:annotation_position=, :annotationPosition=) }
-  it { should have_alias(:position, :annotation_position)             }
+  it { should have_alias(:created_on=, :createdOn=)                            }
+  it { should alias_accessor(:annotation_position, :annotationPosition) }
+  it { should alias_accessor(:position, :annotationPosition)            }
 
   it { should have_alias(:annotationGuid=, :guid=) }
 
@@ -108,7 +90,7 @@ describe GroupDocs::Document::Annotation do
 
   describe '#box=' do
     it 'converts passed hash to GroupDocs::Document::Rectangle object' do
-      subject.box = { X: 0.90, Y: 0.05, Width: 0.06745, Height: 0.005967 }
+      subject.box = { x: 0.90, y: 0.05, width: 0.06745, height: 0.005967 }
       subject.box.should be_a(GroupDocs::Document::Rectangle)
       subject.box.x.should == 0.90
       subject.box.y.should == 0.05
@@ -231,6 +213,19 @@ describe GroupDocs::Document::Annotation do
         subject.move_marker!(10, 10, client_id: 'client_id', private_key: 'private_key')
       end.should_not raise_error(ArgumentError)
     end
+
+    it 'updates box coordinates if it is set' do
+      subject.box = { x: 1, y: 2 }
+      subject.move_marker! 10, 10
+      subject.box.x.should == 10
+      subject.box.y.should == 10
+    end
+
+    it 'creates box coordinates if it is not set' do
+      subject.move_marker! 10, 10
+      subject.box.x.should == 10
+      subject.box.y.should == 10
+    end
   end
 
   describe '#set_access!' do