cloudstrg 0.0.10 → 0.0.11

data/app/models/cloudstrg/cloudstrgplugin.rb

@@ -2,7 +2,7 @@ module Cloudstrg
   class Cloudstrgplugin < ActiveRecord::Base
     attr_accessible :plugin_name, :version
 
-    has_one :cloudstrgconfig, :class_name => Cloudstrg::Config, :dependent => :destroy
+    has_many :cloudstrgconfig, :class_name => Cloudstrg::Config, :dependent => :destroy
     has_many :remotes, :class_name => Cloudstrg::Remoteobject, :dependent => :destroy
   end
 end

data/app/models/cloudstrg/cloudstrgplugin.rb~

@@ -3,6 +3,6 @@ module Cloudstrg
     attr_accessible :plugin_name, :version
 
     has_one :cloudstrgconfig, :class_name => Cloudstrg::Config, :dependent => :destroy
-    has_many :remoteobjects, :class_name => Cloudstrg::Remoteobject, :dependent => :destroy
+    has_many :remotes, :class_name => Cloudstrg::Remoteobject, :dependent => :destroy
   end
 end

data/app/models/cloudstrg/config.rb~

@@ -2,29 +2,8 @@ module Cloudstrg
   class Config < ActiveRecord::Base
     attr_accessible :cloudstrgplugin_id, :user_id
 
-    attr_accessor :cloudstrgplugin_name
-    belongs_to :cloudstrgplugin, :class_name => Cloudstrg::Cloudstrgplugin
+    has_one :cloudstrgplugin, :class_name => Cloudstrg::Cloudstrgplugin
 
-    attr_accessor :user_email
     belongs_to :user, :class_name => Cloudstrg.user_class
-    
-    before_save :set_hooks
-
-    private
-      def set_hooks
-        if cloudstrgplugin_name
-          self.cloudstrgplugin = Cloudstrg::Cloudstrgplugin.find_by_plugin_name(cloudstrgplugin_name)
-        else
-          self.cloudstrgplugin = Cloudstrg::Cloudstrgplugin.find(self.cloudstrgplugin_id)
-        end
-        
-        if not self.cloudstrgplugin
-          return false
-        end
-        self.user = Cloudstrg.user_class.constantize.find_by_email(user_email)
-        if not self.user
-          return false
-        end
-      end
   end
 end

data/lib/cloudstrg/cloudstrg.rb

@@ -148,12 +148,12 @@ module CloudStrg
       puts plugin_name
       plugin = Cloudstrg::Cloudstrgplugin.find_by_plugin_name(plugin_name)
       
-      file = Cloudstrg::Remoteobject.where(:user_id => user, :cloudstrgplugin_id => plugin, :filename => filename)
+      file = Cloudstrg::Remoteobject.where(:user_id => user.id, :cloudstrgplugin_id => plugin.id, :filename => filename)
       if not file.empty?
         file = file[0]
         file.filehash = filecontent.hash.to_s
       else
-        file = plugin.remotes.build(:user_id => user, :filename => filename, :filehash => filecontent.hash.to_s, :file_remote_id => file_remote_id)
+        file = plugin.remotes.build(:user_id => user.id, :filename => filename, :filehash => filecontent.hash.to_s, :file_remote_id => file_remote_id)
       end
       file.save
       return file

data/lib/cloudstrg/cloudstrg.rb~

@@ -127,7 +127,7 @@ module CloudStrg
     #   file_id: the id of the file.
     #   
     # Returns: 
-    #   This method returns the local id of the remote object if the operation success, otherwise it returns false.
+    #   This method returns non-nil data if success.
     #
     def share_file params
       raise NotImplementedError
@@ -148,7 +148,7 @@ module CloudStrg
       puts plugin_name
       plugin = Cloudstrg::Cloudstrgplugin.find_by_plugin_name(plugin_name)
       
-      file = Cloudstrg::Remoteobject.where(:user_id => user, :cloudstrgplugin_id => plugin, :filename => filename)
+      file = Cloudstrg::Remoteobject.where(:user_id => user.id, :cloudstrgplugin_id => plugin, :filename => filename)
       if not file.empty?
         file = file[0]
         file.filehash = filecontent.hash.to_s

data/lib/cloudstrg/version.rb

@@ -1,3 +1,3 @@
 module Cloudstrg
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstrg
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails