groupdocs 0.2.1 → 0.2.2

data/lib/groupdocs/storage/folder.rb

@@ -200,14 +200,16 @@ module GroupDocs
         api.add_params(options)
         json = api.execute!
 
-        json[:entities].map do |entity|
-          entity.merge!(path: path)
-          if entity[:dir]
-            Storage::Folder.new(entity)
-          else
-            Storage::File.new(entity)
-          end
+        folders = json[:folders].map do |folder|
+          folder.merge!(path: path)
+          Storage::Folder.new(folder)
+        end
+        files = json[:files].map do |file|
+          file.merge!(path: path)
+          Storage::File.new(file)
         end
+
+        folders + files
       end
 
       #

data/lib/groupdocs/version.rb

@@ -1,3 +1,3 @@
 module GroupDocs
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end # GroupDocs

data/spec/groupdocs/storage/folder_spec.rb

@@ -196,7 +196,7 @@ describe GroupDocs::Storage::Folder do
     end
 
     it 'returns empty array if nothing is listed in directory' do
-      mock_api_server('{"result": {"entities": []}, "status": "Ok"}')
+      mock_api_server('{"result": {"folders": [], "files": []}, "status": "Ok"}')
       subject.list!.should be_empty
     end
 

data/spec/support/json/folder_list.json

@@ -2,17 +2,18 @@
   "status": "Ok",
   "result":
     {
-      "entities":
+      "folders":
         [
           {
             "id": 1,
-            "dir": true,
             "created_on": 1330450135,
             "modified_on": 1330450135
-          },
+          }
+        ],
+      "files":
+        [
           {
             "id": 2,
-            "dir": false,
             "created_on": 1330450135,
             "modified_on": 1330450135
           }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groupdocs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &8528280 !ruby/object:Gem::Requirement
+  requirement: &3414420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *8528280
+  version_requirements: *3414420
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8543080 !ruby/object:Gem::Requirement
+  requirement: &3428980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *8543080
+  version_requirements: *3428980
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &8541540 !ruby/object:Gem::Requirement
+  requirement: &3427940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *8541540
+  version_requirements: *3427940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8539740 !ruby/object:Gem::Requirement
+  requirement: &3426480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *8539740
+  version_requirements: *3426480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8538840 !ruby/object:Gem::Requirement
+  requirement: &3425060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *8538840
+  version_requirements: *3425060
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &8537820 !ruby/object:Gem::Requirement
+  requirement: &3424140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *8537820
+  version_requirements: *3424140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &8536500 !ruby/object:Gem::Requirement
+  requirement: &3422980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *8536500
+  version_requirements: *3422980
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &8549020 !ruby/object:Gem::Requirement
+  requirement: &3435360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *8549020
+  version_requirements: *3435360
 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: 4127866239273526889
+      hash: -3645027829218934806
 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: 4127866239273526889
+      hash: -3645027829218934806
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10