lines-engine 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79594edd289606077b5e2f2372474a84e0ac485
-  data.tar.gz: 4c2022aad36fffea67189b7161ceccd8f08f7a96
+  metadata.gz: cab63d5a47a590891e484f2ea7f16dba92e95bf6
+  data.tar.gz: a6defa05747dc8cab8b136cc56cc74ac0d18cba1
 SHA512:
-  metadata.gz: cee05d60e72b6e3fd45d67624885e1fadb96bb5063d527aaa43d6da8ea8b2c624935baff9e02f296762d3e5cfda0aab0367d4cc85ea8575924691b1d995ddd98
-  data.tar.gz: 28f0e039b8394e8c850290c7de097a9044592ecc08f2e28d39bd1c662de05c29e176896eae3d3bdd31dde1c672ed87ca3daec27d34611913a7342d31e9b74f81
+  metadata.gz: 5f4c470d99fa76fdc17d7a67db716377663322e3b41d0018c2ff7ae07d09157d444aa19476d8d2d5595f25ca6624456a716a784d31fe8d20be055e35ef1d673b
+  data.tar.gz: ad6438da6803053bbae4a7b26c96fbc6092d8d2c1e580942ec6caa692257a71363c2b0b4438f5038239a2e66d25a862ca036e076394ef629071b2dd05aab1949

data/CHANGELOG.md

@@ -1,9 +1,16 @@
 # Changelog
 
+## 0.3.2
+
+- Pagination (kaminari gem) fixed: templates are now loaded from app/views/kaminari/lines/ as theme
+- Install generator: paginator templates from kaminari gem are now correctly added to host app
+
+
 ## 0.3.1
 
 - Fonts are now referenced by unified names and font attributes ('Ubuntu' instead of 'UbuntuBold' and 'UbuntuItalic')
 
+
 ## 0.3 
 
 - Heavily simplified CSS and markup for articles

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lines-engine (0.3.1)
+    lines-engine (0.3.2)
       acts-as-taggable-on (~> 3.2.6, >= 3.2.6)
       bcrypt (~> 3.1.0, >= 3.1.0)
       carrierwave (~> 0.10.0, >= 0.10.0)

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

@@ -299,6 +299,7 @@ header {
 }
 
 #pagination {
+  font-family: 'Ubuntu';
   display: block;
   overflow: visible;
   border-top: 1px solid #ccc;
@@ -318,13 +319,11 @@ header {
   .older { right: 0px; }
   .prev, .first {
     float: left;
-    background: url('/assets/arrow_left.png') top left no-repeat;
-    padding: 0 10px 0 50px;
+    padding: 0 10px;
   }
   .next, .last {
     float: right;
-    background: url('/assets/arrow_right.png') top right no-repeat;
-    padding: 0 50px 10px 0px;
+    padding: 0 10px;
   }
 
   .pages {

data/app/views/{lines/kaminari → kaminari/lines}/_next_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="next">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+  <%= link_to_unless current_page.last?, raw('Older &rsaquo;'), url, :rel => 'next', :remote => remote %>
 </span>

data/app/views/{lines/kaminari → kaminari/lines}/_prev_page.html.erb

@@ -7,5 +7,5 @@
     remote:        data-remote
 -%>
 <span class="prev">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+  <%= link_to_unless current_page.first?, raw('&lsaquo; Newer'), url, :rel => 'prev', :remote => remote %>
 </span>

data/app/views/lines/articles/index.html.erb

@@ -11,6 +11,6 @@
 
 <% if @articles.num_pages > 1 %>
 <div id="pagination">
-  <%= paginate @articles, outer_window: 1, window: 2 %>
+  <%= paginate @articles, outer_window: 1, window: 2, theme: 'lines' %>
 </div>
 <% end %>

data/config/locales/kaminari.en.yml

@@ -0,0 +1,8 @@
+en:
+  views:
+    pagination:
+      first: "« Newest"
+      last: "Oldest »"
+      previous: "‹ Newer"
+      next: "Older ›"
+      truncate: "…"

data/lib/generators/lines/install_generator.rb

@@ -23,6 +23,7 @@ module Lines
 
     def copy_views
       directory('../../../app/views/lines', 'app/views/lines/', {:exclude_pattern => /admin|sessions/})
+      directory('../../../app/views/kaminari', 'app/views/kaminari/'
       copy_file('../../../app/views/layouts/lines/application.html.erb', 'app/views/layouts/lines/application.html.erb')
       copy_file('../../../app/views/layouts/lines/preview.html.erb', 'app/views/layouts/lines/preview.html.erb')
     end

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/dummy/config/lines_config.yml

@@ -0,0 +1,55 @@
+###################################
+### GENERAL, HEADER & META TAGS ###
+###################################
+
+logo: "/assets/logo.png"                                      # Logo for your blog
+title: "Lines Blog - A Blog about Ruby on Rails"              # Give your blog a meaningful title. This is used for the HTML title attribute
+title_short: "Lines Blog"                                     # Place the name of your blog or a short title here
+short_description: "A Ruby on Rails Developer's Blog"         # Short description for your blog
+meta_description: "Lines - A Ruby on Rails Developer's Blog"  # meta description tag
+meta_author: "John Doe"                                       # meta tag for author
+keywords: "Lines, Blog, Ruby on Rails"                        # your keywords
+og_logo: "http://www.opoloo.de/assets/opoloogo.png"           # OpenGraph logo
+geo_position: "50.00; 8.27"                                   # Geo tags for position and address
+geo_address: "Opoloo, 55116 Mainz"                            # Geo tags for position and address
+
+
+##############
+### SOCIAL ###
+##############
+
+# Your Twitter and Google+ profile URL
+# Leave empty if you don't want to display inside the footer
+twitter_url: 'http://twitter.com/opoloo'
+gplus_url: 'https://plus.google.com/+Opoloo'
+
+
+#################
+### ATOM FEED ###
+#################
+
+feed_title: "Lines Blog - A Blog about Ruby on Rails"      # give your feed a title
+feed_logo: "http://blog.opoloo.com/assets/opoloo_feed.png" # full URL to the feed logo. Aspect ratio should be 2:1
+feed_favicon: "http://blog.opoloo.com/favivon.ico"         # #full URL to the favicon. Aspect ratio should be 1:1
+
+
+#####################
+### APP SPECIFICS ###
+#####################
+
+refresh_sitemap: false
+
+hero_images: ["001_dark.jpg", "001.jpg", "002_dark.jpg", "002.jpg", "003_dark.jpg", "003.jpg"]
+
+articles_per_page: 10 # Pagination: How many articles should be desplayed per page?
+
+# Your apps secret token. Generate a new one with 'rake secret' and paste it below
+secret_token: "afa4a436180a2febe9b814c6a57b6f3ad298aa82ce0ab4c9e8238713764b665e978f9fad8146587b6cf4a518de4a8f0eac1156cf43a778548e0082629d099fef"
+
+# Environment dependent configuration. Place your URLs here
+development:
+  host: "localhost:3000"
+test:
+  host: "test.local"
+production:
+  host: "blog.opoloo.com"

data/spec/dummy/config/locales/en.yml

@@ -20,4 +20,4 @@
 # available at http://guides.rubyonrails.org/i18n.html.
 
 en:
-  hello: "Hello world"
+  hello: 'world'

data/spec/dummy/config/routes.rb

@@ -1,58 +1,3 @@
 Rails.application.routes.draw do
   mount Lines::Engine => "/"
-
-  # The priority is based upon order of creation: first created -> highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id: product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lines-engine
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Opoloo GbR
@@ -618,15 +618,9 @@ files:
 - app/assets/heroes/002_dark.jpg
 - app/assets/heroes/003.jpg
 - app/assets/heroes/003_dark.jpg
-- app/assets/images/arrow_left.png
-- app/assets/images/arrow_right.png
 - app/assets/images/article-icons.png
 - app/assets/images/checkbox-icon.png
-- app/assets/images/favorite.png
-- app/assets/images/feed-icon-14x14.png
-- app/assets/images/feed-icon-28x28.png
 - app/assets/images/footer_icon.png
-- app/assets/images/header.jpg
 - app/assets/images/ic_action_add.png
 - app/assets/images/ic_action_home.png
 - app/assets/images/ic_arrow_left.png
@@ -639,15 +633,12 @@ files:
 - app/assets/images/ic_twitter.png
 - app/assets/images/ic_twitter_hover.png
 - app/assets/images/icon_addphoto.png
-- app/assets/images/lastproject_th.jpg
-- app/assets/images/latest_project.png
 - app/assets/images/logo.png
 - app/assets/images/logo_opoloo.png
 - app/assets/images/opoloo_feed.png
 - app/assets/images/signet.png
 - app/assets/images/signet_opoloo.png
 - app/assets/images/squirrelpark_signet.png
-- app/assets/images/timer_th.jpg
 - app/assets/javascripts/lines/admin.js
 - app/assets/javascripts/lines/application.js
 - app/assets/javascripts/lines/articles.js.coffee
@@ -676,6 +667,11 @@ files:
 - app/uploaders/document_uploader.rb
 - app/uploaders/hero_image_uploader.rb
 - app/uploaders/picture_uploader.rb
+- app/views/kaminari/lines/_gap.html.erb
+- app/views/kaminari/lines/_next_page.html.erb
+- app/views/kaminari/lines/_page.html.erb
+- app/views/kaminari/lines/_paginator.html.erb
+- app/views/kaminari/lines/_prev_page.html.erb
 - app/views/layouts/lines/_messages.html.erb
 - app/views/layouts/lines/admin.html.erb
 - app/views/layouts/lines/application.html.erb
@@ -701,13 +697,6 @@ 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/kaminari/_first_page.html.erb
-- app/views/lines/kaminari/_gap.html.erb
-- app/views/lines/kaminari/_last_page.html.erb
-- app/views/lines/kaminari/_next_page.html.erb
-- app/views/lines/kaminari/_page.html.erb
-- app/views/lines/kaminari/_paginator.html.erb
-- app/views/lines/kaminari/_prev_page.html.erb
 - app/views/lines/sessions/new.html.erb
 - app/views/lines/shared/_footer.html.erb
 - app/views/lines/shared/_navigation.html.erb
@@ -717,6 +706,7 @@ files:
 - config/initializers/load_config.rb
 - config/initializers/simple_form.rb
 - config/lines_config.yml
+- config/locales/kaminari.en.yml
 - config/routes.rb
 - db/migrate/20140505122014_base_migration.rb
 - db/migrate/20140702160602_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb
@@ -771,6 +761,7 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/lines_config.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
@@ -851,6 +842,7 @@ test_files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/lines_config.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml

data/app/views/lines/kaminari/_first_page.html.erb

@@ -1,11 +0,0 @@
-<%# Link to the "First" page
-  - available local variables
-    url:           url to the first page
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="first">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
-</span>

data/app/views/lines/kaminari/_last_page.html.erb

@@ -1,11 +0,0 @@
-<%# Link to the "Last" page
-  - available local variables
-    url:           url to the last page
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="last">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {remote: remote} %>
-</span>