tablets 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68012b3107a6032fcedefead6cebe9842a432400
-  data.tar.gz: 282ee6b15713cffb360deccf1080f35e0fe4bad7
+  metadata.gz: 8913447e8e90a68f62572e09b15021e29735d1d8
+  data.tar.gz: c89c42ec3ac921e0e35390f57b493977992bfec0
 SHA512:
-  metadata.gz: aa226722b0c938c3167197b9636eeaa94562859a044cc008be3af059326e19203639a18206e85ce2ab6b8e38fcb9e689a626215222993781661825a756d6a799
-  data.tar.gz: d8df45c567abda884a7c319c0b64cc7ecd4e75e89ae2676f8e3fb4a59f6cfc77a2c738e579261fa064c98910613c4339401665df9cb3200d6371061ce44d4ecb
+  metadata.gz: eb8b28dfa772a35282cfae6e82858146db98fa9a55f9c74214a2dbdd504191303f6f75239b18364426d093701765b65c8cec9eae79d8ea942d56f7399fb3445e
+  data.tar.gz: bb2bb9bc0b285e077061a176416e6981d4bbbefd007efe14898dcc613746104129fd51cf89f491327e2948cb5d8cddf303cfcfa2f05080ddd00490eb58663093

data/app/assets/javascripts/tablets/tablet.js.coffee

@@ -1,11 +1,13 @@
 class Tablets.Tablet
   constructor: (@element, @options, @params) ->
     @initVars()
-    @initTable()
     @initHandlers()
 
     Tablets.set(@id, this)
 
+    $ =>
+      @initTable()
+
   dataTableOptions: ->
     $.extend {}, @options,
       fnServerParams: (data) =>
@@ -37,7 +39,6 @@ class Tablets.Tablet
     @element.on 'xhr.dt', (_event, _table, data) =>
       @trigger('afterResponse', data)
 
-
   reload: ->
     @element.dataTable().fnDraw(false)
 

data/lib/tablets/data/processing/base.rb

@@ -14,6 +14,11 @@ module Tablets
           fail NotImplementedError, '#apply need to be overrided by processing.'
         end
 
+        # Shorthand for create processing and apply it.
+        def self.apply(params, columns, relation)
+          new(params, columns).apply(relation)
+        end
+
         private
 
         attr_reader :params, :columns

data/lib/tablets/data/processing/filter.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object'
+
 require 'tablets/utils/arel'
 
 require 'tablets/data/processing/base'

data/lib/tablets/data/query.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object'
+
 require 'tablets/data/processing/filter'
 require 'tablets/data/processing/paginate'
 require 'tablets/data/processing/order'
@@ -15,11 +17,7 @@ module Tablets
 
       # Applies all processings on relation and returns it.
       def fetch
-        result = relation
-        result = order(result)
-        result = filter(result)
-        result = paginate(result)
-        result
+        paginate filter order relation
       end
 
       # Returns total records count before filter and pagination is applied.
@@ -40,21 +38,21 @@ module Tablets
       def order(records)
         return records unless params[:order].present?
 
-        Tablets::Data::Processing::Order.new(params, columns).apply(records)
+        Tablets::Data::Processing::Order.apply(params, columns, records)
       end
 
       # Applies filter processing.
       def filter(records)
         return records unless params[:search].present?
 
-        Tablets::Data::Processing::Filter.new(params, columns).apply(records)
+        Tablets::Data::Processing::Filter.apply(params, columns, records)
       end
 
       # Applies paginate processing.
       def paginate(records)
-        return records if params.try(:[], :length) == '-1'
+        return records if params[:length] == '-1'
 
-        Tablets::Data::Processing::Paginate.new(params, columns).apply(records)
+        Tablets::Data::Processing::Paginate.apply(params, columns, records)
       end
     end
   end

data/lib/tablets/data.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object'
+
 require 'tablets/data/query'
 
 module Tablets
@@ -26,11 +28,16 @@ module Tablets
 
     # Initializes query with concretized relation.
     def query
-      @query ||= Tablets::Data::Query.new(tablet.relation(params[:params]),
+      @query ||= Tablets::Data::Query.new(tablet.relation(relation_params),
                                           params,
                                           tablet.columns)
     end
 
+    # Relation params. Empty hash by default.
+    def relation_params
+      params[:params] || {}
+    end
+
     # Fetching records and applies process tablet callback on it.
     def records
       @records ||= tablet.process(query.fetch)

data/lib/tablets/renderer.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object'
+
 require 'tablets/engine'
 
 module Tablets

data/lib/tablets/utils/config.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object'
+
 module Tablets
   module Utils
     # Config utility. Allows to write configs in declarative form.

data/lib/tablets/version.rb

@@ -1,3 +1,3 @@
 module Tablets
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/lib/tablets/data/processing/base_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 require 'tablets/data/processing/base'
 
 RSpec.describe Tablets::Data::Processing::Base do
-  subject { Tablets::Data::Processing::Base.new(params, columns) }
+  subject { described_class.new(params, columns) }
 
-  let(:relation) { 'relation' }
-  let(:params) { 'params' }
-  let(:columns) { 'columns' }
+  let(:relation) { :relation }
+  let(:params) { :params }
+  let(:columns) { :columns }
 
   describe '#apply' do
     it 'raises not implemented error' do
@@ -16,4 +16,12 @@ RSpec.describe Tablets::Data::Processing::Base do
       end.to raise_error(NotImplementedError)
     end
   end
+
+  describe '.apply' do
+    it 'raises not implemented error' do
+      expect do
+        described_class.apply(params, columns, relation)
+      end.to raise_error(NotImplementedError)
+    end
+  end
 end

data/spec/lib/tablets/data/processing/filter_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+require 'tablets/data/processing/filter'
+
+RSpec.describe Tablets::Data::Processing::Filter do
+  subject { described_class.new(params, columns) }
+
+  let(:columns) { :columns }
+end

data/spec/lib/tablets/data/processing/order_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+require 'tablets/data/processing/order'
+
+RSpec.describe Tablets::Data::Processing::Order do
+  subject { described_class.new(params, columns) }
+
+  let(:columns) { :columns }
+end

data/spec/lib/tablets/data/processing/paginate_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 require 'tablets/data/processing/paginate'
 
 RSpec.describe Tablets::Data::Processing::Paginate do
-  subject { Tablets::Data::Processing::Paginate.new(params, columns) }
+  subject { described_class.new(params, columns) }
 
   let(:relation) { double }
   let(:params) { { start: start, length: length } }
-  let(:columns) { 'columns' }
+  let(:columns) { :columns }
 
   describe '#apply' do
     before do

data/spec/lib/tablets/data/query_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+require 'tablets/data/query'
+
+RSpec.describe Tablets::Data::Query do
+  subject { described_class.new(relation, params, columns) }
+
+  let(:relation) { 'relation' }
+  let(:params) { {} }
+  let(:columns) { :columns }
+
+  before do
+    allow(Tablets::Data::Processing::Order).to receive(:apply)
+      .with(params, columns, relation).and_return(relation)
+    allow(Tablets::Data::Processing::Filter).to receive(:apply)
+      .with(params, columns, relation).and_return(relation)
+    allow(Tablets::Data::Processing::Paginate).to receive(:apply)
+      .with(params, columns, relation).and_return(relation)
+  end
+
+  describe '#fetch' do
+    let!(:result) { subject.fetch }
+
+    let(:params) { { order: :order, search: :search } }
+
+    it 'returns relation' do
+      expect(result).to eq(relation)
+    end
+
+    it 'applies order' do
+      expect(Tablets::Data::Processing::Order).to have_received(:apply)
+        .with(params, columns, relation)
+    end
+
+    it 'applies filter' do
+      expect(Tablets::Data::Processing::Filter).to have_received(:apply)
+        .with(params, columns, relation)
+    end
+
+    it 'applies paginate' do
+      expect(Tablets::Data::Processing::Paginate).to have_received(:apply)
+        .with(params, columns, relation)
+    end
+
+    context 'without order' do
+      let(:params) { { search: :search } }
+
+      it 'not applies order' do
+        expect(Tablets::Data::Processing::Order).to_not have_received(:apply)
+      end
+    end
+
+    context 'without search' do
+      let(:params) { { order: :order } }
+
+      it 'not applies order' do
+        expect(Tablets::Data::Processing::Filter).to_not have_received(:apply)
+      end
+    end
+
+    context 'with negative length' do
+      let(:params) { { length: '-1' } }
+
+      it 'not applies order' do
+        expect(Tablets::Data::Processing::Paginate).to_not have_received(:apply)
+      end
+    end
+  end
+
+  describe '#total' do
+    let(:total) { :total }
+
+    before do
+      allow(relation).to receive(:count).with(:all).and_return(total)
+    end
+
+    let!(:result) { subject.total }
+
+    it 'returns total' do
+      expect(result).to eq(total)
+    end
+  end
+
+  describe '#filtered' do
+    let(:params) { { search: :search } }
+
+    let(:total) { :total }
+
+    before do
+      allow(relation).to receive(:count).with(:all).and_return(total)
+    end
+
+    let!(:result) { subject.filtered }
+
+    it 'applies filter' do
+      expect(Tablets::Data::Processing::Filter).to have_received(:apply)
+        .with(params, columns, relation)
+    end
+
+    context 'without search' do
+      let(:params) { {} }
+
+      it 'not applies order' do
+        expect(Tablets::Data::Processing::Filter).to_not have_received(:apply)
+      end
+    end
+
+    it 'returns total' do
+      expect(result).to eq(total)
+    end
+  end
+end

data/spec/lib/tablets/data_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+require 'tablets/data'
+
+RSpec.describe Tablets::Data do
+  subject { described_class.new(tablet, params) }
+end

data/spec/lib/tablets/global/configurator_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+require 'tablets/global/configurator'
+
+RSpec.describe Tablets::Global::Configurator do
+  subject { Object.new.tap { |object| object.extend(described_class) } }
+
+  describe '#setup' do
+    it 'yields self' do
+      expect do |expect_block|
+        subject.setup(&expect_block)
+      end.to yield_with_args(subject)
+    end
+  end
+end

data/spec/lib/tablets/global/loader_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+require 'tablets'
+
+require 'tablets/global/loader'
+
+RSpec.describe Tablets::Global::Loader do
+  subject { Object.new.tap { |object| object.extend(described_class) } }
+
+  def self.set_tablets
+    before do
+      subject.instance_variable_set(:@tablets, yield)
+    end
+  end
+
+  def tablets
+    subject.instance_variable_get(:@tablets)
+  end
+
+  describe '#unload!' do
+    set_tablets { {} }
+
+    before { subject.unload! }
+
+    it 'sets tablets to nil' do
+      expect(tablets).to be_nil
+    end
+  end
+
+  describe '#loaded?' do
+    context 'if tablets is not nil' do
+      set_tablets { {} }
+
+      it 'returns true' do
+        expect(subject.loaded?).to eq(true)
+      end
+    end
+
+    context 'if tablets is nil' do
+      it 'returns false' do
+        expect(subject.loaded?).to eq(false)
+      end
+    end
+  end
+
+  describe '#load!' do
+    let(:files) { %w(file1 file2) }
+    let(:tablets_dir) { 'dir' }
+
+    before do
+      allow(Tablets).to receive(:tablets_dir).and_return(tablets_dir)
+      allow(Dir).to receive(:[]).and_return(files)
+    end
+
+    before do
+      allow(subject).to receive(:load)
+    end
+
+    before { subject.load! }
+
+    it 'sets tablets to empty hash' do
+      expect(tablets).to eq({})
+    end
+
+    it 'loads each file' do
+      files.each do |file|
+        expect(subject).to have_received(:load).with(file)
+      end
+    end
+  end
+end

data/spec/lib/tablets/global/store_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'tablets/global/store'
 
 RSpec.describe Tablets::Global::Store do
-  subject { Object.new.tap { |object| object.extend(Tablets::Global::Store) } }
+  subject { Object.new.tap { |object| object.extend(described_class) } }
 
   describe '#register' do
     let(:name) { :posts }

data/spec/lib/tablets/renderer_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 require 'tablets'
+
 require 'tablets/renderer'
 
 RSpec.describe Tablets::Renderer do
-  subject { Tablets::Renderer.new(tablet, params) }
+  subject { described_class.new(tablet, params) }
 
   describe '#render' do
     let(:tablet) { double }

data/spec/lib/tablets/utils/config_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'tablets/utils/config'
 
 RSpec.describe Tablets::Utils::Config do
-  subject { Tablets::Utils::Config.new(&block) }
+  subject { described_class.new(&block) }
 
   def hash
     subject.instance_eval { @hash }
@@ -38,6 +38,24 @@ RSpec.describe Tablets::Utils::Config do
     end
   end
 
+  describe '#has?' do
+    context 'if value exists' do
+      let(:block) { proc { var('val') } }
+
+      it 'returns true' do
+        expect(subject.has?(:var)).to eq(true)
+      end
+    end
+
+    context 'if value not exists' do
+      let(:block) { nil }
+
+      it 'returns false' do
+        expect(subject.has?(:var)).to eq(false)
+      end
+    end
+  end
+
   describe '#get' do
     context 'if value exists' do
       let(:block) { proc { var('val') } }

data/spec/lib/tablets/view_helpers_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 require 'tablets'
+
 require 'tablets/view_helpers'
 
 RSpec.describe Tablets::ViewHelpers do
-  subject { Object.new.tap { |object| object.extend(Tablets::ViewHelpers) } }
+  subject { Object.new.tap { |object| object.extend(described_class) } }
 
   describe '#render_tablet' do
     let(:name) { :name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablets
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Yevhen Shemet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -131,7 +131,13 @@ files:
 - lib/tablets/version.rb
 - lib/tablets/view_helpers.rb
 - spec/lib/tablets/data/processing/base_spec.rb
+- spec/lib/tablets/data/processing/filter_spec.rb
+- spec/lib/tablets/data/processing/order_spec.rb
 - spec/lib/tablets/data/processing/paginate_spec.rb
+- spec/lib/tablets/data/query_spec.rb
+- spec/lib/tablets/data_spec.rb
+- spec/lib/tablets/global/configurator_spec.rb
+- spec/lib/tablets/global/loader_spec.rb
 - spec/lib/tablets/global/store_spec.rb
 - spec/lib/tablets/renderer_spec.rb
 - spec/lib/tablets/utils/config_spec.rb
@@ -157,15 +163,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Wrapper around jquery-datatables.
 test_files:
+- spec/lib/tablets/data_spec.rb
 - spec/lib/tablets/utils/config_spec.rb
 - spec/lib/tablets/view_helpers_spec.rb
 - spec/lib/tablets/renderer_spec.rb
 - spec/lib/tablets/data/processing/base_spec.rb
+- spec/lib/tablets/data/processing/order_spec.rb
+- spec/lib/tablets/data/processing/filter_spec.rb
 - spec/lib/tablets/data/processing/paginate_spec.rb
+- spec/lib/tablets/data/query_spec.rb
+- spec/lib/tablets/global/loader_spec.rb
 - spec/lib/tablets/global/store_spec.rb
+- spec/lib/tablets/global/configurator_spec.rb
 - spec/spec_helper.rb