lines-engine 0.4.6.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a20ae95168e6f05757c5498d7d72306f60d7bbe
-  data.tar.gz: 42e781bdc2d697c95957fd38d863c45b90c07136
+  metadata.gz: 42964593398a6b475281340989af216edc6ce376
+  data.tar.gz: 3c1bc4bf999bee98015a34ec6466b95c628e2703
 SHA512:
-  metadata.gz: 6c3817425fb844dec8619c4f4d20159d38868db521914bc96af595f8e34f53b34fa20dd2725169ec3ccb50b9c86c904bce05b5b99d98e15b1ae0a2476a42a144
-  data.tar.gz: 6cd01512aaf58f14afd82b7809bd830c709f19768de6c9dc40d9727bb3cab810ce2175df63435480af0d64c0b77389c20c3fc3594c00e62a2c3c0d58c5bfddd0
+  metadata.gz: 4ae0c4f21272902fc6f3aa5837c3032b9527c6b1f135b11a6862fe1b027b870a832d9c86dbe4db1207ddc55cc0581efc50f896915a688d14c87eca756b99447e
+  data.tar.gz: ef78b41edf3abb6112cdc746b184286a5e8c3b416e0528ce582154d0076bf88887c2a63af279eb33076287c41586c9c7738de448da2723a34308070128ef3b96

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 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
+- Require statements from css manifest files removed that prevented @import statements to work correctly
+- renamed .css.scss files to .scss due to Rails deprecation warning
+
+
 ## 0.4.6.x
 
 - Fixed caching bug.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.4.6.4)
+    lines-engine (0.5)
       acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
       bcrypt (~> 3.1.0, >= 3.1.0)
       bcrypt-ruby (>= 3.0.0, <= 4)
@@ -86,15 +86,15 @@ GEM
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.9.1.1)
     colorize (0.7.3)
     crass (0.2.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.4.0)
+    execjs (2.5.2)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
@@ -115,10 +115,9 @@ GEM
     guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    hike (1.2.3)
     hitimes (1.2.2)
     i18n (0.6.11)
-    jquery-fileupload-rails (0.4.4)
+    jquery-fileupload-rails (0.4.5)
       actionpack (>= 3.1)
       railties (>= 3.1)
       sass (>= 3.2)
@@ -146,7 +145,6 @@ GEM
     mime-types (2.3)
     mini_portile (0.6.0)
     minitest (5.4.2)
-    multi_json (1.11.0)
     mysql2 (0.3.17)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -156,12 +154,12 @@ GEM
     nokogumbo (1.1.12)
       nokogiri
     orm_adapter (0.5.0)
-    posix-spawn (0.3.10)
+    posix-spawn (0.3.11)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pygments.rb (0.6.2)
+    pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
     rack (1.5.2)
@@ -212,7 +210,7 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.1.12)
     sass (3.4.13)
-    sass-rails (5.0.1)
+    sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -224,11 +222,8 @@ GEM
     sitemap_generator (5.0.5)
       builder
     slop (3.6.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.0.1)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)

data/app/assets/stylesheets/lines/{application.css.scss → application.scss}

@@ -8,16 +8,15 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require_self
- *= require lines/pygments
  */
 
-@import 'fonts.css.scss';
-@import 'variables_and_mixins.css.scss';
-@import 'navbar.css.scss';
-@import 'general.css.scss';
-@import 'article.css.scss';
-@import 'pagination.css.scss';
-@import 'footer.css.scss';
-@import 'media_queries.css.scss';
-@import 'lines_overrides.css.scss';
+@import 'pygments.css';
+@import 'fonts';
+@import 'variables_and_mixins';
+@import 'navbar';
+@import 'general';
+@import 'article';
+@import 'pagination';
+@import 'footer';
+@import 'media_queries';
+@import 'lines_overrides';

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

@@ -0,0 +1,6 @@
+/*
+ * Place your custom CSS and overrides here.
+ * Make sure to only use the override file for your custom CSS. The original CSS files may be overwritten 
+ * with newer gem versions.
+ * 
+ */

data/db/seeds.rb

@@ -4,6 +4,6 @@ img = Lines::Picture.create!({ image: (File.open(File.join(Rails.root, 'vendor/s
 
 Lines::Article.create({ :title => "Congratulations! You Have a Lines Blog.", :sub_title => "Here's what you get", :content => "This blog is designed to put the reading experience first. The viewer scales perfectly to all screen sizes and devices. So no frustration for the reader caused by small illegible text, but full focus on content instead. \r\n\r\nThe editing system is designed to work simply and beautifully, from action bar to usability issues, so you can use your time thinking about your writing.\r\n\r\n#Technology\r\n\r\nThis blog is based on Ruby on Rails 3.2, which is all you need besides a database that supports it. We're using a MySQL database. We're providing as clean a code as possible, and of course we'll maintain it and keep it up-to-date on GitHub.\r\n\r\n#For Developers\r\nNearly everything about this blog template can be customized to your personal needs and preferences.\r\n\r\n#Default features\r\n+ 960x540 px hero graphics for posts\r\n+ upload default hero images that you want to use more frequently\r\n+ customizable generic titles & subtitles\r\n+ automatic teaser for the article overview\r\n+ six headline styles according to priority\r\n+ *italics* & **bold text**\r\n+ > block quotes\r\n\r\n+ images, lists, links\r\n+ code examples in markdown\r\n\r\n```\r\nfunction fancyAlert(arg) {\r\n  if(arg) {\r\n    $.facebox({div:'#foo'})\r\n  }\r\n}\r\n```\r\n+ tags for articles\r\n+ G+ link to social network discussion\r\n+ multiple authors and author information\r\n+ add documents for download\r\n+ formatting help\r\n+ direct RSS reader access\r\n+ customizable footer\r\n\r\nBy default, the featured post (usually the latest one) is fully displayed, but you may choose your featured post. Below that, the user finds an overview of all the articles published with a small hero graphic and a teaser. If you have more than ten articles in your overview, pagination kicks in. \r\n\r\n#Non-Features\r\n+ management hassle\r\n+ rights and legal bullshit\r\n+ complicated settings\r\n+ disco lights\r\n\r\n\r\n#Design\r\n###Fonts: \r\nHeadlines for posts and H1.s are set in \"Museo\", the rest is \"Ubuntu\" — clean, future-oriented, democratic, appealing.\r\n# So, an H1 headline would look like this\r\n## Whereas, an H2 looks like this\r\n###And so on\r\n####And so forth\r\n#####Until, finally\r\n######You come to an H6. \r\n######Sometimes, it's nice to use those headline tags for highlighting continuing text, too, or for footnotes, additional comments, whatever you can imagine.\r\n\r\n###Colors: \r\nOpoloo orange and shades of grey\r\n\r\n###Flat: \r\nOur Android background clearly shows in the completely flat design approach. No drop shadows, no gloss, no distractions.\r\n\r\n\r\n#And finally ...\r\nWe hope you'll be as happy with this framework as we are. And if not, you can always change it. For any concerns, do by all means [contact us](http://www.opoloo.com/#kontakt).\r\n\r\n\r\n![Octoloo](#{img.image.url})\r\n", :published => true, :published_at => Time.now, :hero_image => "", :created_at => Time.now, :updated_at => Time.now, :slug => "congratulations-you-have-a-lines-blog", :gplus_url => "", :featured => true, :document => nil, :short_hero_image => "/heroes/001_dark.jpg" , :authors => [Lines::Author.first]})
 
-Lines::Article.create({ :title => "Customization & License", :sub_title => "", :content => "Find below all the important details you need to know about customizing your new blog system: modifying the stylesheets, adapting header & footer, and on.\r\n\r\nWe also made sure you get a friendly user license that gives you the freedom to do almost everything you want with this blog.\r\n\r\n#Customization\r\n\r\n##Modify CSS/SCSS\r\nAdmin viewer SCSS: \r\n```app/assets/stylesheets/admin.css.scss\r\n```\r\nDefault viewer SCSS: \r\n```app/assets/stylesheets/style.css.scss\r\n```\r\n##Header (Meta) & Footer\r\nTo change the header/meta/footer elements you need to modify\r\n```app/views/layouts/application.html.erb\r\n```\r\n\r\n#License\r\nYou may use the Lines blog template as you please. You must, however, keep the footer section, so attribution to Lines and Opoloo is granted.\r\n\r\nWe heartily invite you to extend the features of the template, but when you do, you should fork it on GitHub, so everyone can profit from your work.\r\n\r\nYou can see the full license [here](choosealicense.com/licenses/lgpl-v3/).", :published => true, :published_at => Time.now, :hero_image => "", :created_at => Time.now, :updated_at => Time.now, :slug => "customization-license", :gplus_url => "", :featured => false, :document => nil, :short_hero_image => "/heroes/001_dark.jpg" , :authors => [Lines::Author.first]})
+Lines::Article.create({ :title => "Customization & License", :sub_title => "", :content => "Find below all the important details you need to know about customizing your new blog system: modifying the stylesheets, adapting header & footer, and on.\r\n\r\nWe also made sure you get a friendly user license that gives you the freedom to do almost everything you want with this blog.\r\n\r\n#Customization\r\n\r\n##Modify CSS/SCSS\r\nAdmin viewer SCSS: \r\n```app/assets/stylesheets/admin.scss\r\n```\r\nDefault viewer SCSS: \r\n```app/assets/stylesheets/style.scss\r\n```\r\n##Header (Meta) & Footer\r\nTo change the header/meta/footer elements you need to modify\r\n```app/views/layouts/application.html.erb\r\n```\r\n\r\n#License\r\nYou may use the Lines blog template as you please. You must, however, keep the footer section, so attribution to Lines and Opoloo is granted.\r\n\r\nWe heartily invite you to extend the features of the template, but when you do, you should fork it on GitHub, so everyone can profit from your work.\r\n\r\nYou can see the full license [here](choosealicense.com/licenses/lgpl-v3/).", :published => true, :published_at => Time.now, :hero_image => "", :created_at => Time.now, :updated_at => Time.now, :slug => "customization-license", :gplus_url => "", :featured => false, :document => nil, :short_hero_image => "/heroes/001_dark.jpg" , :authors => [Lines::Author.first]})
 
 Lines::Article.create({ :title => "Lines Needs You", :sub_title => "", :content => "We believe in the power of open source. It's one of the best ways to push the boundaries of the web. Because Lines is still a young platform, it needs your help so it can mature and grow to its aspired size and strength. We can't wait to see all the great things your brilliant brain and fingers will do with this project.", :published => true, :published_at => Time.now, :hero_image => "", :created_at => Time.now, :updated_at => Time.now, :slug => "lines-needs-you", :gplus_url => "", :featured => false, :document => nil, :short_hero_image => "/heroes/003.jpg", :authors => [Lines::Author.first] })

data/lib/lines/engine.rb

@@ -25,7 +25,7 @@ module Lines
     end
 
     initializer "lines.assets.precompile" do |app|
-      app.config.assets.precompile += %w(lines/admin.css lines/admin.js)
+      app.config.assets.precompile += %w(lines/application.css lines/application.js lines/admin.css lines/admin.js)
     end
 
     initializer 'lines.action_controller' do |app|

data/lib/lines/version.rb

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

data/spec/dummy/app/assets/stylesheets/application.css

@@ -10,6 +10,4 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require_tree .
- *= require_self
  */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.6.4
+  version: '0.5'
 platform: ruby
 authors:
 - Opoloo GbR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -650,18 +650,18 @@ files:
 - app/assets/javascripts/lines/articles.js.coffee
 - app/assets/javascripts/lines/autosize.min.js
 - app/assets/javascripts/lines/pictures.js.coffee
-- app/assets/stylesheets/lines/admin.css.scss
-- app/assets/stylesheets/lines/application.css.scss
-- app/assets/stylesheets/lines/article.css.scss
-- app/assets/stylesheets/lines/fonts.css.scss
-- app/assets/stylesheets/lines/footer.css.scss
-- app/assets/stylesheets/lines/general.css.scss
-- app/assets/stylesheets/lines/lines_overrides.css.scss
-- app/assets/stylesheets/lines/media_queries.css.scss
-- app/assets/stylesheets/lines/navbar.css.scss
-- app/assets/stylesheets/lines/pagination.css.scss
+- app/assets/stylesheets/lines/admin.scss
+- app/assets/stylesheets/lines/application.scss
+- app/assets/stylesheets/lines/article.scss
+- app/assets/stylesheets/lines/fonts.scss
+- app/assets/stylesheets/lines/footer.scss
+- app/assets/stylesheets/lines/general.scss
+- app/assets/stylesheets/lines/lines_overrides.scss
+- app/assets/stylesheets/lines/media_queries.scss
+- app/assets/stylesheets/lines/navbar.scss
+- app/assets/stylesheets/lines/pagination.scss
 - app/assets/stylesheets/lines/pygments.css.erb
-- app/assets/stylesheets/lines/variables_and_mixins.css.scss
+- app/assets/stylesheets/lines/variables_and_mixins.scss
 - app/controllers/lines/admin/application_controller.rb
 - app/controllers/lines/admin/articles_controller.rb
 - app/controllers/lines/admin/authors_controller.rb

data/app/assets/stylesheets/lines/lines_overrides.css.scss

@@ -1,9 +0,0 @@
-/*
- * Place your custom CSS and overrides here. You can find the original CSS source under:
- *
- * app/assets/stylesheets/lines/style.css.scss
- *
- * Make sure to only use the override file for your custom CSS. The style.css may be overwritten 
- * with newer gem versions.
- * 
- */