active_scaffold 3.4.25 → 3.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ee6cc12616f927c3500f0da84efc6ccbf7f60bf
-  data.tar.gz: c4f7d12b9993f732eab7632b61b37fa36b1ac5c0
+  metadata.gz: 6e391ff964c183c36df4416f85b6c0d1466a44a9
+  data.tar.gz: a5b83b15499bb227ecb459381ca02b421261b383
 SHA512:
-  metadata.gz: 6b1177b6f0c4875ef0353058e0187313f390420f940a2471b8139ad46e244f0f0daeae6fce320dc5e1e9b82abd9056fc7c7b6088606836a28603db76b98fcf34
-  data.tar.gz: ef249a6e53a32b40d7dbaa807d5611bf576e3950c76f0ee50d3465fd30e78d1c19f23c7fbd97f179a64ccfa4074d4c04a070efe9f2f932193d1c0da3d0098c53
+  metadata.gz: f85596592ba07b109e8d645c124a409e610b94df3b47495411e0ff2419a80fbcb617668b1c8029ef8e30f74b224c3a94de684bd390d171ea4848f4e698fdec15
+  data.tar.gz: a8645b27cd94fed33c84d8ffd5ef5073f5ea9e99e8cf27430a1bd6ea798e6679b1444f9cc3fd8e5f2f1c51d7a0ef8a11907c723ba31a813a8cbc3d2d1595c4c1

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 3.4.26
+- fix padding for dynamic action_group inside action_group
+- fix using gem with symlink in BUNDLE_PATH option of config/bundle file
+
+= 3.4.25
 - call focus_first_element after highlight and trigger element_created
 - fix restoring focus to element which triggers update column
 

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -79,7 +79,7 @@ padding: 5px 5px;
 margin-left: 0px;
 }
 
-.active-scaffold .active-scaffold .active-scaffold-header div.actions .action_group > a,
+.active-scaffold .active-scaffold .active-scaffold-header div.actions > .action_group > a,
 .active-scaffold .active-scaffold .active-scaffold-header div.actions > a {
 padding: 1px 5px;
 }

data/lib/active_scaffold/core.rb

@@ -135,7 +135,7 @@ module ActiveScaffold
       end
 
       def add_active_scaffold_path(path)
-        as_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'app', 'views')
+        as_path = File.realpath File.join(ActiveScaffold::Config::Core.plugin_directory, 'app', 'views')
         index = view_paths.find_index { |p| p.to_s == as_path }
         if index
           self.view_paths = view_paths[0..index - 1] + Array(path) + view_paths[index..-1]

data/lib/active_scaffold/extensions/reverse_associations.rb

@@ -112,4 +112,4 @@ end
 
 ActiveRecord::Reflection::AssociationReflection.send :include, ActiveScaffold::ReverseAssociation::AssociationReflection
 ActiveRecord::Reflection::ThroughReflection.send :include, ActiveScaffold::ReverseAssociation::ThroughReflection
-ActiveRecord::Associations::ThroughAssociation.send :include, ActiveScaffold::ReverseAssociation::ThroughAssociation
+ActiveRecord::Associations::ThroughAssociation.send :include, ActiveScaffold::ReverseAssociation::ThroughAssociation

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -26,12 +26,12 @@ module ActiveScaffold
       end
 
       def active_scaffold_show_horizontal(record, column)
-        raise ":horizontal show_ui must be used on association column" unless column.association
+        raise ':horizontal show_ui must be used on association column' unless column.association
         render :partial => 'show_association', :locals => {:column => column, :parent_record => record, :show_partial => :horizontal}
       end
 
       def active_scaffold_show_vertical(record, column)
-        raise ":vertical show_ui must be used on association column" unless column.association
+        raise ':vertical show_ui must be used on association column' unless column.association
         render :partial => 'show_association', :locals => {:column => column, :parent_record => record, :show_partial => :vertical}
       end
 

data/lib/active_scaffold/version.rb

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

data/test/company.rb

@@ -82,6 +82,7 @@ class Company < ActiveRecord::Base
   def name_before_type_cast
     name.to_s
   end
+
   def name_came_from_user?; end
 
   def date

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.25
+  version: 3.4.26
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman
@@ -97,7 +97,7 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG
-- MIT-LICENSE
+- LICENSE
 - README.md
 - app/assets/images/active_scaffold/add.png
 - app/assets/images/active_scaffold/arrow_down.png