effective_assets 1.7.7 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc978e19c2644aa55f3f5ddef384da495141bbf2
-  data.tar.gz: 97c5c56905aca60f285e34d9bfd5c98ec3caa013
+  metadata.gz: 575677689fd92da51a47d0a77ea28c98bb903ca1
+  data.tar.gz: bcd980940b7e926a86de5f427553a45dde5a4010
 SHA512:
-  metadata.gz: 6bb9afcb5b18825bd704bb76414436d24e04567b158e3c723c0e7e83f72da525f78ab5dc9cb054691c6077f4f0363a7289da20510be81d9d38f8c77027a09349
-  data.tar.gz: c1abc5afb4d8594b6168436b78b4a160cf951b4bb924eea427872ed713c6a8b23b5bc59dae32148358b544e13ba2bc4ee4c21dcf1f8b0bd425045f4b2d828d14
+  metadata.gz: 201889c758244e264caf67a5fb3b729e7f8f0466f8f059bd23d5ce84f9146bb231e4bdb3c556cbbee386f79a9bb630f120e3a106f2898d7f796988c1da776228
+  data.tar.gz: 63c9008b994f8920de7607fc56e43b9b4e0e0b3faa711ffd4188f4d76fc632f12d09baac616c32ace52d629638c46e576fd48309302c500e788d0af8cf110afb

data/README.md

@@ -457,6 +457,12 @@ To allow user uploads, using Cancan:
 can [:create, :update, :destroy], Effective::Asset, :user_id => user.id
 ```
 
+To allow a user to see the admin / active_admin area:
+
+```ruby
+can :admin, :effective_assets
+```
+
 
 ## Rake Tasks
 
@@ -517,8 +523,6 @@ rake jobs:clear
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 
-Code and Effect is the product arm of [AgileStyle](http://www.agilestyle.com/), an Edmonton-based shop that specializes in building custom web applications with Ruby on Rails.
-
 
 ## Credits
 

data/active_admin/effective_assets.rb

@@ -1,6 +1,9 @@
 if defined?(ActiveAdmin)
   ActiveAdmin.register Effective::Asset do
-    menu :label => "Assets", :if => proc { EffectiveAssets.authorized?(controller, :manage, Effective::Asset.new()) rescue false }
+    menu :label => "Assets", :if => proc {
+      (EffectiveAssets.authorized?(controller, :manage, Effective::Asset.new()) rescue false) &&
+      (EffectiveAssets.authorized?(controller, :admin, :effective_assets) rescue false)
+    }
 
     filter :title
     filter :content_type

data/{lib/generators/templates → config}/effective_assets.rb

@@ -1,5 +1,3 @@
-# EffectiveAssets Rails Engine
-
 EffectiveAssets.setup do |config|
   config.assets_table_name = :assets
   config.attachments_table_name = :attachments
@@ -25,7 +23,7 @@ EffectiveAssets.setup do |config|
   #
   # Or disable the check completely:
   # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| true } # All users can see every screen
+  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
 
   # This is your S3 bucket information
   config.aws_bucket = ''

data/lib/effective_assets/engine.rb

@@ -27,7 +27,7 @@ module EffectiveAssets
 
     # Set up our default configuration options.
     initializer "effective_assets.defaults", :before => :load_config_initializers do |app|
-      eval File.read("#{config.root}/lib/generators/templates/effective_assets.rb")
+      eval File.read("#{config.root}/config/effective_assets.rb")
     end
 
     initializer "effective_assets.append_precompiled_assets" do |app|

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.7.7'.freeze
+  VERSION = '1.8.0'.freeze
 end

data/lib/generators/effective_assets/install_generator.rb

@@ -3,9 +3,9 @@ module EffectiveAssets
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      desc "Creates an EffectiveAssets initializer in your application."
+      desc 'Creates an EffectiveAssets initializer in your application.'
 
-      source_root File.expand_path("../../templates", __FILE__)
+      source_root File.expand_path('../../templates', __FILE__)
 
       def self.next_migration_number(dirname)
         if not ActiveRecord::Base.timestamped_migrations
@@ -16,25 +16,21 @@ module EffectiveAssets
       end
 
       def copy_initializer
-        template "effective_assets.rb", "config/initializers/effective_assets.rb"
+        template ('../' * 3) + 'config/effective_assets.rb', 'config/initializers/effective_assets.rb'
       end
 
       def copy_uploader
-        template "asset_uploader.rb", "app/uploaders/asset_uploader.rb"
+        template 'asset_uploader.rb', 'app/uploaders/asset_uploader.rb'
       end
 
       def create_migration_file
         @assets_table_name = ':' + EffectiveAssets.assets_table_name.to_s
         @attachments_table_name = ':' + EffectiveAssets.attachments_table_name.to_s
-        migration_template '../../../db/migrate/01_create_effective_assets.rb.erb', 'db/migrate/create_effective_assets.rb'
+        migration_template ('../' * 3) + 'db/migrate/01_create_effective_assets.rb.erb', 'db/migrate/create_effective_assets.rb'
       end
 
       def install_delayed_jobs
-        run "rails generate delayed_job:active_record"
-      end
-
-      def show_readme
-        readme "README" if behavior == :invoke
+        run 'rails generate delayed_job:active_record'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,15 +207,14 @@ files:
 - app/views/effective/assets/iframe.html.haml
 - app/views/effective/snippets/_effective_asset.html.haml
 - app/views/effective/style_guide/_effective_assets.html.haml
+- config/effective_assets.rb
 - config/routes.rb
 - db/migrate/01_create_effective_assets.rb.erb
 - lib/effective_assets.rb
 - lib/effective_assets/engine.rb
 - lib/effective_assets/version.rb
 - lib/generators/effective_assets/install_generator.rb
-- lib/generators/templates/README
 - lib/generators/templates/asset_uploader.rb
-- lib/generators/templates/effective_assets.rb
 - lib/tasks/effective_assets_tasks.rake
 homepage: https://github.com/code-and-effect/effective_assets
 licenses:

data/lib/generators/templates/README

@@ -1 +0,0 @@
-Thanks for using EffectiveAssets