active_scaffold_config_list_vho 3.1.0 → 3.1.1

data/Rakefile

@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{User may reorder and hide/show list columns}
   gem.email = "activescaffold@googlegroups.com"
   gem.authors = ["Volker Hochstein"]
-  gem.add_runtime_dependency 'active_scaffold_vho', '~> 3.1'
+  gem.add_runtime_dependency 'active_scaffold_vho', '>= 3.1.2'
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/active_scaffold_config_list_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_config_list_vho}
-  s.version = "3.1.0"
+  s.version = "3.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Volker Hochstein"]
-  s.date = %q{2011-11-23}
+  s.date = %q{2012-02-11}
   s.description = %q{User may reorder and hide/show list columns}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [
@@ -55,16 +55,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<active_scaffold_vho>, ["~> 3.1"])
+      s.add_runtime_dependency(%q<active_scaffold_vho>, [">= 3.1.2"])
     else
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<active_scaffold_vho>, ["~> 3.1"])
+      s.add_dependency(%q<active_scaffold_vho>, [">= 3.1.2"])
     end
   else
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<active_scaffold_vho>, ["~> 3.1"])
+    s.add_dependency(%q<active_scaffold_vho>, [">= 3.1.2"])
   end
 end
 

data/lib/active_scaffold/helpers/config_list_helpers.rb

@@ -2,17 +2,6 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Form Column
     module ConfigListHelpers
-
-      def self.included(base)
-        base.alias_method_chain :active_scaffold_includes, :cf_as
-      end
-      # Add the cf_as plugin includes
-      def active_scaffold_includes_with_cf_as(frontend = :default)
-        css = stylesheet_link_tag(ActiveScaffold::Config::Core.asset_path('cf_as-stylesheet.css', frontend))
-        ie_css = stylesheet_link_tag(ActiveScaffold::Config::Core.asset_path("cf_as-stylesheet-ie.css", frontend))
-        active_scaffold_includes_without_cf_as + "\n" + css + "\n<!--[if IE]>".html_safe + ie_css + "<![endif]-->\n".html_safe
-      end
-
       def config_list_ol_id
         "ol_#{element_form_id(:action => :config_list)}"
       end

data/lib/active_scaffold_config_list.rb

@@ -1,12 +1,6 @@
-# Make sure that ActiveScaffold has already been included
-ActiveScaffold rescue throw "should have included ActiveScaffold plug in first.  Please make sure that this overwrite plugging comes alphabetically after the ActiveScaffold plug in"
-
 require 'active_scaffold_config_list/engine'
 require 'active_scaffold_config_list/version'
 
-# Load our overrides
-require "active_scaffold_config_list/config/core.rb"
-
 module ActiveScaffoldConfigList
   def self.root
     File.dirname(__FILE__) + "/.."
@@ -26,5 +20,3 @@ module ActiveScaffold
     ActiveScaffold.autoload_subdir('helpers', self, File.dirname(__FILE__))
   end
 end
-
-ActionView::Base.send(:include, ActiveScaffold::Helpers::ConfigListHelpers)

data/lib/active_scaffold_config_list/engine.rb

@@ -3,6 +3,15 @@ module ActiveScaffoldConfigList
   # not sure if it is a must though...
   #module Rails
     class Engine < ::Rails::Engine
+      initializer("initialize_active_scaffold_config_list", :after => "initialize_active_scaffold") do
+        ActiveSupport.on_load(:action_controller) do
+          require "active_scaffold_config_list/config/core.rb"
+        end
+      end
+
+      ActiveSupport.on_load(:action_view) do
+        include ActiveScaffold::Helpers::ConfigListHelpers
+      end
     end
   #end
 end

data/lib/active_scaffold_config_list/version.rb

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

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 0
+  - 1
   segments_generated: true
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors: 
 - Volker Hochstein
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 +01:00
+date: 2012-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,13 +51,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 1
+        - 2
         segments_generated: true
-        version: "3.1"
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: *id003
@@ -109,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2484568556687358833
+      hash: 1903226907340637219
       segments: 
       - 0
       segments_generated: true