lines-engine 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42964593398a6b475281340989af216edc6ce376
-  data.tar.gz: 3c1bc4bf999bee98015a34ec6466b95c628e2703
+  metadata.gz: 3a2d7a3ed1608348ebab01763013e62e3a2f48bd
+  data.tar.gz: 423dde4e108a2fdd0659cb19abfa4ca4ccf2b548
 SHA512:
-  metadata.gz: 4ae0c4f21272902fc6f3aa5837c3032b9527c6b1f135b11a6862fe1b027b870a832d9c86dbe4db1207ddc55cc0581efc50f896915a688d14c87eca756b99447e
-  data.tar.gz: ef78b41edf3abb6112cdc746b184286a5e8c3b416e0528ce582154d0076bf88887c2a63af279eb33076287c41586c9c7738de448da2723a34308070128ef3b96
+  metadata.gz: 310411de1139e7f92ece4aa94c6e6c2d6faf085883cdde6f7c342edddaea34892204c99d11bd9a472cb59ee04e5a7cf3538319ed0c5986ee1005513b8cd30b60
+  data.tar.gz: caa85d2c0182858d9d877a564b831f5e7c1fd3a5765e1655dd2785bf043db32173d140cf0db41ad34f3ffd0dd3f6cf6b4a13e17d20842bead535c8cd779f8160

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## development @master branch
+
+##0.6
+
+- Users are now able to reset their passwords. 
+- Default styles updated. If you want to use the new version, you have to overwrite your existing lines css files.
+- new generator +rails g lines:copy_styles+ added to update stylesheets from newer gem versions
+- IMPORTANT: please adjust your +config/lines_config.yml+ and add +from_email+ according to the following example:
+    ```
+    development:
+      host: "localhost:3000"
+      from_email: 'noreply@example.com'
+    test:
+      host: "test.local"
+      from_email: 'noreply@example.com'
+    production:
+      host: "blog.opoloo.com"
+      from_email: 'noreply@example.com'
+    ```
+- updated required gems (actionpack and redcarpet security alerts)
+
 ## 0.5
 
 - Completely moved from sprockets to SASS @import statements. Be aware that you have to remove all "*= require" statements from your CSS manifest and use @import instead. For more information, see: http://guides.rubyonrails.org/asset_pipeline.html

data/Gemfile

@@ -17,7 +17,7 @@ gemspec
 #gem 'rails3-jquery-autocomplete', github: 'francisd/rails3-jquery-autocomplete'
 #gem 'meta-tags', require: 'meta_tags'
 #gem 'rack-ssl-enforcer', require: 'rack/ssl-enforcer'
-gem 'acts-as-taggable-on', '~> 3.2.6'
+#gem 'acts-as-taggable-on', '~> 3.5.0'
 
 
 group :development do
@@ -39,4 +39,4 @@ group :test do
   gem 'guard-rspec'
   gem 'rb-inotify', '~> 0.9'
   gem 'launchy'
-end
+end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.5)
-      acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
+    lines-engine (0.6)
+      acts-as-taggable-on (~> 3.5, >= 3.5)
       bcrypt (~> 3.1.0, >= 3.1.0)
       bcrypt-ruby (>= 3.0.0, <= 4)
       carrierwave (~> 0.10.0, >= 0.10.0)
@@ -18,7 +18,7 @@ PATH
       rails (>= 3, < 5)
       rails3-jquery-autocomplete (~> 1.0.11, >= 1.0.11)
       railties (>= 3.2.6, < 5)
-      redcarpet (~> 3.1.2, >= 3.1.2)
+      redcarpet (~> 3.2.3, >= 3.2.3)
       rmagick (~> 2.13.4, >= 2.13.4)
       sanitize (~> 3.0.0, >= 3.0.0)
       sass-rails (>= 4.0.0)
@@ -31,45 +31,54 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (3.2.6)
-      activerecord (>= 3, < 5)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
+    acts-as-taggable-on (3.5.0)
+      activerecord (>= 3.2, < 5)
+    addressable (2.3.8)
+    arel (6.0.0)
     bcrypt (3.1.10)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     builder (3.2.2)
-    capistrano (3.2.1)
+    capistrano (3.4.0)
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
-    capybara (2.4.3)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -90,69 +99,81 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1.1)
-    colorize (0.7.3)
+    colorize (0.7.7)
     crass (0.2.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.5.2)
-    factory_girl (4.4.0)
+    factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     faker (1.4.3)
       i18n (~> 0.5)
-    ffi (1.9.5)
+    ffi (1.9.8)
     formatador (0.2.5)
     friendly_id (5.1.0)
       activerecord (>= 4.0.0)
-    guard (2.6.1)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
+    guard (2.12.5)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     hitimes (1.2.2)
-    i18n (0.6.11)
+    i18n (0.7.0)
     jquery-fileupload-rails (0.4.5)
       actionpack (>= 3.1)
       railties (>= 3.1)
       sass (>= 3.2)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.3)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
-    json (1.8.1)
+    json (1.8.2)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    launchy (2.4.2)
+    launchy (2.4.3)
       addressable (~> 2.3)
-    listen (2.7.11)
-      celluloid (>= 0.15.2)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     meta-tags (2.0.0)
       actionpack (>= 3.0.0)
     method_source (0.8.2)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
-    mysql2 (0.3.17)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.6.0)
+    mysql2 (0.3.18)
+    nenv (0.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     nokogumbo (1.1.12)
       nokogiri
+    notiffany (0.0.6)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     orm_adapter (0.5.0)
     posix-spawn (0.3.11)
     pry (0.10.1)
@@ -162,32 +183,41 @@ GEM
     pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    railroady (1.1.2)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
+    railroady (1.3.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
-      sprockets-rails (~> 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
     rails3-jquery-autocomplete (1.0.15)
       rails (>= 3.2)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.1.2)
+    redcarpet (3.2.3)
     rmagick (2.13.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -216,24 +246,25 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
+    shellany (0.0.1)
     simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
     sitemap_generator (5.0.5)
       builder
     slop (3.6.0)
-    sprockets (3.0.1)
+    sprockets (3.0.2)
       rack (~> 1.0)
     sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sshkit (1.5.1)
-      colorize
+    sshkit (1.7.1)
+      colorize (>= 0.7.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
@@ -245,13 +276,12 @@ GEM
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.2.1)
-    yard (0.8.7.4)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  acts-as-taggable-on (~> 3.2.6)
   capistrano
   capybara
   factory_girl_rails

data/Guardfile

@@ -0,0 +1,33 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch('spec/rails_helper.rb')                       { "spec" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/README.rdoc

@@ -21,22 +21,21 @@ To get an idea of the appearance, see the screenshots below, visit the {Lines We
 
 === Features
 
-- 960x540 px hero graphics for posts
+
+- authentication system (w/ password reset, remember token, ...)
+- custom hero graphics for posts
 - upload default hero images that you want to use more frequently
 - customizable generic titles & subtitles
 - automatic teaser & scaled image for the article overview
 - determine featured article
-- six headline styles according to priority
-- italics & bold text
-- block quotes
-- images, lists, links
+- markdown implementation (six headline styles according to priority, italics & bold text, block quotes, images, lists, links,...)
+- code highlighting
+- formatting help
 - tags for articles
 - G+ link to social network discussion
 - multiple authors and author information (for your small company or guest authors)
 - add documents for download
-- formatting help
 - direct RSS reader access
-- code highlighting
 
 
 == Installation
@@ -66,12 +65,17 @@ Currently Lines does not offer a GUI for managing users, but you can use a rake
 
 To update an existing user, you'll need the rails console with 'rails c'
   # UPDATE an existing user
-  u = User.find_by_email('your@email.com')
+  u = User.find_by(email: 'your@email.com')
   u.email = "new@mail.com"
   u.password = "newsekret"
   u.save
 
 
+=== Copy/update stylesheets
+
+Run <tt>rails g lines:copy_styles</tt> to install stylesheets from newer gem versions. Keep in mind to backup your overrides and other customizations before doing so!
+
+
 === Google Sitemap
 
 The sitemap_generator gem (https://github.com/kjvarga/sitemap_generator) handles the creation of sitemaps for search engines. To update the sitemap on server, run:

data/app/assets/stylesheets/lines/article.scss

@@ -2,11 +2,10 @@
   max-width: $max-width;
   font-family: $Merriweather;
   line-height: 1.5em;
-  font-size: 1.125em;
   color: #555;
 
 
-  h1, h2, h3, h4, h5 {
+  h1, h2, h3, h4, h5, h6 {
     font-family: $SourceSansPro;
   }
 
@@ -29,18 +28,18 @@
   .article_header {
     text-align: center;
     h1  {
-      font-size: 2.4em;
-      font-weight: 700;
-      line-height: 1.05em;
-      color: $orange;
-      a { color: $orange; }
-      a:hover { color:$darkgrey; }        
+      font-size: 3.0em;
+      font-weight: 900;
+      line-height: 120%;
+      color: $black;
+      a { color: $black; }
+      a:hover { color:$red; }        
     }
     h2 {
-      font-size: 1.333em;
+      font-size: 1.5em;
       font-weight: 400;
-      color: #b4b4b4;
-      line-height: 1.1em;
+      color: $grey;
+      line-height: 120%;
     }
     .author_name {
       font-family: $MerriweatherSans;
@@ -51,7 +50,7 @@
 
 
   .article_teaser {
-    font-size: 1.2em;
+    font-size: 1.375em;
     line-height: 1.8em;
     font-weight: 400;
   } 
@@ -59,37 +58,39 @@
   .article_content {
     line-height: 1.8em;
 
-    h1, h2, h3, h4, h5, h6 { margin-top: 3.0em; line-height: 1.15em; color: #333 }
-
-    h1 { font-size: 2.0em; }
-
-    h2 { font-size: 1.5em; }
+    h1, h2, h3, h4, h5, h6 { margin-top: 1.8em; line-height: 120%; color: $black }
+    h2, h3, h4, h5 { font-weight: 700; }
+    h6 { font-weight: 600; }
 
+    h1 { font-size: 2.5em; }
+    h2 { font-size: 2.0em;}
     h3 { 
-      font-size: 1.25em; 
-      color: $orange; 
+      font-size: 1.5em;
+      color: $red; 
       margin-bottom: 1.0em; 
-      a { color: $orange; }
-      a:hover { color: $darkgrey; }
+      a { color: $red; }
+      a:hover { color: $grey; }
     }
-
-    h4 { font-size: 1.111em; }
-
-    h5 { font-size: 1em; }
+    h4 { font-size: 1.25em; text-transform: uppercase;  }
+    h5 { font-size: 1.25em; }
+    h6 { font-size: 1.25em; color: $grey; }
 
     p { 
+      font-size: 1.125em;
       display: block; 
-      a { color: $orange; }
-      a:hover { color: $darkgrey; }
+      a { color: $red; }
+      a:hover { color: $grey; }
     }
   
-    a { border-bottom: 1px solid #ccc; }
+    a { 
+      border-bottom: 1px solid $grey;
+    }
 
     img { display: block; margin: 0 auto; }
 
     br { display: block; margin: 0; padding: 0;}
     
-    ul, ol {  }
+    ul, ol { font-size: 1.125em; }
     ul {
       margin-left: 2em;
       margin-right: 2em;
@@ -107,10 +108,33 @@
     }
 
     pre {
-      font-size: 1.0em;
+      border-left: 2px solid $grey;
+      font-family: $Monospace;
+      font-weight: 400;
+      font-size: 1.25em;
+      line-height: 140%;
+      color: $grey;
+      padding: 20px 0;
+    }
+
+    table {
+      border: none;
+      text-align: left;
+      margin: 40px 0;
+      th, td {
+        border: 1px solid $grey;
+        font-family: $SourceSansPro;
+        line-height: 120%;        
+        font-size: 1.25em;
+        color: $grey;
+        text-transform: uppercase;
+        padding: 20px;
+      }
+      th { font-weight: 700; }
+      td { font-weight: 400; }
     }
 
-    .highlight pre { margin: auto 2em; }
+    .highlight pre { margin: auto 2em; font-size: 0.875em; }
   }
 
   .article_footer {