buttercms 0.2.6 → 0.2.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 72e1323cedd8ce9d959dd54a165e66dee25cf5a5
4
- data.tar.gz: 022d163ebb2f2283800ff61e64309fa2ea6a2abd
3
+ metadata.gz: fee5a9ca16b49784b489066e79ba202f87bc93ac
4
+ data.tar.gz: 6eca210254c638a6605fb0e187d361beb449140a
5
5
  SHA512:
6
- metadata.gz: f41d5119c01f2bdf0c8b460e9206788ca141cd44c56fd5fd4326a6219accc621af43b7278dc1f7673534f845525ed49c4154beb7b8ea28f2e67c7f5234569654
7
- data.tar.gz: 3bfec1f7bc5aa609cef1f3bdbd2f5fb91dd9acbdfdd1d680d60b92a827503c5d46d8deafcd26bbcb5ad6a6306d115c61cc396afa872edfce779ddea006c9e76e
6
+ metadata.gz: ae6da0259d7c01f13cb1e75576108334e6c29dd69e9ebe293969d9e5e914c8d87e41f8e3166e6b0ad7fc26ff7e5566b677e9c6f45f32c2a929369d578068003d
7
+ data.tar.gz: ba5bb5eacfef7eec16133c3d1c1a4d5237041c0795013996bb3f4b7ee7b49295f3272a9796529b82d301afe154dd510190dca89a8fa21483aacd67bad715c68d
@@ -71,7 +71,7 @@ module Buttercms
71
71
  end
72
72
 
73
73
 
74
- class BlogController < ApplicationController
74
+ class BlogController < Buttercms.configuration.parent_controller.constantize
75
75
  include Buttercms::API
76
76
 
77
77
  layout :get_butter_layout
data/lib/buttercms.rb CHANGED
@@ -1,6 +1,10 @@
1
1
  require "buttercms/engine"
2
2
 
3
3
  module Buttercms
4
+
5
+ # mattr_accessor :parent_controller
6
+ # @@parent_controller = "ApplicationController"
7
+
4
8
  class << self
5
9
  attr_accessor :configuration
6
10
  end
@@ -11,11 +15,13 @@ module Buttercms
11
15
  end
12
16
 
13
17
  class Configuration
14
- attr_accessor :token, :layout, :home_template, :post_template, :author_template, :category_template
18
+ attr_accessor :token, :layout, :parent_controller
15
19
 
16
20
  def initialize
21
+ @parent_controller = 'ApplicationController'
17
22
  # Displays a default blog post with instructions on getting a personal token.
18
23
  @token = 'f97d131d955f48af0769a4c827bb47728cbd5d05'
19
24
  end
20
25
  end
26
+
21
27
  end
@@ -1,3 +1,3 @@
1
1
  module Buttercms
2
- VERSION = "0.2.6"
2
+ VERSION = "0.2.7"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: buttercms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6
4
+ version: 0.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - ButterCms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-29 00:00:00.000000000 Z
11
+ date: 2015-11-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: json