declarative_grid 0.1.0 → 0.1.1

data/declarative_grid.gemspec

@@ -22,12 +22,18 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activesupport", "~> 3.2.8"
   gem.add_dependency "backports", "~> 2.6.4"
   
+  # Test Framework
   gem.add_development_dependency "rake", "~> 0.9.2.2"
   gem.add_development_dependency "minitest", "~> 4.1.0"
   gem.add_development_dependency "mocha", "~> 0.12.7"
   gem.add_development_dependency "factory_girl", "~> 4.1.0"
   gem.add_development_dependency "nokogiri", "~> 1.5.5"
+  
+  # ORM: ActiveRecord
   gem.add_development_dependency "activerecord", "~> 3.2.8"
   gem.add_development_dependency "sqlite3", "~> 1.3.6"
   
+  # ORM: Sequel
+  gem.add_development_dependency "sequel", "~> 3.20.0"
+  
 end

data/lib/declarative_grid/base.rb

@@ -13,12 +13,25 @@ module DeclarativeGrid
     def initialize(records = nil)
       if block_given?
         STDERR.puts 'WARNING: block-style instantization is deprecated'
-        records = yield
+        records ||= yield
       end
       
-      if records.respond_to?(:find_each)
-        records = Enumerator.new records, :find_each
+      if defined? ::ActiveRecord
+        if records.is_a?(::ActiveRecord::Relation) or
+           (records.is_a?(Class) and 
+            records.ancestors.include?(::ActiveRecord::Base))
+          records = Enumerator.new records, :find_each
+        end
       end
+      
+      if defined? ::Sequel
+        if records.is_a?(Class) && records.ancestors.include?(::Sequel::Model)
+          raise unless records.is_a?(Enumerable)
+        elsif records.is_a?(::Sequel::Dataset)
+          raise unless records.is_a?(Enumerable)
+        end
+      end
+      
       self.records = records
     end
     

data/lib/declarative_grid/version.rb

@@ -1,3 +1,3 @@
 module DeclarativeGrid
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/declarative_grid/{active_record_spec.rb → orm_support/active_record_spec.rb}

@@ -15,6 +15,7 @@ module DeclarativeGrid
       config = { adapter: 'sqlite3', database: ':memory:' }
       ActiveRecord::Base.establish_connection(config)
       
+      ActiveRecord::Schema.verbose = false
       ActiveRecord::Schema.define do
         create_table :members do |t|
           t.string :name
@@ -44,7 +45,10 @@ module DeclarativeGrid
       [@names, @genders].transpose.each do |a|
         @record_klass.create name: a[0], gender_id: a[1]
       end
-      
+    end
+    
+    after do
+      @record_klass.destroy_all
     end
     
     it "can accept ActiveRecord::Base and its subclasses" do

data/spec/declarative_grid/orm_support/sequel_spec.rb

@@ -0,0 +1,67 @@
+#encoding: UTF-8
+require 'sequel'
+require "spec_helper"
+
+module DeclarativeGrid
+  describe Base do
+    before do
+      @grid_klass = Class.new Base do
+        column :name
+        column :gender_id
+        
+        renderer :csv
+      end
+      
+      database = Sequel.sqlite
+      
+      # create an items table
+      database.create_table :members do
+        primary_key :id
+        String :name
+        Integer :gender_id
+      end
+      
+      @record_klass = Class.new Sequel::Model(:members) do
+      end
+      
+      @names = [
+        'Adam Jensen', 'Nathan Drake', 'Lara Croft',
+        "Alta\xC3\xAFr Ibn-La\'Ahad",
+        "Ezio Auditore da Firenze",
+        "Ratonhnhak\xC3\xA9:ton",
+        "Desmond Miles"
+      ]
+      @genders = [
+        1, 1, 2,
+        1,
+        1,
+        1,
+        1
+      ]
+      
+      [@names, @genders].transpose.each do |a|
+        @record_klass.create name: a[0], gender_id: a[1]
+      end
+    end
+    
+    after do
+      @record_klass.destroy
+    end
+    
+    it "can accept Sequel::Model and its subclasses" do
+      base = @grid_klass.new @record_klass
+      base.renderer(:csv).each_record.map(&:name).must_equal @names
+    end
+    
+    it "can accept Sequel::Dataset" do
+      base = @grid_klass.new @record_klass.dataset
+      base.renderer(:csv).each_record.map(&:name).must_equal @names
+    end
+    
+    it "can accept Sequel::Dataset#all" do
+      base = @grid_klass.new @record_klass.dataset.all
+      base.renderer(:csv).each_record.map(&:name).must_equal @names
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: declarative_grid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,6 +155,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.20.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.20.0
 description: DeclarativeGrid is a gem for rendering grids described in simple DSL
 email:
 - davll.xc@gmail.com
@@ -179,11 +195,12 @@ files:
 - lib/declarative_grid/renderers/html.rb
 - lib/declarative_grid/version.rb
 - sample1.rb
-- spec/declarative_grid/active_record_spec.rb
 - spec/declarative_grid/base_spec.rb
 - spec/declarative_grid/model/column_spec.rb
 - spec/declarative_grid/model/row_spec.rb
 - spec/declarative_grid/model_spec.rb
+- spec/declarative_grid/orm_support/active_record_spec.rb
+- spec/declarative_grid/orm_support/sequel_spec.rb
 - spec/declarative_grid/renderers/abstract_renderer_spec.rb
 - spec/declarative_grid/renderers/csv_spec.rb
 - spec/declarative_grid/renderers/html_spec.rb
@@ -216,11 +233,12 @@ signing_key:
 specification_version: 3
 summary: A flexible grid renderer
 test_files:
-- spec/declarative_grid/active_record_spec.rb
 - spec/declarative_grid/base_spec.rb
 - spec/declarative_grid/model/column_spec.rb
 - spec/declarative_grid/model/row_spec.rb
 - spec/declarative_grid/model_spec.rb
+- spec/declarative_grid/orm_support/active_record_spec.rb
+- spec/declarative_grid/orm_support/sequel_spec.rb
 - spec/declarative_grid/renderers/abstract_renderer_spec.rb
 - spec/declarative_grid/renderers/csv_spec.rb
 - spec/declarative_grid/renderers/html_spec.rb