push_type_core 0.2.0.beta2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913da9e49a877e4f10781017676afbf8f87356a9
-  data.tar.gz: 5d277256f7eb5ca7b6f744dbfb203b6169f39f23
+  metadata.gz: 027e8e1c338edaa1fbc4b8fabb37328db231b35f
+  data.tar.gz: 006c080eab42cc183f85fffcccf8067a86e85d1f
 SHA512:
-  metadata.gz: e9dede54e2d4e68d5ffe2a552abe6d9f6e0066c754d260a9af0055afc50128ea212fecee691fc748e4d43305655a41be47122ba3dd6d278b5ea251daef56d4fa
-  data.tar.gz: e204e54912e6538c9350c6aad38cc8522b55d7bf341cf88679c78427380126f790e6bc7ebfccffdfca4dc4979689ef34eee928bea99df140918a964ceb44be47
+  metadata.gz: 6807bd9745cf1937350e426f2cff294c61c2221070417fdbf464a4038dcb4a90752a6bc55a81918a92a6f8bb721157e735eafe95289b7cd2d9b585b2843adf3c
+  data.tar.gz: bf37b3cff59b95aa6f734df9224e0353cf407429be57b595a44da0b1fa43c39d7cdbd8f754360f761b2bb8bbec3ba65f7c4fc9158ecf483059ccddb3c6d8f62c

data/config/initializers/dragonfly.rb

@@ -1,16 +1,3 @@
-# Configure
-Dragonfly.app.configure do
-  plugin :imagemagick
-
-  secret "6fa0d3bcb6c44e897ca39a48eb86eb6262e4351bd0311674ff350ebaeb08c982"
-
-  url_format "/media/:job/:name"
-
-  datastore :file,
-    root_path: Rails.root.join('public/system/dragonfly', Rails.env),
-    server_root: Rails.root.join('public')
-end
-
 # Logger
 Dragonfly.logger = Rails.logger
 

data/lib/generators/push_type/install/install_generator.rb

@@ -7,7 +7,7 @@ module PushType
     class_option :migrate, type: :boolean, default: true
 
     def create_push_type_initializer
-      copy_file 'push_type.rb', 'config/initializers/push_type.rb'
+      template 'push_type.rb', 'config/initializers/push_type.rb'
     end
 
     def inject_push_type_routes

data/lib/generators/push_type/install/templates/push_type.rb

@@ -1,15 +1,33 @@
 PushType.setup do |config|
 
-  #config.root_nodes = :all
+  config.root_nodes = :all
 
-  #config.home_slug = 'home'
+  config.unexposed_nodes = []
 
-  #config.unexposed_nodes = []
+  config.home_slug = 'home'
 
-  #config.media_styles = {
-  #  large:    '1024x1024>',
-  #  medium:   '512x512>',
-  #  small:    '256x256>'
-  #}
+  config.media_styles = {
+    large:    '1024x1024>',
+    medium:   '512x512>',
+    small:    '256x256>'
+  }
+
+  # Dragonfly datastore configuration
+  config.dragonfly_datastore = :file
+  config.dragonfly_datastore_options = {
+    root_path:    Rails.root.join('public/system/dragonfly', Rails.env),
+    server_root:  Rails.root.join('public')
+  }
+  
+  # For S3 storage, remember to add to Gemfile:
+  # gem 'dragonfly-s3_data_store'
+  # config.dragonfly_datastore = :s3
+  # config.dragonfly_datastore_options = {
+  #   bucket_name:        ENV['S3_BUCKET'],
+  #   access_key_id:      ENV['S3_ACCESS_KEY_ID'],
+  #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
+  # }
+
+  # config.dragonfly_secret = '<%= SecureRandom.hex(32) %>'
 
 end

data/lib/push_type/config.rb

@@ -0,0 +1,31 @@
+module PushType
+  module Config
+
+    mattr_accessor :root_nodes
+    @@root_nodes = :all
+
+    mattr_accessor :unexposed_nodes
+    @@unexposed_nodes = []
+
+    mattr_accessor :home_slug
+    @@home_slug = 'home'
+
+    mattr_accessor :media_styles
+    @@media_styles = {
+      large:    '1024x1024>',
+      medium:   '512x512>',
+      small:    '256x256>'
+    }
+
+
+    mattr_accessor :dragonfly_datastore
+    @@dragonfly_datastore = nil
+
+    mattr_accessor :dragonfly_datastore_options
+    @@dragonfly_datastore_options = nil
+
+    mattr_accessor :dragonfly_secret
+    @@dragonfly_secret = nil
+
+  end
+end

data/lib/push_type/core/engine.rb

@@ -4,18 +4,6 @@ module PushType
       isolate_namespace PushType
       engine_name 'push_type'
 
-      config.root_nodes = :all
-
-      config.home_slug = 'home'
-
-      config.unexposed_nodes = []
-
-      config.media_styles = {
-        large:    '1024x1024>',
-        medium:   '512x512>',
-        small:    '256x256>'
-      }
-
       config.generators do |g|
           g.assets false
           g.helper false
@@ -27,6 +15,11 @@ module PushType
       config.to_prepare do
         Rails.application.eager_load! unless Rails.application.config.cache_classes
       end
+
+      initializer 'push_type.dragonfly_config' do
+        PushType.config.dragonfly_secret ||= Rails.application.secrets.secret_key_base
+        PushType.dragonfly_app_setup!
+      end
     end
   end
 end

data/lib/push_type/core.rb

@@ -6,7 +6,7 @@ module PushType
   class << self
 
     def config
-      PushType::Core::Engine.config
+      PushType::Config
     end
 
     def setup(&block)
@@ -36,12 +36,23 @@ module PushType
         end
       end.sort
     end
+
+    def dragonfly_app_setup!
+      Dragonfly.app.configure do
+        plugin      :imagemagick
+        url_format  "/media/:job/:name"
+        secret      PushType.config.dragonfly_secret
+        datastore   PushType.config.dragonfly_datastore, PushType.config.dragonfly_datastore_options
+      end
+    end
+
   end
 
   module Core
   end
 end
 
+require 'push_type/config'
 require 'push_type/core/engine'
 require 'push_type/rails/routes'
 require 'push_type/field_type'

data/test/dummy/config/initializers/push_type.rb

@@ -1,15 +1,33 @@
 PushType.setup do |config|
 
-  #config.root_nodes = :all
+  config.root_nodes = :all
 
-  #config.home_slug = 'home'
+  config.unexposed_nodes = []
 
-  #config.unexposed_nodes = []
+  config.home_slug = 'home'
 
-  #config.media_styles = {
-  #  large:    '1024x1024>',
-  #  medium:   '512x512>',
-  #  small:    '256x256>'
-  #}
+  config.media_styles = {
+    large:    '1024x1024>',
+    medium:   '512x512>',
+    small:    '256x256>'
+  }
+
+  # Dragonfly datastore configuration
+  config.dragonfly_datastore = :file
+  config.dragonfly_datastore_options = {
+    root_path:    Rails.root.join('public/system/dragonfly', Rails.env),
+    server_root:  Rails.root.join('public')
+  }
+  
+  # For S3 storage, remember to add to Gemfile:
+  # gem 'dragonfly-s3_data_store'
+  # config.dragonfly_datastore = :s3
+  # config.dragonfly_datastore_options = {
+  #   bucket_name:        ENV['S3_BUCKET'],
+  #   access_key_id:      ENV['S3_ACCESS_KEY_ID'],
+  #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
+  # }
+
+  # config.dragonfly_secret = '2fcd8782bda2cc7d4af5e73debc5f20ee72ed291ae1bf5c61c70131294fcde45'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: dd929b927bce31a05356eda301eb4836880033a9bca7ca756470c41356c995062c6dc0135b672e9834b74aed8bb5ac42c3ce97a224705e4ddae074f5bedb5df8
+  secret_key_base: 0aa228f56c34f505dfbe61ac5f9833cf6536d4c55c52e6b2af9ebf1c8baf2c4ba4a395a361955b120b344c2e6b548d9c0547fca8d8da5dcbace5718ea9bd888f
 
 test:
-  secret_key_base: 9ec793b11cb3c0ddce5aa08671eb39b9657bc95b1d0c1042d7666733b2138dde01b54e8f413155992a6d7a2b63e0133d3028105d440e204c9018de4a4f4d6d16
+  secret_key_base: 320fa42023072869c0c5042f0523a849026b8f3b2718c8e70863035f966aca0b9924c7aee6572c19823837a04c40e88efa37169a099b9e02164a7ef7d023dc4b
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150208150308) do
+ActiveRecord::Schema.define(version: 20150209204337) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"