bitrix_on_rails 0.1.8 → 0.2.0

data/test/test_active_record.rb

@@ -0,0 +1,36 @@
+require 'helper'
+
+class ActiveRecordTest < Test::Unit::TestCase
+  context 'has_infoblock' do
+    setup do
+      @iblock = Factory.create(:iblock3)
+      BitrixOnRails.define_iblock_class @iblock.id
+
+      id = @iblock.id
+
+      class Post < ActiveRecord::Base
+      end
+
+      Post.instance_eval do
+        has_infoblock id, :property_13
+      end
+    end
+
+    should 'create associations' do
+      assert Post.reflections.include?("iblock_element_prop_s#{@iblock.id}".to_sym)
+      assert Post.reflections.include?(:iblock_element)
+      assert Object.const_get("IblockElementPropS#{@iblock.id}").reflections.include?(:post)
+    end
+
+    should 'delegate property methods to iblock_element' do
+      post = Post.new
+      [:preview_mpage, :glob_class, :preview_mpage=].each { |m|
+        assert_respond_to post, m
+      }
+    end
+
+    should 'not delegete multiple property assignment methods to iblock_element' do
+      assert_not_respond_to Post, :glob_class=
+    end
+  end
+end

data/test/test_bitrix_on_rails.rb

@@ -1,20 +1,25 @@
 # -*- coding: utf-8 -*-
+
 require 'helper'
 
 class TestBitrixOnRails < Test::Unit::TestCase
-  should "автоматичеки создает модели свойств для всех инфоблоков при инициализации" do
-    assert_equal 2, BitrixOnRails.init.count, '2 инфоблока в нашей схеме'
-    # assert defined?(IblockElementPropM7), 'должен определиться автоматически'
-    puts IblockElementPropM7
+  def tests
+    assert_respond_to BitrixOnRails, :configure
   end
 
-  should "Брать свойства для блока и кешировать их" do
+  # should "автоматичеки создает модели свойств для всех инфоблоков при инициализации" do
+  #   assert_equal 2, BitrixOnRails.init.count, '2 инфоблока в нашей схеме'
+  #   # assert defined?(IblockElementPropM7), 'должен определиться автоматически'
+  #   puts IblockElementPropM7
+  # end
 
-    Iblock.get_properties(3)
+  # should "Брать свойства для блока и кешировать их" do
 
-    # А этот запрос уже кеширован
-    Iblock.get_properties(3)
-  end
+  #   Iblock.get_properties(3)
+
+  #   # А этот запрос уже кеширован
+  #   Iblock.get_properties(3)
+  # end
 end
 
 

data/test/test_iblock_element.rb

@@ -0,0 +1,77 @@
+require 'helper'
+
+class IblockElementTest < Test::Unit::TestCase
+
+  context 'define_iblock_class' do
+
+    context 'with class_name set to nil' do
+      setup do
+        BitrixOnRails.define_iblock_class(3)
+      end
+
+      should 'create class IblockElement3 in global namespace' do
+        assert_not_nil Object.const_defined?('IblockElement3')
+      end
+    end
+
+    context 'with class name in global namespace' do
+      setup do
+        BitrixOnRails.define_iblock_class(3, :class_name => 'PostProperties')
+      end
+
+      should 'create class PostProperties in global namespace' do
+        assert_not_nil Object.const_defined?('PostProperties')
+      end
+    end
+
+    context 'with class name in non global namespace' do
+      setup do
+        Object.const_set('Post', Class.new)
+        BitrixOnRails.define_iblock_class(3, :class_name => 'Post::Element')
+      end
+
+      should 'create class Element in Post namespace' do
+        assert_not_nil Post.const_defined?('Element')
+      end
+    end
+
+    context 'behaviour' do
+      setup do
+        BitrixOnRails.define_iblock_class(3)
+      end
+
+      should 'create association with property classes' do
+        assert_not_nil IblockElement3.reflections[:property_set]
+        assert_not_nil IblockElement3.reflections[:m_props]
+      end
+
+      should 'create property classes' do
+        assert_not_nil Object.const_defined?('IblockElementPropS3')
+        assert_not_nil Object.const_defined?('IblockElementPropM3')
+      end
+
+      should 'create associations for property classes in IblockElement' do
+        assert_not_nil IblockElement.reflections[:iblock_element_prop_s3]
+        assert_not_nil IblockElement.reflections[:iblock_element_prop_m3]
+      end
+
+      should 'add class information in BitrixOnRails.infoblocks' do
+        assert_equal IblockElement3, BitrixOnRails.infoblocks[3]
+      end
+    end
+
+    context 'with passed :extended_by' do
+      setup do
+        Object.const_set('IblockElementExtension', Module.new{ def some_method ; end})
+        BitrixOnRails.define_iblock_class(3, :extended_by => 'IblockElementExtension')
+      end
+
+      should 'extend created class with given module' do
+        # Не нашел другого способа проверить, что модуль был включен в класс
+        assert IblockElement3.methods.include?(:some_method)
+      end
+    end
+
+  end
+
+end

data/test/test_iblock_element_prop_s.rb

@@ -0,0 +1,111 @@
+# encoding: UTF-8
+require 'helper'
+
+class IblockElementPropSTest < Test::Unit::TestCase
+   PROP_S_VALUES = [
+     11286, nil, # post_id
+     'a:2:{s:4:"TEXT";s:22:"Полемика по повышению.";s:4:"TYPE";s:4:"html";}', nil, #preview_mpage
+     nil, nil # glob_class
+   ]
+
+  def create_iblock(iblock_factory, iblock_element_factory, prop_s_values = [], prop_m_values = [])
+    iblock = Factory.create(iblock_factory)
+
+    BitrixOnRails.define_iblock_class(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)
+
+    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)
+    }
+
+    prop_s_values = [@iblock_element.id] + prop_s_values
+    @iblock_element_prop_s = @s_prop_class.create(properties.inject({}){ |a,e| a[e] = prop_s_values[properties.find_index(e)]; a})
+  end
+
+  context 'acts_as_iblock_prop_s' do
+    setup do
+      @iblock = Factory.create(:iblock3)
+
+      BitrixOnRails.define_iblock_class(@iblock.id)
+
+      @s_prop_class = Object.const_get("IblockElementPropS#{@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
+
+    should 'set association with iblock_element' do
+      assert @s_prop_class.reflections.include?(:iblock_element)
+      assert_equal BitrixOnRails.infoblocks[@iblock.id].name, @s_prop_class.reflections[:iblock_element].class_name
+    end
+
+    should 'define access methods for single properties' do
+      [:post_id, :post_id=, :find_by_post_id].each { |m|
+        assert @s_prop_class.instance_methods.include?(m)
+      }
+
+      [:preview_mpage, :preview_mpage=, :find_by_preview_mpage].each { |m|
+        assert @s_prop_class.instance_methods.include?(m)
+      }
+    end
+  end
+
+  context 'instance methods' do
+    setup do
+      create_iblock :iblock3, :iblock_element3, PROP_S_VALUES, [144, 1394860, 35, 6, 165]
+    end
+
+    should 'return unserialized values' do
+      assert_equal 11286, @iblock_element_prop_s.post_id
+      assert_equal 'Полемика по повышению.', @iblock_element_prop_s.preview_mpage
+    end
+
+    should 'return instance of MPropValuesWrapper for multiple property' do
+      assert @iblock_element_prop_s.glob_class.is_a?(BitrixOnRails::IblockElementPropS::MPropValuesWrapper)
+    end
+  end
+
+  context 'MPropValuesWrapper' do
+    setup do
+      create_iblock :iblock3, :iblock_element3, PROP_S_VALUES, [10]
+    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)
+      end
+    end
+
+    should 'delete record on destroy' do
+      assert_difference("#{@iblock_element_prop_s.m_prop_class}.count", -1) do
+        @iblock_element_prop_s.glob_class.remove(10)
+      end
+    end
+  end
+
+  context 'serialize' do
+    setup do
+      create_iblock :iblock3, :iblock_element3, PROP_S_VALUES
+    end
+
+    should 'convert value into serialized hash if user_type is HTML' do
+      @iblock_element_prop_s.preview_mpage = 'BitrixOnRails is awesome, bro!'
+      assert_equal 'a:2:{s:4:"TEXT";s:30:"BitrixOnRails is awesome, bro!";s:4:"TYPE";s:4:"html";}',
+                   @iblock_element_prop_s.send("property_#{@s_prop_class.s_props[:preview_mpage][:id]}")
+    end
+
+    should 'convert value into specially formatted string if user_type is DateTime' do
+      t = Time.parse '15 Aug 2011 16:32:18'
+      @iblock_element_prop_s.publication_date = t
+      assert_equal '2011-08-15 16:32:18',
+                   @iblock_element_prop_s.send("property_#{@s_prop_class.s_props[:publication_date][:id]}")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitrix_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-04 00:00:00.000000000 +04:00
-default_executable: 
+date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156264660 !ruby/object:Gem::Requirement
+  requirement: &19514180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156264660
+  version_requirements: *19514180
+- !ruby/object:Gem::Dependency
+  name: php_serialize
+  requirement: &19513460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *19513460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156263400 !ruby/object:Gem::Requirement
+  requirement: &19512780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156263400
+  version_requirements: *19512780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156261940 !ruby/object:Gem::Requirement
+  requirement: &19512200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156261940
+  version_requirements: *19512200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156260820 !ruby/object:Gem::Requirement
+  requirement: &19511460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156260820
+  version_requirements: *19511460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156259780 !ruby/object:Gem::Requirement
+  requirement: &19509100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156259780
+  version_requirements: *19509100
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156258340 !ruby/object:Gem::Requirement
+  requirement: &19508220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,21 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156258340
+  version_requirements: *19508220
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2156257140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2156257140
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: &2156255520 !ruby/object:Gem::Requirement
+  requirement: &19507400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156255520
+  version_requirements: *19507400
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &2156236280 !ruby/object:Gem::Requirement
+  name: factory_girl
+  requirement: &19506560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156236280
+  version_requirements: *19506560
 - !ruby/object:Gem::Dependency
-  name: growl
-  requirement: &2156220420 !ruby/object:Gem::Requirement
+  name: test-unit
+  requirement: &19505960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156220420
+  version_requirements: *19505960
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &2156216740 !ruby/object:Gem::Requirement
+  requirement: &19505320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156216740
+  version_requirements: *19505320
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
-  requirement: &2156214480 !ruby/object:Gem::Requirement
+  requirement: &19504640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156214480
+  version_requirements: *19504640
 description: Использование инфоблоков 1С-Битрикс в Ruby On Rails проектах
 email: danil@orionet.ru
 executables: []
@@ -175,15 +174,20 @@ files:
 - 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
 - lib/bitrix_on_rails/engine.rb
+- 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
 - test/dump.sql
+- test/factories.rb
 - test/get_dump.sh
 - test/helper.rb
 - test/schema.rb
+- test/test_active_record.rb
 - test/test_bitrix_on_rails.rb
-has_rdoc: true
+- test/test_iblock_element.rb
+- test/test_iblock_element_prop_s.rb
 homepage: http://github.com/dapi/bitrix_on_rails
 licenses:
 - MIT
@@ -199,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4502115155340295236
+      hash: 3075423241846664278
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Работа с инфоблоками 1С-Битрикс