groupdocs 0.2.11 → 0.3.0

data/.travis.yml

@@ -2,4 +2,3 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - ruby-head

data/lib/groupdocs/api/entity.rb

@@ -109,6 +109,18 @@ module GroupDocs
         word.to_sym
       end
 
+      #
+      # Converts accessor symbol to instance variable symbol.
+      # @api private
+      #
+      def accessor_to_variable(accessor)
+        word = accessor.to_s
+        word.capitalize!
+        word.gsub!(/_([a-z])/) { |match| match.upcase }
+        word.gsub!(/_/, '')
+        "@#{word}".to_sym
+      end
+
     end # Entity
   end # Api
 end # GroupDocs

data/lib/groupdocs/api/helpers/access_mode_helper.rb

@@ -3,27 +3,22 @@ module GroupDocs
     module Helpers
       module AccessMode
 
-        MODES = {
-          private:    0,
-          restricted: 1,
-          public:     2
-        }
-
         private
 
         #
         # Converts access mode from/to human-readable format.
         #
-        # @param [Integer, Symbol] mode
-        # @return [Symbol, Integer]
+        # @param [String, Symbol] mode
+        # @return [Symbol, String]
+        # @raise [ArgumentError] if argument is not symbol/string
         # @api private
         #
         def parse_access_mode(mode)
-          if mode.is_a?(Integer)
-            MODES.invert[mode]
-          else
-            MODES[mode]
-          end or raise ArgumentError, "Unknown access mode: #{mode.inspect}."
+          case mode
+          when Symbol then mode.to_s.capitalize
+          when String then mode.downcase.to_sym
+          else raise ArgumentError, "Expected string/symbol, received: #{mode.class}"
+          end
         end
 
       end # AccessMode

data/lib/groupdocs/api/helpers/actions_helper.rb

@@ -42,33 +42,6 @@ module GroupDocs
           flag
         end
 
-        #
-        # Converts actions byte flag to array.
-        #
-        # @param [Integer] byte
-        # @return [Array<Symbol>]
-        # @raise [ArgumentError] if actions is not an array
-        # @api private
-        #
-        def convert_byte_to_actions(byte)
-          byte.is_a?(Integer) or raise ArgumentError, "Byte flag should be an integer, received: #{byte.inspect}"
-
-          actions = []
-          ACTIONS.reverse_each do |action, flag|
-            decreased_byte = byte - flag
-            if decreased_byte >= 0
-              actions << action
-              byte = decreased_byte
-            end
-          end
-
-          unless actions == [:none]
-            actions.delete(:none)
-          end
-
-          actions
-        end
-
       end # Actions
     end # Helpers
   end # Api

data/lib/groupdocs/api/helpers/status_helper.rb

@@ -3,43 +3,22 @@ module GroupDocs
     module Helpers
       module Status
 
-        STATUSES = {
-          draft:      -1,
-          pending:     0,
-          scheduled:   1,
-          in_progress: 2,
-          completed:   3,
-          postponed:   4,
-          archived:    5,
-        }
-
-        # @attr [Symbol] status
-        attr_accessor :status
-
-        #
-        # Sets status of the entity.
-        #
-        # @return [Symbol]
-        #
-        def status
-          parse_status(@status)
-        end
-
         private
 
         #
         # Converts status from/to human-readable format.
         #
-        # @param [Integer, Symbol] status
-        # @return [Symbol, Integer]
+        # @param [String, Symbol] status
+        # @return [Symbol, String]
+        # @raise [ArgumentError] if argument is not symbol/string
         # @api private
         #
         def parse_status(status)
-          if status.is_a?(Integer)
-            STATUSES.invert[status]
-          else
-            STATUSES[status]
-          end or raise ArgumentError, "Unknown status: #{status.inspect}."
+          case status
+          when Symbol then accessor_to_variable(status).to_s.delete(?@)
+          when String then variable_to_accessor(status)
+          else raise ArgumentError, "Expected string/symbol, received: #{status.class}"
+          end
         end
 
       end # Status

data/lib/groupdocs/document.rb

@@ -8,6 +8,13 @@ module GroupDocs
     require 'groupdocs/document/rectangle'
     require 'groupdocs/document/view'
 
+    ACCESS_MODES = {
+      private:    0,
+      restricted: 1,
+      inherited:  2,
+      public:     3,
+    }
+
     extend Extensions::Lookup
     include Api::Helpers::AccessMode
     include Api::Helpers::Status
@@ -58,6 +65,8 @@ module GroupDocs
     attr_accessor :outputs
     # @attr [Array<Symbol>] output_formats
     attr_accessor :output_formats
+    # @attr [Symbol] status
+    attr_accessor :status
 
     #
     # Coverts passed array of attributes hash to array of GroupDocs::Storage::File.
@@ -81,6 +90,15 @@ module GroupDocs
       @output_formats.split(?,).map(&:to_sym)
     end
 
+    #
+    # Converts status to human-readable format.
+    #
+    # @return [Symbol]
+    #
+    def status
+      parse_status(@status)
+    end
+
     #
     # Converts timestamp which is return by API server to Time object.
     #
@@ -140,7 +158,7 @@ module GroupDocs
         request[:method] = :PUT
         request[:path] = "/doc/{{client_id}}/files/#{file.id}/accessinfo"
       end
-      api.add_params(mode: parse_access_mode(mode))
+      api.add_params(mode: ACCESS_MODES[mode])
       json = api.execute!
 
       parse_access_mode(json[:access])
@@ -163,7 +181,7 @@ module GroupDocs
         request[:path] = "/doc/{{client_id}}/files/#{file.id}/formats"
       end.execute!
 
-      json[:types].split(';').map do |format|
+      json[:types].map do |format|
         format.downcase.to_sym
       end
     end

data/lib/groupdocs/document/annotation.rb

@@ -3,16 +3,9 @@ module GroupDocs
 
     require 'groupdocs/document/annotation/reply'
 
-    TYPES = {
-      text:  0,
-      area:  1,
-      point: 2,
-    }
+    include Api::Helpers::AccessMode
 
-    ACCESS = {
-      private: 0,
-      public:  1,
-    }
+    TYPES  = %w(Text Area Point)
 
     # @attr [GroupDocs::Document] document
     attr_accessor :document
@@ -74,8 +67,8 @@ module GroupDocs
     #
     def type=(type)
       if type.is_a?(Symbol)
-        TYPES.keys.include?(type) or raise ArgumentError, "Unknown type: #{type.inspect}"
-        type = TYPES[type]
+        type = type.to_s.capitalize
+        TYPES.include?(type) or raise ArgumentError, "Unknown type: #{type.inspect}"
       end
 
       @type = type
@@ -87,31 +80,25 @@ module GroupDocs
     # @return [Symbol]
     #
     def type
-      TYPES.invert[@type]
+      @type.downcase.to_sym
     end
 
     #
-    # Updates access mode with machine-readable format.
+    # Converts access mode to machine-readable format.
     #
-    # @param [Symbol] access
-    # @raise [ArgumentError] if access mode is unknown
+    # @param [Symbol] mode
     #
-    def access=(access)
-      if access.is_a?(Symbol)
-        ACCESS.keys.include?(access) or raise ArgumentError, "Unknown access mode: #{access.inspect}"
-        access = ACCESS[access]
-      end
-
-      @access = access
+    def access=(mode)
+      @access = (mode.is_a?(Symbol) ? parse_access_mode(mode) : mode)
     end
 
     #
-    # Returns access mode in human-readable format.
+    # Converts access mode to human-readable format.
     #
     # @return [Symbol]
     #
     def access
-      ACCESS.invert[@access]
+      parse_access_mode(@access)
     end
 
     #

data/lib/groupdocs/job.rb

@@ -34,7 +34,7 @@ module GroupDocs
     #
     # @param [Hash] options
     # @option options [Integer] :actions Array of actions to be performed. Required
-    # @option options [Boolean] :emails_results
+    # @option options [Boolean] :email_results
     # @option options [Array] :out_formats
     # @option options [Boolean] :url_only
     # @param [Hash] access Access credentials
@@ -70,6 +70,8 @@ module GroupDocs
     attr_accessor :documents
     # @attr [Time] requested_time
     attr_accessor :requested_time
+    # @attr [Symbol] status
+    attr_accessor :status
 
     #
     # Coverts passed array of attributes hash to array of GroupDocs::Document.
@@ -85,6 +87,15 @@ module GroupDocs
       end
     end
 
+    #
+    # Converts status to human-readable format.
+    #
+    # @return [Symbol]
+    #
+    def status
+      parse_status(@status)
+    end
+
     #
     # Converts timestamp which is return by API server to Time object.
     #
@@ -100,7 +111,7 @@ module GroupDocs
     # @return [Array<Symbol>]
     #
     def actions
-      self.class.convert_byte_to_actions(@actions)
+      @actions.split(', ').map { |action| variable_to_accessor(action) }
     end
 
     #

data/lib/groupdocs/questionnaire.rb

@@ -5,8 +5,6 @@ module GroupDocs
     require 'groupdocs/questionnaire/page'
     require 'groupdocs/questionnaire/question'
 
-    include Api::Helpers::AccessMode
-
     #
     # Returns an array of all questionnaires.
     #

data/lib/groupdocs/questionnaire/execution.rb

@@ -1,14 +1,7 @@
 module GroupDocs
   class Questionnaire::Execution < GroupDocs::Api::Entity
 
-    STATUSES = {
-      draft:     0,
-      submitted: 1,
-      executed:  2,
-      approved:  3,
-      rejected:  4,
-      closed:    5,
-    }
+    include Api::Helpers::Status
 
     #
     # Returns an array of all executions.
@@ -56,29 +49,12 @@ module GroupDocs
     alias_method :document_id=,       :documentId=
 
     #
-    # Updates status with machine-readable format.
-    #
-    # If you want to update status on server, use #set_status! method.
-    #
-    # @param [Symbol, Integer] status
-    # @raise [ArgumentError] if status is unknown
-    #
-    def status=(status)
-      if status.is_a?(Symbol)
-        STATUSES.keys.include?(status) or raise ArgumentError, "Unknown status: #{status.inspect}"
-        status = STATUSES[status]
-      end
-
-      @status = status
-    end
-
-    #
-    # Returns execution status in human-readable format.
+    # Converts status to human-readable format.
     #
     # @return [Symbol]
     #
     def status
-      STATUSES.invert[@status]
+      parse_status(@status)
     end
 
     #
@@ -90,11 +66,13 @@ module GroupDocs
     # @option access [String] :private_key
     #
     def set_status!(status, access = {})
+      status = parse_status(status)
+
       Api::Request.new do |request|
         request[:access] = access
         request[:method] = :PUT
         request[:path] = "/merge/{{client_id}}/questionnaires/executions/#{id}/status"
-        request[:request_body] = STATUSES[status]
+        request[:request_body] = status
       end.execute!
 
       self.status = status

data/lib/groupdocs/questionnaire/question.rb

@@ -3,10 +3,7 @@ module GroupDocs
 
     require 'groupdocs/questionnaire/question/answer'
 
-    TYPES = {
-      simple:          0,
-      multiple_choice: 1,
-    }
+    TYPES = %w(GenericText MultipleChoice)
 
     # @attr [String] field
     attr_accessor :field
@@ -60,9 +57,14 @@ module GroupDocs
     # Updates type with machine-readable format.
     #
     # @param [Symbol] type
+    # @raise [ArgumentError] if type is unknown
     #
     def type=(type)
-      type = TYPES[type] if type.is_a?(Symbol)
+      if type.is_a?(Symbol)
+        type = accessor_to_variable(type).to_s.delete(?@)
+        TYPES.include?(type) or raise ArgumentError, "Unknown type: #{type.inspect}"
+      end
+
       @type = type
     end
 
@@ -72,7 +74,7 @@ module GroupDocs
     # @return [Symbol]
     #
     def type
-      TYPES.invert[@type]
+      variable_to_accessor(@type)
     end
 
   end # Questionnaire::Question

data/lib/groupdocs/storage/file.rb

@@ -5,15 +5,7 @@ module GroupDocs
       extend Extensions::Lookup
       include Api::Helpers::AccessMode
 
-      DOCUMENT_TYPES = {
-        undefined: -1,
-        cells:      0,
-        words:      1,
-        slides:     2,
-        pdf:        3,
-        html:       4,
-        image:      5,
-      }
+      DOCUMENT_TYPES = %w(Undefined Cells Words Slides Pdf Html Image)
 
       #
       # Uploads file to API server.
@@ -103,25 +95,25 @@ module GroupDocs
       #
       # Updates type with machine-readable format.
       #
-      # @param [Symbol, Integer] type
+      # @param [Symbol] type
       # @raise [ArgumentError] if type is unknown
       #
       def type=(type)
         if type.is_a?(Symbol)
-          DOCUMENT_TYPES.keys.include?(type) or raise ArgumentError, "Unknown type: #{type.inspect}"
-          type = DOCUMENT_TYPES[type]
+          type = type.to_s.capitalize
+          DOCUMENT_TYPES.include?(type) or raise ArgumentError, "Unknown type: #{type.inspect}"
         end
 
         @type = type
       end
 
       #
-      # Returns document type in human-readable format.
+      # Returns type in human-readable format.
       #
       # @return [Symbol]
       #
       def type
-        DOCUMENT_TYPES.invert[@type]
+        @type.downcase.to_sym
       end
 
       #

data/lib/groupdocs/version.rb

@@ -1,3 +1,3 @@
 module GroupDocs
-  VERSION = '0.2.11'
+  VERSION = '0.3.0'
 end # GroupDocs

data/spec/groupdocs/api/entity_spec.rb

@@ -55,4 +55,14 @@ describe GroupDocs::Api::Entity do
       subject.send(:variable_to_accessor, :@TestOneAndTWO).should == :test_one_and_two
     end
   end
+
+  describe '#accessor_to_variable' do
+    it 'converts accessor method symbol to instance variable symbol' do
+      subject.send(:accessor_to_variable, :test).should == :@Test
+    end
+
+    it 'converts underscored words to camelized ' do
+      subject.send(:accessor_to_variable, :test_one_and_two).should == :@TestOneAndTwo
+    end
+  end
 end

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

@@ -6,44 +6,17 @@ describe GroupDocs::Api::Helpers::AccessMode do
     GroupDocs::Storage::Folder.new
   end
 
-  describe 'MODES' do
-    it 'contains hash of access modes' do
-      described_class::MODES.should == {
-        private:    0,
-        restricted: 1,
-        public:     2,
-      }
-    end
-  end
-
   describe '#parse_access_mode' do
-    it 'raise error if mode is unknown' do
-      -> { subject.send(:parse_access_mode, 3)        }.should raise_error(ArgumentError)
-      -> { subject.send(:parse_access_mode, :unknown) }.should raise_error(ArgumentError)
-    end
-
-    it 'returns :private if passed mode is 0' do
-      subject.send(:parse_access_mode, 0).should == :private
-    end
-
-    it 'returns :restricted if passed mode is 1' do
-      subject.send(:parse_access_mode, 1).should == :restricted
-    end
-
-    it 'returns :public if passed mode is 2' do
-      subject.send(:parse_access_mode, 2).should == :public
-    end
-
-    it 'returns 0 if passed mode is :private' do
-      subject.send(:parse_access_mode, :private).should == 0
+    it 'returns downcased symbol if string is passed' do
+      subject.send(:parse_access_mode, 'Public').should == :public
     end
 
-    it 'returns 1 if passed mode is :restricted' do
-      subject.send(:parse_access_mode, :restricted).should == 1
+    it 'returns capitalized string if symbol is passed' do
+      subject.send(:parse_access_mode, :public).should == 'Public'
     end
 
-    it 'returns 2 if passed mode is :public' do
-      subject.send(:parse_access_mode, :public).should == 2
+    it 'raises error if argument is not string or symbol' do
+      -> { subject.send(:parse_access_mode, 1) }.should raise_error(ArgumentError)
     end
   end
 end

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

@@ -10,23 +10,6 @@ describe GroupDocs::Api::Helpers::Actions do
     %w(convert combine compress_zip compress_rar trace convert_body bind_data print import_annotations)
   end
 
-  describe 'ACTIONS' do
-    it 'contains hash of actions' do
-      described_class::ACTIONS.should == {
-        none:                 0,
-        convert:              1,
-        combine:              2,
-        compress_zip:         4,
-        compress_rar:         8,
-        trace:               16,
-        convert_body:        32,
-        bind_data:           64,
-        print:              128,
-        import_annotations: 256,
-      }
-    end
-  end
-
   describe '.convert_actions_to_byte' do
     it 'raises error if actions is not an array' do
       -> { subject.convert_actions_to_byte(:convert) }.should raise_error(ArgumentError)
@@ -51,15 +34,4 @@ describe GroupDocs::Api::Helpers::Actions do
       flag.should == 511
     end
   end
-
-  describe '#convert_byte_to_actions' do
-    it 'raises error if byte is not an integer' do
-      -> { subject.convert_byte_to_actions('byte') }.should raise_error(ArgumentError)
-    end
-
-
-    it 'returns correct array of actions' do
-      subject.convert_byte_to_actions(511).should =~ actions.map(&:to_sym)
-    end
-  end
 end

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

@@ -3,83 +3,20 @@ require 'spec_helper'
 describe GroupDocs::Api::Helpers::Status do
 
   subject do
-    Object.extend(described_class)
-  end
-
-  describe 'STATUSES' do
-    it 'contains hash of entity statuses' do
-      described_class::STATUSES.should == {
-        draft:      -1,
-        pending:     0,
-        scheduled:   1,
-        in_progress: 2,
-        completed:   3,
-        postponed:   4,
-        archived:    5,
-      }
-    end
+    GroupDocs::Job.new
   end
 
   describe '#parse_status' do
-    it 'raise error if status is unknown' do
-      -> { subject.send(:parse_status, 8)        }.should raise_error(ArgumentError)
-      -> { subject.send(:parse_status, :unknown) }.should raise_error(ArgumentError)
-    end
-
-    it 'returns :draft if passed status is -1' do
-      subject.send(:parse_status, -1).should == :draft
-    end
-
-    it 'returns :pending if passed status is 0' do
-      subject.send(:parse_status, 0).should == :pending
-    end
-
-    it 'returns :scheduled if passed status is 1' do
-      subject.send(:parse_status, 1).should == :scheduled
-    end
-
-    it 'returns :in_progress if passed status is 2' do
-      subject.send(:parse_status, 2).should == :in_progress
-    end
-
-    it 'returns :completed if passed status is 3' do
-      subject.send(:parse_status, 3).should == :completed
-    end
-
-    it 'returns :postponed if passed status is 4' do
-      subject.send(:parse_status, 4).should == :postponed
-    end
-
-    it 'returns :archived if passed status is 5' do
-      subject.send(:parse_status, 5).should == :archived
-    end
-
-    it 'returns -1 if passed status is :draft' do
-      subject.send(:parse_status, :draft).should == -1
-    end
-
-    it 'returns 0 if passed status is :pending' do
-      subject.send(:parse_status, :pending).should == 0
-    end
-
-    it 'returns 1 if passed status is :scheduled' do
-      subject.send(:parse_status, :scheduled).should == 1
-    end
-
-    it 'returns 2 if passed status is :in_progress' do
-      subject.send(:parse_status, :in_progress).should == 2
-    end
-
-    it 'returns 3 if passed status is :completed' do
-      subject.send(:parse_status, :completed).should == 3
+    it 'returns underscored symbol if string is passed' do
+      subject.send(:parse_status, 'InProgress').should == :in_progress
     end
 
-    it 'returns 4 if passed status is :postponed' do
-      subject.send(:parse_status, :postponed).should == 4
+    it 'returns capitalized string if symbol is passed' do
+      subject.send(:parse_status, :in_progress).should == 'InProgress'
     end
 
-    it 'returns 5 if passed status is :archived' do
-      subject.send(:parse_status, :archived).should == 5
+    it 'raises error if argument is not string or symbol' do
+      -> { subject.send(:parse_status, 1) }.should raise_error(ArgumentError)
     end
   end
 end

data/spec/groupdocs/document/annotation_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe GroupDocs::Document::Annotation do
 
   it_behaves_like GroupDocs::Api::Entity
+  include_examples GroupDocs::Api::Helpers::AccessMode
 
   subject do
     file = GroupDocs::Storage::File.new
@@ -78,12 +79,12 @@ describe GroupDocs::Document::Annotation do
   describe '#type=' do
     it 'saves type in machine readable format if symbol is passed' do
       subject.type = :area
-      subject.instance_variable_get(:@type).should == 1
+      subject.instance_variable_get(:@type).should == 'Area'
     end
 
     it 'does nothing if parameter is not symbol' do
-      subject.type = 1
-      subject.instance_variable_get(:@type).should == 1
+      subject.type = 'Area'
+      subject.instance_variable_get(:@type).should == 'Area'
     end
 
     it 'raises error if type is unknown' do
@@ -93,31 +94,20 @@ describe GroupDocs::Document::Annotation do
 
   describe '#type' do
     it 'returns type in human-readable format' do
-      subject.type = 1
+      subject.type = 'Area'
       subject.type.should == :area
     end
   end
 
   describe '#access=' do
-    it 'saves access mode in machine readable format if symbol is passed' do
+    it 'converts symbol to string if passed' do
       subject.access = :public
-      subject.instance_variable_get(:@access).should == 1
+      subject.instance_variable_get(:@access).should == 'Public'
     end
 
-    it 'does nothing if parameter is not symbol' do
-      subject.access = 1
-      subject.instance_variable_get(:@access).should == 1
-    end
-
-    it 'raises error if access mode is unknown' do
-      -> { subject.access = :unknown }.should raise_error(ArgumentError)
-    end
-  end
-
-  describe '#access' do
-    it 'returns access in human-readable format' do
-      subject.access = 1
-      subject.access.should == :public
+    it 'does nothing if not a symbol is passed' do
+      subject.access = 'Blah'
+      subject.instance_variable_get(:@access).should == 'Blah'
     end
   end
 

data/spec/groupdocs/document_spec.rb

@@ -127,14 +127,14 @@ describe GroupDocs::Document do
     end
 
     it 'returns access mode in human readable presentation' do
-      subject.should_receive(:parse_access_mode).with(0).and_return(:private)
+      subject.should_receive(:parse_access_mode).with('Private').and_return(:private)
       subject.access_mode!.should == :private
     end
   end
 
   describe '#access_mode_set!' do
     before(:each) do
-      mock_api_server('{"status": "Ok", "result": {"access": 0 }}')
+      mock_api_server('{"status": "Ok", "result": {"access": "Private" }}')
     end
 
     it 'accepts access credentials hash' do
@@ -143,9 +143,9 @@ describe GroupDocs::Document do
       end.should_not raise_error(ArgumentError)
     end
 
-    it 'sets corresponding access mode and determines set' do
-      subject.should_receive(:parse_access_mode).with(:private).and_return(0)
-      subject.should_receive(:parse_access_mode).with(0).and_return(:private)
+    it 'sets corresponding access mode' do
+      described_class::ACCESS_MODES.should_receive(:[]).with(:private).and_return(0)
+      subject.should_receive(:parse_access_mode).with('Private').and_return(:private)
       subject.access_mode_set!(:private)
     end
 

data/spec/groupdocs/job_spec.rb

@@ -112,9 +112,8 @@ describe GroupDocs::Job do
 
   describe '#actions' do
     it 'converts actions to human-readable format' do
-      subject.actions = 129
-      described_class.should_receive(:convert_byte_to_actions).with(129)
-      subject.actions
+      subject.actions = 'Convert, Combine, CompressZip'
+      subject.actions.should == [:convert, :combine, :compress_zip]
     end
   end
 

data/spec/groupdocs/questionnaire/execution_spec.rb

@@ -3,19 +3,7 @@ require 'spec_helper'
 describe GroupDocs::Questionnaire::Execution do
 
   it_behaves_like GroupDocs::Api::Entity
-
-  describe 'STATUSES' do
-    it 'contains hash of execution statuses' do
-      described_class::STATUSES.should == {
-        draft:     0,
-        submitted: 1,
-        executed:  2,
-        approved:  3,
-        rejected:  4,
-        closed:    5,
-      }
-    end
-  end
+  include_examples GroupDocs::Api::Helpers::Status
 
   describe '.all!' do
     it 'accepts access credentials hash' do
@@ -76,29 +64,6 @@ describe GroupDocs::Questionnaire::Execution do
     subject.method(:document_id=).should      == subject.method(:documentId=)
   end
 
-  describe '#status=' do
-    it 'saves status in machine readable format if symbol is passed' do
-      subject.status = :executed
-      subject.instance_variable_get(:@status).should == 2
-    end
-
-    it 'does nothing if parameter is not symbol' do
-      subject.status = 2
-      subject.instance_variable_get(:@status).should == 2
-    end
-
-    it 'raises error if status is unknown' do
-      -> { subject.status = :unknown }.should raise_error(ArgumentError)
-    end
-  end
-
-  describe '#status' do
-    it 'returns status in human-readable format' do
-      subject.status = 2
-      subject.status.should == :executed
-    end
-  end
-
   describe '#set_status!' do
     before(:each) do
       mock_api_server(load_json('questionnaire_execution_status_set'))
@@ -110,10 +75,14 @@ describe GroupDocs::Questionnaire::Execution do
       end.should_not raise_error(ArgumentError)
     end
 
+    it 'parses status' do
+      subject.should_receive(:parse_status).with(:submitted).and_return('Submitted')
+      subject.set_status!(:submitted)
+    end
+
     it 'updates status of execution object' do
-      lambda do
-        subject.set_status!(:submitted)
-      end.should change(subject, :status).to(:submitted)
+      subject.set_status!(:submitted)
+      subject.status.should == :submitted
     end
   end
 

data/spec/groupdocs/questionnaire/question_spec.rb

@@ -4,15 +4,6 @@ describe GroupDocs::Questionnaire::Question do
 
   it_behaves_like GroupDocs::Api::Entity
 
-  describe 'TYPES' do
-    it 'contains hash of field types' do
-      described_class::TYPES.should == {
-        simple:          0,
-        multiple_choice: 1,
-      }
-    end
-  end
-
   it { should respond_to(:field)       }
   it { should respond_to(:field=)      }
   it { should respond_to(:text)        }
@@ -72,20 +63,24 @@ describe GroupDocs::Questionnaire::Question do
 
   describe '#type=' do
     it 'saves type in machine readable format if symbol is passed' do
-      subject.type = :multiple_choice
-      subject.instance_variable_get(:@type).should == 1
+      subject.type = :generic_text
+      subject.instance_variable_get(:@type).should == 'GenericText'
     end
 
     it 'does nothing if parameter is not symbol' do
-      subject.type = 1
-      subject.instance_variable_get(:@type).should == 1
+      subject.type = 'GenericText'
+      subject.instance_variable_get(:@type).should == 'GenericText'
+    end
+
+    it 'raises error if type is unknown' do
+      -> { subject.type = :unknown }.should raise_error(ArgumentError)
     end
   end
 
   describe '#type' do
     it 'returns type in human-readable format' do
-      subject.type = 1
-      subject.type.should == :multiple_choice
+      subject.type = 'GenericText'
+      subject.type.should == :generic_text
     end
   end
 end

data/spec/groupdocs/storage/file_spec.rb

@@ -6,20 +6,6 @@ describe GroupDocs::Storage::File do
   include_examples GroupDocs::Extensions::Lookup
   include_examples GroupDocs::Api::Helpers::AccessMode
 
-  describe 'DOCUMENT_TYPES' do
-    it 'contains hash of document types' do
-      described_class::DOCUMENT_TYPES.should == {
-        undefined: -1,
-        cells:      0,
-        words:      1,
-        slides:     2,
-        pdf:        3,
-        html:       4,
-        image:      5,
-      }
-    end
-  end
-
   describe '.upload!' do
     before(:each) do
       mock_api_server(load_json('file_upload'))
@@ -81,12 +67,12 @@ describe GroupDocs::Storage::File do
   describe '#type=' do
     it 'saves type in machine readable format if symbol is passed' do
       subject.type = :words
-      subject.instance_variable_get(:@type).should == 1
+      subject.instance_variable_get(:@type).should == 'Words'
     end
 
     it 'does nothing if parameter is not symbol' do
-      subject.type = 2
-      subject.instance_variable_get(:@type).should == 2
+      subject.type = 'Words'
+      subject.instance_variable_get(:@type).should == 'Words'
     end
 
     it 'raises error if type is unknown' do
@@ -96,7 +82,7 @@ describe GroupDocs::Storage::File do
 
   describe '#type' do
     it 'returns type in human-readable format' do
-      subject.type = 1
+      subject.type = 'Words'
       subject.type.should == :words
     end
   end

data/spec/support/json/annotation_list.json

@@ -20,8 +20,8 @@
                 "X": null,
                 "Y": null
               },
-            "type": 0,
-            "access":null,
+            "type": "Text",
+            "access": "Public",
             "createdOn": 1334028956687,
             "replies": []
           }

data/spec/support/json/document_access_info_get.json

@@ -1,7 +1,7 @@
 {
   "result":
     {
-      "access": 0,
+      "access": "Private",
       "sharers":
         [
           {

data/spec/support/json/document_formats.json

@@ -1,7 +1,7 @@
 {
   "result":
     {
-      "types": "Pdf;Tiff;Jpeg"
+      "types": ["Pdf", "Tiff", "Jpeg"]
     },
   "status": "Ok",
   "error_message": null

data/spec/support/json/file_upload.json

@@ -3,6 +3,6 @@
   "result":
     {
       "adj_name": "File.pdf",
-      "type": 1
+      "type": "Words"
     }
 }

data/spec/support/json/job_documents.json

@@ -1,11 +1,11 @@
 {
   "result":
     {
-      "job_status": 5,
+      "job_status": "Archived",
       "inputs":
       [
         {
-          "status": 2,
+          "status": "InProgress",
           "output_formats": "pdf",
           "outputs":
           [
@@ -19,7 +19,7 @@
           "id": 123
         },
         {
-          "status": 1,
+          "status": "Scheduled",
           "output_formats": "tiff",
           "outputs":
           [

data/spec/support/json/jobs_get.json

@@ -5,13 +5,13 @@
         [
           {
             "id": 1,
-            "status": 5,
+            "status": "Archived",
             "documents":
             {
               "inputs":
               [
                 {
-                  "status": 2,
+                  "status": "InProgress",
                   "output_formats": "pdf",
                   "outputs":
                   [
@@ -29,13 +29,13 @@
           },
           {
             "id": 2,
-            "status": 3,
+            "status": "Completed",
             "documents":
             {
               "inputs":
               [
                 {
-                  "status": 1,
+                  "status": "Scheduled",
                   "output_formats": "tiff",
                   "outputs":
                   [

data/spec/support/json/questionnaire_executions.json

@@ -8,14 +8,14 @@
             "executiveId": 789,
             "approverId": 987,
             "datasourceId": 654,
-            "status": 5
+            "status": "Closed"
           },
           {
             "questionnaireId": 111,
             "executiveId": 222,
             "approverId": null,
             "datasourceId": null,
-            "status": 2
+            "status": "Executed"
           }
         ]
     },

data/spec/support/shared_examples/api/helpers/access_mode_helper.rb

@@ -4,8 +4,8 @@ shared_examples_for GroupDocs::Api::Helpers::AccessMode do
 
   describe '#access' do
     it 'returns converted to human-readable format access mode' do
-      subject.should_receive(:parse_access_mode).with(1).and_return(:restricted)
-      subject.access = 1
+      subject.should_receive(:parse_access_mode).with('Restricted').and_return(:restricted)
+      subject.access = 'Restricted'
       subject.access.should == :restricted
     end
   end

data/spec/support/shared_examples/api/helpers/status_helper.rb

@@ -4,9 +4,9 @@ shared_examples_for GroupDocs::Api::Helpers::Status do
 
   describe '#status' do
     it 'returns converted to human-readable format status' do
-      subject.should_receive(:parse_status).with(0).and_return(:pending)
-      subject.status = 0
-      subject.status.should == :pending
+      subject.should_receive(:parse_status).with('InProgress').and_return(:in_progress)
+      subject.status = 'InProgress'
+      subject.status.should == :in_progress
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdocs
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &14690440 !ruby/object:Gem::Requirement
+  requirement: &5249340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *14690440
+  version_requirements: *5249340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14705180 !ruby/object:Gem::Requirement
+  requirement: &5264040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *14705180
+  version_requirements: *5264040
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &14703760 !ruby/object:Gem::Requirement
+  requirement: &5262620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *14703760
+  version_requirements: *5262620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14702040 !ruby/object:Gem::Requirement
+  requirement: &5260820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *14702040
+  version_requirements: *5260820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14701000 !ruby/object:Gem::Requirement
+  requirement: &5259840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *14701000
+  version_requirements: *5259840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &14700140 !ruby/object:Gem::Requirement
+  requirement: &5258940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *14700140
+  version_requirements: *5258940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &14713080 !ruby/object:Gem::Requirement
+  requirement: &5257440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *14713080
+  version_requirements: *5257440
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &14710840 !ruby/object:Gem::Requirement
+  requirement: &5269720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *14710840
+  version_requirements: *5269720
 description: Ruby SDK for GroupDocs REST API
 email: p0deje@gmail.com
 executables: []
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -266361151929611546
+      hash: 546322050822999212
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -266361151929611546
+      hash: 546322050822999212
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10