papermill 1.4.3 → 2.0.0.pre

data/test/papermill_test.rb

@@ -3,6 +3,7 @@ require 'test/unit'
 require 'rubygems'
 gem 'rails'
 require 'active_record'
+require 'action_controller'
 require 'action_view'
 require 'active_support'
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/info.log")
@@ -40,7 +41,7 @@ class Article < ActiveRecord::Base
   def self.table_name 
     :articles
   end
-  papermill 
+  papermill :asset1
   papermill :my_assets, :class_name => "MyAsset"
 end
 
@@ -57,10 +58,8 @@ class PapermillTest < Test::Unit::TestCase
   def initialize(*args)
     super
     @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
-    
     @article = Article.find 1
     @decoy_article = Article.find 2
-    
     @asset1 = PapermillAsset.find 1
     @asset2 = PapermillAsset.find 2
     @asset3 = PapermillAsset.find 3
@@ -70,26 +69,10 @@ class PapermillTest < Test::Unit::TestCase
   
   def test_namedscopes_for_specific_associations
     assert_equal @article.my_assets.map(&:id), [3,4]
-    assert_equal @article.my_assets(:order => "position DESC").map(&:id), [4,3]
-    assert_equal @article.my_assets(:order => "position DESC", :limit => 1).map(&:id), [4]
-    
-    assert_equal @article.assets(:my_assets).map(&:id), [3,4]
-    assert_equal @article.assets(:my_assets, :order => "position DESC").map(&:id), [4,3]
-    assert_equal @article.assets(:my_assets, :order => "position DESC", :limit => 1).map(&:id), [4]
-    
-    assert_equal @article.papermill_assets.key(:my_assets).map(&:id), [3,4]
-    assert_equal @article.papermill_assets.key(:my_assets).all(:order => "position DESC").map(&:id), [4,3]
-    assert_equal @article.papermill_assets.key(:my_assets).all(:order => "position DESC", :limit => 1).map(&:id), [4]
   end
   
   def test_namedscope_for_global_associations
-    assert_equal @article.assets(:asset1).map(&:id), [2,1]
-    assert_equal @article.assets(:asset1, :order => "position DESC").map(&:id), [1,2]
-    assert_equal @article.assets(:asset1, :order => "position DESC", :limit => 1).map(&:id), [1]
-    
-    assert_equal @article.papermill_assets.key(:asset1).map(&:id), [2,1]
-    assert_equal @article.papermill_assets.key(:asset1).all(:order => "position DESC").map(&:id), [1,2]
-    assert_equal @article.papermill_assets.key(:asset1).all(:order => "position DESC", :limit => 1).map(&:id), [1]
+    assert_equal @article.asset1.map(&:id), [2,1]
   end
 
   def test_id_partition
@@ -132,21 +115,3 @@ class PapermillTest < Test::Unit::TestCase
     assert_equal PapermillAsset.compute_style("100x100"), false
   end
 end
-
-#  Filedata=(data)
-#  Filename=(name)
-#  create_thumb_file(style_name)
-#  basename
-#  extension
-#  url(style = nil)
-#  path(style = nil)
-#  self.papermill_options(assetable_class, assetable_key)
-#  papermill_options
-#  destroy_thumbnails
-#  self.destroy_orphans
-#  compute_url_key(style)
-#  has_valid_url_key?(key, style)
-#  root_directory
-#  set_file_name
-#  set_position
-#  destroy_files

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: papermill
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 1
-  - 4
-  - 3
-  version: 1.4.3
+  - 2
+  - 0
+  - 0
+  - pre
+  version: 2.0.0.pre
 platform: ruby
 authors: 
 - "Benoit B\xC3\xA9n\xC3\xA9zech"
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 +01:00
+date: 2010-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +65,7 @@ files:
 - app/views/papermill/_form.html.erb
 - app/views/papermill/_raw_asset.html.erb
 - app/views/papermill/_thumbnail_asset.html.erb
+- app/views/papermill/browser.html.erb
 - app/views/papermill/crop.html.erb
 - app/views/papermill/edit.html.erb
 - config/locales/papermill.yml
@@ -85,6 +87,7 @@ files:
 - lib/papermill/form_builder.rb
 - lib/papermill/papermill.rb
 - lib/papermill/papermill_asset.rb
+- lib/papermill/papermill_association.rb
 - lib/papermill/papermill_helper.rb
 - lib/papermill/papermill_options.rb
 - lib/papermill/papermill_paperclip_processor.rb
@@ -148,11 +151,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: