tenon 1.0.27 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34e1b1b1ecbd92e365d323988b5e9bafb32e19c1
-  data.tar.gz: e068e258a9520d70e0c9acf36afb870a4cbb13cf
+  metadata.gz: b20101b1ae5ed68cc8f35d9b9e328496d3e4f84d
+  data.tar.gz: f80fef4d9a7f943e239e29509635a6f2cc424448
 SHA512:
-  metadata.gz: ea19fd36996e7c42de91645ec5e67cc5b38c5865d2970772d4f7a84d2fd0cc6c469d10113809f59fe2d0c0be73cf7fe4f19ed16908f345a5b5c1599db31a42f3
-  data.tar.gz: a6fb89c25554d018a19ad6b2b9941c6a2c979daf1e2bb6b2ef3fa3410c6bfbdeba6af8ad934dfb1346c6d2e6d008a9ed8462f02a3dbdda7b9c02a5a016d7327d
+  metadata.gz: b1000c12fffc2d03eac160598ec9db64a9d4fd2ac1f663772fa0a643f4c9005f54b283cdcae8973889b7160259fc1ab7316353e63fd610ffeaaba9c5ae8ec091
+  data.tar.gz: ed8fb9276d38ffb365b780ffb89af11915e53c0b03701dc443180f92de6299912fd9d23bc8cf53dda3d0777addeacffcb9313d605c3b2b9ebfc0700f8c4f77f0

data/README.rdoc

@@ -1,3 +1,64 @@
 = Tenon
 
-This project rocks and uses MIT-LICENSE.
+== License
+
+This project uses the MIT-LICENSE.  Do whatever you want with it as long as you
+don't violate the licenses of the various open source pieces on which it
+depends.
+
+== Installation
+
+In your Gemfile
+
+    gem 'tenon'
+
+and then bundle install.
+
+in config/application.rb:
+
+    require 'active_record/railtie'
+
+
+in config/routes.rb:
+
+    mount Tenon::Engine => '/tenon'
+
+
+Run command:
+
+    $ rake tenon:install:migrations
+    $ rake db:migrate
+
+
+You will need to have a database set up at this point.  Currently Tenon requires that you use postgres.
+
+Running rake db:migrate probably threw up a devise error.  Create config/initializers/devise.rb and paste:
+
+    Devise.setup do |config|
+      ## paste the secret key line from the error output ##
+    end
+
+
+Run that command again:
+
+    $ rake db:migrate
+
+
+Install the Tenon helpers in app/controllers/application_controller.rb:
+
+    helper Tenon::Engine.helpers
+
+Install the necessary files to run and customize Tenon (this is now required):
+
+    $ rails generate tenon:install
+
+To run seed data (such as creating an admin user) from Tenon, open console and run:
+
+    ENV['PASSWORD'] = 'password' # or something at least 8 chars long
+    Tenon::Engine.load_seed
+
+Restart your app and navigate to /tenon
+
+If you want to be able to use rspec, which would be good, you will also need to run:
+
+    bundle exec rails generate rspec:install

data/app/assets/javascripts/tenon/features/asset_attachment.js.coffee

@@ -34,4 +34,4 @@ class Tenon.features.AssetAttachment
     if @$browseButton.data('asset-field')
       $(@$browseButton.data('asset-field'))
     else
-      @$browseButton.closest('.asset-field')
+      @$browseButton.closest('.asset-field')

data/app/assets/javascripts/tenon/features/asset_detachment.js.coffee

@@ -0,0 +1,11 @@
+class Tenon.features.AssetDetachment
+  constructor: ->
+    $(document).on('click', '.remove-asset', @_removeAsset)
+
+  _removeAsset: (e) =>
+    e.preventDefault()
+    e.stopPropagation()
+    @$assetField = $(e.currentTarget).closest('.asset-field')
+    @$assetField.find('.asset-id-field').removeAttr('value')
+    @$assetField.find('.thumbnail img').attr('src', '/assets/tenon/thumb-doc.png')
+    @$assetField.find('.asset-info').html('No asset selected.')

data/app/assets/javascripts/tenon/tenon.js

@@ -35,6 +35,7 @@ var Tenon = {
     new Tenon.features.i18n();
     new Tenon.features.Flash();
     new Tenon.features.AssetCropping();
+    new Tenon.features.AssetDetachment();
     new Tenon.features.MainMenu();
     new Tenon.features.Pagination();
     new Tenon.features.HamburgerNavigation();

data/app/views/tenon/shared/_asset_field.html.haml

@@ -20,3 +20,7 @@
           %small
             or
             = link_to_remove_association "remove", f
+        - else
+          %small
+            or
+            = link_to "remove", '#', class: 'remove-asset'

data/lib/tenon/has_asset.rb

@@ -86,6 +86,10 @@ module Tenon
             attachment = ProxyAttachment.new(asset.attachment, self.class, asset_name)
             instance_variable_set("@#{asset_name}_id", val)
             instance_variable_set("@#{asset_name}", attachment)
+          else
+            unless self.send("#{asset_name}_id").blank?
+              Tenon::ItemAsset.where(item_type: self.class.to_s, item_id: id, asset_name: asset_name).destroy_all
+            end
           end
         end
       end

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.27'
+  VERSION = '1.0.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.28
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -192,6 +192,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: quiet_assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -923,6 +937,7 @@ files:
 - app/assets/javascripts/tenon/controllers/tenon.js.coffee
 - app/assets/javascripts/tenon/features/asset_attachment.js.coffee
 - app/assets/javascripts/tenon/features/asset_cropping.js.coffee
+- app/assets/javascripts/tenon/features/asset_detachment.js.coffee
 - app/assets/javascripts/tenon/features/asset_list_post_crop_handler.js.coffee
 - app/assets/javascripts/tenon/features/asset_uploader.js.coffee
 - app/assets/javascripts/tenon/features/box_toggles.js.coffee
@@ -1470,7 +1485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.