welltreat-store-framework 0.2.0 → 0.2.2

data/lib/welltreat_store_framework/core.rb

@@ -42,6 +42,13 @@ module WelltreatStoreFramework
         end
       end
 
+      # Return connection to poll
+      def disconnect_database!
+        if ActiveRecord::Base.connection.present?
+          ActiveRecord::Base.connection.close
+        end
+      end
+
       private
       def _detect_stores(partition_object = nil)
         _stores = { }

data/lib/welltreat_store_framework/haml_renderer.rb

@@ -37,7 +37,7 @@ module WelltreatStoreFramework
       raise StoreApp::TemplateNotFound.new(_file) if _file.nil? || !File.exist?(_file)
 
       if WelltreatStoreFramework::Core.configuration.auto_reload
-        Haml::Engine.new(File.read(_file), filename: _file)
+        Haml::Engine.new(File.read(_file), filename: _file, encoding: 'UTF-8')
       else
         _haml_engines[_key] ||=
             Haml::Engine.new(File.read(_file), filename: _file)

data/lib/welltreat_store_framework/rack_server.rb

@@ -17,11 +17,16 @@ module WelltreatStoreFramework
 
     def call(env)
       _store = _find_store(env)
+      WelltreatStoreFramework::Core.connect_database!
+
       if _store
         _store.call(env)
       else
         raise "Store - #{self.store_name} for partition - #{self.partition_id} not found."
       end
+
+    ensure
+      WelltreatStoreFramework::Core.disconnect_database!
     end
 
     private
@@ -46,11 +51,7 @@ module WelltreatStoreFramework
 
       return store if store.nil?
 
-      store.tap do |_s|
-        _s.start
-        WelltreatStoreFramework::Core.connect_database!
-      end
-
+      store.tap { |_s| _s.start }
     end
   end
 end

data/sample/hello-store/controllers/home.rb

@@ -1,14 +1,14 @@
 class Home
   include WelltreatStoreFramework::Controller
 
-  def index(request, response)
+  def index(request, response, options = {})
     response.set :title, "Hello World"
     response.set :name, "Hasan"
 
     response.set :products, app.models::Product.all
   end
 
-  def not_found(request, response)
+  def not_found(request, response, options = {})
     response.content = "<h1>Page Not found</h1>"
     response.status = 404
   end

data/sample/hello-store/controllers/products.rb

@@ -3,11 +3,11 @@ class Products
 
   class ProductNotFound < StandardError; end
 
-  def index(request, response)
+  def index(request, response, options = {})
     response.set :products, [{name: 'Product 1'}, {name: 'Product 2'}]
   end
 
-  def show(request, response)
+  def show(request, response, options = {})
     if request[:id].present?
       response.set :product, app.models::Product.find(request[:id])
       response.set :title, response.get(:product).name

data/spec/lib/welltreat_store_framework/haml_renderer/context_spec.rb

@@ -15,7 +15,8 @@ describe WelltreatStoreFramework::HamlRenderer::Context do
   let(:app) { WelltreatStoreFramework::Core.find_store_by_name('hello-store') }
   let(:request) { WelltreatStoreFramework::Controller::Request.new }
   let(:response) { WelltreatStoreFramework::Controller::Response.new }
-  let(:context) { WelltreatStoreFramework::HamlRenderer::Context.new(app, request, response) }
+  let(:session) { mock(:session) }
+  let(:context) { WelltreatStoreFramework::HamlRenderer::Context.new(app, request, response, {session: session}) }
 
   describe '#image_tag' do
     it 'should render img tag' do

data/spec/lib/welltreat_store_framework/store_app_spec.rb

@@ -17,15 +17,16 @@ describe WelltreatStoreFramework::StoreApp do
   describe '#dispatch' do
     let(:request) { WelltreatStoreFramework::Controller::Request.new }
     let(:response) { WelltreatStoreFramework::Controller::Response.new }
+    let(:session) { mock(:session) }
 
     it 'should not throw any exception' do
       lambda {
-        app.dispatch('/', request, response)
+        app.dispatch('/', request, response, {session: session})
       }.should_not raise_error
     end
 
     describe 'response object' do
-      before { app.dispatch('/', request, response) }
+      before { app.dispatch('/', request, response, {session: session}) }
       subject { response }
 
       its(:template) { should == :index }
@@ -36,8 +37,8 @@ describe WelltreatStoreFramework::StoreApp do
     end
 
     describe 'rendered content' do
-      before { app.dispatch('/', request, response) }
-      before { app.render!(request, response) }
+      before { app.dispatch('/', request, response, {session: session}) }
+      before { app.render!(request, response, {session: session}) }
       subject { response }
 
       its(:content) { should match 'Hasan' }
@@ -45,8 +46,8 @@ describe WelltreatStoreFramework::StoreApp do
     end
 
     describe 'product controller' do
-      before { app.dispatch('/products', request, response) }
-      before { app.render!(request, response) }
+      before { app.dispatch('/products', request, response, {session: session}) }
+      before { app.render!(request, response, {session: session}) }
       subject { response }
 
       its(:template) { should == :index }
@@ -59,14 +60,14 @@ describe WelltreatStoreFramework::StoreApp do
     context 'auto reload enabled' do
       it 'should have same base module name' do
         _old_app_mod = app.send(:_base_module).name
-        app.dispatch('/', request, response)
+        app.dispatch('/', request, response, {session: session})
 
         app.send(:_base_module).name.should eql _old_app_mod
       end
 
       it 'should have different base object_id' do
         _old_app_mod_id = app.send(:_base_module).object_id
-        app.dispatch('/', request, response)
+        app.dispatch('/', request, response, {session: session})
 
         app.send(:_base_module).object_id.should_not eql _old_app_mod_id
       end
@@ -74,8 +75,8 @@ describe WelltreatStoreFramework::StoreApp do
     end
 
     context 'not found url' do
-      before { app.dispatch('/Something does not exists', request, response) }
-      before { app.render!(request, response) }
+      before { app.dispatch('/Something does not exists', request, response, {session: session}) }
+      before { app.render!(request, response, {session: session}) }
       subject { response }
 
       its(:content) { should match /not\s*found/i }

data/spec/sample/controllers/products_spec.rb

@@ -12,6 +12,7 @@ describe 'SampleApp::HelloStore' do
 
   let(:request) { WelltreatStoreFramework::Controller::Request.new }
   let(:response) { WelltreatStoreFramework::Controller::Response.new }
+  let(:session) { mock(:session) }
 
   before(:each) do
     request  = WelltreatStoreFramework::Controller::Request.new
@@ -26,7 +27,7 @@ describe 'SampleApp::HelloStore' do
     describe '/' do
       it 'should render without error' do
         lambda {
-          app.dispatch('/', request, response)
+          app.dispatch('/', request, response, {session: session})
         }.should_not raise_error
       end
 
@@ -45,7 +46,7 @@ describe 'SampleApp::HelloStore' do
           }
         }
 
-        before { app.dispatch('/', request, response) }
+        before { app.dispatch('/', request, response, {session: session}) }
         subject { response }
 
         its([:products]) { should be }
@@ -53,7 +54,7 @@ describe 'SampleApp::HelloStore' do
         its([:products]) { subject.map(&:_id).should == products.map(&:_id) }
 
         describe 'rendered content' do
-          before { app.render!(request, response) }
+          before { app.render!(request, response, {session: session}) }
           subject { response.content }
 
           it 'should have rendered products' do
@@ -89,24 +90,24 @@ describe 'SampleApp::HelloStore' do
       context 'when valid product id' do
         it 'should render without any problem' do
           lambda {
-            app.dispatch("/products/show/#{products.first._id}", request, response)
+            app.dispatch("/products/show/#{products.first._id}", request, response, {session: session})
           }.should_not raise_error
         end
 
         describe 'before rendered' do
-          before { app.dispatch("/products/show/#{products.first._id}", request, response) }
+          before { app.dispatch("/products/show/#{products.first._id}", request, response, {session: session}) }
           subject { response }
 
           its([:product]) { should be }
 
           it 'should render without any error' do
             lambda {
-              app.render!(request, response)
+              app.render!(request, response, {session: session})
             }.should_not raise_error
           end
 
           describe 'after rendered' do
-            before { app.render!(request, response) }
+            before { app.render!(request, response, {session: session}) }
             subject { response.content }
 
             it { should match products.first.name }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welltreat-store-framework
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157029520 !ruby/object:Gem::Requirement
+  requirement: &2161426880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157029520
+  version_requirements: *2161426880
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157028760 !ruby/object:Gem::Requirement
+  requirement: &2161426340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157028760
+  version_requirements: *2161426340
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2157028200 !ruby/object:Gem::Requirement
+  requirement: &2161425620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157028200
+  version_requirements: *2161425620
 - !ruby/object:Gem::Dependency
   name: flexi_model
-  requirement: &2157027720 !ruby/object:Gem::Requirement
+  requirement: &2161423420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157027720
+  version_requirements: *2161423420
 description: WellTreat Store Framework
 email:
 - hasan83bd@gmail.com