Merge remote-tracking branch 'origin/develop' into develop

Author: avstudnitz

src/app/code/community/IntegerNet/Solr/Helper/Factory.php

@@ -87,24 +87,8 @@ public function getProductIndexer()
     public function getSolrRequest($requestMode = self::REQUEST_MODE_AUTODETECT)
     {
         $storeId = Mage::app()->getStore()->getId();
-        $config = new IntegerNet_Solr_Model_Config_Store($storeId);
-        if ($config->getGeneralConfig()->isLog()) {
-            $logger = $this->_getLogger();
-            if ($logger instanceof IntegerNet_Solr_Helper_Log) {
-                $logger->setFile('solr.log');
-            }
-        } else {
-            $logger = new NullLogger;
-        }
-
         $isCategoryPage = Mage::helper('integernet_solr')->page()->isCategoryPage();
-        $applicationContext = new ApplicationContext(
-            $this->_getAttributeRepository(),
-            $config->getResultsConfig(),
-            $config->getAutosuggestConfig(),
-            $this->_getEventDispatcher(),
-            $logger
-        );
+        $applicationContext = $this->getApplicationContext();
         if (Mage::app()->getLayout() && $block = Mage::app()->getLayout()->getBlock('product_list_toolbar')) {
             $pagination = $this->_bridgeFactory->createPaginationToolbar($block);
             $applicationContext->setPagination($pagination);
@@ -131,7 +115,7 @@ public function getSolrRequest($requestMode = self::REQUEST_MODE_AUTODETECT)
                     break;
                 default:
                     $applicationContext
-                        ->setFuzzyConfig($config->getFuzzySearchConfig())
+                        ->setFuzzyConfig($this->getCurrentStoreConfig()->getFuzzySearchConfig())
                         ->setQuery($this->_getSearchTermSynonymHelper());
                     $factory = new SearchRequestFactory(
                         $applicationContext,
@@ -197,6 +181,31 @@ protected function _getIndexCategoryRepository()
         return $this->_bridgeFactory->getIndexCategoryRepository();
     }
 
+    /**
+     * @return ApplicationContext
+     */
+    public function getApplicationContext()
+    {
+        $config = $this->getCurrentStoreConfig();
+        if ($config->getGeneralConfig()->isLog()) {
+            $logger = $this->_getLogger();
+            if ($logger instanceof IntegerNet_Solr_Helper_Log) {
+                $logger->setFile('solr.log');
+            }
+        } else {
+            $logger = new NullLogger;
+        }
+
+        $applicationContext = new ApplicationContext(
+            $this->_getAttributeRepository(),
+            $config->getResultsConfig(),
+            $config->getAutosuggestConfig(),
+            $this->_getEventDispatcher(),
+            $logger
+        );
+        return $applicationContext;
+    }
+
     /**
      * @return IntegerNet_Solr_Model_Bridge_CategoryRepository
      */

src/app/code/community/IntegerNet/Solr/Model/Bridge/Category.php

@@ -107,7 +107,7 @@ public function getPathExcludingCurrentCategory($separator)
         array_shift($pathIds);
         array_pop($pathIds);
         foreach($pathIds as $pathId) {
-            $pathParts[] = $this->_category->getResource()->getAttributeRawValue($pathId, 'name', $this->getStoreId());
+            $pathParts[] = Mage::getResourceModel('catalog/category')->getAttributeRawValue($pathId, 'name', $this->getStoreId());
         }
         return implode($separator, $pathParts);
     }

src/app/code/community/IntegerNet/Solr/Model/Bridge/StoreEmulation.php

@@ -58,6 +58,7 @@ public function stop()
 
         if ($this->_isEmulated && $this->_initialEnvironmentInfo) {
             Mage::getSingleton('core/app_emulation')->stopEnvironmentEmulation($this->_initialEnvironmentInfo);
+            $this->_isEmulated = false;
         }
     }
 

src/app/code/community/IntegerNet/Solr/Model/Resource/Catalog/Product/Indexing/Collection.php

@@ -9,6 +9,11 @@
  */
 class IntegerNet_Solr_Model_Resource_Catalog_Product_Indexing_Collection extends Mage_Catalog_Model_Resource_Product_Collection
 {
+    public function isEnabledFlat()
+    {
+        return false;
+    }
+
     /**
      * Join Product Price Table
      * Join left by default in order to include products without price index entry

src/app/code/community/IntegerNet/Solr/Model/Resource/Db.php

@@ -19,10 +19,24 @@ public function disconnectMysql()
         /** @var Zend_Db_Adapter_Abstract $connection */
         foreach (Mage::getSingleton('core/resource')->getConnections() as $name => $connection) {
             if ($connection instanceof Zend_Db_Adapter_Abstract) {
+                if ($this->isTransactionOpen($connection)) {
+                    continue;
+                }
                 $connection->closeConnection();
             }
         }
         // connections (adapter objects) must be fully reinitialized, otherwise initStatements are not executed
         Mage::unregister('_singleton/core/resource');
     }
+
+    /**
+     * Returns true if the given connection has open transactions
+     *
+     * @param Zend_Db_Adapter_Abstract $connection
+     * @return bool
+     */
+    private function isTransactionOpen(Zend_Db_Adapter_Abstract $connection)
+    {
+        return $connection instanceof Magento_Db_Adapter_Pdo_Mysql && $connection->isTransaction();
+    }
 }

src/app/code/community/IntegerNet/Solr/Test/Controller/Abstract.php

@@ -12,7 +12,7 @@ abstract class IntegerNet_Solr_Test_Controller_Abstract extends EcomDev_PHPUnit_
 {
     public static function setUpBeforeClass()
     {
-        Mage::register('isSecureArea', true);
+        Mage::register('isSecureArea', true, true);
     }
     public static function tearDownAfterClass()
     {

src/app/code/community/IntegerNet/Solr/Test/Model/Indexer/Product.php

@@ -14,7 +14,7 @@
  * @loadFixture registry
  * @loadFixture config
  */
-class IntegerNet_Solr_Test_Model_Indexer_Product extends EcomDev_PHPUnit_Test_Case_Controller
+class IntegerNet_Solr_Test_Model_Indexer_Product extends IntegerNet_Solr_Test_Controller_Abstract
 {
     /**
      * @param array $config
@@ -35,4 +35,48 @@ public function invalidSwapConfigurationShouldThrowException(array $config)
         Mage::helper('integernet_solr')->factory()->getProductIndexer()->reindex();
     }
 
+    /**
+     * @test
+     * @loadFixture catalog
+     */
+    public function saveProductShouldUpdateSolrIndex()
+    {
+        $this->setUpFreshIndex();
+
+        $this->assertCount(0, $this->searchInStore(1, 'SUPERDUPER')->documents());
+        $productId = 21001;
+        $this->setCurrentStore(0);
+        $product = Mage::getModel('catalog/product')->load($productId);
+        $product->setData('name', 'SUPERDUPER');
+        $product->save();
+        $searchResponse = $this->searchInStore(1, 'SUPERDUPER');
+        $this->assertCount(1, $searchResponse->documents());
+    }
+
+    /**
+     * @param $queryText
+     * @return \IntegerNet\Solr\Resource\SolrResponse
+     */
+    public function searchInStore($storeId, $queryText)
+    {
+        $queryStub = $this->getMockBuilder(\IntegerNet\Solr\Implementor\HasUserQuery::class)
+            ->getMockForAbstractClass();
+        $queryStub->method('getUserQueryText')->willReturn($queryText);
+        $factory = Mage::helper('integernet_solr/factory');
+        $applicationContext = $factory->getApplicationContext();
+        $applicationContext->setFuzzyConfig($factory->getCurrentStoreConfig()->getFuzzySearchConfig());
+        $applicationContext->setQuery($queryStub);
+        $applicationContext->setPagination(new \IntegerNet\Solr\Request\SinglePage(2));
+        $searchRequestFactory = new \IntegerNet\Solr\Request\SearchRequestFactory(
+            $applicationContext,
+            $factory->getSolrResource(),
+            $storeId
+        );
+        return $searchRequestFactory->createRequest()->doRequest();
+    }
+
+    private function setUpFreshIndex()
+    {
+        Mage::getModel('integernet_solr/indexer')->reindexAll();
+    }
 }

src/app/code/community/IntegerNet/Solr/Test/fixtures/registry.yaml

@@ -7,6 +7,9 @@ registry:
     - integernet_solr/factory
     - integernet_solr/log
   singleton:
+    - eav/config
+    - core/app_emulation
+    - core/factory
     - catalog/layer
     - core/session
     - customer/session

src/app/design/frontend/base/default/layout/integernet/solr.xml

@@ -10,12 +10,6 @@
     </default>
 
     <catalogsearch_result_index>
-        <reference name="head">
-            <action method="addItem" ifconfig="integernet_solr/general/is_active">
-                <type>skin_js</type>
-                <name>integernet/solr/js/result.js</name>
-            </action>
-        </reference>
         <reference name="head">
             <action method="addItem" ifconfig="integernet_solr/general/is_active">
                 <type>skin_js</type>