bitrix_on_rails 0.1.6 → 0.1.7

data/README.rdoc

@@ -74,6 +74,32 @@ prop_s - для одиночных свойтсв, prop_m - для множес
 
     а также default_scope с номером инфоблока, поэтому Post::Element.all выдаст только элементы к специфичному инфоблоку
 
+== Примерчики:
+
+=== Хеш кодов свойств инфоблока и их идентификаторов
+
+    Iblock.get_property_codes(3)
+    # => {:blog_id=>9, :glob_class=>11, :post_id=>13, :post_cafe=>15, :post_analitik=>16, :post_type=>17, :anonim=>18, :file=>20, :status=>21, :auto_rubric=>37, :link_change=>38, :link_company=>123, :post_kitchen=>124, :analyst=>152, :post_toilet=>193, :theme=>280, :post_analitik_bloger=>290, :num_comments=>309, :cnt_thanks=>327, :preview_mpage=>341, :name2=>342, :cnt_complaint=>349, :pr_subscribe=>410, :was_published=>421, :vip_subscribe=>422, :post_skyline=>430, :vip_send_date=>438}
+
+    # Тоже что и
+    Iblock.find(3).property_codes
+
+=== Кешированный список всех свойств инфоблока хешем с ключом-идентификатором
+
+    Iblock.get_properties(3)
+
+    # Тоже самое
+    Iblock.find(3).get_properties(3)[13]
+    # => #<IblockProperty id: 13, timestamp_x: "2009-12-17 18:13:59", iblock_id: 3, name: "ID Поста", active: "Y", sort: 600, code: "POST_ID", default_value: "", property_type: "N", row_count: 1, col_count: 30, list_type: "L", multiple: "N", xml_id: nil, file_type: "", multiple_cnt: 5, tmp_id: nil, link_iblock_id: 0, with_description: "N", searchable: "N", filtrable: "Y", is_required: "Y", version: 2, user_type: nil, user_type_settings: nil>
+
+=== Конретное свойство
+
+    Iblock.get_property(ibock_id, property_id)
+
+    # Тоже самое
+    Iblock.find(3).get_property(13).code
+    # => :post_id
+
 
 === Битрикс-авторизация
 

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/app/models/iblock.rb

@@ -34,12 +34,83 @@ class Iblock < ActiveRecord::Base
     def all
       @cached_all ||= super
     end
+
+    def get_properties(id)
+      @properties = {} unless @properties
+      @properties[id] ||= IblockProperty.where(:iblock_id => id).inject({}) { |a,e| a[e.id] = e; a }
+    end
+
+    def get_property(iblock_id, property_id)
+      get_properties(iblock_id)[property_id]
+    end
+
+    def get_property_codes(id)
+      @property_codes = {} unless @property_codes
+      @property_codes[id] ||= get_properties(id).values.inject({}){ |a,e| a[e.code] = e.id; a }
+    end
+
+    # Определяем методы совпадающие с именами свойств и их установкой, например следующие записи идентичны:
+    #
+    #   post.iblock_element.property_set.name2 = 'имя'
+    #   post.iblock_element.name2 = 'имя'
+    #   post.name2 = 'имя'
+    #   post.property_name2 = 'имя'
+    #
+    # Вызывается для классов наследуемых от IblockElement, типа Emitent и расширяемых
+    # инфоблоком через has_infoblock, например Post
+    #
+    def define_delegated_methods(scope, id, is_class=false)
+      # TODO Проверять не создали ли мы такие методы уже в рамках класса
+      # это так если у класса установлен @iblock_id
+
+      return if scope.is_a?(IblockElement) and scope.class.iblock_id
+
+      eval_method = is_class ? :class_eval : :instance_eval
+
+      get_property_codes(id).each { |code, number|
+
+        if scope.respond_to? code
+          logger.warn "Iblock(#{id}): Метод #{code} уже определен в #{scope.class}"
+        else
+          scope.send eval_method, "def #{code}; property_set.send('#{code}'); end"
+        end
+        scope.send eval_method,  "def property_#{code}; property_set.send('#{code}'); end"
+
+
+        # TODO Сделать .to_i если тип свойства NUMERIC, также для boolean
+        if scope.respond_to? "#{code}="
+          logger.warn "Iblock(#{id}): Метод #{code}= уже определен в #{scope.class}"
+        else
+          scope.send eval_method, "def #{code}=(value); property_set.send('#{code}=', value); end"
+        end
+        scope.send eval_method, "def property_#{code}=(value); property_set.send('#{code}=', value); end"
+
+        # Если мы спрашиваем iblock_element.post
+        # то он ищет ключ :post_id в свойствах элемента
+        # и если находит, то возвращает Post.find_by_id(properties[:post_id])
+        # if code.to_s=~/_id$/
+        #   method = code.to_s.gsub(/_id$/,'')
+        #   if Kernel.const_defined? class_name = code.to_s.humanize
+        #     instance_eval "def #{method}; #{class_name}.find_by_id(self.send :#{code}); end"
+        #   end
+        # end
+      }
+
+    end
+
   end
 
   def to_s
     name
   end
 
+  def get_property(property_id)
+    self.class.get_property(id, property_id)
+  end
+
+  def property_codes
+    self.class.get_property_codes(id)
+  end
 
   def init_property_models
     return unless version==2

data/app/models/iblock_element.rb

@@ -1,23 +1,12 @@
 # -*- coding: utf-8 -*-
 class IblockElement < ActiveRecord::Base
-  class << self
-    @block_id = nil
-    @iblock_properties = nil
-
-    def iblock_id
-      @iblock_id
-    end
-
-    def iblock_properties
-      @iblock_properties
-    end
-  end
-
   set_table_name :b_iblock_element
 
   belongs_to :iblock
   belongs_to :iblock_section
 
+  after_find { Iblock.define_delegated_methods(self, self.iblock_id) }
+
   # Применяется только для iblock-ов 1-й версии
   #
   has_many :iblock_element_properties
@@ -27,31 +16,44 @@ class IblockElement < ActiveRecord::Base
   has_many :iblock_section_elements
   has_many :iblock_sections, :through => :iblock_section_elements
 
-  def to_s
-    name
-  end
+  class << self
+    def iblock_id
+      @iblock_id
+    end
 
-  def self.set_iblock_id(id)
-    @iblock_id = id
-    @iblock_properties = IblockProperty.where(:iblock_id => id).inject({}){ |a,e| a[e.code] = e.id; a }
+    def property_codes
+      raise "Не установлен @iblock_id" unless iblock_id
+      Iblock.get_property_codes(iblock_id)
+    end
+
+    def set_iblock_id(id)
+      @iblock_id = id
 
-    prop_s_class = "IblockElementPropS#{id}"
-    prop_m_class = "IblockElementPropM#{id}"
+      prop_s_class = "IblockElementPropS#{id}"
+      prop_m_class = "IblockElementPropM#{id}"
 
-    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_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'
 
-    # Создаем прокси-методы для доступа к значениям свойств элемента
-    Kernel.const_get(prop_s_class).properties.each { |code, property_name|
-      define_method(code) do
-        property_set.send(code)
-      end
+      default_scope where(:iblock_id => id, :active => 'Y')
 
-      define_method("#{code}=") do |value|
-        property_set.send("#{code}=", value)
-      end
-    }
+      property_codes.each { |code, number|
+        define_method(code) do
+          property_set.send(code)
+        end
 
-    default_scope where(:iblock_id => id, :active => 'Y')
+        define_method("#{code}=") do |value|
+          property_set.send("#{code}=", value)
+        end
+      }
+    end
+  end
+
+  def property_codes
+    ::Iblock.get_property_codes(self.iblock_id)
+  end
+
+  def to_s
+    name
   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.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]

data/lib/bitrix_on_rails/active_record.rb

@@ -14,7 +14,11 @@ module BitrixOnRails
 
       self.const_set('Element', element_class)
 
+      self.class_eval("def property_set; iblock_element.property_set; end")
+      Iblock.define_delegated_methods(self, iblock_id, true)
+
       has_one :iblock_element, :through => prop_s_name, :class_name => 'Element', :autosave => true
+
     end
   end
 end

data/lib/bitrix_on_rails.rb

@@ -6,7 +6,7 @@ module BitrixOnRails
   def self.init
     # При работе с тестовой базой может случиться ситуация, что база пуста и никакой таблицы b_iblock
     # там нет, что приведет к ислючению. Проверка сделана для корректной работы Rake задач.
-    if ::ActiveRecord::Base.connection.tables.find{ |t| t == 'b_iblock'}
+    if ::ActiveRecord::Base.connection.tables.include? 'b_iblock'
       Iblock.all.map &:init_property_models
     end
   end

data/test/test_bitrix_on_rails.rb

@@ -8,7 +8,12 @@ class TestBitrixOnRails < Test::Unit::TestCase
     puts IblockElementPropM7
   end
 
-  should "" do
+  should "Брать свойства для блока и кешировать их" do
+
+    Iblock.get_properties(3)
+
+    # А этот запрос уже кеширован
+    Iblock.get_properties(3)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitrix_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152482120 !ruby/object:Gem::Requirement
+  requirement: &2152591520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152482120
+  version_requirements: *2152591520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152481040 !ruby/object:Gem::Requirement
+  requirement: &2152590160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152481040
+  version_requirements: *2152590160
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152480000 !ruby/object:Gem::Requirement
+  requirement: &2152588760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152480000
+  version_requirements: *2152588760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152479140 !ruby/object:Gem::Requirement
+  requirement: &2152587320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152479140
+  version_requirements: *2152587320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152477680 !ruby/object:Gem::Requirement
+  requirement: &2152585880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152477680
+  version_requirements: *2152585880
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152476320 !ruby/object:Gem::Requirement
+  requirement: &2152584520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152476320
+  version_requirements: *2152584520
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2152475360 !ruby/object:Gem::Requirement
+  requirement: &2152583840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152475360
+  version_requirements: *2152583840
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2152473580 !ruby/object:Gem::Requirement
+  requirement: &2152583100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152473580
+  version_requirements: *2152583100
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2152465920 !ruby/object:Gem::Requirement
+  requirement: &2152582460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152465920
+  version_requirements: *2152582460
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2152464240 !ruby/object:Gem::Requirement
+  requirement: &2152581680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152464240
+  version_requirements: *2152581680
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &2152462820 !ruby/object:Gem::Requirement
+  requirement: &2152581040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152462820
+  version_requirements: *2152581040
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
-  requirement: &2152461800 !ruby/object:Gem::Requirement
+  requirement: &2152580340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152461800
+  version_requirements: *2152580340
 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: 1586929030619519133
+      hash: -279074760190885807
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: