outpost-asset_host 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0b057234884be99db3aa56824d86d30feb805b5c
+  data.tar.gz: 698ef6151d5ad6a3cdf287b38c3d6277cdfc683c
+SHA512:
+  metadata.gz: 0f8879c7a9e081de29e1706b0fecabc625c8fb4a6ee2ff627b3c8a29cf00bd8661d25edc6dd76eff746b1f1965ceb1191e79997e14428123d6d3be2977deda6e
+  data.tar.gz: dc1b6e608bf178f74bb4afa7c1b029501278608868bf1c8f2bee892333eca222bc148db963053c91c052935e9b68b870accdc4e440fe6d6db40c39bd49dbc1c2

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## 1.1.0
+### Changes
+* Removed old Secretary hooks.
+* Increased pop-up chooser height.

data/lib/assets/javascripts/outpost/asset_host/asset_manager.js.coffee

@@ -17,9 +17,9 @@ class outpost.AssetManager
 
         @assets     = new outpost.AssetHost.Assets(assets)
         @assetsView = new outpost.AssetManager.Assets(collection: @assets)
-        
+
         @el.html @assetsView.el
-        
+
         # Register listener for AssetHost message
         window.addEventListener "message", (event) =>
             # If the data is an object (i.e. not "LOADED"), do things
@@ -31,18 +31,18 @@ class outpost.AssetManager
         , false
 
     #----------
-    
+
     updateInput: ->
         $(@options.jsonInput).val(JSON.stringify(@assets.simpleJSON()))
-        
+
     #----------
-    
+
     @Asset: Backbone.View.extend
         tagName: "li"
         template: JST[AssetManager.TemplatePath + 'asset']
-        
+
         #----------
-        
+
         initialize: ->
             @render()
             @model.bind "change", => @render()
@@ -52,35 +52,35 @@ class outpost.AssetManager
         render: ->
             if @model.get('tags')
                 @$el.html @template(asset: @model.toJSON())
-                
+
             @
-    
+
     #----------
 
     @Assets: Backbone.View.extend
         tagName: "ul"
         events: "click a.popup": "_popup"
-        
+
         initialize: ->
             @_views = {}
-            
-            @collection.bind "reset", => 
+
+            @collection.bind "reset", =>
                 view.detach() for view in @_views
                 @_views = {}
-                
-            @collection.bind 'add', (f) => 
+
+            @collection.bind 'add', (f) =>
                 @_views[f.cid] = new outpost.AssetManager.Asset
                     model: f
-                
+
                 @renderCollection()
 
-            @collection.bind 'remove', (f) => 
+            @collection.bind 'remove', (f) =>
                 $(@_views[f.cid].el).detach()
                 delete @_views[f.cid]
                 @renderCollection()
-            
+
             # attach a listener to wait for the LOADED message
-            window.addEventListener "message", (evt) => 
+            window.addEventListener "message", (evt) =>
                 if evt.data == "LOADED" and @chooserIsAvailable()
                     console.log @collection.toJSON()
                     # dispatch our event with the asset data
@@ -88,56 +88,56 @@ class outpost.AssetManager
             , false
 
             @render()
-        
+
         #----------
 
         chooserIsAvailable: ->
             window.assethostChooser and !window.assethostChooser.closed
 
         #----------
-        
+
         _popup: (event) ->
             event.originalEvent.stopPropagation()
             event.originalEvent.preventDefault()
-            
+
             popup =
                 url:     "#{assethost.SERVER}/a/chooser"
                 name:    "chooser"
-                options: "height=620,width=1000,scrollbars=1"
-            
+                options: "height=1000,width=1000,scrollbars=1"
+
             if @chooserIsAvailable()
                 window.assethostChooser.focus()
             else
                 window.assethostChooser = window.open(popup.url, popup.name, popup.options)
-            
+
             false
-            
+
         #----------
         # Render the full view. This should only be called once.
         render: ->
             @$el.html JST[AssetManager.TemplatePath + 'asset_manager']
             @collectionEl = $(".collection", @$el)
             @emptyNotification = new outpost.Notification(
-                @collectionEl, 
-                "info", 
+                @collectionEl,
+                "info",
                 "There are no assets. Click the button to open AssetHost."
             )
-            
+
             @renderCollection()
             @
-            
+
         #----------
         # Render the collection. This gets called every time AssetHost send a message.
         renderCollection: ->
             if @collection.isEmpty()
                 return @emptyNotification.render()
-                
+
             @collection.each (asset, index) =>
                 asset.set(ORDER: index)
 
                 @_views[asset.cid] ?= new outpost.AssetManager.Asset
                     model: asset
-            
+
             views = _(@_views).sortBy (a) => a.model.get("ORDER")
             @collectionEl.html( _(views).map (v) -> v.el )
             @

data/lib/assets/javascripts/outpost/asset_host/assets.js.coffee

@@ -10,7 +10,7 @@ class outpost.AssetHost
         # simpleJSON is an object of just the attributes
         # we care about for SCPRv4. Everything else is
         # pulled from the AssetHost API.
-        # 
+        #
         # This should be kept in sync with ContentAsset#simple_json
         simpleJSON: ->
             {
@@ -18,28 +18,28 @@ class outpost.AssetHost
                 caption:     @get 'caption'
                 position:    @get 'ORDER'
             }
-        
+
         #--------------
-        
+
         url: ->
             url = if @isNew() then @urlRoot else @urlRoot + encodeURIComponent(@id)
-            
+
             if assethost.TOKEN
                 token = $.param(auth_token:assethost.TOKEN)
                 url += "?#{token}"
-                
+
             url
-            
+
     #----------
 
     @Assets: Backbone.Collection.extend
         model: @Asset
-        
+
         # If we have an ORDER attribute, sort by that.
         # Otherwise, sort by just the asset ID.
         comparator: (asset) ->
             asset.get("ORDER") || -Number(asset.get("id"))
-        
+
         #----------
         # An array of assets turned into simpleJSON. See
         # Asset#simpleJSON for more.
@@ -47,5 +47,5 @@ class outpost.AssetHost
             assets = []
             @each (asset) -> assets.push(asset.simpleJSON())
             assets
-                
+
         #----------

data/lib/assets/javascripts/outpost/asset_host/templates/asset.jst.eco

@@ -1,6 +1,6 @@
 <div class="thumbnail">
   <%- @asset.tags.lsquare %>
-  
+
   <div class="asset-info">
     <h6><%= @asset.title %></h6>
     <small class="muted"><%= @asset.caption %></small>

data/lib/assets/stylesheets/outpost/assets.css.scss

@@ -1,14 +1,14 @@
 #asset_bucket {
   ul, li { @extend .unstyled; }
 
-  li { 
+  li {
     @extend .span4;
     margin: 0 5px 5px 0;
     float: left;
     height: 165px;
     overflow: hidden;
   }
-    
+
   .thumbnail {
     border: 1px solid $grayLighter;
     padding: 5px;
@@ -19,12 +19,12 @@
       max-width: 150px;
       margin-right: 5px;
     }
-    
+
     .asset-info {
-      line-height: 12px; 
-      h6 { 
-        display: inline; 
-        line-height: 11px; 
+      line-height: 12px;
+      h6 {
+        display: inline;
+        line-height: 11px;
       }
     }
   }

data/lib/outpost/asset_host/json_input.rb

@@ -19,7 +19,7 @@ module Outpost
         #-------------------
         # #asset_json is a way to pass in a string representation
         # of a javascript object to the model, which will then be
-        # parsed and turned into ContentAsset objects in the 
+        # parsed and turned into ContentAsset objects in the
         # #asset_json= method.
         def asset_json
           current_assets_json.to_json
@@ -27,9 +27,9 @@ module Outpost
 
         #-------------------
         # Parse the input from #asset_json and turn it into real
-        # ContentAsset objects. 
+        # ContentAsset objects.
         def asset_json=(json)
-          # If this is literally an empty string (as opposed to an 
+          # If this is literally an empty string (as opposed to an
           # empty JSON object, which is what it would be if there were no assets),
           # then we can assume something went wrong and just abort.
           # This shouldn't happen since we're populating the field in the template.
@@ -37,26 +37,21 @@ module Outpost
 
           json = Array(JSON.parse(json)).sort_by { |c| c["position"].to_i }
           loaded_assets = []
-          
+
           json.each do |asset_hash|
             new_asset = self.class.assets_association_join_class.constantize.new(
-              :asset_id    => asset_hash["id"].to_i, 
-              :caption     => asset_hash["caption"].to_s, 
+              :asset_id    => asset_hash["id"].to_i,
+              :caption     => asset_hash["caption"].to_s,
               :position    => asset_hash["position"].to_i
             )
-            
+
             loaded_assets.push new_asset
           end
-          
+
           loaded_assets_json = assets_to_simple_json(loaded_assets)
 
-          # If the assets didn't change, there's no need to bother the database.        
+          # If the assets didn't change, there's no need to bother the database.
           if current_assets_json != loaded_assets_json
-            if self.respond_to?(:custom_changes)
-              self.custom_changes['assets'] = [current_assets_json, loaded_assets_json]
-            end
-            
-            self.changed_attributes['assets'] = current_assets_json
             self.assets = loaded_assets
           end
 

data/lib/outpost/asset_host/version.rb

@@ -1,5 +1,5 @@
 module Outpost
   module AssetHost
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: outpost-asset_host
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Bryan Ricker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,49 +27,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: AssetHost integration with Outpost.
@@ -83,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -101,27 +93,26 @@ files:
 homepage: https://github.com/SCPR/outpost-asset_host
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides client-side hooks into AssetHost for Outpost.
 test_files: []
 has_rdoc: