active_scaffold 3.4.16 → 3.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 247539a2068b350fca651a90998fd9627de11326
-  data.tar.gz: fe55bfa49b3670fed3d8015034eab74343d80aab
+  metadata.gz: 6b1be864fa28fa3a7caca50a268de1ecd1070426
+  data.tar.gz: db83b56413734d2fdc7aab465efa47b89dd3edfe
 SHA512:
-  metadata.gz: 528632a5420784e879854874f60fad64d4705569021d9b57278cc2144d2301efbe2180176f23d7a521eb2cca1efe17f67abdf04cce45dc87ffed2ad4e20e16bc
-  data.tar.gz: 954b32ea74a131e29b0555612a9f2f444ccead1887a12d65be00bf80a3b14d8fca914152219603c7a31d7e3aaa63bedcd72d45118d8637246b0ef6281e19fe59
+  metadata.gz: f98c93d4d03d4347e73dd18793629c1bc8cb16ee6b0ee900a130b86f9c7e27f6aec751d67cf2abd255d74a087bab3af16f54466ddcbf17d2ec5cab568b947171
+  data.tar.gz: 36e97b6c0e09d2aecb3f27d63690e0bcbea16239d371ccd6711820de75ab059b43796e2a3af63b69c206143e25e7efc9e43d3cbc374ea6ba7743c9f0fb8181c7

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.4.17
+- Fix deprecation warning "Extra .css in SCSS file is unnecessary"
+- Improve support for namespaced models on namespaced controllers with different namespace
+
 = 3.4.16
 - add scoped_query to list methods, so it can be used for calculations, like each_record_in_scope is used to iterate over every filtered record
 - fix field_search_ignore? and search_ignore?

data/lib/active_scaffold/actions/mark.rb

@@ -13,7 +13,7 @@ module ActiveScaffold::Actions
       else
         do_demark
       end
-      if marked_records.length > 0
+      if marked_records.any?
         count = marked_records.length
         flash[:info] = as_(:records_marked, :count => count, :model => active_scaffold_config.label(:count => count))
       end
@@ -37,7 +37,7 @@ module ActiveScaffold::Actions
         render :action => 'on_mark', :locals => {:checked => mark?}
       end
     end
- 
+
     # We need to give the ActiveRecord classes a handle to currently marked records. We don't want to just pass the object,
     # because the object may change. So we give ActiveRecord a proc that ties to the marked_records_method on this ApplicationController.
     def assign_marked_records_to_model
@@ -71,12 +71,12 @@ module ActiveScaffold::Actions
         each_record_in_scope { |record| record.as_marked = false }
       end
     end
-    
+
     def do_destroy
       super
       @record.as_marked = false if successful?
     end
-    
+
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def mark_authorized?

data/lib/active_scaffold/core.rb

@@ -186,7 +186,8 @@ module ActiveScaffold
       end
 
       def active_scaffold_controller_for(klass)
-        ActiveScaffold::Core.active_scaffold_controller_for(klass, self.to_s.split('::')[0...-1].join('::') + '::')
+        return self if uses_active_scaffold? && klass == active_scaffold_config.model
+        ActiveScaffold::Core.active_scaffold_controller_for(klass, self.to_s.deconstantize + '::')
       end
 
 
@@ -200,8 +201,9 @@ module ActiveScaffold
     # You may override this method to customize the search routine.
     def self.active_scaffold_controller_for(klass, controller_namespace = '::')
       error_message = []
+      class_names = [klass.to_s, klass.to_s.demodulize].map { |k| k.underscore.pluralize }.map { |k| [k, k.singularize] }.flatten
       [controller_namespace, ''].each do |namespace|
-        ["#{klass.to_s.underscore.pluralize}", "#{klass.to_s.underscore.pluralize.singularize}"].each do |controller_name|
+        class_names.each do |controller_name|
           begin
             controller = "#{namespace}#{controller_name.camelize}Controller".constantize
           rescue NameError => error

data/lib/active_scaffold/finder.rb

@@ -10,7 +10,7 @@ module ActiveScaffold
       # token is found in at least one of the columns.
       def create_conditions_for_columns(tokens, columns, text_search = :full)
         # if there aren't any columns, then just return a nil condition
-        return unless columns.length > 0
+        return unless columns.any?
         like_pattern = like_pattern(text_search)
 
         tokens = [tokens] if tokens.is_a? String
@@ -132,7 +132,7 @@ module ActiveScaffold
         end
         value
       end
-      
+
       def condition_value_for_datetime(column, value, conversion = :to_time)
         if value.is_a? Hash
           Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[part].to_i}) rescue nil
@@ -184,7 +184,7 @@ module ActiveScaffold
           value
         end
       end
-      
+
       def datetime_conversion_for_condition(column)
         if column.column
           column.column.type == :date ? :to_date : :to_time
@@ -192,7 +192,7 @@ module ActiveScaffold
           :to_time
         end
       end
-            
+
       def condition_for_datetime(column, value, like_pattern = nil)
         conversion = datetime_conversion_for_condition(column)
         from_value = condition_value_for_datetime(column, value[:from], conversion)
@@ -216,7 +216,7 @@ module ActiveScaffold
           ["%{search_sql} = ?", value]
         end
       end
-      
+
       def condition_for_null_type(column, value, like_pattern = nil)
         case value.to_sym
         when :null
@@ -256,8 +256,8 @@ module ActiveScaffold
       'null',
       'not_null'
     ]
-    
-    
+
+
 
     def self.included(klass)
       klass.extend ClassMethods
@@ -289,12 +289,12 @@ module ActiveScaffold
     def active_scaffold_habtm_joins
       @active_scaffold_habtm_joins ||= []
     end
-    
+
     attr_writer :active_scaffold_outer_joins
     def active_scaffold_outer_joins
       @active_scaffold_outer_joins ||= []
     end
-    
+
     attr_writer :active_scaffold_references
     def active_scaffold_references
       @active_scaffold_references ||= []
@@ -303,11 +303,11 @@ module ActiveScaffold
     # Override this method on your controller to define conditions to be used when querying a recordset (e.g. for List). The return of this method should be any format compatible with the :conditions clause of ActiveRecord::Base's find.
     def conditions_for_collection
     end
-  
+
     # Override this method on your controller to define joins to be used when querying a recordset (e.g. for List).  The return of this method should be any format compatible with the :joins clause of ActiveRecord::Base's find.
     def joins_for_collection
     end
-  
+
     # Override this method on your controller to provide custom finder options to the find() call. The return of this method should be a hash.
     def custom_finder_options
       {}
@@ -327,7 +327,7 @@ module ActiveScaffold
     def id_condition
       {active_scaffold_config.model.primary_key => params[:id]} if params[:id]
     end
-    
+
     # returns a single record (the given id) but only if it's allowed for the specified security options.
     # security options can be a hash for authorized_for? method or a value to check as a :crud_type
     # accomplishes this by checking model.#{action}_authorized?
@@ -361,7 +361,7 @@ module ActiveScaffold
         end
         finder_options.merge!(:references => active_scaffold_references)
       end
-    
+
       finder_options.merge! custom_finder_options
       finder_options
     end
@@ -371,9 +371,9 @@ module ActiveScaffold
       options = find_options.reject{|k,v| [:select, :reorder].include? k}
       # NOTE: we must use includes in the count query, because some conditions may reference other tables
       options[:includes] = count_includes
-      
+
       count = append_to_query(query, options).count
-  
+
       # Converts count to an integer if ActiveRecord returned an OrderedHash
       # that happens when find_options contains a :group key
       count = count.length if count.is_a?(Hash)
@@ -389,7 +389,7 @@ module ActiveScaffold
 
       find_options = finder_options(options)
       query = beginning_of_chain.where(nil) # where(nil) is needed because we need a relation
-      
+
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
       if options[:pagination] && options[:pagination] != :infinite
         count = count_items(query, find_options, options[:count_includes])
@@ -430,7 +430,7 @@ module ActiveScaffold
       subquery = append_to_query(beginning_of_chain, :conditions => conditions, :joins => joins_for_finder, :outer_joins => outer_joins, :select => active_scaffold_config.columns[primary_key].field)
       active_scaffold_config.model.where(primary_key => subquery)
     end
-    
+
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :outer_joins, :includes, :lock, :readonly, :from, :conditions, :preload, (:references if Rails::VERSION::MAJOR >= 4)
       query = options.reject{|k,v| v.blank?}.inject(query) do |query, (k, v)|
@@ -438,7 +438,7 @@ module ActiveScaffold
       end
       if options[:outer_joins].present?
         if Rails::VERSION::MAJOR >= 4
-          query.distinct_value = true 
+          query.distinct_value = true
         else
           query = query.uniq
         end
@@ -456,7 +456,7 @@ module ActiveScaffold
           []
       end + active_scaffold_habtm_joins
     end
-    
+
     def apply_conditions(query, *conditions)
       conditions.reject(&:blank?).inject(query) do |query, condition|
         if condition.is_a?(Array) && !condition.first.is_a?(String) # multiple conditions

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.16
+  version: 3.4.17
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -96,11 +96,11 @@ files:
 - app/assets/javascripts/prototype/form_enhancements.js
 - app/assets/javascripts/prototype/rico_corner.js
 - app/assets/javascripts/prototype/tiny_mce_bridge.js
-- app/assets/stylesheets/active_scaffold-ie.css.scss
-- app/assets/stylesheets/active_scaffold.css.scss
-- app/assets/stylesheets/active_scaffold_colors.css.scss
+- app/assets/stylesheets/active_scaffold-ie.scss
+- app/assets/stylesheets/active_scaffold.scss
+- app/assets/stylesheets/active_scaffold_colors.scss
 - app/assets/stylesheets/active_scaffold_extensions.css.erb
-- app/assets/stylesheets/active_scaffold_images.css.scss
+- app/assets/stylesheets/active_scaffold_images.scss
 - app/assets/stylesheets/active_scaffold_jquery_ui.css.erb
 - app/assets/stylesheets/active_scaffold_layout.css
 - app/assets/stylesheets/blue-theme.css