buttercms 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 213c4e3b0d9409ef01f566115ee59ac79c1ffd6a
-  data.tar.gz: 936f410d199bf0bc5f9aa1fa49364f5d10fc9885
+  metadata.gz: 8b02b7d0590f7a4ad62bdab1961aa391ed09e4e3
+  data.tar.gz: 4fe5e6b47d516f1fad01096afc7888243bde8220
 SHA512:
-  metadata.gz: e906ef1e61db4a768425715d96fc0ecc75d39f53d4ea9a0d958cfa1c9a7f2e7ef5b588e047609308c9fbc35af6101b5a925ca3fbc6818909d0bdb6a988a929da
-  data.tar.gz: 85ec67f19e0dd63aeed49feff44178268e3f67e22d488f298eee027c4e163abadacba75707c18879830f894e50d0ba75cddd6925fbad21718e683a7d604d7406
+  metadata.gz: 8abe1ee76e26bb29642a6221947594017fa40405b566820597dd44cd2ca07caf303042e47c94f16f5563d4ef4633fba44a0e0e21dcb3cd0f1a714d1ce9aa9adb
+  data.tar.gz: 42371ee5c84d8b8ea342d99e4abb16e6b47eaa8367a98c47eac5b5dd278eded929ba65e6c41cf3583dc34641718d280048ed988f516dc069ff8eaa414b2467ee

data/.gitignore

@@ -20,6 +20,7 @@ config/secrets.yml
 ## Environment normalisation:
 /.bundle
 /vendor/bundle
+/vendor/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/app/controllers/buttercms/blog_controller.rb

@@ -30,7 +30,7 @@ module Buttercms
 
   # Thin wrapper around RestClient for talking to Butter API
   module API
-    API_URL = 'https://buttercms.com/api/'
+    API_URL = 'https://api.buttercms.com/api/'
 
     def butter_not_found
       raise ActionController::RoutingError.new('Not Found')
@@ -49,8 +49,11 @@ module Buttercms
 
     def make_butter_request(path)
       begin
-        # Get the content. If it takes longer than 10 seconds timeout.
-        response = RestClient.get "#{API_URL}#{path}", {:Authorization => "Token #{get_butter_token}", :timeout => 10}
+        response = RestClient::Request.execute(
+          method: :get,
+          url: "#{API_URL}#{path}",
+          verify_ssl: false
+        )
       rescue SocketError => e
         raise Buttercms::ConnectionError
       rescue => e
@@ -95,9 +98,9 @@ module Buttercms
     def butter_home
       # Check for pagination
       if params[:page]
-        page_param = "?page=#{params[:page]}"
+        page_param = "?page=#{params[:page]}&auth_token=#{get_butter_token}"
       else
-        page_param = ''
+        page_param = "?auth_token=#{get_butter_token}"
       end
 
       response = make_butter_request("posts/#{page_param}")
@@ -110,14 +113,14 @@ module Buttercms
     end
 
     def butter_post
-      response = make_butter_request("posts/#{params[:slug]}")
+      response = make_butter_request("posts/#{params[:slug]}?auth_token=#{get_butter_token}")
       @post = JSON.parse(response)
 
       render template: "blog/post"
     end
 
     def butter_author
-      response = make_butter_request("authors/#{params[:author_slug]}")
+      response = make_butter_request("authors/#{params[:author_slug]}?auth_token=#{get_butter_token}")
       response_json = JSON.parse(response)
       @first_name = response_json['first_name']
       @last_name = response_json['last_name']
@@ -128,7 +131,7 @@ module Buttercms
     end
 
     def butter_category
-      response = make_butter_request("categories/#{params[:category_slug]}")
+      response = make_butter_request("categories/#{params[:category_slug]}?auth_token=#{get_butter_token}")
       response_json = JSON.parse(response)
       @name = response_json['name']
       @recent_posts = response_json['recent_posts']
@@ -138,7 +141,7 @@ module Buttercms
 
 
     def butter_feed
-      response = make_butter_request("posts/")
+      response = make_butter_request("posts/?auth_token=#{get_butter_token}")
       response_json = JSON.parse(response)
       @recent_posts = response_json['results']
       respond_to do |format|
@@ -148,7 +151,7 @@ module Buttercms
     end
 
     def butter_sitemap
-      response = make_butter_request("sitemap/")
+      response = make_butter_request("sitemap/?auth_token=#{get_butter_token}")
       response_json = JSON.parse(response)
       @recent_posts = response_json
     end

data/lib/buttercms/version.rb

@@ -1,3 +1,3 @@
 module Buttercms
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/buttercms_test.rb

@@ -3,7 +3,7 @@ require 'rest-client'
 
 module Buttercms
   class ButtercmsApiTest < ActiveSupport::TestCase
-    API_URL = 'https://buttercms.com/api/'
+    API_URL = 'https://api.buttercms.com/api/'
     TEST_TOKEN = '6e9f14b48892b00079604c24c7c64a6a987456cf'
 
     test "truth" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buttercms
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - ButterCms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json