bitrix_on_rails 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/app/models/iblock.rb

@@ -122,25 +122,11 @@ class Iblock < ActiveRecord::Base
     unless Kernel.const_defined? const_name
       e = Class.new(ActiveRecord::Base) do
         extend BitrixOnRails::IblockElementPropS
-
-       class << self
-         @m_prop_class = nil
-         @m_props = nil
-
-         def m_prop_class
-           Kernel.const_get(@m_prop_class)
-         end
-
-         def m_props
-           @m_props
-         end
-       end
-
-       acts_as_iblock_element_prop_s(iblock_id)
-     end
-     Kernel.const_set const_name, e
-   end
-   Kernel.const_get(const_name).init
+        acts_as_iblock_element_prop_s(iblock_id)
+      end
+      Kernel.const_set const_name, e
+    end
+    Kernel.const_get(const_name).init
 
     # Создаем классы IblockElementPropMНОМЕР
    #

data/app/models/iblock_element.rb

@@ -29,11 +29,15 @@ class IblockElement < ActiveRecord::Base
     def set_iblock_id(id)
       @iblock_id = id
 
-      prop_s_class = "IblockElementPropS#{id}"
-      prop_m_class = "IblockElementPropM#{id}"
+      hash = {
+        :class_name => Iblock.s_props_class(id).name,
+        :foreign_key => 'iblock_element_id',
+        :autosave => true}
+      has_one :s_prop, hash
+      has_one "iblock_element_prop_s#{iblock_id}".to_sym, hash
 
-      has_one :property_set, :class_name => "::#{prop_s_class}", :foreign_key => 'iblock_element_id', :autosave => true
-      has_many :m_prop_values, :class_name => "::#{prop_m_class}", :foreign_key => 'iblock_element_id'
+      has_many :m_prop_values, :class_name => Iblock.m_props_class(id),
+               :foreign_key => 'iblock_element_id', :autosave => true
 
       default_scope where(:iblock_id => id, :active => 'Y')
 
@@ -56,4 +60,12 @@ class IblockElement < ActiveRecord::Base
   def to_s
     name
   end
+
+  def multiply_properties
+    send "iblock_element_prop_m#{iblock_id}"
+  end
+
+  def property_set
+    send "iblock_element_prop_s#{iblock_id}"
+  end
 end

data/bitrix_on_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitrix_on_rails}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]

data/lib/bitrix_on_rails/iblock_element_prop_s.rb

@@ -4,11 +4,6 @@ module BitrixOnRails::IblockElementPropS
     extend ClassMethods
     include InstanceMethods
 
-    @m_prop_class = "IblockElementPropM#{id}"
-    # Название свойства сохраняется только для наглядности, чтобы можно было через консоль понять
-    # что за свойство.
-    @m_props = IblockProperty.where(:iblock_id => id).inject({}){ |a,e| a[e.code] = e.id if e.multiple == 'Y'; a }
-
     # Убираем лишнюю s вконце
     #set_table_name 'b_'+table_name.chop
     set_table_name "b_iblock_element_prop_s#{id}"
@@ -26,10 +21,9 @@ module BitrixOnRails::IblockElementPropS
     end
 
     before_save do
-      self.class.m_props.each_value { |id|
-        values = m_prop_values(id)
-        self.send("property_#{id}=", PHP.serialize({'VALUE' => values, 'DESCRIPTION' => Array.new(values.size, nil)}))
-        # self.send("property_#{id}=", PhpSerialization.dump({'VALUE' => values, 'DESCRIPTION' => Array.new(values.size, nil)}))
+      self.class.m_props.each_value { |p|
+        values = m_prop_values(p.id)
+        self.send("property_#{p.id}=", PHP.serialize({'VALUE' => values, 'DESCRIPTION' => Array.new(values.size, nil)}))
       }
     end
 
@@ -41,6 +35,14 @@ module BitrixOnRails::IblockElementPropS
 
   module ClassMethods
 
+
+    def m_props
+      # @m_prop_class = "IblockElementPropM#{id}"
+      # Название свойства сохраняется только для наглядности, чтобы можно было через консоль понять
+      # что за свойство.
+      @m_props ||= Iblock.get_properties(iblock_id).select { |k,e| e.multiple == 'Y' }
+    end
+
     # code - врое как кодовое название свойства
     # name - русское описание
 
@@ -60,11 +62,17 @@ module BitrixOnRails::IblockElementPropS
     #
     #   self.post_id вместо self.property_120
     #
+
+    def iblock_id
+      self.name=~/(\d+)/
+      $1.to_i
+    end
+
     def init
-      self.to_s=~/(\d+)/
-      iblock_id = $1.to_i
 
-      IblockElement.send :has_one, "iblock_element_prop_s#{iblock_id}".to_sym, :class_name=>"::IblockElementPropS#{iblock_id}"
+      # Вот это не срабатывает для Post::Element
+      #
+      IblockElement.send :has_one, "iblock_element_prop_s#{iblock_id}".to_sym, :class_name=>Iblock.s_props_class(iblock_id).name, :autosave => true
 
       self.properties = {}
       attribute_names.select {|a| a[0,4]=='prop' }.each do |name|
@@ -96,6 +104,11 @@ module BitrixOnRails::IblockElementPropS
 
   module InstanceMethods
 
+    def iblock_id
+      self.class.to_s=~/(\d+)/
+      $1.to_i
+    end
+
     # Возвращает десериализованное (при необходимости) значение свойства
     #
     # prop - код свойства (post_id к примеру)
@@ -104,15 +117,15 @@ module BitrixOnRails::IblockElementPropS
     end
 
     def m_prop_values(prop_id)
-      self.class.m_prop_class.where(:iblock_element_id => self.id, :iblock_property_id => prop_id).collect { |e| e.value }
+      Iblock.m_props_class(iblock_id).where(:iblock_element_id => self.id, :iblock_property_id => prop_id).collect { |e| e.value }
     end
 
     def create_m_prop_value(prop_id, value)
-      self.class.m_prop_class.create(:iblock_element_id => self.id, :iblock_property_id => prop_id, :value => value)
+      Iblock.m_props_class(iblock_id).create(:iblock_element_id => self.id, :iblock_property_id => prop_id, :value => value)
     end
 
     def destroy_m_prop_value(prop_id, value)
-      m_props = self.class.m_prop_class.where(:iblock_element_id => self.iblock_element_id, :iblock_property_id => prop_id, :value => value)
+      m_props = Iblock.m_props_class(iblock_id).where(:iblock_element_id => self.iblock_element_id, :iblock_property_id => prop_id, :value => value)
       m_props.each { |p| p.destroy } if m_props.any?
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitrix_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152591520 !ruby/object:Gem::Requirement
+  requirement: &2156264660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152591520
+  version_requirements: *2156264660
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152590160 !ruby/object:Gem::Requirement
+  requirement: &2156263400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152590160
+  version_requirements: *2156263400
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152588760 !ruby/object:Gem::Requirement
+  requirement: &2156261940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152588760
+  version_requirements: *2156261940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152587320 !ruby/object:Gem::Requirement
+  requirement: &2156260820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152587320
+  version_requirements: *2156260820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152585880 !ruby/object:Gem::Requirement
+  requirement: &2156259780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152585880
+  version_requirements: *2156259780
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152584520 !ruby/object:Gem::Requirement
+  requirement: &2156258340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152584520
+  version_requirements: *2156258340
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2152583840 !ruby/object:Gem::Requirement
+  requirement: &2156257140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152583840
+  version_requirements: *2156257140
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2152583100 !ruby/object:Gem::Requirement
+  requirement: &2156255520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152583100
+  version_requirements: *2156255520
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2152582460 !ruby/object:Gem::Requirement
+  requirement: &2156236280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152582460
+  version_requirements: *2156236280
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2152581680 !ruby/object:Gem::Requirement
+  requirement: &2156220420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152581680
+  version_requirements: *2156220420
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &2152581040 !ruby/object:Gem::Requirement
+  requirement: &2156216740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152581040
+  version_requirements: *2156216740
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
-  requirement: &2152580340 !ruby/object:Gem::Requirement
+  requirement: &2156214480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152580340
+  version_requirements: *2156214480
 description: Использование инфоблоков 1С-Битрикс в Ruby On Rails проектах
 email: danil@orionet.ru
 executables: []
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -279074760190885807
+      hash: 4502115155340295236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: