active_scaffold 3.0.11 → 3.0.12

data/init.rb

@@ -1,7 +1,2 @@
+ACTIVE_SCAFFOLD_PLUGIN = true
 require 'active_scaffold'
-
-begin
-  ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
-rescue
-  raise $! unless Rails.env == 'production'
-end

data/lib/active_scaffold.rb

@@ -338,11 +338,10 @@ require 'active_scaffold_env'
 ## But at least rescue the action in production
 ##
 
-Rails::Application.initializer("active_scaffold.install_assets") do
-  begin
+if defined?(ACTIVE_SCAFFOLD_PLUGIN)
+  ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
+else
+  Rails::Application.initializer("active_scaffold.install_assets") do
     ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
-  rescue
-    raise $! unless Rails.env == 'production'
   end
-end if defined?(ACTIVE_SCAFFOLD_GEM)
-
+end

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold_assets.rb

@@ -8,6 +8,8 @@ class ActiveScaffoldAssets
         copy_asset_type(from, available_frontends, asset_type, options)
       end
     end
+  rescue
+    raise $! unless Rails.env == 'production'
   end
 
 protected
@@ -42,4 +44,4 @@ protected
     FileUtils.rm Dir.glob("#{destination}/*") if options[:clean_up_destination]
     FileUtils.cp_r(Dir.glob("#{source}/#{file_mask}"), destination)
   end
-end
+end

data/lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb

@@ -8,7 +8,7 @@ module Rails
       end
 
       def install_plugins
-        unless defined?(ACTIVE_SCAFFOLD_GEM)
+        if defined?(ACTIVE_SCAFFOLD_PLUGIN)
           plugin 'verification', :git => 'git://github.com/rails/verification.git'
           plugin 'render_component', :git => 'git://github.com/vhochstein/render_component.git'
         end
@@ -21,7 +21,7 @@ module Rails
       end
 
       def configure_active_scaffold
-        unless defined?(ACTIVE_SCAFFOLD_GEM)
+        if defined?(ACTIVE_SCAFFOLD_PLUGIN)
           if js_lib == 'jquery'
             gsub_file 'vendor/plugins/active_scaffold/lib/active_scaffold_env.rb', /#ActiveScaffold.js_framework = :jquery/, 'ActiveScaffold.js_framework = :jquery'
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 3
   - 0
-  - 11
-  version: 3.0.11
+  - 12
+  version: 3.0.12
 platform: ruby
 authors: 
 - Many, see README
@@ -315,7 +315,6 @@ files:
 - lib/active_scaffold/version.rb
 - lib/active_scaffold_assets.rb
 - lib/active_scaffold_env.rb
-- lib/active_scaffold_vho.rb
 - lib/extensions/action_controller_rendering.rb
 - lib/extensions/action_view_rendering.rb
 - lib/extensions/action_view_resolver.rb

data/lib/active_scaffold_vho.rb

@@ -1,2 +0,0 @@
-ACTIVE_SCAFFOLD_GEM = true
-require 'active_scaffold'