groupdocs 0.2.3 → 0.2.4

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

@@ -25,7 +25,7 @@ module GroupDocs
         # @raise [ArgumentError] if action is unknown
         # @api private
         #
-        def convert_actions(actions)
+        def convert_actions_to_byte(actions)
           actions.is_a?(Array) or raise ArgumentError, "Actions should be an array, received: #{actions.inspect}"
           actions = actions.map(&:to_sym)
 
@@ -42,6 +42,33 @@ 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/datasource.rb

@@ -51,7 +51,7 @@ module GroupDocs
     # @return [Time]
     #
     def created_on
-      Time.at(@created_on)
+      Time.at(@created_on / 1000)
     end
 
     #
@@ -60,7 +60,7 @@ module GroupDocs
     # @return [Time]
     #
     def modified_on
-      Time.at(@modified_on)
+      Time.at(@modified_on / 1000)
     end
 
     #

data/lib/groupdocs/document.rb

@@ -63,7 +63,7 @@ module GroupDocs
     # @return [Time]
     #
     def process_date
-      Time.at(@process_date)
+      Time.at(@process_date / 1000)
     end
 
     # Compatibility with response JSON

data/lib/groupdocs/document/view.rb

@@ -14,7 +14,7 @@ module GroupDocs
     # @return [Time]
     #
     def viewed_on
-      Time.at(@viewed_on)
+      Time.at(@viewed_on / 1000)
     end
 
     #

data/lib/groupdocs/job.rb

@@ -44,7 +44,7 @@ module GroupDocs
     #
     def self.create!(options, access = {})
       options[:actions] or raise ArgumentError, 'options[:actions] is required.'
-      options[:actions] = convert_actions(options[:actions])
+      options[:actions] = convert_actions_to_byte(options[:actions])
       options[:out_formats] = options[:out_formats].join(?;) if options[:out_formats]
 
       api = Api::Request.new do |request|
@@ -60,8 +60,19 @@ module GroupDocs
 
     # @attr [Integer] id
     attr_accessor :id
+    # @attr [Array<Symbol>] actions
+    attr_accessor :actions
+    # @attr [Array<Symbol>] out_formats
+    # TODO how should it behave?
+    attr_accessor :out_formats
+    # @attr [Boolean] email_results
+    attr_accessor :email_results
+    # @attr [Boolean] url_only
+    attr_accessor :url_only
     # @attr [Array<GroupDocs::Document] documents
     attr_accessor :documents
+    # @attr [Time] requested_time
+    attr_accessor :requested_time
 
     #
     # Coverts passed array of attributes hash to array of GroupDocs::Document.
@@ -69,12 +80,32 @@ module GroupDocs
     # @param [Array<Hash>] documents Array of document attributes hashes
     #
     def documents=(documents)
-      @documents = documents.map do |document|
-        document.merge!(file: GroupDocs::Storage::File.new(document))
-        Document.new(document)
+      if documents
+        @documents = documents.map do |document|
+          document.merge!(file: GroupDocs::Storage::File.new(document))
+          Document.new(document)
+        end
       end
     end
 
+    #
+    # Converts timestamp which is return by API server to Time object.
+    #
+    # @return [Time]
+    #
+    def requested_time
+      Time.at(@requested_time / 1000)
+    end
+
+    #
+    # Returns job actions in human-readable format.
+    #
+    # @return [Array<Symbol>]
+    #
+    def actions
+      self.class.convert_byte_to_actions(@actions)
+    end
+
     #
     # Returns an array of documents associated to job.
     #

data/lib/groupdocs/storage/file.rb

@@ -130,7 +130,7 @@ module GroupDocs
       # @return [Time]
       #
       def created_on
-        Time.at(@created_on)
+        Time.at(@created_on / 1000)
       end
 
       #
@@ -148,7 +148,7 @@ module GroupDocs
       # @return [Time]
       #
       def modified_on
-        Time.at(@modified_on)
+        Time.at(@modified_on / 1000)
       end
 
       #

data/lib/groupdocs/storage/folder.rb

@@ -98,7 +98,7 @@ module GroupDocs
       # @return [Time]
       #
       def created_on
-        Time.at(@created_on)
+        Time.at(@created_on / 1000)
       end
 
       #
@@ -107,7 +107,7 @@ module GroupDocs
       # @return [Time]
       #
       def modified_on
-        Time.at(@modified_on)
+        Time.at(@modified_on / 1000)
       end
 
       #

data/lib/groupdocs/user.rb

@@ -38,7 +38,7 @@ module GroupDocs
     # @return [Time]
     #
     def signed_up_on
-      Time.at(@signed_up_on)
+      Time.at(@signed_up_on / 1000)
     end
 
     # Compatibility with response JSON

data/lib/groupdocs/version.rb

@@ -1,3 +1,3 @@
 module GroupDocs
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end # GroupDocs

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

@@ -6,6 +6,10 @@ describe GroupDocs::Api::Helpers::Actions do
     Object.extend(described_class)
   end
 
+  let(: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 == {
@@ -23,13 +27,13 @@ describe GroupDocs::Api::Helpers::Actions do
     end
   end
 
-  describe '.convert_actions' do
+  describe '.convert_actions_to_byte' do
     it 'raises error if actions is not an array' do
-      -> { subject.convert_actions(:convert) }.should raise_error(ArgumentError)
+      -> { subject.convert_actions_to_byte(:convert) }.should raise_error(ArgumentError)
     end
 
     it 'raises error if action is unknown' do
-      -> { subject.convert_actions(%w(unknown)) }.should raise_error(ArgumentError)
+      -> { subject.convert_actions_to_byte(%w(unknown)) }.should raise_error(ArgumentError)
     end
 
     it 'converts each action to Symbol' do
@@ -38,14 +42,24 @@ describe GroupDocs::Api::Helpers::Actions do
         symbol = action.to_sym
         action.should_receive(:to_sym).and_return(symbol)
       end
-      subject.convert_actions(actions)
+      subject.convert_actions_to_byte(actions)
     end
 
     it 'returns correct byte flag' do
-      actions = %w(none convert combine compress_zip compress_rar trace convert_body bind_data print import_annotations)
-      flag = subject.convert_actions(actions)
+      flag = subject.convert_actions_to_byte(actions)
       flag.should be_an(Integer)
       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/datasource_spec.rb

@@ -53,15 +53,15 @@ describe GroupDocs::DataSource do
 
   describe '#created_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.created_on = 1332950825
-      subject.created_on.should be_a(Time)
+      subject.created_on = 1332950825000
+      subject.created_on.should == Time.at(1332950825)
     end
   end
 
   describe '#modified_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.modified_on = 1332950825
-      subject.modified_on.should be_a(Time)
+      subject.modified_on = 1332950825000
+      subject.modified_on.should == Time.at(1332950825)
     end
   end
 

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

@@ -104,11 +104,6 @@ describe GroupDocs::Document::Annotation::Reply do
 
   describe '#replied_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.replied_on = 1332950825
-      subject.replied_on.should be_a(Time)
-    end
-
-    it 'divides timestamp by 1000 because it is in milliseconds' do
       subject.replied_on = 1332950825000
       subject.replied_on.should == Time.at(1332950825)
     end

data/spec/groupdocs/document/annotation_spec.rb

@@ -92,11 +92,6 @@ describe GroupDocs::Document::Annotation do
 
   describe '#created_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.created_on = 1332950825
-      subject.created_on.should be_a(Time)
-    end
-
-    it 'divides timestamp by 1000 because it is in milliseconds' do
       subject.created_on = 1332950825000
       subject.created_on.should == Time.at(1332950825)
     end

data/spec/groupdocs/document/view_spec.rb

@@ -29,8 +29,8 @@ describe GroupDocs::Document::View do
 
   describe '#viewed_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.viewed_on = 1330450135
-      subject.viewed_on.should be_a(Time)
+      subject.viewed_on = 1330450135000
+      subject.viewed_on.should == Time.at(1330450135)
     end
   end
 end

data/spec/groupdocs/document_spec.rb

@@ -67,8 +67,8 @@ describe GroupDocs::Document do
 
   describe '#process_date' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.process_date = 1330450135
-      subject.process_date.should be_a(Time)
+      subject.process_date = 1330450135000
+      subject.process_date.should == Time.at(1330450135)
     end
   end
 

data/spec/groupdocs/job_spec.rb

@@ -49,7 +49,7 @@ describe GroupDocs::Job do
     end
 
     it 'convert actions to byte flag' do
-      described_class.should_receive(:convert_actions).with(actions).and_return(5)
+      described_class.should_receive(:convert_actions_to_byte).with(actions).and_return(5)
       described_class.create!(actions: actions)
     end
 
@@ -64,10 +64,20 @@ describe GroupDocs::Job do
     end
   end
 
-  it { should respond_to(:id)         }
-  it { should respond_to(:id=)        }
-  it { should respond_to(:documents)  }
-  it { should respond_to(:documents=) }
+  it { should respond_to(:id)              }
+  it { should respond_to(:id=)             }
+  it { should respond_to(:actions)         }
+  it { should respond_to(:actions=)        }
+  it { should respond_to(:out_formats)     }
+  it { should respond_to(:out_formats=)    }
+  it { should respond_to(:email_results)   }
+  it { should respond_to(:email_results=)  }
+  it { should respond_to(:url_only)        }
+  it { should respond_to(:url_only=)       }
+  it { should respond_to(:documents)       }
+  it { should respond_to(:documents=)      }
+  it { should respond_to(:requested_time)  }
+  it { should respond_to(:requested_time=) }
 
   describe '#documents=' do
     let(:response) do
@@ -83,6 +93,27 @@ describe GroupDocs::Job do
         document.should be_a(GroupDocs::Document)
       end
     end
+
+    it 'does nothing if nil is passed' do
+      lambda do
+        subject.documents = nil
+      end.should_not change(subject, :documents)
+    end
+  end
+
+  describe '#requested_time' do
+    it 'converts timestamp to Time object' do
+      subject.requested_time = 1330450135000
+      subject.requested_time.should == Time.at(1330450135)
+    end
+  end
+
+  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
+    end
   end
 
   describe '#documents!' do

data/spec/groupdocs/storage/file_spec.rb

@@ -103,15 +103,15 @@ describe GroupDocs::Storage::File do
 
   describe '#created_on' do
     it 'converts timestamp to Time object' do
-      subject.created_on = 1330450135
-      subject.created_on.should be_a(Time)
+      subject.created_on = 1330450135000
+      subject.created_on.should == Time.at(1330450135)
     end
   end
 
   describe '#modified_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.modified_on = 1330450135
-      subject.modified_on.should be_a(Time)
+      subject.modified_on = 1330450135000
+      subject.modified_on.should == Time.at(1330450135)
     end
   end
 

data/spec/groupdocs/storage/folder_spec.rb

@@ -79,15 +79,15 @@ describe GroupDocs::Storage::Folder do
 
   describe '#created_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.created_on = 1330450135
-      subject.created_on.should be_a(Time)
+      subject.created_on = 1330450135000
+      subject.created_on.should == Time.at(1330450135)
     end
   end
 
   describe '#modified_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.modified_on = 1330450135
-      subject.modified_on.should be_a(Time)
+      subject.modified_on = 1330450135000
+      subject.modified_on.should == Time.at(1330450135)
     end
   end
 

data/spec/groupdocs/user_spec.rb

@@ -46,8 +46,8 @@ describe GroupDocs::User do
 
   describe '#signed_up_on' do
     it 'returns converted to Time object Unix timestamp' do
-      subject.signed_up_on = 1330450135
-      subject.signed_up_on.should be_a(Time)
+      subject.signed_up_on = 1330450135000
+      subject.signed_up_on.should == Time.at(1330450135)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdocs
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-19 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &6748580 !ruby/object:Gem::Requirement
+  requirement: &10687000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *6748580
+  version_requirements: *10687000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &6763480 !ruby/object:Gem::Requirement
+  requirement: &10702060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *6763480
+  version_requirements: *10702060
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &6761660 !ruby/object:Gem::Requirement
+  requirement: &10700260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *6761660
+  version_requirements: *10700260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6759960 !ruby/object:Gem::Requirement
+  requirement: &10698500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *6759960
+  version_requirements: *10698500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6759060 !ruby/object:Gem::Requirement
+  requirement: &10697660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *6759060
+  version_requirements: *10697660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &6758080 !ruby/object:Gem::Requirement
+  requirement: &10696640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *6758080
+  version_requirements: *10696640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &6756520 !ruby/object:Gem::Requirement
+  requirement: &10694880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *6756520
+  version_requirements: *10694880
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &6769060 !ruby/object:Gem::Requirement
+  requirement: &10707460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *6769060
+  version_requirements: *10707460
 description: Ruby SDK for GroupDocs REST API
 email: p0deje@gmail.com
 executables: []
@@ -253,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2726974365030193800
+      hash: -2096464079406588274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2726974365030193800
+      hash: -2096464079406588274
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10