buttercms 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 011636c65a7805bebf4508d06043e5c530d5c281
-  data.tar.gz: ee5605a5e3854743db839c04cd033140c5de5797
+  metadata.gz: cdaf25f92202f5af0f2abe882d1d57e6dce8afaa
+  data.tar.gz: 68cc14b6e2510c9a3d9f2e330a0158d8c1d25050
 SHA512:
-  metadata.gz: 8f1ad496e7bf4eaed110d89e2ae2ac2335117e2fb3cd5d06e66117f0240f74f4b025229f663ea4e8acbfa7f5c8e24096860de88c753a7989da8d8ca18f8dd93a
-  data.tar.gz: 65c64531e34b81b33bb80dd4ad513bc06193f8801e8e77dea1e43f3641be0aecd8a0a3b2934e67f22062e311d1b46bcc9050c59ed6c61adb01d86004a7689492
+  metadata.gz: 5e30acd6680bf3702b9f870e7e11cdb3e473b5db66e5327973ce205a34a0a192a23b06e79f3ab38a516c553aa6442cda574a45d71196977a67fc6bab9db57ce6
+  data.tar.gz: 3d1b05d4449fb621dba58525fbbfc1daf7119e7855f81963b5b83693e90eac0ce186ce5277bf07deb322c25b323ec9bbe8661da5e3353576e2121bd60b4d0da7

data/app/controllers/buttercms/blog_controller.rb

@@ -7,13 +7,25 @@ module Buttercms
   API_URL = 'https://buttercms.com/api/'
 
   class BlogController < ApplicationController
+    layout :get_butter_layout
+    helper Rails.application.helpers
 
-    def not_found
+    def get_butter_layout
+      if defined? Buttercms.configuration
+        if !Buttercms.configuration.layout.nil?
+          return Buttercms.configuration.layout
+        end
+      end
+
+      # Default to the included layout.
+      return "buttercms/application"
+    end
+
+    def butter_not_found
       raise ActionController::RoutingError.new('Not Found')
     end
 
-    def get_token
-      
+    def get_butter_token
       # Make sure the Buttercms has been initialized.
       if defined? Buttercms.configuration
         if defined? Buttercms.configuration.token
@@ -24,9 +36,9 @@ module Buttercms
       raise Exception.new("/config/intitializer/butter.rb is missing. Please run $ rails g buttercms:install")
     end
 
-    def make_request(path)
+    def make_butter_request(path)
       begin
-        response = RestClient.get path, {:Authorization => "Token #{get_token}"}
+        response = RestClient.get path, {:Authorization => "Token #{get_butter_token}"}
       rescue SocketError => e
         raise Exception.new("Unable to connect to ButterCms. Please double check your internet connection.")
       rescue => e
@@ -34,7 +46,7 @@ module Buttercms
 
         case e.response.code
           when 404
-            not_found
+            butter_not_found
           when 401
             raise Exception.new("This token has not been registered. Please register one @ https://buttercms.com/api_token/")
           else
@@ -45,7 +57,7 @@ module Buttercms
       return response
     end
 
-    def home
+    def butter_home
       # Check for pagination
       if params[:page]
         page_param = "?page=#{params[:page]}"
@@ -53,7 +65,7 @@ module Buttercms
         page_param = ''
       end
 
-      response = make_request("#{API_URL}posts/#{page_param}")
+      response = make_butter_request("#{API_URL}posts/#{page_param}")
       response_json = JSON.parse(response)
       @next_page = response_json['next_page']
       @previous_page = response_json['previous_page']
@@ -66,8 +78,8 @@ module Buttercms
       end
     end
 
-    def post
-      response = make_request("#{API_URL}posts/#{params[:slug]}")
+    def butter_post
+      response = make_butter_request("#{API_URL}posts/#{params[:slug]}")
       @post = JSON.parse(response)
 
       if defined? Buttercms.configuration
@@ -77,8 +89,8 @@ module Buttercms
       end
     end
 
-    def author
-      response = make_request("#{API_URL}authors/#{params[:author_slug]}")
+    def butter_author
+      response = make_butter_request("#{API_URL}authors/#{params[:author_slug]}")
       response_json = JSON.parse(response)
       @first_name = response_json['first_name']
       @last_name = response_json['last_name']
@@ -91,8 +103,8 @@ module Buttercms
       end
     end
 
-    def category
-      response = make_request("#{API_URL}categories/#{params[:category_slug]}")
+    def butter_category
+      response = make_butter_request("#{API_URL}categories/#{params[:category_slug]}")
       response_json = JSON.parse(response)
       @name = response_json['name']
       @recent_posts = response_json['recent_posts']

data/config/routes.rb

@@ -1,9 +1,9 @@
 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
-    get '/category/:category_slug' => 'blog#category', as: :blog_category
+    get '/' => 'blog#butter_home', as: :blog
+    get '/page/:page' => 'blog#butter_home', as: :archive
+    get '/author/:author_slug' => 'blog#butter_author', as: :blog_author
+    get '/category/:category_slug' => 'blog#butter_category', as: :blog_category
     
     # This must appear last since it's a catch all
-    get '/:slug' => 'blog#post', as: :blog_post
+    get '/:slug' => 'blog#butter_post', as: :blog_post
 end

data/lib/buttercms/version.rb

@@ -1,3 +1,3 @@
 module Buttercms
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buttercms
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ButterCms
@@ -84,15 +84,14 @@ files:
 - app/assets/images/buttercms/.keep
 - app/assets/javascripts/buttercms/application.js
 - app/assets/stylesheets/buttercms/application.css
-- app/controllers/buttercms/application_controller.rb
 - app/controllers/buttercms/blog_controller.rb
 - app/helpers/buttercms/application_helper.rb
 - app/views/buttercms/blog/_pagers.html.erb
 - app/views/buttercms/blog/_post.html.erb
-- app/views/buttercms/blog/author.html.erb
-- app/views/buttercms/blog/category.html.erb
-- app/views/buttercms/blog/home.html.erb
-- app/views/buttercms/blog/post.html.erb
+- app/views/buttercms/blog/butter_author.html.erb
+- app/views/buttercms/blog/butter_category.html.erb
+- app/views/buttercms/blog/butter_home.html.erb
+- app/views/buttercms/blog/butter_post.html.erb
 - app/views/layouts/buttercms/application.html.erb
 - bin/rails
 - buttercms.gemspec

data/app/controllers/buttercms/application_controller.rb

@@ -1,17 +0,0 @@
-module Buttercms
-  class ApplicationController < ActionController::Base
-    layout :get_layout
-    helper Rails.application.helpers
-
-    def get_layout
-      if defined? Buttercms.configuration
-        if !Buttercms.configuration.layout.nil?
-          return Buttercms.configuration.layout
-        end
-      end
-
-      # Default to the included layout.
-      return "buttercms/application"
-    end
-  end
-end