rmce_uploadr 0.0.2 → 0.0.3

data/README.rdoc

@@ -19,17 +19,21 @@ For this gem to work you *have* to put your TinyMCE javascripts in public/javasc
 === 2. Set RMceUploadr::App as a middleware
 
 * for a rails app add the following inside <tt>Rails::Initializer.run</tt> block:
-    config.middleware.use "RMceUploadr::App" do |conf|
+    config.middleware.use "RMceUploadr::App" do |app|
       # configuration according to ActiveRecord::Base.establish_connection
-      conf.dbconf = {:adapter => 'sqlite3', 
-                     :database => File.join(File.dirname(__FILE__), '..', '..', 'shared', 'db.sqlite3')}
+      app.dbconf = {:adapter => 'sqlite3', 
+                    :database => File.join(File.dirname(__FILE__), '..', '..', 'shared', 'db.sqlite3')}
+      app.settings.set :cdn_host, "http://localhost:3000"
     end
 * almost the same if you're a rack/sinatra app:
-    use ::RMceUploadr::App do |conf|
+    use ::RMceUploadr::App do |app|
       # configuration according to ActiveRecord::Base.establish_connection
-      conf.dbconf = {:adapter => 'sqlite3', 
-                     :database => root_path('..', 'shared', 'db.sqlite3')}
+      app.dbconf = {:adapter => 'sqlite3', 
+                    :database => root_path('..', 'shared', 'db.sqlite3')}
     end
+<tt>cdn_host</tt> is an optional parameter. Useful when you host your images through another domain.
+Having this set will result in images src attribute be an absolute URL, otherwise image URLs will
+be something like "/public/uploads/g/images/..."
 
 === 3. Add plugin loading to TinyMCE init function, e.g.
 

data/Rakefile

@@ -17,7 +17,9 @@ begin
     gem.add_dependency "activerecord", ">= 2.3.4"
     gem.add_dependency "paperclip", ">= 2.3.1.1"
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rack-test", ">= 0.5.3"
     gem.files.include('lib/**/*.rb', 'lib/rmce_uploadr/public/**/*', 'lib/**/*.erb')
+    gem.test_files.include('spec/test.sqlite3')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/examples/rails/README

@@ -1,243 +1,15 @@
-== Welcome to Rails
+= How to run
 
-Rails is a web-application framework that includes everything needed to create 
-database-backed web applications according to the Model-View-Control pattern. 
+First, create the database
 
-This pattern splits the view (also called the presentation) into "dumb" templates
-that are primarily responsible for inserting pre-built data in between HTML tags.
-The model contains the "smart" domain objects (such as Account, Product, Person,
-Post) that holds all the business logic and knows how to persist themselves to
-a database. The controller handles the incoming requests (such as Save New Account,
-Update Product, Show Post) by manipulating the model and directing data to the view.
+  rake db:create
+ 
+Run the migrations
 
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
+  rake db:migrate
+ 
+And lastly,
 
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails.  You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, start a new Rails application using the <tt>rails</tt> command
-   and your application name. Ex: rails myapp
-2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options)
-3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!"
-4. Follow the guidelines to start developing your application
-
-
-== Web Servers
-
-By default, Rails will try to use Mongrel if it's are installed when started with script/server, otherwise Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails
-with a variety of other web servers.
-
-Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is
-suitable for development and deployment of Rails applications. If you have Ruby Gems installed,
-getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>.
-More info at: http://mongrel.rubyforge.org
-
-Say other Ruby web servers like Thin and Ebb or regular web servers like Apache or LiteSpeed or
-Lighttpd or IIS. The Ruby web servers are run through Rack and the latter can either be setup to use
-FCGI or proxy to a pack of Mongrels/Thin/Ebb servers.
-
-== Apache .htaccess example for FCGI/CGI
-
-# General Apache options
-AddHandler fastcgi-script .fcgi
-AddHandler cgi-script .cgi
-Options +FollowSymLinks +ExecCGI
-
-# If you don't want Rails to look in certain directories,
-# use the following rewrite rules so that Apache won't rewrite certain requests
-# 
-# Example:
-#   RewriteCond %{REQUEST_URI} ^/notrails.*
-#   RewriteRule .* - [L]
-
-# Redirect all requests not available on the filesystem to Rails
-# By default the cgi dispatcher is used which is very slow
-# 
-# For better performance replace the dispatcher with the fastcgi one
-#
-# Example:
-#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
-RewriteEngine On
-
-# If your Rails application is accessed via an Alias directive,
-# then you MUST also set the RewriteBase in this htaccess file.
-#
-# Example:
-#   Alias /myrailsapp /path/to/myrailsapp/public
-#   RewriteBase /myrailsapp
-
-RewriteRule ^$ index.html [QSA]
-RewriteRule ^([^.]+)$ $1.html [QSA]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
-
-# In case Rails experiences terminal errors
-# Instead of displaying this message you can supply a file here which will be rendered instead
-# 
-# Example:
-#   ErrorDocument 500 /500.html
-
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong.  Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files.  Have "tail -f" commands running
-on the server.log and development.log. Rails will automatically display debugging
-and runtime information to these files. Debugging info will also be shown in the
-browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code using
-the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController < ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/ including:
-
-* The Learning Ruby (Pickaxe) Book: http://www.ruby-doc.org/docs/ProgrammingRuby/
-* Learn to Program: http://pine.fm/LearnToProgram/  (a beginners guide)
-
-These two online (and free) books will bring you up to speed on the Ruby language
-and also on programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your Mongrel or
-Webrick server with --debugger. This means that you can break out of execution at any point
-in the code, investigate and change the model, AND then resume execution! 
-You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'
-Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.find(:all)
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>,
-       #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
-  >> @posts.first.title = "hello from a debugger"
-  => "hello from a debugger"
-
-...and even better is that you can examine how your runtime objects actually work:
-
-  >> f = @posts.first
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you enter "cont"
-
-
-== Console
-
-You can interact with the domain model by starting the console through <tt>script/console</tt>.
-Here you'll have all parts of the application configured, just like it is when the
-application is running. You can inspect domain models, change values, and save to the
-database. Starting the script without arguments will launch it in the development environment.
-Passing an argument will specify a different environment, like <tt>script/console production</tt>.
-
-To reload your controllers and models after launching the console run <tt>reload!</tt>
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>script/dbconsole</tt>.
-You would be connected to the database with the credentials defined in database.yml.
-Starting the script without arguments will connect you to the development database. Passing an
-argument will connect you to a different database, like <tt>script/dbconsole production</tt>.
-Currently works for mysql, postgresql and sqlite.
-
-== Description of Contents
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from ApplicationController
-  which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb.
-  Most models will descend from ActiveRecord::Base.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use eRuby
-  syntax.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the common
-  header/footer method of wrapping views. In your views, define a layout using the
-  <tt>layout :default</tt> and create a file named default.html.erb. Inside default.html.erb,
-  call <% yield %> to render the view using this layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are generated
-  for you automatically when using script/generate for controllers. Helpers can be used to
-  wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
-
-db
-  Contains the database schema in schema.rb.  db/migrate contains all
-  the sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when generated
-  using <tt>rake doc:app</tt>
-
-lib
-  Application specific libraries. Basically, any kind of custom code that doesn't
-  belong under controllers, models, or helpers. This directory is in the load path.
-
-public
-  The directory available for the web server. Contains subdirectories for images, stylesheets,
-  and javascripts. Also contains the dispatchers and the default HTML files. This should be
-  set as the DOCUMENT_ROOT of your web server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the script/generate scripts, template
-  test files will be generated for you and placed in this directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins subdirectory.
-  If the app has frozen rails, those gems also go here, under vendor/rails/.
-  This directory is in the load path.
+  script/server
+ 
+Point your browser to http://localhost:3000

data/examples/rails/app/views/layouts/posts.html.erb

@@ -12,6 +12,8 @@
     tinyMCE.init({
         plugins: "rmce_uploadr,inlinepopups",
         mode : "textareas",
+        convert_urls : false,
+        relative_urls : false,
         theme : "advanced",
         dialog_type: 'modal',
         theme_advanced_buttons1 : "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,undo,redo,link,unlink,image",

data/examples/rails/config/environment.rb

@@ -40,8 +40,9 @@ Rails::Initializer.run do |config|
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   # config.i18n.default_locale = :de
   
-  config.middleware.use "RMceUploadr::App" do |conf|
-    conf.dbconf = {:adapter => 'sqlite3', 
+  config.middleware.use "RMceUploadr::App" do |app|
+    app.dbconf = {:adapter => 'sqlite3', 
                    :database => File.join(File.dirname(__FILE__), '..', '..', 'shared', 'db.sqlite3')}
+    app.settings.set :cdn_host, "http://localhost:3000"
   end
 end

data/examples/rails/config/routes.rb

@@ -33,7 +33,7 @@ ActionController::Routing::Routes.draw do |map|
   #   end
 
   # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
-  # map.root :controller => "welcome"
+  map.root :controller => "posts"
 
   # See how all your routes lay out with "rake routes"
 

data/examples/sinatra/Gemfile

@@ -6,4 +6,4 @@ gem "rack-flash", ">= 0.1.1"
 gem "sinatra", ">= 1.0"
 gem "activerecord", ">= 2.3.2"
 gem "sqlite3-ruby", :require => "sqlite3"
-gem "rmce_uploadr", "= 0.0.1"
+gem "rmce_uploadr", "= 0.0.3"

data/examples/sinatra/README

@@ -0,0 +1,13 @@
+= How to run
+
+It is pretty much setup already. <tt>db/development.sqlite3</tt> contains valid <tt>images</tt> (empty) table so all you need to do is run
+
+  bundle install
+ 
+(you'll need bundler gem for that) and
+
+  scripts/server
+
+(you'll need shotgun gem)
+
+Point your browser to http://localhost:3000

data/lib/rmce_uploadr/app/app.rb

@@ -18,6 +18,11 @@ module RMceUploadr
     set :public, rmce_uploadr_root_path('rmce_uploadr', 'public')
     set :views, rmce_uploadr_root_path('rmce_uploadr', 'views')
     
+    # a host that distributes static content
+    # can be set in use RMceUPloadr::App do |conf| block like
+    # conf.settings.set :cdn_host, "http://cdn.host.com/"
+    set :cdn_host, nil
+    
     def dbconf=(opts)
       RMceUploadr.dbconf = opts
     end

data/lib/rmce_uploadr/app/image.rb

@@ -1,7 +1,53 @@
+# This class expects the following table attributes to be found:
+#  - +data_file_name+ (string)
+#  - +data_content_type+ (string)
+#  - +data_file_size+ (integer)
+#  - +data_updated_at+ (datetime)
+#  - +width+ (integer)
+#  - +height+ (integer)
 class RMceUploadr::Image < ActiveRecord::Base
   has_attached_file :data, :styles => { :medium => "300x300>", :thumb => "100x100#" },
                     :url => "/uploads/g/images/:id_partition/:style_:filename",
                     :default_url => "/images/rmce_uploadr_default/:style.png",
                     :storage => :filesystem,
                     :path => "public/uploads/g/images/:id_partition/:style_:filename"
+  # set in images_controller
+  # needed to calcuate original file geometry in :update_image_geometry
+  attr_accessor :tempfile
+  
+  before_save :update_image_geometry
+  
+  # Returns a string with width and height
+  # e.g. "100x50"
+  def geometry
+    return "" if width.nil? || height.nil?
+    "#{width}x#{height}"
+  end
+  
+  # Convers image size in B, Kb, Mb or Gb
+  # and returns something like "10Kb"
+  def size_in_bytes
+    case data_file_size
+    when 0..1023
+      "#{data_file_size}B"
+    when 1024..1048575
+      "#{(data_file_size / 1024.0).round}Kb"
+    when 1048576..1073741823
+      "#{(data_file_size / 1048576.0).round}Mb"
+    else
+      "#{(data_file_size / 1073741823.0).round}Gb"
+    end
+  end
+  
+  private
+  
+  def update_image_geometry
+    unless tempfile.nil?
+      begin
+       geometry = Paperclip::Geometry.from_file(tempfile)
+       self.width = geometry.width.to_i
+       self.height = geometry.height.to_i
+      rescue NotIdentifiedByImageMagickError => e; end
+    end
+  end
 end

data/lib/rmce_uploadr/app/images_controller.rb

@@ -22,8 +22,7 @@ module Sinatra
         # actual image upload 
         app.post '/rmce_uploadr/images' do
           data = Fash.new(params[:image][:data])
-          puts data.inspect
-          @image = ::RMceUploadr::Image.new(:data => data)
+          @image = ::RMceUploadr::Image.new(:data => data, :tempfile => data.to_tempfile)
           @image.save
           redirect '/rmce_uploadr/images'
         end

data/lib/rmce_uploadr/public/javascripts/rmce_uploadr.js

@@ -1 +1,39 @@
-// rmce_uploadr app javascript
+/*
+ * rmce_uploadr app main javascript
+ *
+ * should be loaded after tiny_mce.js and jquery.js
+ */
+
+// when DOM is loaded
+$(function(){
+  // we're looking mainly for images that have data-src-original attribute set
+  $("[data-src-original]").click(function(){
+    var editor = tinyMCEPopup.editor;
+
+    // Fixes crash in Safari
+    if (tinymce.isWebKit) { editor.getWin().focus(); }
+    
+    // TODO: add widht, height and other stuff
+    var imgParams = {
+      src: uploadrCdnHost + $(this).attr('data-src-original')
+    };
+    
+    // get original selection, an image already inserted in the editor's main area
+    var original = editor.selection.getNode();
+    
+    // check if that's really an image and replace it with the new one
+    if (original && original.nodeName == 'IMG') {
+			editor.dom.setAttribs(original, imgParams);
+			
+		// otherwise just insert a new image
+		} else {
+			editor.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
+			editor.dom.setAttribs('__mce_tmp', imgParams);
+			editor.dom.setAttrib('__mce_tmp', 'id', '');
+			editor.undoManager.add();
+		}
+			
+		// close ourselves, i.e. the popup
+    tinyMCEPopup.close();
+  });
+});

data/lib/rmce_uploadr/views/index.erb

@@ -1,11 +1,12 @@
-<p>
-  images index files (GET /rmce_uploadr/images)
-</p>
+<% @images.each do |image| %>
+  <div class="image">
+    <img src="<%= image.data.url(:thumb) %>" width="100" height="100" class="srcimage"
+         data-src-original="<%= image.data.url(:original) %>" />
+    <br/>
+    <span class="small"><%= image.size_in_bytes %>, <%= image.geometry %></span>
+  </div>
+<% end %>
 
-<ul>
-  <% @images.each do |image| %>
-    <li><img src="<%= image.data.url(:thumb) %>" 
-             data-src-original="<%= image.data.url(:original) %>" 
-             width="100" height="100" class="srcimage"/></li>
-  <% end %>
-</ul>
+<% if @images.empty? %>
+  <em class="quiet">No images found, yet.</em>
+<% end %>

data/lib/rmce_uploadr/views/layout.erb

@@ -3,42 +3,53 @@
 <html>
   <head>
     <title>RMce Uploadr</title>
-    <script type="text/javascript" charset="utf-8" src="/javascripts/tiny_mce/tiny_mce_popup.js"></script>
-    <script type="text/javascript" charset="utf-8" src="/javascripts/rmce_uploadr/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" charset="utf-8" src="/javascripts/rmce_uploadr.js"></script>
+    <style type="text/css" media="screen">
+      #upload_form, #main_area {
+        margin-bottom: 1em;
+      }
+      .image {
+        float: left;
+        background-color: white;
+        border: 1px solid #ccc;
+        padding: 5px;
+        margin: 10px;
+        cursor: pointer;
+      }
+      .image:hover, .image:focus {
+        background-color: #eee;
+      }
+      img.srcimage {
+        padding: 0;
+        margin: 0 0 .2 0;
+        border: 1px solid #aaa;
+      }
+      .quiet { color: #ccc; }
+      .small { font-size: 11px; }
+      .clearfix {
+        clear: both;
+        overflow: hidden;
+        height: 0;
+      }
+    </style>
   </head>
-  <div id="upload_form">
-    <form action="/rmce_uploadr/images" method="post" enctype="multipart/form-data">
-      <input type="file" name="image[data]"/>
-      <input type="submit" value="Upload"/>
-    </form>
-  </div>
-  <%= yield %>
+  <body>
+    <div id="upload_form">
+      <form action="/rmce_uploadr/images" method="post" enctype="multipart/form-data">
+        <input type="file" name="image[data]"/>
+        <input type="submit" value="Upload"/>
+      </form>
+    </div>
   
-  <script type="text/javascript" charset="utf-8">
-    $(function(){
-      $("[data-src-original]").click(function(){
-        var editor = tinyMCEPopup.editor;
+    <div id="main_area">
+      <%= yield %>
+    </div>
 
-        // Fixes crash in Safari
-        if (tinymce.isWebKit) { editor.getWin().focus(); }
-        
-        var imgParams = {
-          src: $(this).attr('data-src-original')
-        };
-        
-        var original = editor.selection.getNode();
-        if (original && original.nodeName == 'IMG') {
-    			editor.dom.setAttribs(original, imgParams);
-    		} else {
-    			editor.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
-    			editor.dom.setAttribs('__mce_tmp', imgParams);
-    			editor.dom.setAttrib('__mce_tmp', 'id', '');
-    			editor.undoManager.add();
-    		}
-    			
-        tinyMCEPopup.close();
-      });
-    });
-  </script>
+    <script type="text/javascript" charset="utf-8">
+      var uploadrCdnHost = "<%= settings.cdn_host %>";
+    </script>
+    
+    <script type="text/javascript" src="/javascripts/tiny_mce/tiny_mce_popup.js"></script>
+    <script type="text/javascript" src="/javascripts/rmce_uploadr/jquery-1.4.2.min.js"></script>
+    <script type="text/javascript" src="/javascripts/rmce_uploadr.js"></script>
+  </body>
 </html>

data/rmce_uploadr.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rmce_uploadr}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Vagin"]
@@ -52,7 +52,6 @@ Gem::Specification.new do |s|
      "examples/rails/db/migrate/20100417132216_create_posts.rb",
      "examples/rails/db/schema.rb",
      "examples/rails/db/seeds.rb",
-     "examples/rails/doc/README_FOR_APP",
      "examples/rails/public/404.html",
      "examples/rails/public/422.html",
      "examples/rails/public/500.html",
@@ -327,6 +326,7 @@ Gem::Specification.new do |s|
      "examples/shared/uploads/.gitignore",
      "examples/sinatra/.bundle/config",
      "examples/sinatra/Gemfile",
+     "examples/sinatra/README",
      "examples/sinatra/app/post.rb",
      "examples/sinatra/app/posts_controller.rb",
      "examples/sinatra/boot.rb",
@@ -603,9 +603,11 @@ Gem::Specification.new do |s|
      "spec/core_ext_spec.rb",
      "spec/image_spec.rb",
      "spec/images_controller_spec.rb",
+     "spec/layout_spec.rb",
      "spec/rcov.opts",
      "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/test.sqlite3"
   ]
   s.homepage = %q{http://github.com/crhym3/rmce_uploadr}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -617,6 +619,7 @@ Gem::Specification.new do |s|
      "spec/core_ext_spec.rb",
      "spec/image_spec.rb",
      "spec/images_controller_spec.rb",
+     "spec/layout_spec.rb",
      "spec/spec_helper.rb",
      "examples/rails/app/controllers/application_controller.rb",
      "examples/rails/app/controllers/posts_controller.rb",
@@ -644,7 +647,8 @@ Gem::Specification.new do |s|
      "examples/sinatra/app/post.rb",
      "examples/sinatra/app/posts_controller.rb",
      "examples/sinatra/boot.rb",
-     "examples/sinatra/scripts/console.rb"
+     "examples/sinatra/scripts/console.rb",
+     "spec/test.sqlite3"
   ]
 
   if s.respond_to? :specification_version then
@@ -656,17 +660,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<paperclip>, [">= 2.3.1.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rack-test>, [">= 0.5.3"])
     else
       s.add_dependency(%q<sinatra>, [">= 1.0"])
       s.add_dependency(%q<activerecord>, [">= 2.3.4"])
       s.add_dependency(%q<paperclip>, [">= 2.3.1.1"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rack-test>, [">= 0.5.3"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 1.0"])
     s.add_dependency(%q<activerecord>, [">= 2.3.4"])
     s.add_dependency(%q<paperclip>, [">= 2.3.1.1"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rack-test>, [">= 0.5.3"])
   end
 end
 

data/spec/app_spec.rb

@@ -1,5 +1,39 @@
 require 'spec_helper'
 
 describe RMceUploadr::App do
-  it "should work"
+  before(:each) do
+    RMceUploadr.stub!(:dbconf=).and_return(true)
+  end
+  
+  describe "settings" do
+    it "should set cdn_host" do
+      RMceUploadr::App.should_receive(:set).with(:cdn_host, "http://cdn.host.com/")
+      RMceUploadr::App.new do |conf|
+        conf.settings.set :cdn_host, "http://cdn.host.com/"
+      end
+    end
+    
+    it "should have static option enabled" do
+      RMceUploadr::App.static.should be_true
+    end
+    
+    it "should have set app root path" do
+      RMceUploadr::App.root.should =~ /.*\/lib\/rmce_uploadr$/
+    end
+    
+    it "should have set a public dir" do
+      RMceUploadr::App.public.should =~ /.*\/lib\/rmce_uploadr\/public$/
+    end
+    
+    it "should have set views dir" do
+      RMceUploadr::App.views.should =~ /.*\/lib\/rmce_uploadr\/views$/
+    end
+    
+    it "should call main module's dbconf= method" do
+      RMceUploadr.should_receive(:dbconf=).with({:adapter => 'myadapter', :database => 'mydb'}).and_return(true)
+      RMceUploadr::App.new do |app|
+        app.dbconf = {:adapter => 'myadapter', :database => 'mydb'}
+      end
+    end
+  end
 end

data/spec/image_spec.rb

@@ -1,13 +1,65 @@
 require 'spec_helper'
 
-describe RMceUploadr::Image do
+describe RMceUploadr::Image do  
   before(:each) do
-    RMceUploadr::Image.stub!(:columns).and_return([])
-    @image = RMceUploadr::Image.new
+    @tmpfile = mock("uploaded image file")
+    @image = RMceUploadr::Image.new(:data => @tmpfile, :tempfile => "temp file path")
+    @image.stub!(:data).and_return(@tmpfile)
+    @image.stub!(:save_attached_files).and_return(true)
   end
   
   it "should have :data- methods" do
     @image.should respond_to(:data)
     @image.should respond_to(:data=)
-  end  
+  end
+  
+  it "should return its dimensions" do
+    @image.stub!(:width).and_return(23)
+    @image.stub!(:height).and_return(45)
+    @image.geometry.should == "23x45"
+  end
+  
+  it "should return empty string if either width or height isn't set" do
+    @image.geometry.should be_empty
+    
+    @image.stub!(:width).and_return(10)
+    @image.geometry.should be_empty
+    
+    @image.stub!(:width).and_return(nil)
+    @image.stub!(:height).and_return(10)
+    @image.geometry.should be_empty
+  end
+  
+  it "should return image file size in human format" do
+    @image.stub!(:data_file_size).and_return(1000)
+    @image.size_in_bytes.should == "1000B"
+    
+    @image.stub!(:data_file_size).and_return(10000)
+    @image.size_in_bytes.should == "10Kb"
+    
+    @image.stub!(:data_file_size).and_return(2000000)
+    @image.size_in_bytes.should == "2Mb"
+    
+    @image.stub!(:data_file_size).and_return(30000000000)
+    @image.size_in_bytes.should == "28Gb"
+  end
+  
+  describe "saving an object" do
+    before(:each) do
+      @geometry = mock("geometry", :width => 10, :height => "11")
+      Paperclip::Geometry.stub!(:from_file).and_return(@geometry)
+    end
+    
+    it "should have a callback to calculate original image geometry" do
+      @image.should_receive(:update_image_geometry)
+      @image.save
+    end
+    
+    it "should use Paperclip::Geometry to calculate width and height" do
+      Paperclip::Geometry.should_receive(:from_file).with("temp file path")
+      @image.should_receive(:width=).with(@geometry.width.to_i)
+      @image.should_receive(:height=).with(@geometry.height.to_i)
+      @image.save
+    end
+  end
 end

data/spec/images_controller_spec.rb

@@ -1,5 +1,32 @@
 require 'spec_helper'
 
 describe Sinatra::RMceUploadr::ImagesController, :type => :controller do
-  it "should work"
+  before(:each) do
+    @image_data = mock("image data", :url => "image url")
+    @image = mock("image", :data => @image_data, :size_in_bytes => "10Kb", :geometry => "10x11")
+    
+    RMceUploadr::Image.stub!(:find).and_return(@image)
+    RMceUploadr::Image.stub!(:all).and_return([@image])
+  end
+  
+  it "should find all images" do
+    RMceUploadr::Image.should_receive(:all)
+    get '/rmce_uploadr/images'
+  end
+  
+  it "should render found images" do
+    get '/rmce_uploadr/images'
+    last_response.body.gsub(/[\n\r]/, '').should =~ /<img .*src="image url" .*data-src-original="image url"/
+  end
+  
+  it "should display image size and geometry" do
+    get '/rmce_uploadr/images'
+    last_response.body.should =~ /<span .*>#{@image.size_in_bytes}, #{@image.geometry}/
+  end
+  
+  it "should say something of no images found" do
+    RMceUploadr::Image.stub!(:all).and_return([])
+    get '/rmce_uploadr/images'
+    last_response.body.should =~ /no images found/i
+  end
 end

data/spec/layout_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe "Main layout", :type => :controller do
+  before(:all) do
+    RMceUploadr::Image.stub!(:all).and_return([])
+    app.set :cdn_host, "http://mycdn.host.com/"
+  end
+  
+  it "should set javascript global cdn host variable" do
+    get '/rmce_uploadr/images'
+    last_response.body.should =~ /var +uploadrCdnHost += +["']http:\/\/mycdn\.host\.com\/["'];/
+  end
+end

data/spec/spec_helper.rb

@@ -15,19 +15,24 @@ require 'spec/autorun'
 
 module RMceUploadr; module Test; module Controllers
   def app
-    @app ||= ::RMCEUploadr::App
+    @app ||= ::RMceUploadr::App
   end
 end; end; end
 
 Spec::Runner.configure do |config|
   Rake.application = Rake::Application.new
-  # load File.join(File.dirname(__FILE__), '..', 'Rakefile')
+
+  # before all tests begin
   config.before(:all) do
-    # before :all tests config
+    test_db = File.join(File.dirname(__FILE__), 'dummy.sqlite3')
+    FileUtils.cp File.join(File.dirname(__FILE__), 'test.sqlite3'), test_db
+    
+    ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => test_db)
   end
   
+  # after :all tests end
   config.after(:all) do
-    # after :all tests config
+    FileUtils.rm File.join(File.dirname(__FILE__), 'dummy.sqlite3')
   end
   
   config.include(Rack::Test::Methods, RMceUploadr::Test::Controllers, :type => :controller)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alex Vagin
@@ -73,6 +73,20 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 3
+        version: 0.5.3
+  type: :development
+  version_requirements: *id005
 description: Written in Ruby, using Sinatra + ActiveRecord and Paperclip
 email: alex@cloudware.it
 executables: []
@@ -118,7 +132,6 @@ files:
 - examples/rails/db/migrate/20100417132216_create_posts.rb
 - examples/rails/db/schema.rb
 - examples/rails/db/seeds.rb
-- examples/rails/doc/README_FOR_APP
 - examples/rails/public/404.html
 - examples/rails/public/422.html
 - examples/rails/public/500.html
@@ -393,6 +406,7 @@ files:
 - examples/shared/uploads/.gitignore
 - examples/sinatra/.bundle/config
 - examples/sinatra/Gemfile
+- examples/sinatra/README
 - examples/sinatra/app/post.rb
 - examples/sinatra/app/posts_controller.rb
 - examples/sinatra/boot.rb
@@ -669,9 +683,11 @@ files:
 - spec/core_ext_spec.rb
 - spec/image_spec.rb
 - spec/images_controller_spec.rb
+- spec/layout_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/test.sqlite3
 has_rdoc: true
 homepage: http://github.com/crhym3/rmce_uploadr
 licenses: []
@@ -707,6 +723,7 @@ test_files:
 - spec/core_ext_spec.rb
 - spec/image_spec.rb
 - spec/images_controller_spec.rb
+- spec/layout_spec.rb
 - spec/spec_helper.rb
 - examples/rails/app/controllers/application_controller.rb
 - examples/rails/app/controllers/posts_controller.rb
@@ -735,3 +752,4 @@ test_files:
 - examples/sinatra/app/posts_controller.rb
 - examples/sinatra/boot.rb
 - examples/sinatra/scripts/console.rb
+- spec/test.sqlite3

data/examples/rails/doc/README_FOR_APP

@@ -1,2 +0,0 @@
-Use this README file to introduce your application and point to useful places in the API for learning more.
-Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.