attachinary 0.0.8 → 1.0.0

data/README.md

@@ -1,16 +1,19 @@
-# Attachinary
+# Attachinary v1
+
+_Note: v1 is not backward compatible._
 
 Need lightweight attachment (photos and raw files) handler for any of your model, in either has\_one or has\_many relation, without altering your models' schema and with zero effort? Attachinary is the tool for you!
 
 Why is Attachinary different:
 
-* **No need to alter your model schema** any time you introduce new kind of attachment.
+* Supports both **ActiveRecord** and **Mongoid** ORMs!
+* **No need to alter your model schema** every time you introduce new kind of attachment.
 * Handles **both has\_one and has\_many** use cases.
 * **No need for ImageMagick** (or similar) - your thumbnails are generated on the fly by Cloudinary.
-* Fully customizable, built-in **jQuery plugin** for async file uploads with previews.
+* Fully customizable, custom **jQuery plugin** for async file uploads with previews.
 * **Files are uploaded directly to Cloudinary** completely bypassing your app (without affecting its performance).
 * **Very easy to use**. Once set up, 1 line is enough to add attachment support to your model. **No migrations, no Uploaders**.
-* **Lightweight form submission**. Attachinary handles file upload asynchronously and the only thing that is passed to your server are the IDs of the files. That makes form postbacks fast and reliable.
+* **Lightweight form submission**. Attachinary handles file upload asynchronously and the only thing that is passed to your server is metadata. That makes form postbacks fast and reliable.
 * All the [benefits of Cloudinary](http://cloudinary.com/documentation/image_transformations) (resizing, cropping, rotating, rounding corners, **face detection**...).
 
 Attachinary uses [Cloudinary](http://cloudinary.com) service. Gem is structured as mountable rails engine.
@@ -18,23 +21,30 @@ Attachinary uses [Cloudinary](http://cloudinary.com) service. Gem is structured
 
 ## Installation
 
-First, make sure that you have [cloudinary gem](https://github.com/cloudinary/cloudinary_gem) installed and properly configured. Also, make sure that you have following line in head section of your application layout file:
-
-	<%= cloudinary_js_config %>
+First, make sure that you have [cloudinary gem](https://github.com/cloudinary/cloudinary_gem) installed and properly configured.
 
-Then, add following line to your `Gemfile`:
+Add following line to your `Gemfile`:
 
     gem 'attachinary'
 
-Run following rake command in terminal to create necessary tables:
+Specify which ORM you wish to use by adding following line to your `application.rb` file (or custom initializer):
+
+	require "attachinary/orm/YOUR_ORM" # active_record or mongoid
+
+If you're using `ActiveRecord` ORM, then run following lines to generate required table:
 
 	rake attachinary:install:migrations
 	rake db:migrate
 
-Add following line in your `routes.rb` file to mount the engine:
+Next, add following line in your `routes.rb` file:
 
 	mount Attachinary::Engine => "/attachinary"
 
+It will generate '/attachinary/cors' which will be used for iframe file transfers (for unsupported browsers).
+
+Finally, make sure that you have following line in head section of your application layout file:
+
+	<%= cloudinary_js_config %>
 
 
 
@@ -44,17 +54,17 @@ Lets say that we want all of our **users** to have single **avatar** and many **
 
 	class User < ActiveRecord::Base
 		...
-		has_attachment  :avatar, accept: ['jpg', 'png', 'gif']
+		has_attachment  :avatar, accept: [:jpg, :png, :gif]
 		has_attachments :photos, maximum: 10
 
-		validates :avatar_id, presence: true
+		validates :avatar, presence: true
 		...
 	end
 
 In our `_form.html.erb` template, we need to add only this:
 
-	<%= attachinary_file_field_tag 'user[avatar_id]', user.avatar_id, attachinary: user.avatar_options %>
-	<%= attachinary_file_field_tag 'user[photo_ids]', user.photo_ids, attachinary: user.photo_options %>
+	<%= attachinary_file_field_tag 'user[avatar]', user, :avatar %>
+	<%= attachinary_file_field_tag 'user[photos]', user, :photos %>
 
 If you're using [SimpleForm](https://github.com/plataformatec/simple_form), you can even shorten this to:
 
@@ -76,6 +86,7 @@ Attachinary jquery plugin is based upon [jQuery File Upload plugin](https://gith
 
 Plugin is fully customizable. It uses John Resig's micro templating in the background, but you can override it with whatever you like. Check out the source code for more configuration options you can set.
 
+
 ### Displaying avatar and photos
 
 Here comes the good part. There is no need to transform images on your server. Instead, you can request image transformations directly from Cloudinary. First time you request image, it is created and cached on the Cloudinary server for later use. Here is sample code that you can use in your `_user.html.erb` partial:
@@ -96,7 +107,8 @@ Whenever you feel like changing image sizes, you don't need to set rake task tha
 ## Conventions
 
 * always use singular identifier after `has_attachment` (e.g. `has_attachment :photo`)
-* always use plural identifier after `has_attachments` (e.g. `has_attachments :photos`)
+* always use plural identifier after `has_attachments` (e.g. `has_attachments :images`)
+* you can't use colliding identifiers (e.g. `has_attachment :photo` and `has_attachments :photos`) on same model.
 
 
 ## Requirements and Compatibility
@@ -107,6 +119,12 @@ Whenever you feel like changing image sizes, you don't need to set rake task tha
 * jQuery
 
 
+### Browser Compatibility
+
+Attachinary jquery plugin uses JSON2 to generate JSON data.
+This works for all major browsers, but if you wish to support older ones (e.g. IE7-), include [json2.js](https://github.com/douglascrockford/JSON-js/blob/master/json2.js).
+
+
 ## Credits and License
 
 Developed by Milovan Zogovic.

data/Rakefile

@@ -38,6 +38,15 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
 
 
+desc 'Run Devise tests for all ORMs.'
+task :spec_all_orms do
+  Dir[File.join(File.dirname(__FILE__), 'spec', 'orm', '*.rb')].each do |file|
+    orm = File.basename(file).split(".").first
+    puts "\n\n-------- ORM: #{orm}\n\n"
+    exit 1 unless system "rake spec ATTACHINARY_ORM=#{orm}"
+  end
+end
+
+task :default => :spec_all_orms

data/app/controllers/attachinary/files_controller.rb

@@ -14,7 +14,7 @@ module Attachinary
 
   private
     def file_params
-      request.query_parameters.slice(:public_id, :version, :width, :height, :format, :resource_type)
+      request.query_parameters.slice(:public_id, :version, :width, :height, :format, :resource_type, :scope)
     end
 
   end

data/db/migrate/20120612112526_create_attachinary_tables.rb

@@ -1,14 +1,9 @@
 class CreateAttachinaryTables < ActiveRecord::Migration
   def change
-    create_table :attachinary_attachments do |t|
-      t.belongs_to :parent, polymorphic: true
-      t.belongs_to :file
+    create_table :attachinary_files do |t|
+      t.references :attachinariable, polymorphic: true
       t.string :scope
-      t.timestamps
-    end
-    add_index :attachinary_attachments, [:parent_type, :parent_id, :scope], name: 'by_scoped_parent'
 
-    create_table :attachinary_files do |t|
       t.string :public_id
       t.string :version
       t.integer :width
@@ -17,5 +12,6 @@ class CreateAttachinaryTables < ActiveRecord::Migration
       t.string :resource_type
       t.timestamps
     end
+    add_index :attachinary_files, [:attachinariable_type, :attachinariable_id, :scope], name: 'by_scoped_parent'
   end
 end

data/lib/attachinary.rb

@@ -1,7 +1,4 @@
 require 'attachinary/engine'
 
-require 'attachinary/active_record_extension'
-ActiveRecord::Base.extend Attachinary::ActiveRecordExtension
-
 module Attachinary
 end

data/lib/attachinary/orm/active_record.rb

@@ -0,0 +1,5 @@
+require_relative 'file_mixin'
+require_relative 'active_record/extension'
+require_relative 'active_record/file'
+
+ActiveRecord::Base.extend Attachinary::Extension

data/lib/attachinary/orm/active_record/extension.rb

@@ -0,0 +1,116 @@
+module Attachinary
+  module Extension
+
+    def has_attachment(scope, options={})
+      options[:single] = true
+      attachinary scope, options
+    end
+
+    def has_attachments(scope, options={})
+      options[:single] = false
+      attachinary scope, options
+    end
+
+    def attachinary(scope, options)
+      options.reverse_merge!({
+        accessible: true
+      })
+
+      if options[:single]
+        singular = scope.to_s
+        plural = scope.to_s.pluralize
+      else
+        plural = scope.to_s
+        singular = scope.to_s.singularize
+      end
+
+      relation = "#{singular}_files"
+
+      # has_many :photo_files, ...
+      # has_many :image_files, ...
+      has_many :"#{relation}",
+        as: :attachinariable,
+        class_name: '::Attachinary::File',
+        conditions: { scope: scope.to_s },
+        dependent: :destroy
+
+      # attr_accessible :photo
+      # attr_accessible :images
+      attr_accessible :"#{scope}" if options[:accessible]
+
+
+      # def photo?
+      #   photo.present?
+      # end
+      # def images?
+      #   images.present?
+      # end
+      define_method :"#{scope}?" do
+        send(:"#{scope}").present?
+      end
+
+      # def photo_metadata
+      #   options[:scope] = 'photo'
+      #   options[:maximum] = 1 if options[:single]
+      #   options
+      # end
+      define_method :"#{scope}_metadata" do
+        options[:scope] = scope
+        options[:maximum] = 1 if options[:single]
+        options
+      end
+
+      # def photo=(file)
+      #   if file.blank?
+      #     self.photo_files.clear
+      #   else
+      #     case file
+      #     when String
+      #       files = ... parse JSON and MAP to array of Attachinary::File ..
+      #       self.photo_files = files
+      #     else
+      #       self.photo_files = [file].flatten
+      #     end
+      #   end
+      # end
+      define_method "#{scope}=" do |file|
+        if file.blank?
+          send("#{relation}").clear
+        else
+          case file
+          when String
+            files = [JSON.parse(file)].flatten.map do |data|
+              data = data.slice(*Attachinary::File.attr_accessible[:default].to_a)
+              Attachinary::File.new(data) do |f|
+                f.scope = scope.to_s
+              end
+            end
+            send("#{relation}=", files)
+          else
+            send("#{relation}=", [file].flatten)
+          end
+        end
+      end
+
+
+      if options[:single]
+        # def photo
+        #   photo_files.first
+        # end
+        define_method "#{scope}" do
+          send("#{relation}").first
+        end
+
+      else # plural
+        # def images
+        #   image_files
+        # end
+        define_method "#{scope}" do
+          send("#{relation}")
+        end
+      end
+
+    end
+
+  end
+end

data/lib/attachinary/orm/active_record/file.rb

@@ -0,0 +1,6 @@
+module Attachinary
+  class File < ::ActiveRecord::Base
+    belongs_to :attachinariable, polymorphic: true
+    include FileMixin
+  end
+end

data/lib/attachinary/orm/extension.rb

@@ -0,0 +1,121 @@
+module Attachinary
+  module Extension
+
+    def has_attachment(scope, options={})
+      options[:single] = true
+      attachinary scope, options
+    end
+
+    def has_attachments(scope, options={})
+      options[:single] = false
+      attachinary scope, options
+    end
+
+    def attachinary(scope, options)
+      options.reverse_merge!({
+        accessible: true
+      })
+
+      if options[:single]
+        singular = scope.to_s
+        plural = scope.to_s.pluralize
+      else
+        plural = scope.to_s
+        singular = scope.to_s.singularize
+      end
+
+      relation = "#{singular}_files"
+
+      # # has_many :photo_files, ...
+      # # has_many :image_files, ...
+      # has_many :"#{relation}",
+      #   as: :attachinariable,
+      #   class_name: '::Attachinary::File',
+      #   conditions: { scope: scope.to_s },
+      #   dependent: :destroy
+
+      embeds_many :"#{relation}",
+        as: :attachinariable,
+        class_name: '::Attachinary::File',
+        validate: false
+
+      # attr_accessible :photo
+      # attr_accessible :images
+      attr_accessible :"#{scope}" if options[:accessible]
+
+
+      # def photo?
+      #   photo.present?
+      # end
+      # def images?
+      #   images.present?
+      # end
+      define_method :"#{scope}?" do
+        send(:"#{scope}").present?
+      end
+
+      # def photo_metadata
+      #   options[:scope] = 'photo'
+      #   options[:maximum] = 1 if options[:single]
+      #   options
+      # end
+      define_method :"#{scope}_metadata" do
+        options[:scope] = scope
+        options[:maximum] = 1 if options[:single]
+        options
+      end
+
+      # def photo=(file)
+      #   if file.blank?
+      #     self.photo_files.clear
+      #   else
+      #     case file
+      #     when String
+      #       files = ... parse JSON and MAP to array of Attachinary::File ..
+      #       self.photo_files = files
+      #     else
+      #       self.photo_files = [file].flatten
+      #     end
+      #   end
+      # end
+      define_method "#{scope}=" do |file|
+        if file.blank?
+          send("#{relation}").clear
+        else
+          case file
+          when String
+            files = [JSON.parse(file)].flatten.map do |data|
+              data = data.slice(*Attachinary::File.attr_accessible[:default].to_a)
+              Attachinary::File.new(data) do |f|
+                f.scope = scope.to_s if f.respond_to?(:scope)
+              end
+            end
+            send("#{relation}=", files)
+          else
+            send("#{relation}=", [file].flatten)
+          end
+        end
+      end
+
+
+      if options[:single]
+        # def photo
+        #   photo_files.first
+        # end
+        define_method "#{scope}" do
+          send("#{relation}").first
+        end
+
+      else # plural
+        # def images
+        #   image_files
+        # end
+        define_method "#{scope}" do
+          send("#{relation}")
+        end
+      end
+
+    end
+
+  end
+end

data/{app/models/attachinary/file.rb → lib/attachinary/orm/file_mixin.rb}

@@ -1,10 +1,10 @@
 module Attachinary
-  class File < ::ActiveRecord::Base
-    validates :public_id, :version, presence: true
-    validates :resource_type, presence: true
-
-    attr_accessible :public_id, :version, :width, :height, :format, :resource_type
-    after_destroy :destroy_file
+  module FileMixin
+    def self.included(base)
+      base.validates :public_id, :version, :resource_type, presence: true
+      base.attr_accessible :public_id, :version, :width, :height, :format, :resource_type
+      base.after_destroy :destroy_file
+    end
 
     def as_json(options)
       super(only: [:id, :public_id, :format, :version, :resource_type], methods: [:path])
@@ -24,13 +24,6 @@ module Attachinary
       Cloudinary::Utils.cloudinary_url(path(format), options)
     end
 
-    def self.upload!(file)
-      if file.respond_to?(:read)
-        response = Cloudinary::Uploader.upload(file, tags: "env_#{Rails.env}")
-        create! response.slice('public_id', 'version', 'width', 'height', 'format', 'resource_type')
-      end
-    end
-
   private
     def destroy_file
       Cloudinary::Uploader.destroy(public_id) if public_id

data/lib/attachinary/orm/mongoid.rb

@@ -0,0 +1,5 @@
+require_relative 'file_mixin'
+require_relative 'mongoid/extension'
+require_relative 'mongoid/file'
+
+Mongoid::Document::ClassMethods.send :include, Attachinary::Extension

data/lib/attachinary/orm/mongoid/extension.rb

@@ -0,0 +1,90 @@
+module Attachinary
+  module Extension
+
+    def has_attachment(scope, options={})
+      options[:single] = true
+      attachinary scope, options
+    end
+
+    def has_attachments(scope, options={})
+      options[:single] = false
+      attachinary scope, options
+    end
+
+    def attachinary(scope, options)
+      options.reverse_merge!({
+        accessible: true
+      })
+
+      if options[:single]
+        singular = scope.to_s
+        plural = scope.to_s.pluralize
+      else
+        plural = scope.to_s
+        singular = scope.to_s.singularize
+      end
+
+      if options[:single]
+        # embeds_on :photo, ...
+        embeds_one :"#{scope}", as: :attachinariable, class_name: '::Attachinary::File'
+      else
+        # embeds_many :images, ...
+        embeds_many :"#{scope}", as: :attachinariable, class_name: '::Attachinary::File'
+      end
+
+
+      # attr_accessible :photo
+      # attr_accessible :images
+      attr_accessible :"#{scope}" if options[:accessible]
+
+      # def photo?
+      #   photo.present?
+      # end
+      # def images?
+      #   images.present?
+      # end
+      define_method :"#{scope}?" do
+        send(:"#{scope}").present?
+      end
+
+      # def photo_metadata
+      #   options[:scope] = 'photo'
+      #   options[:maximum] = 1 if options[:single]
+      #   options
+      # end
+      define_method :"#{scope}_metadata" do
+        options[:scope] = scope
+        options[:maximum] = 1 if options[:single]
+        options
+      end
+
+
+      # alias_method :orig_photo=, :photo=
+      # def photo=(arg)
+      #   arg = nil if arg.empty?
+      #   if arg.is_a?(String)
+      #     files = ... parse JSON and MAP to array of Attachinary::File ..
+      #     files = files[0] if options[:singular]
+      #     super files
+      #   else
+      #     super
+      #   end
+      # end
+      alias_method "orig_#{scope}=", "#{scope}="
+      define_method "#{scope}=" do |arg|
+        arg = nil if arg.respond_to?(:empty?) && arg.empty?
+
+        if arg.is_a?(String)
+          files = [JSON.parse(arg)].flatten.map do |data|
+            data = data.slice(*Attachinary::File.attr_accessible[:default].to_a)
+            Attachinary::File.new(data)
+          end
+          send("orig_#{scope}=", options[:single] ? files[0] : files)
+        else
+          send("orig_#{scope}=", arg)
+        end
+      end
+    end
+
+  end
+end

data/lib/attachinary/orm/mongoid/file.rb

@@ -0,0 +1,16 @@
+module Attachinary
+  class File
+    include ::Mongoid::Document
+    include ::Mongoid::Timestamps
+    include FileMixin
+
+    field :public_id, type: String
+    field :version, type: String
+    field :width, type: Integer
+    field :height, type: Integer
+    field :format, type: String
+    field :resource_type, type: String
+
+    embedded_in :attachinariable, polymorphic: true
+  end
+end

data/lib/attachinary/simple_form.rb

@@ -1,18 +1,9 @@
 class AttachinaryInput < SimpleForm::Inputs::Base
   attr_reader :attachinary_options
 
-  def initialize(builder, attribute_name, column, input_type, options = {})
-    @attachinary_options = builder.object.send("#{attribute_name.to_s.singularize}_options")
-    attribute_name = @attachinary_options[:field_name]
-
-    super builder, attribute_name, column, input_type, options
-  end
-
   def input
     name = "#{@builder.object_name}[#{attribute_name}]"
-    value = object.send(attribute_name)
-
-    template.attachinary_file_field_tag name, value,
-      { html: input_html_options, attachinary: attachinary_options }
+    template.attachinary_file_field_tag name, @builder.object, attribute_name,
+     { html: input_html_options }
   end
 end

data/lib/attachinary/version.rb

@@ -1,3 +1,3 @@
 module Attachinary
-  VERSION = "0.0.8"
+  VERSION = "1.0.0"
 end

data/lib/attachinary/view_helpers.rb

@@ -3,7 +3,9 @@ require 'mime/types'
 module Attachinary
   module ViewHelpers
 
-    def attachinary_file_field_tag(name, value, options={})
+    def attachinary_file_field_tag(field_name, model, relation, options={})
+      options[:attachinary] = model.send("#{relation}_metadata")
+
       options[:cloudinary] ||= {}
       options[:cloudinary][:tags] ||= []
       options[:cloudinary][:tags]<< "#{Rails.env}_env"
@@ -33,15 +35,13 @@ module Attachinary
 
       options[:html][:data] ||= {}
       options[:html][:data][:attachinary] = options[:attachinary] || {}
-      options[:html][:data][:attachinary][:callback] = attachinary.callback_path
-      options[:html][:data][:attachinary][:files] = Attachinary::File.where(id: value).all
-      options[:html][:data][:attachinary][:file_field_name] = name.gsub(options[:attachinary][:field_name], options[:attachinary][:file_field_name])
-      options[:html][:data][:attachinary][:field_name] = name
+      options[:html][:data][:attachinary][:files] = [model.send(relation)].compact.flatten
+      options[:html][:data][:attachinary][:field_name] = field_name
 
       options[:html][:data][:form_data] = cloudinary_params.reject{ |k, v| v.blank? }
       options[:html][:data][:url] = cloudinary_upload_url
 
-      file_field_tag(options[:html][:data][:attachinary][:file_field_name], options[:html])
+      file_field_tag('file', options[:html])
     end
 
   end

data/vendor/assets/javascripts/attachinary.js.coffee

@@ -15,7 +15,7 @@
               <img
                 src="<%= $.cloudinary.url(files[i].public_id, { "version": files[i].version, "format": 'jpg', "crop": 'fill', "width": 75, "height": 75 }) %>"
                 alt="" width="75" height="75" />
-              <a href="#" data-remove="<%= files[i].id %>">Remove</a>
+              <a href="#" data-remove="<%= files[i].public_id %>">Remove</a>
             </li>
           <% } %>
         </ul>
@@ -55,13 +55,12 @@
       if @$input.attr('accept')
         options.acceptFileTypes = new RegExp("^#{@$input.attr('accept').split(",").join("|")}$", "i")
 
-      @$input.attr('name', 'file')
       @$input.fileupload(options)
 
 
     bindEventHandlers: ->
       @$input.bind 'fileuploaddone', (event, data) =>
-        @issueCallback(data.result)
+        setTimeout (=> @addFile(data.result)), 0 # let 'fileuploadalways' finish
 
       @$input.bind 'fileuploadstart', (event) =>
         @$input = $(event.target)  # important! changed on every file upload
@@ -72,9 +71,7 @@
         $form.addClass  'uploading'
 
         @$input.prop 'disabled', true
-
         if @config.disableWith
-          $submit.prop 'disabled', true
           $submit.data 'old-val', $submit.val()
           $submit.val  @config.disableWith
 
@@ -86,21 +83,11 @@
         $form.removeClass  'uploading'
 
         @$input.prop 'disabled', false
-
         if @config.disableWith
-          $submit.prop 'disabled', false
           $submit.val  $submit.data('old-val')
 
-
-    issueCallback: (data) ->
-      $.ajax
-        url: @options.callback,
-        data: data,
-        success: (file) => @addFile(file)
-
     addFile: (file) ->
-      extension = file.path.split(".")[1]
-      if !@options.accept || $.inArray(extension, @options.accept) != -1
+      if !@options.accept || $.inArray(file.format, @options.accept) != -1
         @files.push file
         @redraw()
         @checkMaximum()
@@ -108,7 +95,7 @@
         alert @config.invalidFormatMessage
 
     removeFile: (fileIdToRemove) ->
-      @files = (file for file in @files when file.id.toString() != fileIdToRemove.toString())
+      @files = (file for file in @files when file.public_id != fileIdToRemove)
       @redraw()
       @checkMaximum()
 
@@ -124,11 +111,9 @@
 
     redraw: ->
       @$filesContainer.empty()
-      @$filesContainer.append @makeHiddenField(null)
 
       if @files.length > 0
-        for file in @files
-          @$filesContainer.append @makeHiddenField(file.id)
+        @$filesContainer.append @makeHiddenField(JSON.stringify(@files))
 
         @$filesContainer.append @config.render(@files)
         @$filesContainer.find('[data-remove]').on 'click', (event) =>
@@ -137,15 +122,12 @@
 
         @$filesContainer.show()
       else
+        @$filesContainer.append @makeHiddenField(null)
         @$filesContainer.hide()
 
     makeHiddenField: (value) ->
       $input = $('<input type="hidden">')
-
-      name = @options.field_name
-      name+= "[]" unless @options.single
-
-      $input.attr 'name', name
+      $input.attr 'name', @options.field_name
       $input.val value
       $input
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attachinary
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000Z
+date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70282217818480 !ruby/object:Gem::Requirement
+  requirement: &70213729979420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70282217818480
+  version_requirements: *70213729979420
 - !ruby/object:Gem::Dependency
   name: cloudinary
-  requirement: &70282217817980 !ruby/object:Gem::Requirement
+  requirement: &70213729994680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.30
   type: :runtime
   prerelease: false
-  version_requirements: *70282217817980
+  version_requirements: *70213729994680
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70282217817600 !ruby/object:Gem::Requirement
+  requirement: &70213729993740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282217817600
+  version_requirements: *70213729993740
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70282217817060 !ruby/object:Gem::Requirement
+  requirement: &70213729992700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70282217817060
+  version_requirements: *70213729992700
 - !ruby/object:Gem::Dependency
   name: valid_attribute
-  requirement: &70282217816640 !ruby/object:Gem::Requirement
+  requirement: &70213729991360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282217816640
+  version_requirements: *70213729991360
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70282217816180 !ruby/object:Gem::Requirement
+  requirement: &70213730002500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282217816180
+  version_requirements: *70213730002500
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70282217815680 !ruby/object:Gem::Requirement
+  requirement: &70213729996140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70282217815680
+  version_requirements: *70213729996140
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70282217815260 !ruby/object:Gem::Requirement
+  requirement: &70213729995080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282217815260
+  version_requirements: *70213729995080
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70282217814800 !ruby/object:Gem::Requirement
+  requirement: &70213730007760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282217814800
+  version_requirements: *70213730007760
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &70213730006740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70213730006740
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70282217814380 !ruby/object:Gem::Requirement
+  requirement: &70213730005440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282217814380
+  version_requirements: *70213730005440
 description: Attachments handler for Rails that uses Cloudinary for storage.
 email:
 - milovan.zogovic@gmail.com
@@ -131,12 +142,17 @@ files:
 - app/controllers/attachinary/application_controller.rb
 - app/controllers/attachinary/cors_controller.rb
 - app/controllers/attachinary/files_controller.rb
-- app/models/attachinary/attachment.rb
-- app/models/attachinary/file.rb
 - config/routes.rb
 - db/migrate/20120612112526_create_attachinary_tables.rb
-- lib/attachinary/active_record_extension.rb
 - lib/attachinary/engine.rb
+- lib/attachinary/orm/active_record/extension.rb
+- lib/attachinary/orm/active_record/file.rb
+- lib/attachinary/orm/active_record.rb
+- lib/attachinary/orm/extension.rb
+- lib/attachinary/orm/file_mixin.rb
+- lib/attachinary/orm/mongoid/extension.rb
+- lib/attachinary/orm/mongoid/file.rb
+- lib/attachinary/orm/mongoid.rb
 - lib/attachinary/simple_form.rb
 - lib/attachinary/version.rb
 - lib/attachinary/view_helpers.rb
@@ -159,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1778917027853764357
+      hash: -3340139382106100314
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,11 +184,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1778917027853764357
+      hash: -3340139382106100314
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: attachinary-0.0.8
+summary: attachinary-1.0.0
 test_files: []

data/app/models/attachinary/attachment.rb

@@ -1,10 +0,0 @@
-module Attachinary
-  class Attachment < ::ActiveRecord::Base
-    belongs_to :parent, polymorphic: true, touch: true
-    belongs_to :file, class_name: 'Attachinary::File', foreign_key: 'file_id'
-
-    validates :parent_id, :parent_type, :scope, presence: true
-
-    attr_accessible :parent_id, :parent_type, :file_id
-  end
-end

data/lib/attachinary/active_record_extension.rb

@@ -1,189 +0,0 @@
-module Attachinary
-  module ActiveRecordExtension
-
-    def has_attachment(scope, options={})
-      attachinary_apply_defaults!(options)
-
-      # has_one :photo_attachment, ...
-      has_one :"#{scope}_attachment",
-        as: :parent,
-        class_name: '::Attachinary::Attachment',
-        conditions: { scope: scope.to_s },
-        dependent: :destroy
-
-      # has_one :photo_attachment_file, through: :photo_attachment, ...
-      has_one :"#{scope}_attachment_file",
-        through: :"#{scope}_attachment",
-        source: :file
-
-      # attr_accessible :photo_id, :photo_file
-      attr_accessible :"#{scope}_id", :"#{scope}_file" if options[:accessible]
-
-      # attr_writer :photo
-      attr_writer :"#{scope}"
-
-      # def photo
-      #   unless defined?(@photo)
-      #     @photo = photo_attachment_file
-      #   end
-      #   @photo
-      # end
-      define_method :"#{scope}" do
-        unless instance_variable_defined? :"@#{scope}"
-          instance_variable_set :"@#{scope}", send(:"#{scope}_attachment_file")
-        end
-        instance_variable_get :"@#{scope}"
-      end
-
-      # def photo_id=(id)
-      #   photo = ::Attachinary::File.find_by_id(id)
-      # end
-      define_method :"#{scope}_id=" do |id|
-        send(:"#{scope}=", ::Attachinary::File.find_by_id(id))
-      end
-
-      # def photo_file=(f)
-      #   photo = ::Attachinary::File.upload!(f) if f.present?
-      # end
-      define_method :"#{scope}_file=" do |f|
-        send(:"#{scope}=", ::Attachinary::File.upload!(f)) if f.present?
-      end
-
-      # def photo_id
-      #   photo.try(:id)
-      # end
-      define_method :"#{scope}_id" do
-        send(:"#{scope}").try(:id)
-      end
-
-      # def photo?
-      #   photo.present?
-      # end
-      define_method :"#{scope}?" do
-        send(:"#{scope}").present?
-      end
-
-      # before_save do
-      #   photo_attachment_file = photo
-      # end
-      before_save do
-        send(:"#{scope}_attachment_file=", send(:"#{scope}"))
-      end
-
-      # def photo_options
-      #   options.merge({
-      #     field_name: "photo_id",
-      #     maximum: 1
-      #   })
-      # end
-      define_method :"#{scope}_options" do
-        options.merge({
-          field_name: "#{scope}_id",
-          file_field_name: "#{scope}_file",
-          single: true,
-          maximum: 1
-        })
-      end
-    end
-
-    def has_attachments(scope, options={})
-      attachinary_apply_defaults!(options)
-      singular = scope.to_s.singularize
-
-      # has_many :image_attachments
-      has_many :"#{singular}_attachments",
-        as: :parent,
-        class_name: '::Attachinary::Attachment',
-        conditions: { scope: scope.to_s },
-        dependent: :destroy
-
-      # has_many :image_attachment_files, through: :image_attachments
-      has_many :"#{singular}_attachment_files",
-        through: :"#{singular}_attachments",
-        source: :file
-
-      # attr_accessible :image_ids, :image_files
-      attr_accessible :"#{singular}_ids", :"#{singular}_files" if options[:accessible]
-
-      # attr_writer :images
-      attr_writer :"#{scope}"
-
-      # def images
-      #   unless defined?(@images)
-      #     @images = image_attachment_files
-      #   end
-      #   @images
-      # end
-      define_method :"#{scope}" do
-        unless instance_variable_defined? :"@#{scope}"
-          instance_variable_set :"@#{scope}", send(:"#{singular}_attachment_files")
-        end
-        instance_variable_get :"@#{scope}"
-      end
-
-      # def image_ids=(ids)
-      #   files = [ids].flatten.compact.uniq.reject(&:blank?) do |id|
-      #     ::Attachinary::File.find_by_id(id)
-      #   end.compact
-      #   images = files
-      # end
-      define_method :"#{singular}_ids=" do |ids|
-        files = [ids].flatten.compact.uniq.reject(&:blank?).map do |id|
-          ::Attachinary::File.find_by_id(id)
-        end.compact
-        send(:"#{scope}=", files)
-      end
-
-      # def image_files=(fs)
-      #   files = fs.map { |f| ::Attachinary::File.upload!(f) }
-      #   images = files
-      # end
-      define_method :"#{singular}_files=" do |fs|
-        files = fs.map{ |f| ::Attachinary::File.upload!(f) }.compact
-        send(:"#{scope}=", files)
-      end
-
-      # def image_ids
-      #   images.map(&:id)
-      # end
-      define_method :"#{singular}_ids" do
-        send(:"#{scope}").map(&:id)
-      end
-
-      # def images?
-      #   images.present?
-      # end
-      define_method :"#{scope}?" do
-        send(:"#{scope}").present?
-      end
-
-      # before_save do
-      #   image_attachment_files = images
-      # end
-      before_save do
-        send(:"#{singular}_attachment_files=", send(:"#{scope}"))
-      end
-
-      # def image_options
-      #   options.merge({
-      #     field_name: "image_ids"
-      #   })
-      # end
-      define_method :"#{singular}_options" do
-        options.merge({
-          field_name: "#{singular}_ids",
-          file_field_name: "#{singular}_files",
-          single: false
-        })
-      end
-    end
-
-  private
-    def attachinary_apply_defaults!(options)
-      options.reverse_merge!({
-        accessible: true
-      })
-    end
-
-  end
-end