lines-engine 0.5 → 0.6

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.5"
+  VERSION = "0.6"
 end

data/lines.gemspec

@@ -14,6 +14,9 @@ Gem::Specification.new do |s|
   s.description = "LINES lets you manage your posts in a clear, consistent frontend. The gracefully slender editor keeps your editing simple and lets you just splash around in your ideas. Once you're happy, just hit publish and see your text, code examples, images, and links shine."
   s.license     = "LGPL3"
   s.date        = Date.today.to_s
+  s.required_ruby_version = '>= 1.9.3'
+  s.cert_chain  = ['certs/lines-engine.pem']
+  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
 
 
   s.add_dependency 'orm_adapter', '>= 0.5'
@@ -24,9 +27,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'carrierwave', '~> 0.10.0', '>= 0.10.0'
   s.add_dependency 'kaminari', '~> 0.16.1', '>= 0.16.1'
   s.add_dependency 'pygments.rb', '~> 0.6.0', '>= 0.6.0'
-  s.add_dependency 'redcarpet', '~> 3.1.2', '>= 3.1.2'
+  s.add_dependency 'redcarpet', '~> 3.2.3', '>= 3.2.3'
   s.add_dependency 'jquery-rails', '< 5', '>= 3.1.0'
-  s.add_dependency 'acts-as-taggable-on', '~> 3.2.6', '>= 3.2.6'
+  s.add_dependency 'acts-as-taggable-on', '~> 3.5', '>= 3.5'
   s.add_dependency 'bcrypt', '~> 3.1.0', '>= 3.1.0'
   s.add_dependency 'simple_form', '~> 3', '>= 3.0.0', '< 4'
   s.add_dependency 'sitemap_generator', '~> 5.0.0', '>= 5.0.5'

data/spec/dummy/config/environments/development.rb

@@ -34,4 +34,9 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+  
+  # Mailer 
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.delivery_method = :test
+  config.action_mailer.default_url_options = { host: 'localhost:3000' }
 end

data/spec/dummy/config/environments/test.rb

@@ -36,4 +36,6 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  config.action_mailer.default_url_options = { host: 'example.com' }
 end

data/spec/dummy/config/lines_config.yml

@@ -49,7 +49,10 @@ secret_token: "afa4a436180a2febe9b814c6a57b6f3ad298aa82ce0ab4c9e8238713764b665e9
 # Environment dependent configuration. Place your URLs here
 development:
   host: "localhost:3000"
+  from_email: 'noreply@example.com'
 test:
   host: "test.local"
+  from_email: 'noreply@example.com'
 production:
-  host: "blog.opoloo.com"
+  host: "blog.opoloo.com"
+  from_email: 'noreply@example.com'

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141027143656) do
+ActiveRecord::Schema.define(version: 20150421093311) do
 
   create_table "friendly_id_slugs", force: true do |t|
     t.string   "slug",                      null: false
@@ -77,6 +77,8 @@ ActiveRecord::Schema.define(version: 20141027143656) do
     t.string   "password_digest"
     t.datetime "created_at",      null: false
     t.datetime "updated_at",      null: false
+    t.string   "reset_digest"
+    t.datetime "reset_sent_at"
   end
 
   create_table "taggings", force: true do |t|

data/spec/dummy/test/mailers/previews/user_mailer_preview.rb

@@ -0,0 +1,11 @@
+# Preview all emails at http://localhost:3000/rails/mailers/user_mailer
+class UserMailerPreview < ActionMailer::Preview
+
+  # Preview this email at
+  # http://localhost:3000/rails/mailers/user_mailer/password_reset
+  def password_reset
+    user = Lines::User.first
+    user.reset_token = Lines::User.generate_token
+    Lines::UserMailer.password_reset(user)
+  end
+end

data/spec/features/article_spec.rb

@@ -62,5 +62,4 @@ feature 'user publishes an article' do
     click_on "Publish"
     page.find("table.published").should have_content "How to Test"
   end
-
 end

data/spec/features/password_reset_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+feature 'user resets password' do
+  before(:each) do
+    @user = FactoryGirl.create(:user, password: 'password1234')
+    visit lines.login_path
+    expect(page).to have_content "Forgot password"
+    click_on "Forgot password"
+    expect(page).to have_content "Email"
+    fill_in "Email", with: @user.email
+    click_on 'Submit'
+    expect(page).to have_content "Email sent with password reset instructions"
+    #generate new reset token
+    @user.create_reset_digest
+    visit lines.edit_password_reset_url(@user.reload.reset_token, email: @user.email)
+    expect(page).to have_content 'Password Confirmation'
+  end
+
+  scenario 'with valid password' do
+    fill_in "Password", with: 'testtest'
+    fill_in "Confirmation", with: 'testtest'
+    click_on 'Update password'
+    expect(page).to have_content 'Password has been reset.'
+    expect(@user.reload.reset_digest).to eq nil
+  end
+
+  scenario 'with password too short' do
+    fill_in "Password", with: 't'
+    fill_in "Confirmation", with: 't'
+    click_on 'Update password'
+    expect(page).to have_content 'too short'
+  end
+
+  scenario 'with empty password' do
+    fill_in "Password", with: ''
+    fill_in "Confirmation", with: ''
+    click_on 'Update password'
+    expect(page).to have_content "Password can't be blank"
+  end
+
+  scenario 'with password confirmation not matching' do
+    fill_in "Password", with: 'testtest'
+    fill_in "Confirmation", with: 'testtest234'
+    click_on 'Update password'
+    expect(page).to have_content 'not match'
+  end
+
+end

data/spec/mailers/lines/user_mailer_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+module Lines
+  describe UserMailer do
+    describe "password_reset" do
+      let(:user) { FactoryGirl.create(:user) }
+      let(:mail) { UserMailer.password_reset(user) }
+
+      before(:each) do
+        user.create_reset_digest
+      end
+
+      it "renders the headers" do
+        mail.subject.should eq("Password reset")
+        mail.to.should eq([user.email])
+      end
+
+      it "renders the body" do
+        mail.body.encoded.should match("password")
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Opoloo GbR
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDYDCCAkigAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQ0wCwYDVQQDDARpbmZv
+  MRYwFAYKCZImiZPyLGQBGRYGb3BvbG9vMRIwEAYKCZImiZPyLGQBGRYCZGUwHhcN
+  MTUwNDIxMTIyMzQ5WhcNMTYwNDIwMTIyMzQ5WjA7MQ0wCwYDVQQDDARpbmZvMRYw
+  FAYKCZImiZPyLGQBGRYGb3BvbG9vMRIwEAYKCZImiZPyLGQBGRYCZGUwggEiMA0G
+  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxEm+2kvkvFdAyi6VKiSPvEbFLgvC7
+  +MnhXzkFGLOb4UFNB0uSK2xGdBf2QVDWmK8W19UQNWoXHv5Pfni0wmUJ5yoP7lNg
+  qMqZFK0tkDImsQRrfOndqNylVyy9vBn/YtyAYG/v+IGxEW59OoL1uvX4FnxJ3C07
+  P8I0gWPUlw4/UFSpzTj1r4IEeN21oYlgCSz98O5vZVkRZAVNmotxcn/+vcpERjZ+
+  ugolMzyEqC5Uztos/D4pSrtum/UIhDbYfzkoI78hZjsaKQQwbmJd9/WzI5FUqEhS
+  ucANoSTcibahVQ5Qg1AedJCTgO5Z2NBdCSXce8q5wx5W7BqNPNjML5VpAgMBAAGj
+  bzBtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSB4W9llLnHPI5e
+  OUL+IbfDGahfYjAZBgNVHREEEjAQgQ5pbmZvQG9wb2xvby5kZTAZBgNVHRIEEjAQ
+  gQ5pbmZvQG9wb2xvby5kZTANBgkqhkiG9w0BAQUFAAOCAQEAxSYCQ1c3Am0fpQZW
+  NNOiHDAcn8k8B4rFp0/llzsIH0WOttTnhYYHqKdnpWJms2xPOPppb9MD8d+HpBn4
+  mCIzpjfzE0RQ0RzzLUdfDXLJPjOaJ/vtKZMMBxfMivLfx8HZTGrVVVE3l8wPav/2
+  CMUyx9n4Yn6xztVzRbadZp3Q1O/Bsg7dFz7xVkxUEaM1oHGFR+HrWRX2ZyDpaUHJ
+  fNEZV3vwM6Ye3VRzeM3R7Z1R9e9FbUK6awQt/x4gAaI9m3LS85lbwuibKKpdYupp
+  5BNWA8E1pTLFIGuj2vWGF3LmLHATeyBGXNDBRf6XZUG124zSK5pxkJ5zm2uBhu00
+  +pn0Gw==
+  -----END CERTIFICATE-----
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -170,20 +192,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.2.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.2.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -210,20 +232,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -579,6 +601,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -668,8 +691,10 @@ files:
 - app/controllers/lines/admin/pictures_controller.rb
 - app/controllers/lines/application_controller.rb
 - app/controllers/lines/articles_controller.rb
+- app/controllers/lines/password_resets_controller.rb
 - app/controllers/lines/sessions_controller.rb
 - app/helpers/lines/application_helper.rb
+- app/mailers/lines/user_mailer.rb
 - app/models/lines/article.rb
 - app/models/lines/author.rb
 - app/models/lines/authorable.rb
@@ -709,10 +734,16 @@ files:
 - app/views/lines/articles/index.atom.builder
 - app/views/lines/articles/index.html.erb
 - app/views/lines/articles/show.html.erb
+- app/views/lines/password_resets/edit.html.erb
+- app/views/lines/password_resets/new.html.erb
 - app/views/lines/sessions/new.html.erb
+- app/views/lines/shared/_flash.html.erb
 - app/views/lines/shared/_footer.html.erb
 - app/views/lines/shared/_navigation.html.erb
+- app/views/lines/user_mailer/password_reset.html.erb
+- app/views/lines/user_mailer/password_reset.text.erb
 - bin/rails
+- certs/lines-engine.pem
 - config/initializers/carrierwave_test.rb
 - config/initializers/kaminari_config.rb
 - config/initializers/load_config.rb
@@ -725,8 +756,10 @@ files:
 - db/migrate/20140702160603_add_missing_unique_indices.acts_as_taggable_on_engine.rb
 - db/migrate/20140702160604_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - db/migrate/20141027143656_add_teaser_to_article.rb
+- db/migrate/20150421093311_add_reset_password_fields_to_users.rb
 - db/seeds.rb
 - lib/generators/lines/README
+- lib/generators/lines/copy_styles_generator.rb
 - lib/generators/lines/install_generator.rb
 - lib/generators/lines/templates/octorel.png
 - lib/lines.rb
@@ -783,13 +816,16 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/test/mailers/previews/user_mailer_preview.rb
 - spec/dummy/vendor/screenshots/octorel.png
 - spec/factories/articles.rb
 - spec/factories/authors.rb
 - spec/factories/pictures.rb
 - spec/factories/users.rb
 - spec/features/article_spec.rb
+- spec/features/password_reset_spec.rb
 - spec/features/user_logs_in_spec.rb
+- spec/mailers/lines/user_mailer_spec.rb
 - spec/models/article_spec.rb
 - spec/models/lines/author_spec.rb
 - spec/models/lines/picture_spec.rb
@@ -809,7 +845,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -864,13 +900,16 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/test/mailers/previews/user_mailer_preview.rb
 - spec/dummy/vendor/screenshots/octorel.png
 - spec/factories/articles.rb
 - spec/factories/authors.rb
 - spec/factories/pictures.rb
 - spec/factories/users.rb
 - spec/features/article_spec.rb
+- spec/features/password_reset_spec.rb
 - spec/features/user_logs_in_spec.rb
+- spec/mailers/lines/user_mailer_spec.rb
 - spec/models/article_spec.rb
 - spec/models/lines/author_spec.rb
 - spec/models/lines/picture_spec.rb