active_scaffold_vho 3.2.2 → 3.2.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGM3YmZiODIwOWE0ZTk5ZmVlZTgzNjE3YTQxYTc1YWUxZmFjMzdjMg==
+  data.tar.gz: !binary |-
+    ZmE4NWI2MTQ2MWQ5ODlkNGNjNGIxMGVjZmYyNjhmMjhkZGIzY2Y5MQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZTEwMjAwMDQxYTFlMGFhNzI0ZTRjZjdiOTcwYTFjNmM0MjFmNjNiYjVmMmNj
+    NmJhZjRlYjZlNWY5OTkxN2MwNjVmMzFmMzY4YWUxY2ZjZmRlODcyZDlmM2I4
+    YjQyY2NmMjI4MWU1NzU3NDZjMjY4ODY5NjBmZWEzOWI5MGUwYjY=
+  data.tar.gz: !binary |-
+    NmM0YTdiOTlhOTU2NDRiODNjMDM3NDA0NTQyMjc5YzZhZDk5ZTUyZjA4NjZl
+    YTBmNzcyNGM0OTYyZWJkZDM4ZDk4YjgxNWRmZjgzMzIyNTI5ZmEwODYxYzMz
+    NzNlMDllYTk0MDJlNDZiMTNlZjU0YWQzOTFiYjUzZTM5YTA1NWU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.1)
+    active_scaffold_vho (3.2.2)
       kaminari
       rails (>= 3.1.0)
 

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -120,7 +120,7 @@ module ActiveScaffold
             end
             
             def date_bridge_from_to(column, value)
-              conversion = column.column.type == :date ? :to_date : :to_time
+              conversion = datetime_conversion_for_condition(column)
               case value[:opt]
               when 'RANGE'
                 date_bridge_from_to_for_range(column, value).collect(&conversion)

data/lib/active_scaffold/data_structures/column.rb

@@ -171,7 +171,7 @@ module ActiveScaffold::DataStructures
     #   search = "CONCAT(a, b)" define your own sql for searching. this should be the "left-side" of a WHERE condition. the operator and value will be supplied by ActiveScaffold.
     attr_writer :search_sql
     def search_sql
-      self.initialize_search_sql if @search_sql === true
+      self.initialize_search_sql if !@search_sql.is_a?(Proc) && @search_sql === true
       @search_sql
     end
     def searchable?

data/lib/active_scaffold/finder.rb

@@ -142,9 +142,17 @@ module ActiveScaffold
           value
         end
       end
+
+      def datetime_conversion_for_condition(column)
+        if column.column
+          column.column.type == :date ? :to_date : :to_time
+        else
+          :to_time
+        end
+      end
             
       def condition_for_datetime(column, value, like_pattern = nil)
-        conversion = column.column.type == :date ? :to_date : :to_time
+        conversion = datetime_conversion_for_condition(column)
         from_value = condition_value_for_datetime(value[:from], conversion)
         to_value = condition_value_for_datetime(value[:to], conversion)
 

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.2
-  prerelease: 
+  version: 3.2.3
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &17853480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17853480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17853000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17853000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &17852520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17852520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17852040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *17852040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &17851660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17851660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Save time and headaches, and create a more easily maintainable set of
   pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read,
   update, delete) user interface needs, leaving you more time to focus on more challenging
@@ -370,27 +384,26 @@ files:
 homepage: http://github.com/vhochstein/active_scaffold
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails 3 Version of activescaffold supporting prototype and jquery
 test_files:
 - test/bridges/bridge_test.rb