active_scaffold 3.4.35 → 3.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 047204c7ed281db3ab039a622cde11ad71d7a7d6
-  data.tar.gz: c60b1312ef3aa2e21edeaaa25ff8d4e432cf3142
+  metadata.gz: 83c0925aecdf8e8cb67457796ee92dda1238e643
+  data.tar.gz: ca9244cc82582adb62affbd49e316d5b4a5bafd4
 SHA512:
-  metadata.gz: 13d05fe3a97d1cc2542dc01074ad250f2e2dfe6a4ae56ceb55875360b966254d942463b3286a2b11e911b9bbbe645c741021c11232eaff749886d46152ee410d
-  data.tar.gz: 63e0aa647cf1bdd0f527c201f851dfc349cf6cb8626e752feba3d065cb0ead2a312c5a429c28a72b3df9d8b11af800526b47d231d8b73f934c2c13b34202540d
+  metadata.gz: 5bf876c309a71dd8a954782e51ce23ff8a20dc937f5562a110cd9814909f9bdd16c0da239cd40c2b79045895235194638d7b0383d68853e031e537b713892ef8
+  data.tar.gz: d7aef2c46b06c3a13a980ae5faf7f1df628802921643a9a92784f4b55066406f7b7da2a99e25c40c5307a0c7ad324d37dc8cd408d7166bf3d037eb7b4ee3e3a1

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 3.4.36
+- Fix tableless for rails >= 4.1 for associations with table
+- use number_with_precision for non-integer numbers with i18n_number format, so strip_insignificant_zeros and precision can be used
+
+= 3.4.35
 - Fix JS error on update columns when request fails and form is loaded on page
 - Not raise exception when trying to scroll to missing element
 - Fix error on rails 3.2 caused by a workaround to fix eager load HABTM with scope on rails 4.2

data/app/views/active_scaffold_overrides/on_update.js.erb

@@ -8,7 +8,9 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
     ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
     action_link.target = $('#<%= row_selector %>');
     <%= render :partial => 'update_calculations', :formats => [:js] %>
-    <%= "ActiveScaffold.enable_form('#{form_selector}');" if params[:iframe] == 'true' %>
+    <% if params[:iframe] == 'true' %>
+      ActiveScaffold.enable_form('<%= form_selector %>');
+    <% end %>
   <% else %>
     <% if render_parent? %>
       <% if nested_singular_association? || render_parent_action == :row %>

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -132,7 +132,7 @@ module ActiveScaffold
           when :currency
             number_to_currency(value, options[:i18n_options] || {})
           when :i18n_number
-            number_with_delimiter(value, options[:i18n_options] || {})
+            send("number_with_#{value.is_a?(Integer) ? 'delimiter' : 'precision'}", value, options[:i18n_options] || {})
           else
             value
         end

data/lib/active_scaffold/tableless.rb

@@ -4,7 +4,9 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       klass = alias_tracker ? alias_tracker.connection.klass : self.klass
       if table_name == klass.table_name
         klass.columns_hash[column_name]
-      else
+      elsif alias_tracker && (klass = alias_tracker.instance_variable_get(:@assoc_klass))
+        klass.columns_hash[column_name]
+      else # rails < 4.1
         association.klass.columns_hash[column_name]
       end
     end
@@ -14,6 +16,11 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       def self.scope(association, connection)
         INSTANCE.scope association, connection
       end
+
+      def add_constraints(scope, owner, assoc_klass, refl, tracker)
+        tracker.instance_variable_set(:@assoc_klass, assoc_klass)
+        super
+      end
     end
   end
 

data/lib/active_scaffold/version.rb

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

data/lib/tasks/brakeman.rake

@@ -0,0 +1,16 @@
+namespace :brakeman do
+  desc 'Run Brakeman'
+  task :run, :output_files do |_t, args|
+    require 'brakeman'
+
+    files = args[:output_files].split(' ') if args[:output_files]
+    Brakeman.run app_path: '.', output_files: files, print_report: true
+  end
+
+  desc 'Check your code with Brakeman'
+  task :check do
+    require 'brakeman'
+    result = Brakeman.run app_path: '.', print_report: true
+    exit Brakeman::Warnings_Found_Exit_Code unless result.filtered_warnings.empty?
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,7 @@
-require 'simplecov'
-SimpleCov.start { add_filter 'test' }
+if RUBY_ENGINE == 'ruby'
+  require 'simplecov'
+  SimpleCov.start { add_filter 'test' }
+end
 
 ENV['RAILS_ENV'] = 'test'
 require 'mock_app/config/environment'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.35
+  version: 3.4.36
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -331,6 +331,7 @@ files:
 - lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb
 - lib/generators/active_scaffold_controller/templates/controller.rb
 - lib/generators/active_scaffold_controller/templates/helper.rb
+- lib/tasks/brakeman.rake
 - public/blank.html
 - shoulda_macros/macros.rb
 - test/bridges/bridge_test.rb
@@ -444,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rails 3.2, 4.0, 4.1 and 4.2 versions of ActiveScaffold supporting prototype