gdrivestrg 0.0.9 → 0.0.10

data/app/models/gdrivestrg/folder.rb

@@ -0,0 +1,7 @@
+module Gdrivestrg
+  class Folder < ActiveRecord::Base
+    attr_accessible :folder_name, :remote_id, :user_id
+
+    belongs_to :user, :class_name => Gdrivestrg.user_class
+  end
+end

data/app/models/gdrivestrg/folder.rb~

@@ -0,0 +1,7 @@
+module Gdrivestrg
+  class Folder < ActiveRecord::Base
+    attr_accessible :folder_name, :remote_id
+
+    belongs_to :user, :class_name => Gdrivestrg.user_class
+  end
+end

data/db/migrate/20130313115251_create_gdrivestrg_folders.rb

@@ -0,0 +1,10 @@
+class CreateGdrivestrgFolders < ActiveRecord::Migration
+  def change
+    create_table :gdrivestrg_folders do |t|
+      t.string :folder_name
+      t.string :remote_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20130313124441_add_user_id_to_gdrivestrg_folders.rb

@@ -0,0 +1,5 @@
+class AddUserIdToGdrivestrgFolders < ActiveRecord::Migration
+  def change
+    add_column :gdrivestrg_folders, :user_id, :integer
+  end
+end

data/lib/gdrivestrg/gdrivestrg.rb

@@ -72,7 +72,27 @@ class GdriveStrg < CloudStrg::CloudStorage
           end
         else
           begin
-            @client.execute!(:api_method => @auth_api.userinfo.get)
+            if @user.gdrivestrgfolder
+              @client.execute!(:api_method => @auth_api.userinfo.get)
+            else
+              #Search for folder and if it's not present create it and insert existing files on it.
+              l = search_files_by_title Gdrivestrg.app_name
+              if l.length > 0
+                folder = @user.build_gdrivestrgfolder(:folder_name => l[0][0], :remote_id => l[0][1])
+                folder.save
+              else
+                f_id = create_folder({:foldername => Gdrivestrg.app_name})
+                folder = @user.build_gdrivestrgfolder(:folder_name => Gdrivestrg.app_name, :remote_id => f_id)
+                folder.save
+                files = Cloudstrg::Remoteobject.where(:user_id => @user.id, :cloudstrgplugin_id => Cloudstrg::Cloudstrgplugin.find_by_plugin_name('gdrive').id)
+                _params = {}
+                files.each do |file|
+                  _params[:folder_id] = f_id
+                  _params[:file_id] = file.file_remote_id
+                  insert_parent _params
+                end
+              end
+            end
           rescue Exception => e
             session.delete(:gdrive_access_token)
             session = requestAccessToken(session, user_params)
@@ -84,9 +104,10 @@ class GdriveStrg < CloudStrg::CloudStorage
   end
 
   def create_file params
+    # TODO check folder
     filename = params[:filename]
-
-    file = @drive_api.files.insert.request_schema.new({'title' => filename, 'description' => 'Netlab scenario', 'mimeType' => 'text/json'})
+    parentID = @user.gdrivestrgfolder.remote_id
+    file = @drive_api.files.insert.request_schema.new({'title' => filename, 'parents' => [{'id' => parentID}], 'description' => 'Netlab file', 'mimeType' => 'text/json'})
     media=Google::APIClient::UploadIO.new(StringIO.new(params[:file_content]), 'text/json')
     r = @client.execute(:api_method => @drive_api.files.insert, :body_object => file, :media => media, :parameters => {'uploadType' => 'multipart', 'alt' => 'json'})
     if r.status != 200
@@ -96,8 +117,16 @@ class GdriveStrg < CloudStrg::CloudStorage
     
   end
 
-  #def create_folder params
-  #end
+  def create_folder params
+    foldername = params[:foldername]
+
+    file = @drive_api.files.insert.request_schema.new({'title' => foldername, 'mimeType' => 'application/vnd.google-apps.folder'})
+    r = @client.execute(:api_method => @drive_api.files.insert, :body_object => file)
+    if r.status != 200
+      return false
+    end
+    return r.data.id
+  end
 
   def get_file params
     r = @client.execute!(:api_method => @drive_api.files.get, :parameters => {'fileId' => params[:fileid]})
@@ -143,6 +172,33 @@ class GdriveStrg < CloudStrg::CloudStorage
     return lines
   end
 
+  def search_files_by_title file_title
+    parameters = {'q' => "title = '#{file_title}'"}
+    r=@client.execute!(:api_method => @drive_api.files.list, :parameters => parameters)
+    if r.status != 200
+      return []
+    end
+    
+    lines = []
+    if r.data.items
+      r.data.items.each do |line|
+        lines.append([line.title, line.id])
+      end
+    end
+    return lines
+  end
+
+  def insert_parent params
+    new_parent = @drive_api.parents.insert.request_schema.new({'id' => params[:folder_id]})
+    result = @client.execute!( :api_method => @drive_api.parents.insert, :body_object => new_parent, :parameters => { 'fileId' => params[:file_id] })
+    if result.status == 200
+      return result.data
+    else
+      puts "An error occurred: #{result.data['error']['message']}"
+      return nil
+    end
+  end
+
   def share_file params
     new_permission = @drive_api.permissions.insert.request_schema.new({'value' => params[:share_email], 'type' => 'user', 'role' => 'writer'})
     result = @client.execute!(

data/lib/gdrivestrg/gdrivestrg.rb~

@@ -61,9 +61,12 @@ class GdriveStrg < CloudStrg::CloudStorage
                                      :expires_in => user_params.expires_in, 
                                      :issued_at => user_params.issued_at)
       if @client.authorization.refresh_token && @client.authorization.expired?
+        p "aqui1"
         session = requestAccessToken(session, user_params)
       else
+        p "aqui2"
         if not authorized?
+          p "aqui3"
           if @client.authorization.refresh_token
             session = requestAccessToken(session, user_params)
           else
@@ -72,7 +75,27 @@ class GdriveStrg < CloudStrg::CloudStorage
           end
         else
           begin
-            r = @client.execute!(:api_method => @auth_api.userinfo.get)
+            if @user.gdrivestrgfolder
+              @client.execute!(:api_method => @auth_api.userinfo.get)
+            else
+              #Search for folder and if it's not present create it and insert existing files on it.
+              l = search_files_by_title Gdrivestrg.app_name
+              if l.length > 0
+                folder = @user.build_gdrivestrgfolder(:folder_name => l[0][0], :remote_id => l[0][1])
+                folder.save
+              else
+                f_id = create_folder({:foldername => Gdrivestrg.app_name})
+                folder = @user.build_gdrivestrgfolder(:folder_name => Gdrivestrg.app_name, :remote_id => f_id)
+                folder.save
+                files = Cloudstrg::Remoteobject.where(:user_id => @user.id, :cloudstrgplugin_id => Cloudstrg::Cloudstrgplugin.find_by_plugin_name('gdrive').id)
+                _params = {}
+                files.each do |file|
+                  _params[:folder_id] = f_id
+                  _params[:file_id] = file.file_remote_id
+                  insert_parent _params
+                end
+              end
+            end
           rescue Exception => e
             session.delete(:gdrive_access_token)
             session = requestAccessToken(session, user_params)
@@ -84,9 +107,10 @@ class GdriveStrg < CloudStrg::CloudStorage
   end
 
   def create_file params
+    # TODO check folder
     filename = params[:filename]
-
-    file = @drive_api.files.insert.request_schema.new({'title' => filename, 'description' => 'Netlab scenario', 'mimeType' => 'text/json'})
+    parentID = @user.gdrivestrgfolder.remote_id
+    file = @drive_api.files.insert.request_schema.new({'title' => filename, 'parents' => [{'id' => parentID}], 'description' => 'Netlab file', 'mimeType' => 'text/json'})
     media=Google::APIClient::UploadIO.new(StringIO.new(params[:file_content]), 'text/json')
     r = @client.execute(:api_method => @drive_api.files.insert, :body_object => file, :media => media, :parameters => {'uploadType' => 'multipart', 'alt' => 'json'})
     if r.status != 200
@@ -96,8 +120,16 @@ class GdriveStrg < CloudStrg::CloudStorage
     
   end
 
-  #def create_folder params
-  #end
+  def create_folder params
+    foldername = params[:foldername]
+
+    file = @drive_api.files.insert.request_schema.new({'title' => foldername, 'mimeType' => 'application/vnd.google-apps.folder'})
+    r = @client.execute(:api_method => @drive_api.files.insert, :body_object => file)
+    if r.status != 200
+      return false
+    end
+    return r.data.id
+  end
 
   def get_file params
     r = @client.execute!(:api_method => @drive_api.files.get, :parameters => {'fileId' => params[:fileid]})
@@ -143,6 +175,33 @@ class GdriveStrg < CloudStrg::CloudStorage
     return lines
   end
 
+  def search_files_by_title file_title
+    parameters = {'q' => "title = '#{file_title}'"}
+    r=@client.execute!(:api_method => @drive_api.files.list, :parameters => parameters)
+    if r.status != 200
+      return []
+    end
+    
+    lines = []
+    if r.data.items
+      r.data.items.each do |line|
+        lines.append([line.title, line.id])
+      end
+    end
+    return lines
+  end
+
+  def insert_parent params
+    new_parent = @drive_api.parents.insert.request_schema.new({'id' => params[:folder_id]})
+    result = @client.execute!( :api_method => @drive_api.parents.insert, :body_object => new_parent, :parameters => { 'fileId' => params[:file_id] })
+    if result.status == 200
+      return result.data
+    else
+      puts "An error occurred: #{result.data['error']['message']}"
+      return nil
+    end
+  end
+
   def share_file params
     new_permission = @drive_api.permissions.insert.request_schema.new({'value' => params[:share_email], 'type' => 'user', 'role' => 'writer'})
     result = @client.execute!(

data/lib/gdrivestrg/version.rb

@@ -1,3 +1,3 @@
 module Gdrivestrg
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/gdrivestrg/version.rb~

@@ -1,3 +1,3 @@
 module Gdrivestrg
-  VERSION = "0.0.6"
+  VERSION = "0.0.9"
 end

data/lib/gdrivestrg.rb

@@ -1,5 +1,5 @@
 require "gdrivestrg/engine"
 
 module Gdrivestrg
-  mattr_accessor :user_class
+  mattr_accessor :user_class, :app_name
 end

data/lib/gdrivestrg.rb~

@@ -1,4 +1,5 @@
 require "gdrivestrg/engine"
 
 module Gdrivestrg
+  mattr_accessor :user_class
 end

data/test/fixtures/gdrivestrg/folders.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  folder_name: MyString
+  remote_id: MyString
+
+two:
+  folder_name: MyString
+  remote_id: MyString

data/test/unit/gdrivestrg/folder_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Gdrivestrg
+  class FolderTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gdrivestrg
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,8 +84,10 @@ extra_rdoc_files: []
 files:
 - app/helpers/gdrivestrg/params_helper.rb
 - app/helpers/gdrivestrg/application_helper.rb
+- app/models/gdrivestrg/folder.rb
 - app/models/gdrivestrg/param.rb~
 - app/models/gdrivestrg/param.rb
+- app/models/gdrivestrg/folder.rb~
 - app/assets/stylesheets/scaffold.css
 - app/assets/stylesheets/gdrivestrg/params.css
 - app/assets/stylesheets/gdrivestrg/application.css
@@ -101,6 +103,8 @@ files:
 - app/controllers/gdrivestrg/params_controller.rb
 - config/routes.rb
 - db/migrate/20121107140721_create_gdrivestrg_params.rb~
+- db/migrate/20130313124441_add_user_id_to_gdrivestrg_folders.rb
+- db/migrate/20130313115251_create_gdrivestrg_folders.rb
 - db/migrate/20121107140721_create_gdrivestrg_params.rb
 - db/migrate/20121108121038_add_user_id_to_gdrivestrg_params.rb
 - db/migrate/20121108121038_add_user_id_to_gdrivestrg_params.rb~
@@ -120,9 +124,11 @@ files:
 - test/gdrivestrg_test.rb
 - test/unit/helpers/gdrivestrg/params_helper_test.rb
 - test/unit/gdrivestrg/param_test.rb
+- test/unit/gdrivestrg/folder_test.rb
 - test/test_helper.rb
 - test/integration/navigation_test.rb
 - test/fixtures/gdrivestrg/params.yml
+- test/fixtures/gdrivestrg/folders.yml
 - test/dummy/script/rails
 - test/dummy/config.ru
 - test/dummy/app/helpers/application_helper.rb
@@ -180,9 +186,11 @@ test_files:
 - test/gdrivestrg_test.rb
 - test/unit/helpers/gdrivestrg/params_helper_test.rb
 - test/unit/gdrivestrg/param_test.rb
+- test/unit/gdrivestrg/folder_test.rb
 - test/test_helper.rb
 - test/integration/navigation_test.rb
 - test/fixtures/gdrivestrg/params.yml
+- test/fixtures/gdrivestrg/folders.yml
 - test/dummy/script/rails
 - test/dummy/config.ru
 - test/dummy/app/helpers/application_helper.rb