tableling-rails 0.0.17 → 0.0.18

data/lib/tableling-rails/field.rb

@@ -69,8 +69,8 @@ module Tableling
     end
 
     def serialize value
-      serializer = @view.settings.serializers.find{ |s| s.match? value }
-      serializer ? serializer.serialize(value) : value
+      type_serializer = @view.settings.type_serializers.find{ |s| s.match? value }
+      type_serializer ? type_serializer.serialize(value) : value
     end
   end
 end

data/lib/tableling-rails/settings.rb

@@ -5,26 +5,26 @@ module Tableling
 
     def initialize parent = nil
       @parent = parent
-      @serializers = []
+      @type_serializers = []
     end
 
     def configure &block
       instance_eval &block if block
     end
 
-    def serialize type, &block
-      @serializers << Serializer.new(type, block)
+    def serialize_type type, &block
+      @type_serializers << TypeSerializer.new(type, block)
     end
 
-    def serializers
-      (@parent ? @parent.serializers : []) + @serializers.dup
+    def type_serializers
+      (@parent ? @parent.type_serializers : []) + @type_serializers
     end
 
     def dsl
       m = Module.new do
 
-        def serialize type, &block
-          @settings.serialize type, &block
+        def serialize_type type, &block
+          @settings.serialize_type type, &block
         end
       end
       m.instance_variable_set :@settings, self

data/lib/tableling-rails/{serializer.rb → type_serializer.rb}

@@ -1,7 +1,7 @@
 
 module Tableling
 
-  class Serializer
+  class TypeSerializer
 
     def initialize type, block
       @type, @block = type, block

data/lib/tableling-rails/version.rb

@@ -1,3 +1,3 @@
 module Tableling
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

data/lib/tableling-rails/view.rb

@@ -2,7 +2,8 @@
 module Tableling
 
   class View
-    attr_reader :name, :config, :settings, :base_query, :base_count_query
+    attr_reader :name, :config, :settings, :fields
+    attr_accessor :base_query, :base_count_query, :quick_search_block, :serialize_record_block, :serialize_response_block
 
     def initialize name, config, options = {}, &block
 
@@ -13,28 +14,16 @@ module Tableling
       @base_count_query = nil
 
       @settings = Settings.new @config.settings
-      extend @settings.dsl
 
-      instance_eval &block if block
-      @frozen = true
-    end
-
-    def field name, options = {}, &block
-      return @fields.find{ |f| f.name.to_s == name.to_s } if @frozen
-      @fields.delete_if{ |f| f.name.to_s == name.to_s }
-      Field.new(name, self, options, &block).tap{ |f| @fields << f }
-    end
-
-    def quick_search &block
-      @quick_search = block
-    end
-
-    def base base_query
-      @base_query = base_query
+      if block
+        dsl = DSL.new self
+        dsl.extend @settings.dsl
+        dsl.instance_eval &block
+      end
     end
 
-    def base_count base_count_query
-      @base_count_query = base_count_query
+    def field name
+      @fields.find{ |f| f.name.to_s == name.to_s }
     end
 
     def process options = {}
@@ -42,9 +31,9 @@ module Tableling
       q = options[:base] || @base_query
       cq = options[:base_count] || @base_count_query
 
-      if @quick_search and options[:quickSearch].present?
-        q = @quick_search.call q, options[:quickSearch].to_s
-        cq = @quick_search.call cq, options[:quickSearch].to_s if cq
+      if @quick_search_block and options[:quickSearch].present?
+        q = @quick_search_block.call q, options[:quickSearch].to_s
+        cq = @quick_search_block.call cq, options[:quickSearch].to_s if cq
       end
 
       total = (cq || q).count
@@ -68,12 +57,52 @@ module Tableling
       offset = 0 if offset < 0
       q = q.offset offset * limit
 
-      {
-        :total => total,
-        :data => q.all.collect{ |o|
-          @fields.inject({}){ |memo,f| memo[f.name] = f.extract(o); memo }
-        }
+      serialize_response total, q
+    end
+
+    class DSL
+
+      def initialize view
+        @view = view
+      end
+
+      def field name, options = {}, &block
+        @view.fields.delete_if{ |f| f.name.to_s == name.to_s }
+        Field.new(name, @view, options, &block).tap{ |f| @view.fields << f }
+      end
+
+      %w(base base_count).each do |m|
+        define_method m do |q|
+          @view.send "#{m}_query=", q
+        end
+      end
+
+      %w(quick_search serialize_record serialize_response).each do |m|
+        define_method m do |&block|
+          @view.send "#{m}_block=", block
+        end
+      end
+    end
+
+    private
+
+    def serialize_response total, query
+
+      res = {
+        total: total,
+        data: query.all
       }
+
+      if @serialize_response_block
+        @serialize_response_block.call res
+      else
+        res[:data] = res[:data].collect{ |r| serialize_record r }
+        res
+      end
+    end
+
+    def serialize_record record
+      @serialize_record_block ? @serialize_record_block.call(record) : @fields.inject({}){ |memo,f| memo[f.name] = f.extract(record); memo }
     end
   end
 end

data/spec/dummy/app/models/book.rb

@@ -1,13 +1,17 @@
 class Book < ActiveRecord::Base
+  include Tableling::Model
 
   tableling do
 
-    field :title
-    field :author
+    default_view do
 
-    quick_search do |query,term|
-      term = "%#{term.downcase}%"
-      query.where('LOWER(books.title) LIKE ? OR LOWER(books.author) LIKE ?', term, term)
+      field :title
+      field :author
+
+      quick_search do |query,term|
+        term = "%#{term.downcase}%"
+        query.where('LOWER(books.title) LIKE ? OR LOWER(books.author) LIKE ?', term, term)
+      end
     end
   end
 end

data/spec/dummy/log/development.log

@@ -1,59 +1,52 @@
 Connecting to database specified by database.yml
-   (0.2ms)  select sqlite_version(*)
-   (3.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (0.0ms)  PRAGMA index_list("schema_migrations")
-   (1.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (2.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.1ms)  select sqlite_version(*)
+   (5.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (2.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
 Connecting to database specified by database.yml
-   (2.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (1.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
 Migrating to CreateBooks (20121008115302)
    (0.0ms)  select sqlite_version(*)
    (0.0ms)  begin transaction
-   (0.7ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (0.0ms)  PRAGMA index_list("books")
-   (0.3ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
-   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20121008115302')
-   (3.0ms)  commit transaction
-   (0.3ms)  select sqlite_version(*)
+   (0.4ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.2ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20121008115302')
+   (4.9ms)  commit transaction
    (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.0ms)  PRAGMA index_list("books")
-   (0.0ms)  PRAGMA index_info('index_books_on_title')
 Connecting to database specified by database.yml
-   (1.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.4ms)  select sqlite_version(*)
-   (3.8ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (0.0ms)  PRAGMA index_list("books")
-   (1.2ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
-   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (0.0ms)  PRAGMA index_list("schema_migrations")
-   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (1.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.0ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
+   (0.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.1ms)  SELECT version FROM "schema_migrations"
    (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20121008115302')
 Connecting to database specified by database.yml
-   (3.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (1.1ms)  select sqlite_version(*)
-   (1.6ms)  DROP TABLE "books"
-   (1.3ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (1.2ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
+   (1.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.8ms)  DROP TABLE "books"
+   (0.9ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
    (0.1ms)  SELECT version FROM "schema_migrations"
 Connecting to database specified by database.yml
-   (1.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.4ms)  select sqlite_version(*)
-   (3.5ms)  DROP TABLE "books"
-   (1.2ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (1.0ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
-   (0.1ms)  SELECT version FROM "schema_migrations"
-Connecting to database specified by database.yml
-   (2.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.4ms)  select sqlite_version(*)
-   (3.3ms)  DROP TABLE "books"
-   (1.0ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (5.2ms)  DROP TABLE "books"
+   (0.9ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
    (0.9ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
    (0.1ms)  SELECT version FROM "schema_migrations"
 Connecting to database specified by database.yml
-   (3.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.4ms)  select sqlite_version(*)
-   (1.4ms)  DROP TABLE "books"
+   (1.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (5.5ms)  DROP TABLE "books"
    (1.1ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (1.1ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
+   (1.4ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+Connecting to database specified by database.yml
+   (1.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.3ms)  DROP TABLE "books"
+   (0.8ms)  CREATE TABLE "books" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255) NOT NULL, "author" varchar(255) NOT NULL, "year" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.7ms)  CREATE UNIQUE INDEX "index_books_on_title" ON "books" ("title")
    (0.1ms)  SELECT version FROM "schema_migrations"

data/spec/dummy/log/test.log

@@ -1,28 +1,23 @@
 Connecting to database specified by database.yml
-   (2.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (1.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
 Migrating to CreateBooks (20121008115302)
    (0.1ms)  begin transaction
-   (0.1ms)  rollback transaction
+   (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
 Connecting to database specified by database.yml
-   (2.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (1.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
 Migrating to CreateBooks (20121008115302)
    (0.1ms)  begin transaction
-   (0.1ms)  rollback transaction
+   (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
 Connecting to database specified by database.yml
-   (1.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (1.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
 Migrating to CreateBooks (20121008115302)
    (0.1ms)  begin transaction
    (0.1ms)  rollback transaction
-   (0.1ms)  begin transaction
-   (0.0ms)  rollback transaction
-Connecting to database specified by database.yml
-   (1.9ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-Migrating to CreateBooks (20121008115302)
-   (0.1ms)  begin transaction
-   (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
-   (0.1ms)  rollback transaction
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tableling-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,8 +41,8 @@ files:
 - lib/tableling-rails/ext.rb
 - lib/tableling-rails/field.rb
 - lib/tableling-rails/global.rb
-- lib/tableling-rails/serializer.rb
 - lib/tableling-rails/settings.rb
+- lib/tableling-rails/type_serializer.rb
 - lib/tableling-rails/version.rb
 - lib/tableling-rails/view.rb
 - lib/tableling-rails.rb
@@ -123,12 +123,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4338373402448950759
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4338373402448950759
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25