RubyGems - active_scaffold - Versions diffs - 3.0.12 → 3.0.21 - Mend

active_scaffold 3.0.12 → 3.0.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (142) hide show

data/lib/active_scaffold/bridges/carrierwave/lib/form_ui.rb CHANGED

@@ -3,31 +3,41 @@ module ActiveScaffold
     module FormColumnHelpers
       def active_scaffold_input_carrierwave(column, options)
         options = active_scaffold_input_text_options(options)
-        input = file_field(:record, column.name, options)
         carrierwave = @record.send("#{column.name}")
-        if carrierwave.file.present? && !carrierwave.file.empty?
+        if !carrierwave.file.blank?
+          remove_field_options = {
+            :name => options[:name].gsub(/\[#{column.name}\]$/, "[remove_#{column.name}]"),
+            :id => 'remove_' + options[:id],
+            :value => false
+          }
+          cache_field_options = {
+            :name => options[:name].gsub(/\[#{column.name}\]$/, "[#{column.name}_cache]"),
+            :id => options[:id] + '_cache'
+          }
           if ActiveScaffold.js_framework == :jquery
-            js_remove_file_code = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
+            js_remove_file_code = "$(this).prev('input#remove_#{options[:id]}').val('true'); $(this).parent().hide().next().show(); return false;";
+            js_dont_remove_file_code = "$(this).parents('div.carrierwave_controls').find('input#remove_#{options[:id]}').val('false'); return false;";
           else
-            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
+            js_remove_file_code = "$(this).previous('input#remove_#{options[:id]}').value='true'; $(this).up().hide().next().show(); return false;";
+            js_dont_remove_file_code = "$(this).up('div.carrierwave_controls').down('input#remove_#{options[:id]}').value='false'; return false;";
           end
-          hidden_field_options = {
-            :name => options[:name].gsub(/\[#{column.name}\]$/, "[delete_#{column.name}]"),
-            :id => options[:id] + '_delete',
-            :value => "false"
-          }
+          input = file_field(:record, column.name, options.merge(:onchange => js_dont_remove_file_code))
           content_tag( :div,
             content_tag(:div, (
                 get_column_value(@record, column) + " | " +
-                  hidden_field(:record, "delete_#{column.name}", hidden_field_options) +
+                  hidden_field(:record, "#{column.name}_cache", cache_field_options) +
+                  hidden_field(:record, "remove_#{column.name}", remove_field_options) +
                   content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code})
               ).html_safe
-            ) + content_tag(:div, input, :style => "display: none")
+            ) + content_tag(:div, input, :style => "display: none"),
+            :class => 'carrierwave_controls'
           )
         else
-          input
+          file_field(:record, column.name, options)
         end
       end
     end

data/lib/active_scaffold/bridges/carrierwave/lib/list_ui.rb CHANGED

@@ -3,7 +3,7 @@ module ActiveScaffold
     module ListColumnHelpers
       def active_scaffold_column_carrierwave(column, record)
         carrierwave = record.send("#{column.name}")
-        return nil unless carrierwave.file.present? && !carrierwave.file.empty?
+        return nil unless !carrierwave.file.blank?
         thumbnail_style = ActiveScaffold::Bridges::Carrierwave::Lib::CarrierwaveBridgeHelpers.thumbnail_style
         content = if carrierwave.versions.keys.include?(thumbnail_style)
           image_tag(carrierwave.url(thumbnail_style), :border => 0).html_safe

data/lib/active_scaffold/bridges/country_helper/bridge.rb ADDED

@@ -0,0 +1,9 @@
+ActiveScaffold::Bridges.bridge "CountryHelper" do
+  install do
+    require File.join(File.dirname(__FILE__), "lib/country_helper_bridge.rb")
+  end
+  install? do
+    true
+  end
+end

data/lib/active_scaffold/bridges/country_helper/lib/country_helper_bridge.rb ADDED

@@ -0,0 +1,358 @@
+module ActiveScaffold
+  module CountryHelperBridge
+    module CountryHelpers
+      # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
+      def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
+        ActionView::Helpers::InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
+      end
+      def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
+        ActionView::Helpers::InstanceTag.new(object, method, self, options.delete(:object)).to_usa_state_select_tag(priority_states, options, html_options)
+      end
+      # Returns a string of option tags for pretty much any country in the world. Supply a country name as +selected+ to
+      # have it marked as the selected option tag. You can also supply an array of countries as +priority_countries+, so
+      # that they will be listed above the rest of the (long) list.
+      #
+      # NOTE: Only the option tags are returned, you have to wrap this call in a regular HTML select tag.
+      def country_options_for_select(selected = nil, priority_countries = nil)
+        if priority_countries
+          country_options = options_for_select(priority_countries.collect {|country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country.to_s]} + [['-------------', '']], :selected => selected, :disabled => '')
+        else
+          country_options = ""
+        end
+        return country_options + options_for_select(COUNTRIES.collect {|country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country.to_s]}, :selected => selected)
+      end
+      # Returns a string of option tags for the states in the United States. Supply a state name as +selected to
+      # have it marked as the selected option tag. Included also is the option to set a couple of +priority_states+
+      # in case you want to highligh a local area
+      # NOTE: Only the option tags are returned from this method, wrap it in a <select>
+      def usa_state_options_for_select(selected = nil, priority_states = nil)
+        if priority_states
+          state_options = options_for_select(priority_states + [['-------------', '']], :selected => selected, :disabled => '')
+        else
+          state_options = ""
+        end
+        if priority_states && priority_states.include?(selected)
+          state_options += options_for_select(USASTATES - priority_states, :selected => selected)
+        else
+          state_options += options_for_select(USASTATES, :selected => selected)
+        end
+        return state_options
+      end
+            # All the countries included in the country_options output.
+            COUNTRIES = [
+      :afghanistan,
+      :aland_islands,
+      :albania,
+      :algeria,
+      :american_samoa,
+      :andorra,
+      :angola,
+      :anguilla,
+      :antarctica,
+      :antigua_and_barbuda,
+      :argentina,
+      :armenia,
+      :aruba,
+      :australia,
+      :austria,
+      :azerbaijan,
+      :bahamas,
+      :bahrain,
+      :bangladesh,
+      :barbados,
+      :belarus,
+      :belgium,
+      :belize,
+      :benin,
+      :bermuda,
+      :bhutan,
+      :bolivia,
+      :bosnia_and_herzegowina,
+      :botswana,
+      :bouvet_island,
+      :brazil,
+      :british_indian_ocean_territory,
+      :brunei_darussalam,
+      :bulgaria,
+      :burkina_faso,
+      :burundi,
+      :cambodia,
+      :cameroon,
+      :canada,
+      :cape_verde,
+      :cayman_islands,
+      :central_african_republic,
+      :chad,
+      :chile,
+      :china,
+      :christmas_island,
+      :cocos_keeling_islands,
+      :colombia,
+      :comoros,
+      :congo,
+      :congo_the_democratic_republic_of_the,
+      :cook_islands,
+      :costa_rica,
+      :cote_divoire,
+      :croatia,
+      :cuba,
+      :cyprus,
+      :czech_republic,
+      :denmark,
+      :djibouti,
+      :dominica,
+      :dominican_republic,
+      :ecuador,
+      :egypt,
+      :el_salvador,
+      :equatorial_guinea,
+      :eritrea,
+      :estonia,
+      :ethiopia,
+      :falkland_islands_malvinas,
+      :faroe_islands,
+      :fiji,
+      :finland,
+      :france,
+      :french_guiana,
+      :french_polynesia,
+      :french_southern_territories,
+      :gabon,
+      :gambia,
+      :georgia,
+      :germany,
+      :ghana,
+      :gibraltar,
+      :greece,
+      :greenland,
+      :grenada,
+      :guadeloupe,
+      :guam,
+      :guatemala,
+      :guernsey,
+      :guinea,
+      :guinea_bissau,
+      :guyana,
+      :haiti,
+      :heard_and_mcdonald_islands,
+      :holy_see_vatican_city_state,
+      :honduras,
+      :hong_kong,
+      :hungary,
+      :iceland,
+      :india,
+      :indonesia,
+      :iran_islamic_republic_of,
+      :iraq,
+      :ireland,
+      :isle_of_man,
+      :israel,
+      :italy,
+      :jamaica,
+      :japan,
+      :jersey,
+      :jordan,
+      :kazakhstan,
+      :kenya,
+      :kiribati,
+      :korea_democratic_peoples_republic_of,
+      :korea_republic_of,
+      :kuwait,
+      :kyrgyzstan,
+      :lao_peoples_democratic_republic,
+      :latvia,
+      :lebanon,
+      :lesotho,
+      :liberia,
+      :libyan_arab_jamahiriya,
+      :liechtenstein,
+      :lithuania,
+      :luxembourg,
+      :macao,
+      :macedonia_the_former_yugoslav_republic_of,
+      :madagascar,
+      :malawi,
+      :malaysia,
+      :maldives,
+      :mali,
+      :malta,
+      :marshall_islands,
+      :martinique,
+      :mauritania,
+      :mauritius,
+      :mayotte,
+      :mexico,
+      :micronesia_federated_states_of,
+      :moldova_republic_of,
+      :monaco,
+      :mongolia,
+      :montenegro,
+      :montserrat,
+      :morocco,
+      :mozambique,
+      :myanmar,
+      :namibia,
+      :nauru,
+      :nepal,
+      :netherlands,
+      :netherlands_antilles,
+      :new_caledonia,
+      :new_zealand,
+      :nicaragua,
+      :niger,
+      :nigeria,
+      :niue,
+      :norfolk_island,
+      :northern_mariana_islands,
+      :norway,
+      :oman,
+      :pakistan,
+      :palau,
+      :palestinian_territory_occupied,
+      :panama,
+      :papua_new_guinea,
+      :paraguay,
+      :peru,
+      :philippines,
+      :pitcairn,
+      :poland,
+      :portugal,
+      :puerto_rico,
+      :qatar,
+      :reunion,
+      :romania,
+      :russian_federation,
+      :rwanda,
+      :saint_barthelemy,
+      :saint_helena,
+      :saint_kitts_and_nevis,
+      :saint_lucia,
+      :saint_pierre_and_miquelon,
+      :saint_vincent_and_the_grenadines,
+      :samoa,
+      :san_marino,
+      :sao_tome_and_principe,
+      :saudi_arabia,
+      :senegal,
+      :serbia,
+      :seychelles,
+      :sierra_leone,
+      :singapore,
+      :slovakia,
+      :slovenia,
+      :solomon_islands,
+      :somalia,
+      :south_africa,
+      :south_georgia_and_the_south_sandwich_islands,
+      :spain,
+      :sri_lanka,
+      :sudan,
+      :suriname,
+      :svalbard_and_jan_mayen,
+      :swaziland,
+      :sweden,
+      :switzerland,
+      :syrian_arab_republic,
+      :taiwan_province_of_china,
+      :tajikistan,
+      :tanzania_united_republic_of,
+      :thailand,
+      :timor_leste,
+      :togo,
+      :tokelau,
+      :tonga,
+      :trinidad_and_tobago,
+      :tunisia,
+      :turkey,
+      :turkmenistan,
+      :turks_and_caicos_islands,
+      :tuvalu,
+      :uganda,
+      :ukraine,
+      :united_arab_emirates,
+      :united_kingdom,
+      :united_states,
+      :united_states_minor_outlying_islands,
+      :uruguay,
+      :uzbekistan,
+      :vanuatu,
+      :venezuela,
+      :viet_nam,
+      :virgin_islands_british,
+      :virgin_islands_us,
+      :wallis_and_futuna,
+      :western_sahara,
+      :yemen,
+      :zambia,
+      :zimbabwe] unless const_defined?("COUNTRIES")
+    	USASTATES = [["Alabama", "AL"], ["Alaska", "AK"], ["Arizona", "AZ"], ["Arkansas", "AR"], ["California", "CA"], ["Colorado", "CO"], ["Connecticut", "CT"], ["Delaware", "DE"], ["District of Columbia", "DC"], ["Florida", "FL"], ["Georgia", "GA"], ["Hawaii", "HI"], ["Idaho", "ID"], ["Illinois", "IL"], ["Indiana", "IN"], ["Iowa", "IA"], ["Kansas", "KS"], ["Kentucky", "KY"], ["Louisiana", "LA"], ["Maine", "ME"], ["Maryland", "MD"], ["Massachusetts", "MA"], ["Michigan", "MI"], ["Minnesota", "MN"], ["Mississippi", "MS"], ["Missouri", "MO"], ["Montana", "MT"], ["Nebraska", "NE"], ["Nevada", "NV"], ["New Hampshire", "NH"], ["New Jersey", "NJ"], ["New Mexico", "NM"], ["New York", "NY"], ["North Carolina", "NC"], ["North Dakota", "ND"], ["Ohio", "OH"], ["Oklahoma", "OK"], ["Oregon", "OR"], ["Pennsylvania", "PA"], ["Rhode Island", "RI"], ["South Carolina", "SC"], ["South Dakota", "SD"], ["Tennessee", "TN"], ["Texas", "TX"], ["Utah", "UT"], ["Vermont", "VT"], ["Virginia", "VA"], ["Washington", "WA"], ["Wisconsin", "WI"], ["West Virginia", "WV"], ["Wyoming", "WY"]] unless const_defined?("USASTATES")
+      class ActionView::Helpers::InstanceTag #:nodoc:
+        include CountryHelpers
+        def to_country_select_tag(priority_countries, options, html_options)
+          html_options = html_options.stringify_keys
+          add_default_name_and_id(html_options)
+          value = value(object)
+          selected_value = options.has_key?(:selected) ? options[:selected] : value
+          content_tag("select",
+            add_options(
+              country_options_for_select(selected_value, priority_countries),
+              options, selected_value
+            ), html_options
+          )
+        end
+        def to_usa_state_select_tag(priority_states, options, html_options)
+          html_options = html_options.stringify_keys
+          add_default_name_and_id(html_options)
+          value = value(object)
+          selected_value = options.has_key?(:selected) ? options[:selected] : value
+          content_tag("select", add_options(usa_state_options_for_select(selected_value, priority_states), options, selected_value), html_options)
+        end
+      end
+    end
+    module FormColumnHelpers
+      def active_scaffold_input_country(column, options)
+        select_options = {:prompt => as_(:_select_)}
+        select_options.merge!(options)
+        options.reverse_merge!(column.options).except!(:prompt, :priority)
+        options[:name] += '[]' if options[:multiple]
+        country_select(:record, column.name, column.options[:priority] || [:united_states], select_options, options)
+      end
+      def active_scaffold_input_usa_state(column, options)
+        select_options = {:prompt => as_(:_select_)}
+        select_options.merge!(options)
+        options.reverse_merge!(column.options).except!(:prompt, :priority)
+        options[:name] += '[]' if options[:multiple]
+        usa_state_select(:record, column.name, column.options[:priority], select_options, options)
+      end
+    end
+    module SearchColumnHelpers
+      def active_scaffold_search_country(column, options)
+        active_scaffold_input_country(column, options.merge!(:selected => options.delete(:value)))
+      end
+      def active_scaffold_search_usa_state(column, options)
+        active_scaffold_input_usa_state(column, options.merge!(:selected => options.delete(:value)))
+      end
+    end
+  end
+end
+ActionView::Base.class_eval do
+  include ActiveScaffold::CountryHelperBridge::CountryHelpers
+  include ActiveScaffold::CountryHelperBridge::FormColumnHelpers
+  include ActiveScaffold::CountryHelperBridge::SearchColumnHelpers
+end

data/lib/active_scaffold/bridges/date_picker/bridge.rb CHANGED

@@ -8,14 +8,16 @@ ActiveScaffold::Bridges.bridge "DatePicker" do
     if ActiveScaffold.js_framework == :jquery
       require File.join(directory, "lib/datepicker_bridge.rb")
-      FileUtils.cp(source, destination)
-      ActiveScaffold::Bridges::DatePickerBridge.localization(File.join(destination, 'date_picker_bridge.js'))
+      unless defined?(ACTIVE_SCAFFOLD_INSTALL_ASSETS) && ACTIVE_SCAFFOLD_INSTALL_ASSETS == false
+        FileUtils.cp(source, destination)
+        ActiveScaffold::Bridges::DatePickerBridge.localization(File.join(destination, 'date_picker_bridge.js'))
+      end
     else
       # make sure that jquery files are removed
       FileUtils.rm(File.join(destination, 'date_picker_bridge.js')) if File.exist?(File.join(destination, 'date_picker_bridge.js'))
     end
   end
   install? do
     true
   end