active_scaffold_vho 3.2.5 → 3.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDc3NWI5YWQ0NmNlZTY0YzNiZjBhZmMxZGRlYzdjYjI3OWY2NTYyNw==
+    ZGRkMDJiNzc1YjJkNmZkMTViODdmMjEzY2ZkZjg4OGE3OTUxYjgzNw==
   data.tar.gz: !binary |-
-    MmYzMzdhMzJmMmNiNTk0NGY4MTAyNzcwZGE2Nzg3YjBhMzhjZDM2Mw==
+    YWJkODA0NGI4OTQ1YjMxNmJmYmJhZWQwNWUwNTIwYTQxNjJmNTAyNQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2EyYTljMzA2YmE1OWFlMmExNGZjMDZlNThhYzQzM2I5MDBmN2Q0ZTkwNWJj
-    MDFlZjhhYWQyN2VkMjdiNWM5NjhiNzlkOTE2ZjI2ZDI2YjBiOGU5NGRlNmE1
-    ZTFmY2Y1M2RiNDAyZjA2OWQ2ZWE4NmQ0OThiOTZjZTY5N2E3M2I=
+    ZmY0ZjczYTMyODc4ZTU2YWE2ZjdmZGY3OTg4N2FlNzJjZjMyNTJkM2U0NjY1
+    YTI0Y2Y4OTI4Mzc5MjA0MTYyYzlhMGJlNTFmYTliN2Y3MDQ3ZmE3ZThjMDAw
+    NGVjYTgzYWI4MWY2MmI4Njc5MTZlY2FiY2RmZDg1NDMwNTYwYTE=
   data.tar.gz: !binary |-
-    ZDg0ZTNkMzhlYzdlY2U0NTYwMGQ2NjhlY2NiY2Q2MGE4MTI0YzI5YTU3OWJh
-    NjFmMWQ2ZjMzNTJlZmY2ZWVhNDkyZjNkZjY1ZThmYjU4YTBiMmU1NmNmMmQz
-    MWYzNmViYjc5YTJkNDlmZGI0M2QzYmVhZmM1ZWY5OTRmOTdlNGQ=
+    OGZkMWE5NmQzMTU0YTlkMTlhMGNhOTRhZTJjYWNjMzFmMmEzMzYwMmJlOTI0
+    NTA2MTU0YTVmOTNkMDE3MGFjMWNlMWZiNjA4ZDgyZDU4ZTZmYzEyNThlY2I2
+    OTY5NDFmODJlOGQ5ZGNjNWMyZDVlOWU1MDZjM2E1NWVhMzA2Mzg=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.4)
+    active_scaffold_vho (3.2.5)
       kaminari
       rails (>= 3.1.0)
 
@@ -73,7 +73,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rcov (0.9.9)
     rdoc (3.12.2)
       json (~> 1.4)

data/lib/active_scaffold/actions/list.rb

@@ -76,7 +76,12 @@ module ActiveScaffold::Actions
           })
       end
 
-      @records = find_page(options);
+      if active_scaffold_config.model.respond_to?(:tableless?) && active_scaffold_config.model.tableless?
+        @records = Kaminari.paginate_array(active_scaffold_config.model.all)
+        @records = @records.page(options[:page]).per(options[:per_page]) if options[:pagination]
+      else
+        @records = find_page(options);
+      end
       @records
     end
 

data/lib/active_scaffold/data_structures/column.rb

@@ -318,6 +318,7 @@ module ActiveScaffold::DataStructures
     # just the field (not table.field)
     def field_name
       return nil if virtual?
+      return column.name if !column.nil? && @active_record_class.respond_to?(:tableless?) && @active_record_class.tableless?
       column ? @active_record_class.connection.quote_column_name(column.name) : association.foreign_key
     end
 
@@ -360,7 +361,7 @@ module ActiveScaffold::DataStructures
 
     # the table.field name for this column, if applicable
     def field
-      @field ||= [@active_record_class.connection.quote_table_name(@table), field_name].join('.')
+      @field ||= (@active_record_class.respond_to?(:tableless?) && @active_record_class.tableless? ? "#{@table}.#{field_name}" : [@active_record_class.connection.quote_table_name(@table), field_name].join('.'))
     end
     
     def estimate_weight

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -75,7 +75,7 @@ module ActiveScaffold
         if column.association
           associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
           method = column.association.macro == :belongs_to ? column.association.foreign_key : column.name
-          select_options = options_for_association(column.association, true)
+          select_options = options_for_association(column.association, false)
         else
           method = column.name
           select_options = Array(column.options[:options])

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 5
+    PATCH = 6
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda