active_scaffold 3.4.0 → 3.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f45af2d20c0a1737e0bd7a2c7d5d777013c3a77d
-  data.tar.gz: 6c171bde1438fecf021bafa5a2ff4b8151abd220
+  metadata.gz: 7ff51aa94fbd9816af72b232b8a66ade37aac935
+  data.tar.gz: 1ca9e81926e02e3a057b819b51196d470126baf1
 SHA512:
-  metadata.gz: 003e6d3d878fec9b8de7921dd2d292056eb21af6a1cc599f02016709b12f2bc5de62f5e558efe942873fb5f6915c445c99c4256cbbfb9ec8896163fb267778ab
-  data.tar.gz: a2e1b1ed3360944f8eadc4d519c9a6cc1a92cf394b658d6990081d2a47c3ade4c623daee33f429c380308ad06a02f08c35caf7f81f11a3ae0cefb778e04e0777
+  metadata.gz: 1fee132f4a758bcd29506196d667fb7d7d3cccae4865b0402e4861866070cff9a57866c18c4422e03976abfc11626dcb1feee51fd3df8f7b4d932293455164e5
+  data.tar.gz: 77033023eafda83e3d48478c2ec8067dc9c2ca49ff72478a0e4dae146cd9b55c1bcbd24d91eeb848a5f269acc4ecee12d5da39038deee5730b3402f7fc5ce602

data/CHANGELOG

@@ -1,4 +1,7 @@
-= 3.4.0 (not released yet)
+= 3.4.0.1
+- Fix record_select on field_search
+
+= 3.4.0
 - Support rails4
 - Quote selected columns
 - More unobtrusive html views

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -70,7 +70,7 @@ class ActiveScaffold::Bridges::RecordSelect
     module SearchColumnHelpers
       def active_scaffold_search_record_select(column, options)
         value = field_search_record_select_value(column)
-        active_scaffold_record_select(column, options, value, column.options[:multiple])
+        active_scaffold_record_select(options[:object], column, options, value, column.options[:multiple])
       end
       
       def field_search_record_select_value(column)

data/lib/active_scaffold/tableless.rb

@@ -26,12 +26,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
 
   class Column < ActiveRecord::ConnectionAdapters::Column
-    def initialize(name, default, sql_type = nil, null = true)
-      if defined?(ActiveRecord::ConnectionAdapters::Type) # rails >= 4.2
+    if instance_method(:initialize).arity == -4 # rails >= 4.2
+      def initialize(name, default, sql_type = nil, null = true)
         cast_type = ActiveRecord::Base.connection.send :lookup_cast_type, sql_type
         super(name, default, cast_type, sql_type, null)
-      else # rails < 4.2
-        super
       end
     end
   end

data/lib/active_scaffold/version.rb

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

data/test/company.rb

@@ -5,6 +5,7 @@ class Company < ActiveRecord::Base
     @with_main_company = with_or_without == :with_main_company
     @attributes = {}
     @attributes_cache = {}
+    @raw_attributes = {}
   end
   
   def self.columns_hash

data/test/misc/attribute_params_test.rb

@@ -78,9 +78,9 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal 1, model.number
     assert_nil model.tenant_id, 'tenant should be cleared'
     assert_nil model.tenant, 'tenant should be cleared'
-    assert_equal person.id, Floor.find(model).tenant_id, 'floor should not be saved yet'
+    assert_equal person.id, Floor.find(model.id).tenant_id, 'floor should not be saved yet'
     assert model.save
-    assert_nil Floor.find(model).tenant_id, 'floor should not be saved'
+    assert_nil Floor.find(model.id).tenant_id, 'floor should not be saved'
   end
 
   def test_saving_has_one_select
@@ -272,9 +272,9 @@ class AttributeParamsTest < MiniTest::Test
     assert_nil model.contactable_type
     assert_nil model.contactable_id, 'contactable should be cleared'
     assert_nil model.contactable, 'contactable should be cleared'
-    assert_equal person.id, Contact.find(model).contactable_id, 'contact should not be saved yet'
+    assert_equal person.id, Contact.find(model.id).contactable_id, 'contact should not be saved yet'
     assert model.save
-    assert_nil Contact.find(model).contactable_id, 'contact should be saved'
+    assert_nil Contact.find(model.id).contactable_id, 'contact should be saved'
   end
 
   protected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.0.1
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda