filecluster 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2a7e2b03e88697fb0e2123c32db16dd8a266b40
-  data.tar.gz: 323c7c1efaaaef5e84eafdb87c0d55cf04c1b827
+  metadata.gz: 682a63b1d5a1315b249718bc596d4297ceecd7aa
+  data.tar.gz: f212b750a964e94e454f2a2163359334ec1cc898
 SHA512:
-  metadata.gz: 15a70282e51cd4d7571920c2c458e17c9402148593004ac7b48777c976e3c635f79fac3d732c6a4811181f4a1219a74409bd1e1bd2159faa10f6e411922adcb9
-  data.tar.gz: 35d9f0727102c900cbfaffab42e6ad1de334b6ef795c055f6f09c7c2ae53c6d4202c41e116d9872dfffe6cc39d116412898cc90dd8b567bdfd1dcd9b381c4410
+  metadata.gz: 228b7124186c2bac6921b6a4e286c9e87f36d0352dfc842e2c1c4090978cca84a1f9a5b6cd9aff2706dcf9f793f8fb98f03ea68856c7fc73e986d5a72756b78f
+  data.tar.gz: 9d95e2fe21d4dd036451019d28783102f2098462afd8e34f8dd29a23d4de235043c413cea82dabda56c510ea882641d85eb21750f138e6219ce45f61c03dbcf0

data/lib/fc/base.rb

@@ -2,7 +2,7 @@
 
 module FC
   class DbBase
-    attr_accessor :id, :database_fields
+    attr_accessor :id, :database_fields, :additional_fields
     
     class << self
       attr_accessor :table_name, :table_fields
@@ -12,6 +12,7 @@ module FC
       self.class.table_fields.each {|key| self.send("#{key}=", params[key] || params[key.to_sym]) }
       @id = (params["id"] || params[:id]).to_i if params["id"] || params[:id]
       @database_fields = params[:database_fields] || {}
+      @additional_fields = params[:additional_fields] || {}
     end
     
     def self.table_name
@@ -29,8 +30,17 @@ module FC
     # make instance on fields hash
     def self.create_from_fiels(data)
       # use only defined in set_table fields
-      database_fields = data.select{|key, val| self.table_fields.include?(key.to_s)}
-      self.new(database_fields.merge({:id => data["id"].to_s, :database_fields => database_fields}))
+      #database_fields = data.select{|key, val| self.table_fields.include?(key.to_s)}
+      additional_fields = {}
+      database_fields = {}
+      data.each do |key, val| 
+        if self.table_fields.include?(key.to_s)
+          database_fields[key] = val
+        elsif key != 'id'
+          additional_fields[key.to_sym] = val
+        end
+      end
+      self.new(database_fields.merge({:id => data["id"].to_s, :database_fields => database_fields, :additional_fields => additional_fields}))
     end
     
     # get element by id
@@ -61,6 +71,11 @@ module FC
           fields << "#{key}=#{val ? (val.class == String ? "'#{FC::DB.connect.escape(val)}'" : val.to_i) : 'NULL'}"
         end
       end
+      @additional_fields.each do |key, val|
+        val = 1 if val == true
+        val = 0 if val == false
+        fields << "#{key}=#{val ? (val.class == String ? "'#{FC::DB.connect.escape(val)}'" : val.to_i) : 'NULL'}"
+      end
       if fields.length > 0
         sql << fields.join(',')
         sql << " WHERE id=#{@id.to_i}" if @id

data/lib/fc/item.rb

@@ -10,6 +10,7 @@ module FC
     # Additional options: 
     #   :replace=true - replace item if it exists
     #   :remove_local=true - delete local_path file/dir after add
+    #   :additional_fields - hash of additional FC:Item fields 
     # If item_name is part of local_path it processed as inplace - local_path is valid path to the item for policy
     def self.create_from_local(local_path, item_name, policy, options={})
       raise 'Path not exists' unless File.exists?(local_path)

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.4.13"
+  VERSION = "0.4.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2