muck-engine 0.1.20 → 0.1.21

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.21

data/lib/action_controller/muck_application.rb

@@ -64,7 +64,18 @@ module ActionController
           nil
         end
       end 
-      
+
+      # **********************************************
+      # SSL method
+      # only require ssl if we are in production
+      def ssl_required?
+        return false unless GlobalConfig.enable_ssl
+        return ENV['SSL'] == 'on' ? true : false if defined? ENV['SSL']
+        return false if local_request?
+        return false if RAILS_ENV == 'test'
+        ((self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)) && (RAILS_ENV == 'production' || RAILS_ENV == 'staging')
+      end
+            
       # **********************************************
       # Paging methods
       def setup_paging
@@ -76,8 +87,8 @@ module ActionController
       def set_will_paginate_string
         # Because I18n.locale are dynamically determined in ApplicationController, 
         # it should not put in config/initializers/will_paginate.rb
-        WillPaginate::ViewHelpers.pagination_options[:previous_label] = t('common.previous_page')
-        WillPaginate::ViewHelpers.pagination_options[:next_label] = t('common.next_page')
+        WillPaginate::ViewHelpers.pagination_options[:previous_label] = t('muck.general.previous')
+        WillPaginate::ViewHelpers.pagination_options[:next_label] = t('muck.general.next')
       end
 
       # **********************************************

data/locales/en.yml

@@ -16,6 +16,8 @@ en:
       settings_saved: Settings have been saved.
       delete: Delete
       update: Update
+      previous: '« Previous'
+      next: 'Next »'
     engine:
       choose_country: "Choose Country"
       select_country_prompt: "Please select a country"

data/muck-engine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors: 
 - Justin Ball