attachinary 1.0.0 → 1.0.1

data/README.md

@@ -1,6 +1,6 @@
 # Attachinary v1
 
-_Note: v1 is not backward compatible._
+_Note: v1 is not backward compatible. Refer to [wiki](https://github.com/assembler/attachinary/wiki/Upgrading-to-v1.0) on how to upgrade._
 
 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!
 

data/lib/attachinary/simple_form.rb

@@ -3,6 +3,8 @@ class AttachinaryInput < SimpleForm::Inputs::Base
 
   def input
     name = "#{@builder.object_name}[#{attribute_name}]"
+    input_html_options[:id] ||= "#{@builder.object_name}_#{attribute_name}"
+
     template.attachinary_file_field_tag name, @builder.object, attribute_name,
      { html: input_html_options }
   end

data/lib/attachinary/version.rb

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

data/lib/attachinary/view_helpers.rb

@@ -23,7 +23,6 @@ module Attachinary
 
 
       options[:html] ||= {}
-      options[:html][:id] = nil
       options[:html][:class] = [options[:html][:class], 'attachinary-input'].flatten.compact
 
       if !options[:html][:accept] && accepted_types = options[:attachinary][:accept]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attachinary
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70213729979420 !ruby/object:Gem::Requirement
+  requirement: &70198166992480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70213729979420
+  version_requirements: *70198166992480
 - !ruby/object:Gem::Dependency
   name: cloudinary
-  requirement: &70213729994680 !ruby/object:Gem::Requirement
+  requirement: &70198167000640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.30
   type: :runtime
   prerelease: false
-  version_requirements: *70213729994680
+  version_requirements: *70198167000640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70213729993740 !ruby/object:Gem::Requirement
+  requirement: &70198167040760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213729993740
+  version_requirements: *70198167040760
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70213729992700 !ruby/object:Gem::Requirement
+  requirement: &70198167038660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70213729992700
+  version_requirements: *70198167038660
 - !ruby/object:Gem::Dependency
   name: valid_attribute
-  requirement: &70213729991360 !ruby/object:Gem::Requirement
+  requirement: &70198167037580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213729991360
+  version_requirements: *70198167037580
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70213730002500 !ruby/object:Gem::Requirement
+  requirement: &70198167055900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213730002500
+  version_requirements: *70198167055900
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70213729996140 !ruby/object:Gem::Requirement
+  requirement: &70198167053580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70213729996140
+  version_requirements: *70198167053580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70213729995080 !ruby/object:Gem::Requirement
+  requirement: &70198167052440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213729995080
+  version_requirements: *70198167052440
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70213730007760 !ruby/object:Gem::Requirement
+  requirement: &70198167050240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213730007760
+  version_requirements: *70198167050240
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70213730006740 !ruby/object:Gem::Requirement
+  requirement: &70198167062200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213730006740
+  version_requirements: *70198167062200
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70213730005440 !ruby/object:Gem::Requirement
+  requirement: &70198167059120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213730005440
+  version_requirements: *70198167059120
 description: Attachments handler for Rails that uses Cloudinary for storage.
 email:
 - milovan.zogovic@gmail.com
@@ -148,7 +148,6 @@ files:
 - 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
@@ -175,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3340139382106100314
+      hash: -42460769790723876
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -184,11 +183,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3340139382106100314
+      hash: -42460769790723876
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: attachinary-1.0.0
+summary: attachinary-1.0.1
 test_files: []

data/lib/attachinary/orm/extension.rb

@@ -1,121 +0,0 @@
-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