beef-has_assets 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/app/helpers/admin/assets_helper.rb

@@ -23,7 +23,8 @@ module Admin::AssetsHelper
   
   def admin_assets_path_with_session_information
     session_key = ActionController::Base.session_options[:key]
-    admin_assets_path(session_key => cookies[session_key], request_forgery_protection_token => form_authenticity_token)
+    params = {request_forgery_protection_token => form_authenticity_token, :cookies => cookies}
+    admin_assets_path(params)
   end
   
   def replace_thumbnail_admin_asset_path_with_session_information(asset)

data/has_assets.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_assets}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-01}
+  s.date = %q{2009-09-03}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -45,12 +45,13 @@ Gem::Specification.new do |s|
      "generators/assets_admin_files/templates/public/javascripts/swfupload.js",
      "generators/assets_admin_files/templates/public/javascripts/upload_progress.js",
      "has_assets.gemspec",
-     "lib/custom_redcloth_tags.rb",
-     "lib/flash_sesion_cookie_middleware.rb",
-     "lib/geometry_crop.rb",
      "lib/has_assets.rb",
-     "lib/imagescience_crop.rb",
-     "lib/swfupload.rb",
+     "lib/has_assets/custom_redcloth_tags.rb",
+     "lib/has_assets/flash_sesion_cookie_middleware.rb",
+     "lib/has_assets/geometry_crop.rb",
+     "lib/has_assets/has_assets.rb",
+     "lib/has_assets/imagescience_crop.rb",
+     "lib/has_assets/swfupload.rb",
      "rails/init.rb",
      "test/has_assets_test.rb",
      "test/test_helper.rb"

data/lib/{flash_sesion_cookie_middleware.rb → has_assets/flash_sesion_cookie_middleware.rb}

@@ -9,7 +9,14 @@ class FlashSessionCookieMiddleware
   def call(env)
     if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
       params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
-      env['HTTP_COOKIE'] = [ @session_key, params[@session_key] ].join('=').freeze unless params[@session_key].nil?
+      cookies = []
+      params.each_pair do |key, value|
+        if key =~ /^cookie/
+          cookie_key = key[8..-2]
+          cookies << [ cookie_key, value ].join('=').freeze
+        end
+      end
+      env['HTTP_COOKIE'] = cookies.join(';')
     end
     @app.call(env)
   end

data/lib/has_assets/has_assets.rb

@@ -0,0 +1,28 @@
+module Beef
+  module Has
+    module Assets
+      def self.included(base)
+        base.extend ClassMethods
+      end
+      
+      module ClassMethods
+        def has_assets
+          has_many :assetings, :as => :assetable, :dependent => :delete_all
+          has_many :assets, :through => :assetings, :order => 'assetings.id'
+          
+          # Override the default asset_ids method
+          define_method("asset_ids=") do |new_value|
+            ids = (new_value || []).reject { |nid| nid.blank? }
+            ids.collect!{ |id| id.to_i}
+            logger.debug "ASSETS the same #{ids == self.asset_ids} | IDS #{ids} | #{self.asset_ids}"
+            return if ids == self.asset_ids
+            self.assets.clear
+            ids.each_index do |idx|
+              self.assets << Asset.find(ids[idx])
+            end
+          end
+        end
+      end
+    end
+  end  
+end

data/lib/has_assets.rb

@@ -1,28 +1,7 @@
-module Beef
-  module Has
-    module Assets
-      def self.included(base)
-        base.extend ClassMethods
-      end
-      
-      module ClassMethods
-        def has_assets
-          has_many :assetings, :as => :assetable, :dependent => :delete_all
-          has_many :assets, :through => :assetings, :order => 'assetings.id'
-          
-          # Override the default asset_ids method
-          define_method("asset_ids=") do |new_value|
-            ids = (new_value || []).reject { |nid| nid.blank? }
-            ids.collect!{ |id| id.to_i}
-            logger.debug "ASSETS the same #{ids == self.asset_ids} | IDS #{ids} | #{self.asset_ids}"
-            return if ids == self.asset_ids
-            self.assets.clear
-            ids.each_index do |idx|
-              self.assets << Asset.find(ids[idx])
-            end
-          end
-        end
-      end
-    end
-  end  
-end
+require 'has_assets/custom_redcloth_tags'
+require 'has_assets/flash_sesion_cookie_middleware'
+require 'has_assets/geometry_crop'
+require 'has_assets/has_assets'
+require 'has_assets/imagescience_crop'
+require 'has_assets/swfupload'
+                                         

data/rails/init.rb

@@ -1,14 +1,13 @@
-require 'flash_sesion_cookie_middleware'
-require 'admin_area'
-require 'has_assets'
-require 'swfupload'
-require 'geometry_crop'
-require 'imagescience_crop'
+require 'has_assets/flash_sesion_cookie_middleware'
+require 'has_assets/geometry_crop'
+require 'has_assets/has_assets'
+require 'has_assets/imagescience_crop'
+require 'has_assets/swfupload'
 
 config.to_prepare do
   # Rack middleware for fixing flash's issues with sessions
   # http://thewebfellas.com/blog/2008/12/22/flash-uploaders-rails-cookie-based-sessions-and-csrf-rack-middleware-to-the-rescue
-  ActionController::Dispatcher.middleware.use FlashSessionCookieMiddleware, ActionController::Base.session_options[:key]
+  ActionController::Dispatcher.middleware.insert_before(ActionController::Base.session_store, FlashSessionCookieMiddleware, ActionController::Base.session_options[:key])
   # Add the asset management helpers
   Admin::BaseController.helper(Admin::AssetsHelper)
   ApplicationController.helper(AssetsHelper)
@@ -16,6 +15,6 @@ end
 ActiveRecord::Base.send :include, Beef::Has::Assets
 
 if defined?(RedCloth)
-  require 'custom_redcloth_tags'
+  require 'has_assets/custom_redcloth_tags'
 end
 

data/test/test_helper.rb

@@ -1,9 +1,8 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'redcloth'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'has_assets'
 
 class Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 -07:00
+date: 2009-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,17 +55,19 @@ files:
 - generators/assets_admin_files/templates/public/javascripts/swfupload.js
 - generators/assets_admin_files/templates/public/javascripts/upload_progress.js
 - has_assets.gemspec
-- lib/custom_redcloth_tags.rb
-- lib/flash_sesion_cookie_middleware.rb
-- lib/geometry_crop.rb
 - lib/has_assets.rb
-- lib/imagescience_crop.rb
-- lib/swfupload.rb
+- lib/has_assets/custom_redcloth_tags.rb
+- lib/has_assets/flash_sesion_cookie_middleware.rb
+- lib/has_assets/geometry_crop.rb
+- lib/has_assets/has_assets.rb
+- lib/has_assets/imagescience_crop.rb
+- lib/has_assets/swfupload.rb
 - rails/init.rb
 - test/has_assets_test.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/beef/assets
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -86,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rails Engine. Adds uploadable assets to a model and admin area for files