buttercms 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b6a0e0792ce8b2169b4667e7b9ec9c9dd14de5
-  data.tar.gz: f800f177dca63d6ae49f47c572339de495e0b31f
+  metadata.gz: 55f6699fcd36b9e43d3e71e61efd09f864bc5766
+  data.tar.gz: 1735ef0367b65646be7a234be8ad6985581ef23f
 SHA512:
-  metadata.gz: 7e24e9f5b41556dc688da01f17ffb074371fa42b44caa22dbaf182c8ff539f998abb26d8258dd21ab59eeb6c1778b4532767f017bb3bb0444f6da2f3a9aade0b
-  data.tar.gz: e758cff407b66f481f8e6988c22a9c37cb9ed1cfefccd2adb00753c79aded5edbe97f0919532fec7fe9edbf2b934140707afeae52ec77ef611b48a67ee79a06b
+  metadata.gz: 8fc98f77fc5e32a8839921dc91c67f136ae9c01912669f973c1518cf192b69a6f201424a92140a4f260706bd930150014488a7867c04891049acdaccc053778f
+  data.tar.gz: c7fdd1b97b1fca18a552fd709ceecbc2274671d6a43be85d1a2d5a341812a82413d4fb0056b44cbb8f4cbec2c0ee14b87d86465c0310745a603990bef4d9253b

data/Rakefile

@@ -1,39 +1 @@
-require "bundler/gem_tasks"
-
-# begin
-#   require 'bundler/setup'
-# rescue LoadError
-#   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-# end
-
-# require 'rdoc/task'
-
-# RDoc::Task.new(:rdoc) do |rdoc|
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title    = 'Buttercms'
-#   rdoc.options << '--line-numbers'
-#   rdoc.rdoc_files.include('README.rdoc')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
-
-# APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-# load 'rails/tasks/engine.rake'
-
-
-# load 'rails/tasks/statistics.rake'
-
-
-
-# Bundler::GemHelper.install_tasks
-
-# require 'rake/testtask'
-
-# Rake::TestTask.new(:test) do |t|
-#   t.libs << 'lib'
-#   t.libs << 'test'
-#   t.pattern = 'test/**/*_test.rb'
-#   t.verbose = false
-# end
-
-
-# task default: :test
+require "bundler/gem_tasks"

data/app/controllers/buttercms/blog_controller.rb

@@ -5,7 +5,7 @@ require 'rest-client'
 module Buttercms
 
   # Displays a default blog post with instructions on getting a personal token.
-  DEFAULT_TOKEN = '6d7505c309afd84e80d806e8e2cb91be12b896ad'
+  DEFAULT_TOKEN = 'f97d131d955f48af0769a4c827bb47728cbd5d05'
   API_URL = 'https://buttercms.com/api/'
 
   class BlogController < ApplicationController
@@ -42,15 +42,33 @@ module Buttercms
     end
 
     def home
-      response = make_request("#{API_URL}posts/")
-      @recent_posts = JSON.parse(response)
+      # Check for pagination
+      if params[:page]
+        page_param = "?page=#{params[:page]}"
+      else
+        page_param = ''
+      end
+
+      p "#{API_URL}posts/#{page_param}"
+
+      response = make_request("#{API_URL}posts/#{page_param}")
+      response_json = JSON.parse(response)
+      @next_page = response_json['next_page']
+      @previous_page = response_json['previous_page']
+      @recent_posts = response_json['results']
     end
 
     def post
       response = make_request("#{API_URL}posts/#{params[:slug]}")
-      @blog_post = JSON.parse(response)
+      @post = JSON.parse(response)
+    end
+
+    def author
+      response = make_request("#{API_URL}authors/#{params[:author_slug]}")
+      response_json = JSON.parse(response)
+      @first_name = response_json['first_name']
+      @last_name = response_json['last_name']
+      @recent_posts = response_json['recent_posts']
     end
   end
 end
-
-

data/app/views/buttercms/blog/author.html.erb

@@ -0,0 +1,19 @@
+<h2>Recent posts from  <%=@first_name %> <%=@last_name %></h2>
+
+<% @recent_posts.each do |post| %>
+  <div class="post-preview">
+      <h2 class="post-title">
+        <%= link_to(post['title'], blog_post_path(:slug => post['slug'])) %>
+      </h2>
+
+      <p class="post-meta">
+        Posted by 
+        <%= link_to("#{post['author']['first_name']} #{post['author']['last_name']}", blog_author_path(:author_slug => post['author']['slug'])) %>
+        on <%= post['created'] %></p>
+
+      <p class="post-summary">
+          <%= post['summary'] %>
+      </p>
+  </div>
+  <hr>
+<% end %>

data/app/views/buttercms/blog/home.html.erb

@@ -4,11 +4,28 @@
         <%= link_to(post['title'], blog_post_path(:slug => post['slug'])) %>
       </h2>
 
-      <p class="post-meta">Posted by <%= post['author']['first_name'] %> <%= post['author']['last_name'] %> on <%= post['created'] %></p>
+      <p class="post-meta">
+        Posted by 
+        <%= link_to("#{post['author']['first_name']} #{post['author']['last_name']}", blog_author_path(:author_slug => post['author']['slug'])) %>
+        on <%= post['created'] %></p>
 
       <p class="post-summary">
           <%= post['summary'] %>
       </p>
   </div>
   <hr>
-<% end %>
+<% end %>
+
+<ul class="pager">
+  <% if @next_page %>
+  <li class="previous">
+    <%= link_to("&larr; Older Posts".html_safe, archive_path(:page => @next_page)) %>
+  </li>
+  <% end %>
+
+  <% if @previous_page %>
+  <li class="previous">
+    <%= link_to("Newer Posts &rarr;".html_safe, archive_path(:page => @previous_page)) %>
+  </li>
+  <% end %>
+</ul>

data/app/views/buttercms/blog/post.html.erb

@@ -1,12 +1,15 @@
 <div class="post-preview">
 
     <h2 class="post-title">
-        <%= @blog_post['title'] %>
+        <%= @post['title'] %>
     </h2>
 
-    <p class="post-meta">Posted by <%= @blog_post['author']['first_name'] %> <%= @blog_post['author']['last_name'] %> on <%= @blog_post['created'] %></p>
+    <p class="post-meta">
+    Posted by 
+    <%= link_to("#{@post['author']['first_name']} #{@post['author']['last_name']}", blog_author_path(:author_slug => @post['author']['slug'])) %>
+     on <%= @post['created'] %></p>
 
     <p class="post-body">
-        <%= @blog_post['body'].html_safe %>
+        <%= @post['body'].html_safe %>
     </p>
 </div>

data/buttercms.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  # Note that files like new views must be commited and tracked via git for them to be included when building.
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 

data/config/routes.rb

@@ -1,4 +1,8 @@
 Buttercms::Engine.routes.draw do
     get '/' => 'blog#home', as: :blog
+    get '/page/:page' => 'blog#home', as: :archive
+    get '/author/:author_slug' => 'blog#author', as: :blog_author
+    
+    # This must appear last since it's a catch all
     get '/:slug' => 'blog#post', as: :blog_post
 end

data/lib/buttercms/version.rb

@@ -1,3 +1,3 @@
 module Buttercms
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buttercms
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ButterCms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - app/controllers/buttercms/application_controller.rb
 - app/controllers/buttercms/blog_controller.rb
 - app/helpers/buttercms/application_helper.rb
+- app/views/buttercms/blog/author.html.erb
 - app/views/buttercms/blog/home.html.erb
 - app/views/buttercms/blog/post.html.erb
 - app/views/layouts/buttercms/application.html.erb