bitrix_on_rails 0.2.0 → 0.2.1

data/Gemfile

@@ -25,5 +25,5 @@ group :development, :test do
   gem "guard-test"
   # http://test-unit.rubyforge.org/
   # gem 'test-unit-notify'
-  gem 'test-unit-rr'
+  gem 'rr'
 end

data/Gemfile.lock

@@ -42,6 +42,7 @@ GEM
       abstract (>= 1.0.0)
     factory_girl (2.0.2)
     git (1.2.5)
+    growl (1.0.3)
     guard (0.5.1)
       thor (~> 0.14.6)
     guard-test (0.3.0)
@@ -81,6 +82,7 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2)
+    rb-fsevent (0.4.3.1)
     rcov (0.9.9)
     rdoc (3.9.1)
     rr (1.0.3)
@@ -97,9 +99,6 @@ GEM
     shoulda (2.11.3)
     sqlite3 (1.3.4)
     test-unit (2.3.0)
-    test-unit-rr (1.0.1)
-      rr (>= 1.0.2)
-      test-unit (>= 2.1.2)
     thor (0.14.6)
     treetop (1.4.10)
       polyglot
@@ -112,13 +111,15 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   factory_girl
+  growl
   guard-test
   jeweler (~> 1.6.4)
   php_serialize!
   rails (>= 3.0)
+  rb-fsevent
   rcov
+  rr
   ruby-debug19
   shoulda
   sqlite3
   test-unit
-  test-unit-rr

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bitrix_on_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitrix_on_rails}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Danil Pismenny}]
-  s.date = %q{2011-08-29}
+  s.authors = ["Danil Pismenny"]
+  s.date = %q{2011-08-30}
   s.description = %q{Использование инфоблоков 1С-Битрикс в Ruby On Rails проектах}
   s.email = %q{danil@orionet.ru}
   s.extra_rdoc_files = [
@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
     "app/models/iblock_type.rb",
     "bitrix_on_rails.gemspec",
     "init.rb",
-    "lib/active_record/connection_adapters/mysql2_downcase_adapter.rb",
     "lib/bitrix_on_rails.rb",
     "lib/bitrix_on_rails/active_record.rb",
     "lib/bitrix_on_rails/configuration.rb",
@@ -45,6 +44,7 @@ Gem::Specification.new do |s|
     "lib/bitrix_on_rails/iblock_element.rb",
     "lib/bitrix_on_rails/iblock_element_prop_m.rb",
     "lib/bitrix_on_rails/iblock_element_prop_s.rb",
+    "lib/php_serialize_encoded.rb",
     "test/dump.sql",
     "test/factories.rb",
     "test/get_dump.sh",
@@ -53,12 +53,13 @@ Gem::Specification.new do |s|
     "test/test_active_record.rb",
     "test/test_bitrix_on_rails.rb",
     "test/test_iblock_element.rb",
-    "test/test_iblock_element_prop_s.rb"
+    "test/test_iblock_element_prop_s.rb",
+    "test/test_php_serialize_encoded.rb"
   ]
   s.homepage = %q{http://github.com/dapi/bitrix_on_rails}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Работа с инфоблоками 1С-Битрикс}
 
   if s.respond_to? :specification_version then
@@ -75,8 +76,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<factory_girl>, [">= 0"])
       s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_development_dependency(%q<growl>, [">= 0"])
       s.add_development_dependency(%q<guard-test>, [">= 0"])
-      s.add_development_dependency(%q<test-unit-rr>, [">= 0"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0"])
       s.add_dependency(%q<php_serialize>, [">= 0"])
@@ -88,8 +91,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<factory_girl>, [">= 0"])
       s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_dependency(%q<growl>, [">= 0"])
       s.add_dependency(%q<guard-test>, [">= 0"])
-      s.add_dependency(%q<test-unit-rr>, [">= 0"])
+      s.add_dependency(%q<rr>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0"])
@@ -102,8 +107,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<factory_girl>, [">= 0"])
     s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<rb-fsevent>, [">= 0"])
+    s.add_dependency(%q<growl>, [">= 0"])
     s.add_dependency(%q<guard-test>, [">= 0"])
-    s.add_dependency(%q<test-unit-rr>, [">= 0"])
+    s.add_dependency(%q<rr>, [">= 0"])
   end
 end
 

data/lib/bitrix_on_rails.rb

@@ -22,5 +22,6 @@ require 'bitrix_on_rails/active_record'
 require 'bitrix_on_rails/iblock_element'
 require 'bitrix_on_rails/iblock_element_prop_s'
 require 'bitrix_on_rails/iblock_element_prop_m'
+require 'php_serialize_encoded'
 
 ActiveRecord::Base.extend BitrixOnRails::ActiveRecord

data/lib/bitrix_on_rails/iblock_element.rb

@@ -8,7 +8,9 @@ module BitrixOnRails
   end
 
   def self.define_iblock_class(iblock_id, options = {})
-    iblock_element_class = create_iblock_class(iblock_id, options[:extended_class], options[:extended_by])
+    iblock_version = Iblock.find(iblock_id).version
+
+    iblock_element_class = send("create_iblock_v#{iblock_version}_class", iblock_id, options[:extended_class], options[:extended_by])
 
     unless options[:extended_class]
       # Определяем имя класса, который нужно создать, а также namespace, в котором
@@ -28,28 +30,54 @@ module BitrixOnRails
       namespace.const_set(class_name, iblock_element_class)
     end
 
-    create_prop_classes(iblock_id, iblock_element_class)
+    # Порядок вызова важен, так как только в этот момент у iblock_element_class появляется имя, которое
+    # используется в IblockElementPropS.
+    create_prop_classes(iblock_id, iblock_element_class) if iblock_version == 2
+
+    iblock_element_class
   end
 
   protected
 
-  def self.create_iblock_class(iblock_id, extended_class = nil, extended_by = nil)
-    iblock_element_class = extended_class || Class.new(::IblockElement) {}
+  def self.create_iblock_v1_class(iblock_id, extended_class = nil, extended_by = nil)
+    create_iblock_class(iblock_id, extended_class, extended_by) do
+      has_many :prop_values, :class_name => 'IblockElementProperty', :foreign_key => 'iblock_element_id'
 
-    iblock_element_class.instance_eval do
-      @iblock_id = iblock_id
-      @iblock_properties = Iblock.get_properties(iblock_id).inject({}){ |a,e| a[e[1].code] = {:id => e[1].id, :multiple => e[1].multiple == 'Y'}; a}
+      @iblock_properties.each { |m, property|
+        define_method m do
+          prop_values.where(:iblock_property_id => property[:id]).first.try(:value)
+        end
+
+        define_method "#{m}=" do |value|
+          prop_values.create(:iblock_property_id => property[:id], :value => value)
+        end
+      }
+    end
+  end
 
+  def self.create_iblock_v2_class(iblock_id, extended_class = nil, extended_by = nil)
+    create_iblock_class(iblock_id, extended_class, extended_by) do
       has_one :property_set, :class_name => "IblockElementPropS#{iblock_id}", :foreign_key => 'iblock_element_id', :autosave => true
       has_many :m_props, :class_name => "IblockElementPropM#{iblock_id}", :foreign_key => 'iblock_element_id', :readonly => true
 
-      default_scope where(:iblock_id => iblock_id)
-
       @iblock_properties.each { |m, property|
         delegate m, :to => :property_set
         delegate "#{m}=", :to => :property_set unless property[:multiple]
       }
     end
+  end
+
+  def self.create_iblock_class(iblock_id, extended_class = nil, extended_by = nil, &blk)
+    iblock_element_class = extended_class || Class.new(::IblockElement) {}
+
+    iblock_element_class.instance_eval do
+      @iblock_id = iblock_id
+      @iblock_properties = Iblock.get_properties(iblock_id).inject({}){ |a,e| a[e[1].code] = {:id => e[1].id, :multiple => e[1].multiple == 'Y'}; a}
+
+      instance_eval(&blk)
+
+      default_scope where(:iblock_id => iblock_id)
+    end
 
     iblock_element_class.extend Object.const_get(extended_by) if extended_by
 

data/lib/bitrix_on_rails/iblock_element_prop_s.rb

@@ -79,7 +79,7 @@ module BitrixOnRails::IblockElementPropS
     before_save do
       self.class.m_props.each { |code, p|
         values = send(code).values
-        self.send("property_#{p[:id]}=", ::PHP.serialize({'VALUE' => values, 'DESCRIPTION' => Array.new(values.size, nil)}))
+        self.send("property_#{p[:id]}=", ::PHP.serialize_encoded({'VALUE' => values, 'DESCRIPTION' => Array.new(values.size, nil)}))
       }
     end
   end
@@ -107,7 +107,7 @@ module BitrixOnRails::IblockElementPropS
           value.is_a?(BigDecimal) ? value.to_i : value
         when 'S'
           if value.length > 5 && value[0..3] =~ /[a-z]:\d/
-            v = ::PHP.unserialize(value)
+            v = ::PHP.unserialize_encoded(value)
             v.is_a?(Hash) && v.include?('TEXT') ? v['TEXT'] : value
           elsif user_type == 'DateTime'
             Time.parse(value).in_time_zone
@@ -125,7 +125,7 @@ module BitrixOnRails::IblockElementPropS
       case type
       when 'S'
         if user_type == 'HTML'
-          ::PHP.serialize({'TEXT' => value, 'TYPE' => 'html'})
+          ::PHP.serialize_encoded({'TEXT' => value, 'TYPE' => 'html'})
         elsif user_type == 'DateTime'
           value.strftime('%Y-%m-%d %H:%M:%S')
         else

data/lib/php_serialize_encoded.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+module PHP
+  # Когда битрикс работает с базой в cp1251, а рельсы с UTF-8
+  # Возникают проблемы с подсчетом длинны строк при сериализации
+  # 'тест' в cp1251 имеет 4 символа, а в utf-8 - 8.
+  #
+  # Поэтому приходится производить все сериализацию через эти врапперы.
+  #
+
+  def PHP.encode_in_deep(val, encoding)
+    if val.is_a? Array
+      val = val.map { |v| encode_in_deep(v, encoding) }
+    elsif val.is_a? Hash
+      val.each_pair do |k,v|
+        val[k] = encode_in_deep(v, encoding)
+      end
+    elsif val.is_a? String
+      val = val.encode(encoding)
+    end
+    val
+  end
+
+  def PHP.serialize_encoded(val)
+    val = encode_in_deep(val, 'CP1251')
+    serialize(val).encode('UTF-8')
+  end
+
+  def PHP.unserialize_encoded(s)
+    val = unserialize(s.encode('CP1251'))
+    val = encode_in_deep(val, 'UTF-8')
+    val
+  end
+end

data/test/factories.rb

@@ -102,4 +102,22 @@ FactoryGirl.define do
   factory :iblock_element7, :parent => :iblock_element do
     association :iblock, :factory=>:iblock7
   end
+
+  #
+  # Инфоблок с version = 1
+  #
+  factory :iblock_v1, :parent => :iblock do
+    version 1
+
+    after_build { |iblock|
+      iblock.iblock_properties.build Factory.build(:iblock_v1_prop_synonym).attributes
+    }
+  end
+
+  factory :iblock_v1_prop_synonym, :parent => :iblock_property do
+    name 'Синоним'
+    code 'synonym'
+    property_type 'S'
+    multiple 'N'
+  end
 end

data/test/helper.rb

@@ -14,6 +14,7 @@ require 'active_record'
 require 'factory_girl'
 require 'shoulda'
 require 'active_support/test_case'
+require 'rr'
 
 ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3',
@@ -40,12 +41,5 @@ require 'factories'
 class Test::Unit::TestCase
   include Factory::Syntax::Methods
   include ActiveSupport::Testing::Assertions
-
-  def bitrix_configure
-    BitrixOnRails.configure do
-      infoblock 3, IblockElement3
-      infoblock 7, IblockElement7
-    end
-  end
-
+  include RR::Adapters::TestUnit
 end

data/test/test_active_record.rb

@@ -16,6 +16,10 @@ class ActiveRecordTest < Test::Unit::TestCase
       end
     end
 
+    teardown do
+      Object.send :remove_const, "IblockElement#{@iblock.id}"
+    end
+
     should 'create associations' do
       assert Post.reflections.include?("iblock_element_prop_s#{@iblock.id}".to_sym)
       assert Post.reflections.include?(:iblock_element)

data/test/test_bitrix_on_rails.rb

@@ -6,23 +6,4 @@ class TestBitrixOnRails < Test::Unit::TestCase
   def tests
     assert_respond_to BitrixOnRails, :configure
   end
-
-  # should "автоматичеки создает модели свойств для всех инфоблоков при инициализации" do
-  #   assert_equal 2, BitrixOnRails.init.count, '2 инфоблока в нашей схеме'
-  #   # assert defined?(IblockElementPropM7), 'должен определиться автоматически'
-  #   puts IblockElementPropM7
-  # end
-
-  # should "Брать свойства для блока и кешировать их" do
-
-  #   Iblock.get_properties(3)
-
-  #   # А этот запрос уже кеширован
-  #   Iblock.get_properties(3)
-  # end
 end
-
-
-# При инициализации создаются модели для всех инфоблоков
-# При использовании IblockElement можно работать со свойствами
-# Пожно подключать Инфоблок через has_infoblock к модели

data/test/test_iblock_element.rb

@@ -3,14 +3,22 @@ require 'helper'
 class IblockElementTest < Test::Unit::TestCase
 
   context 'define_iblock_class' do
+    setup do
+      stub(iblock = Object.new).version { 2 }
+      stub(Iblock).find { iblock }
+    end
 
     context 'with class_name set to nil' do
       setup do
         BitrixOnRails.define_iblock_class(3)
       end
 
+      teardown do
+        Object.send :remove_const, "IblockElement3"
+      end
+
       should 'create class IblockElement3 in global namespace' do
-        assert_not_nil Object.const_defined?('IblockElement3')
+        assert_not_nil Object.const_defined?("IblockElement3")
       end
     end
 
@@ -40,6 +48,10 @@ class IblockElementTest < Test::Unit::TestCase
         BitrixOnRails.define_iblock_class(3)
       end
 
+      teardown do
+        Object.send :remove_const, "IblockElement3"
+      end
+
       should 'create association with property classes' do
         assert_not_nil IblockElement3.reflections[:property_set]
         assert_not_nil IblockElement3.reflections[:m_props]
@@ -66,6 +78,10 @@ class IblockElementTest < Test::Unit::TestCase
         BitrixOnRails.define_iblock_class(3, :extended_by => 'IblockElementExtension')
       end
 
+      teardown do
+        Object.send :remove_const, "IblockElement3"
+      end
+
       should 'extend created class with given module' do
         # Не нашел другого способа проверить, что модуль был включен в класс
         assert IblockElement3.methods.include?(:some_method)
@@ -74,4 +90,20 @@ class IblockElementTest < Test::Unit::TestCase
 
   end
 
+  context 'described by iblock with version == 1' do
+    setup do
+      @iblock = Factory.create(:iblock_v1)
+      @iblock_element_class = BitrixOnRails.define_iblock_class(@iblock.id)
+    end
+
+    should 'set multiple association for prop_values' do
+      assert_not_nil @iblock_element_class.reflections[:prop_values]
+    end
+
+    should 'define access methods for iblock properties' do
+      assert @iblock_element_class.instance_methods.include?(:synonym)
+      assert @iblock_element_class.instance_methods.include?(:synonym=)
+    end
+  end
+
 end

data/test/test_iblock_element_prop_s.rb

@@ -9,19 +9,19 @@ class IblockElementPropSTest < Test::Unit::TestCase
    ]
 
   def create_iblock(iblock_factory, iblock_element_factory, prop_s_values = [], prop_m_values = [])
-    iblock = Factory.create(iblock_factory)
+    @iblock = Factory.create(iblock_factory)
 
-    BitrixOnRails.define_iblock_class(iblock.id)
+    BitrixOnRails.define_iblock_class(@iblock.id)
 
-    @s_prop_class = Object.const_get("IblockElementPropS#{iblock.id}")
-    @m_prop_class = Object.const_get("IblockElementPropM#{iblock.id}")
+    @s_prop_class = Object.const_get("IblockElementPropS#{@iblock.id}")
+    @m_prop_class = Object.const_get("IblockElementPropM#{@iblock.id}")
 
     properties = @s_prop_class.columns.collect { |c| c.name }
 
-    @iblock_element = Factory.create(iblock_element_factory, :iblock => iblock)
+    @iblock_element = Factory.create(iblock_element_factory, :iblock => @iblock)
 
     prop_m_values.each { |v|
-      @m_prop_class.create(:iblock_element_id => @iblock_element.id, :iblock_property_id => iblock.iblock_properties.last.id, :value => v)
+      @m_prop_class.create(:iblock_element_id => @iblock_element.id, :iblock_property_id => @iblock.iblock_properties.last.id, :value => v)
     }
 
     prop_s_values = [@iblock_element.id] + prop_s_values
@@ -37,6 +37,10 @@ class IblockElementPropSTest < Test::Unit::TestCase
       @s_prop_class = Object.const_get("IblockElementPropS#{@iblock.id}")
     end
 
+    teardown do
+      Object.send :remove_const, "IblockElement#{@iblock.id}"
+    end
+
     should 'set table name to b_iblock_element_prop_s#{id}' do
       assert_equal "b_iblock_element_prop_s#{@iblock.id}", @s_prop_class.table_name
     end
@@ -62,6 +66,10 @@ class IblockElementPropSTest < Test::Unit::TestCase
       create_iblock :iblock3, :iblock_element3, PROP_S_VALUES, [144, 1394860, 35, 6, 165]
     end
 
+    teardown do
+      Object.send :remove_const, "IblockElement#{@iblock.id}"
+    end
+
     should 'return unserialized values' do
       assert_equal 11286, @iblock_element_prop_s.post_id
       assert_equal 'Полемика по повышению.', @iblock_element_prop_s.preview_mpage
@@ -77,6 +85,10 @@ class IblockElementPropSTest < Test::Unit::TestCase
       create_iblock :iblock3, :iblock_element3, PROP_S_VALUES, [10]
     end
 
+    teardown do
+      Object.send :remove_const, "IblockElement#{@iblock.id}"
+    end
+
     should 'add new record to b_iblock_element_prop_m on add' do
       assert_difference("#{@iblock_element_prop_s.m_prop_class}.count") do
         @iblock_element_prop_s.glob_class.add(16)

data/test/test_php_serialize_encoded.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+require 'helper'
+
+class TestPHPSerializeEncoded < Test::Unit::TestCase
+  def tests
+    assert_respond_to PHP, :serialize_encoded
+    assert_respond_to PHP, :unserialize_encoded
+
+    s = "a:2:{s:4:\"TEXT\";s:294:\"В четверг, 25 августа, торги в России начались хорошим ростом, но после обеда рынок начал терять отвоеванные позиции. В итоге почти 1,5% роста индекса ММВБ на 17:00 сменились 0,2% падения. При этом некоторую довольно слабую поддержку нашему рынку оказывают немного подрастающие котировки нефти.\";s:4:\"TYPE\";s:4:\"html\";}"
+    val = PHP.unserialize_encoded(s)
+
+    assert_equal val['TEXT'], "В четверг, 25 августа, торги в России начались хорошим ростом, но после обеда рынок начал терять отвоеванные позиции. В итоге почти 1,5% роста индекса ММВБ на 17:00 сменились 0,2% падения. При этом некоторую довольно слабую поддержку нашему рынку оказывают немного подрастающие котировки нефти."
+
+    val = PHP.serialize_encoded(['тест'])
+    assert_equal val, 'a:1:{i:0;s:4:"тест";}'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitrix_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+date: 2011-08-30 00:00:00.000000000 +04:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19514180 !ruby/object:Gem::Requirement
+  requirement: &2153466700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19514180
+  version_requirements: *2153466700
 - !ruby/object:Gem::Dependency
   name: php_serialize
-  requirement: &19513460 !ruby/object:Gem::Requirement
+  requirement: &2153465440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19513460
+  version_requirements: *2153465440
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19512780 !ruby/object:Gem::Requirement
+  requirement: &2153463940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19512780
+  version_requirements: *2153463940
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &19512200 !ruby/object:Gem::Requirement
+  requirement: &2153458140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19512200
+  version_requirements: *2153458140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19511460 !ruby/object:Gem::Requirement
+  requirement: &2153456080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19511460
+  version_requirements: *2153456080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19509100 !ruby/object:Gem::Requirement
+  requirement: &2153452480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +77,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *19509100
+  version_requirements: *2153452480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19508220 !ruby/object:Gem::Requirement
+  requirement: &2153450440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19508220
+  version_requirements: *2153450440
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &19507400 !ruby/object:Gem::Requirement
+  requirement: &2153449020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19507400
+  version_requirements: *2153449020
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &19506560 !ruby/object:Gem::Requirement
+  requirement: &2153448060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19506560
+  version_requirements: *2153448060
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &19505960 !ruby/object:Gem::Requirement
+  requirement: &2153446980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +121,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19505960
+  version_requirements: *2153446980
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &2153445780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153445780
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: &2153444480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153444480
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &19505320 !ruby/object:Gem::Requirement
+  requirement: &2153443040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19505320
+  version_requirements: *2153443040
 - !ruby/object:Gem::Dependency
-  name: test-unit-rr
-  requirement: &19504640 !ruby/object:Gem::Requirement
+  name: rr
+  requirement: &2153441700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19504640
+  version_requirements: *2153441700
 description: Использование инфоблоков 1С-Битрикс в Ruby On Rails проектах
 email: danil@orionet.ru
 executables: []
@@ -171,7 +194,6 @@ files:
 - app/models/iblock_type.rb
 - bitrix_on_rails.gemspec
 - init.rb
-- lib/active_record/connection_adapters/mysql2_downcase_adapter.rb
 - lib/bitrix_on_rails.rb
 - lib/bitrix_on_rails/active_record.rb
 - lib/bitrix_on_rails/configuration.rb
@@ -179,6 +201,7 @@ files:
 - lib/bitrix_on_rails/iblock_element.rb
 - lib/bitrix_on_rails/iblock_element_prop_m.rb
 - lib/bitrix_on_rails/iblock_element_prop_s.rb
+- lib/php_serialize_encoded.rb
 - test/dump.sql
 - test/factories.rb
 - test/get_dump.sh
@@ -188,6 +211,8 @@ files:
 - test/test_bitrix_on_rails.rb
 - test/test_iblock_element.rb
 - test/test_iblock_element_prop_s.rb
+- test/test_php_serialize_encoded.rb
+has_rdoc: true
 homepage: http://github.com/dapi/bitrix_on_rails
 licenses:
 - MIT
@@ -203,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3075423241846664278
+      hash: -2381565352969100600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Работа с инфоблоками 1С-Битрикс

data/lib/active_record/connection_adapters/mysql2_downcase_adapter.rb

@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-# Just use 'mysql2_downcase' adapter in database.yml
-#
-
-require 'active_record/connection_adapters/mysql2_adapter'
-
-module ActiveRecord
-  class Base
-    # Establishes a connection to the database that's used by all Active Record objects.
-    def self.mysql2_downcase_connection(config)
-      config[:username] = 'root' if config[:username].nil?
-
-      if Mysql2::Client.const_defined? :FOUND_ROWS
-        config[:flags] = Mysql2::Client::FOUND_ROWS
-      end
-
-      client = Mysql2::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
-      ConnectionAdapters::Mysql2DowncaseAdapter.new(client, logger, options, config)
-      # ActiveRecord::Base.mysql2_connection(config)
-    end
-  end
-
-  class Result
-
-    # Это выполняется через ActiveRecord::Result.new в mysql2_adapter
-    # при выполнении запроса
-    def initialize(columns, rows)
-      @columns   = columns.map { |c| c.downcase }
-      @rows      = rows
-      @hash_rows = nil
-    end
-  end
-
-  module ConnectionAdapters
-    class Column
-
-      alias_method :old_initialize, :initialize
-
-      # Это выполняется при выборке списка аттрибутов на уровне класса
-      #
-      def initialize(name, default, sql_type = nil, null = true)
-        old_initialize name.downcase, default, sql_type, null
-      end
-
-    end
-
-    class Mysql2DowncaseAdapter < Mysql2Adapter
-
-      ADAPTER_NAME = 'Mysql2Downcase'
-
-      # Надо бы глобально сделать тут:
-      # def execute(sql, name = nil)
-      #   debugger
-      # end
-
-      # Это чтобы нормально определся primary_key
-      def pk_and_sequence_for(table)
-        keys = []
-        result = execute("DESCRIBE #{quote_table_name(table)}", 'SCHEMA')
-        result.each(:symbolize_keys => true, :as => :hash) do |row|
-          keys << row[:Field].downcase if row[:Key] == "PRI"
-        end
-        keys.length == 1 ? [keys.first, nil] : nil
-      end
-
-    end
-  end
-end
-
-
-# Возможно понадобится исправить этот метод
-# quote_column_name
-
-# Хороший пример адаптера - http://virtuoso.rubyforge.org/activerecord-mysql2spatial-adapter/
-# https://github.com/dazuma/activerecord-mysql2spatial-adapter