instedd-rails 0.0.24 → 0.0.25

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjE0NDNjMDAxODEwOGQ2NmJlZjVkYTZmMzg0ZDk2NzcxMzgzNzllNQ==
-  data.tar.gz: !binary |-
-    NDJlOTI4ODM1ZDZjMzJiNTRhYTA0NjFhMTczODcxOTUwYTM0ZjUwNQ==
+SHA1:
+  metadata.gz: 5291c3b3a2047903c33613cf180962112f6b4946
+  data.tar.gz: 2cb9ef8f57ca86c068c76001ca97eecd914de06b
 SHA512:
-  metadata.gz: !binary |-
-    M2Q1NzNiNTNhNzgxYTUyZjMwMmIyYzJkMGJjNmYzNmFiYTdmYWUxMGU0Y2Jm
-    YjJjMTFiNGY0Yzk0ZDE4ZjA1ZjNkYWZkZGYzYjZlY2FlMDhmYTUxYjJmZmM4
-    YzhhY2ZkNGRjYjRkMDdhZGE1YWU4ZjNhYThjNTFlNTUxZTg0ZWU=
-  data.tar.gz: !binary |-
-    MmEzMmFlM2NmYmEyN2ZhYWJiMzRiMWQzYjI4NjM1Zjc5NDM5MWZiNDMzODVl
-    YjNlMmM2YTk4ZWU5YzYxNmYxNDk1MmY2YWE1ZTg2MGMwNmI4MjJiY2E2MDVj
-    ZTcyOWUzYTkzNDRiYmQwYTI5NjNlZGFhMTI2NjY5MTU1MWNkOGY=
+  metadata.gz: e7180d75dbf85b95e48b0ef6f280fdf8e94ef60fbe8b66c2edfb1da048cc08aab7717f9dfadb2e364b10db2d3ef52d2e0bb3697b9f3ee07831b428a7a87f5f9b
+  data.tar.gz: d5fdbd626f5202754917d37e63e97c52440324c7d7c630181e5092368d7888132d8776c06d23d20a9e00cc0a32131071bfd5e8bc0bd6d695607daf8477fcc8a0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    instedd-rails (0.0.24)
+    instedd-rails (0.0.25)
       breadcrumbs_on_rails (>= 2.2.0)
       haml-rails
       rails (>= 3.0)

data/app/views/layouts/instedd_application.html.erb

@@ -81,7 +81,7 @@
           </div>
           <div>
             <div class="left">
-              <a href="http://instedd.org">&copy; 2011 InSTEDD</a>
+              <a href="http://instedd.org">&copy; <%= Date.current.year %> InSTEDD</a>
               <a href="<%= terms_and_conditions_path %>"><%= t("terms_and_conditions", :default => "Terms and conditions") %></a>
               <a href="mailto:support@instedd.org?subject=[<%= application_name.titleize %>]"><%= t("contact_us", :default => "Contact us") %></a>
             </div>

data/app/views/user_mailer/confirmation_instructions.html.erb

@@ -5,4 +5,4 @@
 	<%= t("to_verify_your_account_and_complete_the_registration_process_please_click_in_the_link_below_or_copy_paste_the_url_into_your_browser", :default => "To verify your account and complete the registration process please click in the link below or copy paste the URL into your browser") %>
 <% end  %>
 <br/>
-<%= advertised_link t("confirm_my_account", default:'Confirm my account'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
+<%= advertised_link t("confirm_my_account", default:'Confirm my account'), confirmation_url(@resource, :confirmation_token => (Gem.loaded_specs["devise"].version.version >= "3.0.0" ? @token : @resource.confirmation_token)) %>

data/app/views/user_mailer/confirmation_instructions.text.erb

@@ -2,4 +2,4 @@
 
 <%= t("to_verify_your_account_and_complete_the_registration_process_please_click_in_the_link_below_or_copy_paste_the_url_into_your_browser", :default => "To verify your account and complete the registration process please click in the link below or copy paste the URL into your browser") %>
 
-<%= confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>
+<%= confirmation_url(@resource, :confirmation_token => (Gem.loaded_specs["devise"].version.version >= "3.0.0" ? @token : @resource.confirmation_token)) %>

data/app/views/user_mailer/reset_password_instructions.html.erb

@@ -5,7 +5,7 @@
 	<%= t("someone_has_requested_a_link_to_change_your_password_and_you_can_do_this_through_the_link_below", :default => "Someone has requested a link to change your password, and you can do this through the link below.") %>
 <% end  %>
 <br/>
-<%= advertised_link t("change_my_password", default: 'Change my password'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
+<%= advertised_link t("change_my_password", default: 'Change my password'), edit_password_url(@resource, :reset_password_token => (Gem.loaded_specs["devise"].version.version >= "3.0.0" ? @token : @resource.confirmation_token)) %>
 <br/>
 <%= h2 do %>
 	<%= t("if_you_didnt_request_this_please_ignore_this_email_your_password_wont_change_until_you_access_the_link_above_and_create_a_new_one", :default => "If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.") %>

data/app/views/user_mailer/reset_password_instructions.text.erb

@@ -2,6 +2,6 @@
 
 <%= t("someone_has_requested_a_link_to_change_your_password_and_you_can_do_this_through_the_link_below", :default => "Someone has requested a link to change your password, and you can do this through the link below.") %>
 
-<%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
+<%= edit_password_url(@resource, :reset_password_token => (Gem.loaded_specs["devise"].version.version >= "3.0.0" ? @token : @resource.confirmation_token)) %>
 
 <%= t("if_you_didnt_request_this_please_ignore_this_email_your_password_wont_change_until_you_access_the_link_above_and_create_a_new_one", :default => "If you didn't request this, please ignore this email. Your password won't change until you access the link above and create a new one.") %>

data/lib/instedd_rails/version.rb

@@ -1,3 +1,3 @@
 module InsteddRails
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: instedd-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Instedd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem unifies all the helpers and common views used by all Instedd
@@ -124,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: instedd-rails
-rubygems_version: 2.1.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Instedd Platform Common helpers for Rails