buttercms 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791d5af2a7da43fc63cec4c2e9c98537b5fad58b
-  data.tar.gz: e06028b7a6df2e89d9273d12f5e391da4d6d9ef9
+  metadata.gz: ffae362326c854f4c71b6b211a56dd618adba2e1
+  data.tar.gz: afb3417b99243d4399c41374b6940d75d101a50c
 SHA512:
-  metadata.gz: 28951af34e703b3f9e1c10245ae9b5f096c1b06403431efd6affacbd653f1ec78e82b79820033a5d6db6b94868f3c4dc1ccf93ce3066feed5f7f01295c43a7c1
-  data.tar.gz: fee0f123668d11988fcf6592bfe79e3f6b78b2409a03c6b641c291179e1033133f8a1f124777966c99fbdc4d057596fa13ce8c9351b244dd014ab21873dec6af
+  metadata.gz: b01327d77dc814e3079875a3d4b1dcee22d00b0d8a8269a8c2569137ac0705a0d7d31ac825b662294eba4df349dda1cea23be2028274980ba68332678bf4ca78
+  data.tar.gz: 4708804b8006672435d02b8e5f4d6cc80a8ab4e8c6ddac95f52636663dfb942f1273bed19d481236b317f248d2e4928c3354d1cf5ab37c1f650523d1bb525c65

data/.gitignore

@@ -8,6 +8,7 @@ capybara-*.html
 /public/system
 /coverage/
 /spec/tmp
+/Gemfile.lock
 **.orig
 rerun.txt
 pickle-email-*.html
@@ -20,9 +21,6 @@ config/secrets.yml
 /.bundle
 /vendor/bundle
 
-# these should all be checked in to normalise the environment:
-# Gemfile.lock, .ruby-version, .ruby-gemset
-
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
@@ -36,4 +34,4 @@ bower.json
 
 pkg/*
 
-.DS_Store
+.DS_Store

data/app/controllers/buttercms/blog_controller.rb

@@ -6,6 +6,27 @@ module Buttercms
 
   API_URL = 'https://buttercms.com/api/'
 
+  class Error < StandardError
+  end
+
+  class ConnectionError < Error
+    def message
+      "Unable to connect to ButterCms. Please double check your internet connection."
+    end
+  end
+
+  class TokenError < Error
+    def message
+      "This token has not been registered. Please register one @ https://buttercms.com/api_token/"
+    end
+  end
+
+  class InvalidResponseError < Error
+    def message
+      "An error occured retrieving blog. Please try again later."
+    end
+  end
+
   class BlogController < ApplicationController
     layout :get_butter_layout
     helper Rails.application.helpers
@@ -39,9 +60,11 @@ module Buttercms
 
     def make_butter_request(path)
       begin
-        response = RestClient.get path, {:Authorization => "Token #{get_butter_token}"}
+        # Get the content. If it takes longer than 10 seconds timeout.
+        # TODO(jlumetta): Make :timeout configurable.
+        response = RestClient.get path, {:Authorization => "Token #{get_butter_token}", :timeout => 10}
       rescue SocketError => e
-        raise Exception.new("Unable to connect to ButterCms. Please double check your internet connection.")
+        raise Buttercms::ConnectionError
       rescue => e
         puts e.message
 
@@ -49,9 +72,9 @@ module Buttercms
           when 404
             butter_not_found
           when 401
-            raise Exception.new("This token has not been registered. Please register one @ https://buttercms.com/api_token/")
+            raise Buttercms::TokenError
           else
-            raise Exception.new("An error occured retrieving blog. Please try again later.")
+            raise Buttercms::InvalidResponseError
           end
       end
 

data/buttercms.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.add_dependency "bundler", "~> 1.7"
-  spec.add_dependency "rake", "~> 10.0"
-  spec.add_dependency "json"
-  spec.add_dependency "rest-client"
+  spec.add_runtime_dependency "json", "~> 1.8"
+  spec.add_runtime_dependency "rest-client", "~> 1.8"
 
-
-end
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rake", "~> 10.0"
+end

data/lib/buttercms/version.rb

@@ -1,3 +1,3 @@
 module Buttercms
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: buttercms
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ButterCms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 description: Butter makes setting up a company blog on Rails insanely easy. It's built
   for developers to save us from hosting, DB setup, themeing, maintaining yet another
   Wordpress install. It's designed to be quickly integrated to an existing Rails project.
@@ -77,7 +77,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rst
 - Rakefile
@@ -93,7 +92,7 @@ files:
 - 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-0.1.6.gem
 - buttercms.gemspec
 - config/routes.rb
 - lib/buttercms.rb

data/Gemfile.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    buttercms (0.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    json (1.8.2)
-    mime-types (2.4.3)
-    netrc (0.10.3)
-    rake (10.4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  buttercms!
-  json
-  rake (~> 10.0)
-  rest-client

data/bin/rails

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/buttercms/engine', __FILE__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'rails/all'
-require 'rails/engine/commands'