push_type_admin 0.2.0.beta2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3283ed56c6b6c2cb1e116645d4390e7e1895c37
-  data.tar.gz: aeb9a25918ea7524614dea92a501e2aac8eda409
+  metadata.gz: 0c4e7408a0353cc8b18200c69a7d06c5e9a90894
+  data.tar.gz: 89ed5b00e3a60657a64345c952cd0ce336efd110
 SHA512:
-  metadata.gz: 7a5cae1c9126f84edbd704ef0abd4595ddae5e2708b3b09568b0326ac90e76a0b21c1723880720294153447a4f0dafd31b8048a4aa74aa56c3f335205e6ed239
-  data.tar.gz: 21c9f2d6e9978ce66cd824199993490f178125023e4aab31e4ab1a7767317539faf4233ea68ab405b69e769efdefafe95dc65f799a5cf61fd053c58cce584747
+  metadata.gz: 667f60e3d856a97d960752deec2173b0c729877089b0f55c079f706eb52054d706c37c436a5a4e08236454e5b0e4870bd3c7f0d65cd303832fa9063b7e4c0f4e
+  data.tar.gz: 2f1735a0e87776766308530a1041113d7997c7ce5d4745e7bde041fed646793d614590c862d25385b86c7a9303956ddb105b0894ae9f53176cd23fd328cd7f30

data/app/assets/javascripts/push_type/admin_assets.js.coffee.erb

@@ -1 +1 @@
-<% PushType.config.admin_assets.javascripts.each { |js| require_asset(js) } %>
+<% PushType.admin_assets.javascripts.each { |js| require_asset(js) } %>

data/app/assets/stylesheets/push_type/admin_assets.scss.erb

@@ -1 +1 @@
-<% PushType.config.admin_assets.stylesheets.each { |css| require_asset(css) } %>
+<% PushType.admin_assets.stylesheets.each { |css| require_asset(css) } %>

data/app/helpers/push_type/assets_helper.rb

@@ -13,6 +13,7 @@ module PushType
     end
 
     def asset_preview_thumb_url(asset)
+      return nil unless asset.persisted?
       if asset.image?
         main_app.media_path(file_uid: asset.file_uid, style: :push_type_thumb)
       else

data/lib/push_type/admin/engine.rb

@@ -1,13 +1,9 @@
-require 'push_type/admin/assets'
-
 module PushType
   module Admin
     class Engine < ::Rails::Engine
       isolate_namespace PushType
       engine_name 'push_type_admin'
 
-      config.admin_assets = PushType::Admin::Assets.new
-
       config.generators do |g|
         g.assets false
         g.helper false

data/lib/push_type/admin.rb

@@ -12,14 +12,18 @@ require 'turbolinks'
 
 require 'breadcrumbs'
 require 'kaminari'
-require 'jbuilder'
 
 module PushType
 
   module Admin
   end
+
+  def self.admin_assets
+    @@admin_assets ||= PushType::Admin::Assets.new
+  end
 end
 
+require 'push_type/admin/assets'
 require 'push_type/admin/engine'
 
 require 'push_type/breadcrumbs/foundation'

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 = 'fa6b3b336dcbc625a762f200818f89ac1a12d7c90791aa1d2acef012459258a7'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: c1de6f2d504534a352c90408d6bf1244ad12330d720cf08580c977f1456811c56ffb9688656755826817121da7ec8fa11231b306ff53c7fd4361d326f0e9625d
+  secret_key_base: 5341e50f1e32d393d388ae11e5c79bcebb08645714e192569745d889e865fef4df4cf73d3f712aae19e5205ae01f372be11de799666954cdaa56071dc79f5457
 
 test:
-  secret_key_base: d5b2279ee139b7a430c68ab4e4a180a5588deebc5ce066027c9098b2db8eafb1b4bbfb760d3ac998d19d92a29b513a40aecd7f1a712879da96179bbdfcd8d3f7
+  secret_key_base: 50e03399fe84a88f86130c59f1b4231813feb92efdd5c17aac7c61e86c892c3312520a8e5e930d2a8c85861671b9edd5fa9699149700289d97f4c6fa47f741bd
 
 # 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: 20150208150319) do
+ActiveRecord::Schema.define(version: 20150209204348) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"