ruby_gallery 0.1.5 → 0.1.6

data/app/helpers/ruby_gallery/test_helper.rb

@@ -0,0 +1,16 @@
+module RubyGallery::TestHelper
+  def upload_factory(model_name, fields={})
+    object = model_name.to_s.singularize.classify.constantize.find(params[:id])
+    
+    content_tag(:div, class: "factory-box") do
+      content_tag(:form, action: "/upload_factories/upload_processes") 
+      content_tag(:ul, class: "factory-content") do
+        content_tag(:li, class: "factory-item") do
+          [tag(:label, 'Upload Photo'),
+          tag(:input, type: 'file', multiple: "", class: "factory-input")].join.html_safe
+        end
+      end
+    end
+    
+  end #end def
+end

data/app/models/album_photo.rb

@@ -1,6 +1,5 @@
 class AlbumPhoto < ActiveRecord::Base
   attr_accessible :photo
-  
-  belongs_to :album_attachment
+  belongs_to :album_photoable, polymorphic: true
   has_attached_file :photo, :styles => { :medium => "300x300>", :thumb => "100x100>" }
 end

data/app/views/shared/_photo_box.html.erb

@@ -0,0 +1,6 @@
+<li class='photo-cat photo_<%=photo.id %>'  key="<%= photo.id%>">
+  <span class="entypo-icon-1 remove-photo hide", photo_id="<%= photo.id %>">&#10006;</span>
+  <a class="gallery-colorbox" href="<%= photo.photo.url(:medium)%>">
+  <%= image_tag photo.photo.url(:thumb) ,size: '120x120'  %>
+  <input type="hidden" name="position-item" class="item-position" value="<%= photo.position%>" />
+</li>

data/lib/generators/active_record/ruby_gallery_generator.rb

@@ -1,17 +1,41 @@
 require 'rails/generators/active_record'
+require 'generators/ruby_gallery/orm_helpers'
 module ActiveRecord
   module Generators
     class RubyGalleryGenerator < ActiveRecord::Generators::Base
+      include RubyGallery::Generators::OrmHelpers
       argument :attributes, :type => :array, :default => [], :banner => "filed:type field:type"
       
       source_root File.expand_path("../templates", __FILE__)
       
       def copy_ruby_gallery_migration
-        migration_template "album_photo_migration.rb", "db/migrate/ruby_gallery_create_album_photos"
-        migration_template "migration.rb", "db/migrate/ruby_gallery_add_columns_to_#{table_name}"
-        migration_template "album_attachment_migration.rb", "db/migrate/ruby_gallery_create_album_attachments"
+        route "put '/#{table_name}/update_ruby_gallery_position', controller: :#{table_name}, action: :update_ruby_gallery_position"
+        route "post '/#{table_name}/upload_album', controller: :#{table_name}, action: :upload_album"
+        route "delete '/#{table_name}/:id/delete_photo', controller: :#{table_name}, action: :delete_photo"
+        if migration_exists?("album_photos") && migration_add_columns_exists?("album_photos")
+          # migration_template "migration.rb", "db/migrate/ruby_gallery_add_columns_to_album_photos" unless migration_add_columns_exists?("album_photos")
+        else
+          migration_template "album_photo_migration.rb", "db/migrate/ruby_gallery_create_album_photos"
+          migration_template "migration.rb", "db/migrate/ruby_gallery_add_columns_to_album_photos"
+        end
+      end
+      
+      def inject_ruby_gallery_content_to_model
+        content = %Q{  has_many :album_photos, as: :photoable}
+        class_path = class_name.to_s.split("::")
+        indent_depth = class_path.size - 1
+        content = content.split("\n").map { |line| "  " * indent_depth + line } .join("\n") << "\n"
+        inject_into_class(model_path, class_path.last, content) if model_exists?
+      end
+      
+      def inject_ruby_gallery_content_to_controller
+        content = %Q{  upload_album_for :#{table_name}}
+
+        class_path = class_name.to_s.split("::")
+        indent_depth = class_path.size - 1
+        content = content.split("\n").map { |line| "  " * indent_depth + line } .join("\n") << "\n"
+        inject_into_class(controller_path, class_path.last.tableize.camelize + "Controller", content) if controller_exists?
       end
-    
     end
   end
 end

data/lib/generators/active_record/templates/album_photo_migration.rb

@@ -1,13 +1,18 @@
 class RubyGalleryCreateAlbumPhotos < ActiveRecord::Migration
+
+  
   def self.up
-    drop_table :album_photos
-  end
-  def change
     create_table :album_photos do |b|
-      b.integer :album_attachment_id
+      b.belongs_to :photoable, polymorphic: true
+      b.integer :position, default: 0
       b.timestamps
     end
+    
+    add_index :album_photos, [:photoable_id, :photoable_type]
+  end
+  
+  def self.down
+    drop_table :album_photos
   end
-
 
 end

data/lib/generators/active_record/templates/migration.rb

@@ -1,9 +1,9 @@
-class RubyGalleryAddColumnsTo<%= table_name.camelize %> < ActiveRecord::Migration
+class RubyGalleryAddColumnsToAlbumPhotos < ActiveRecord::Migration
   def self.up
-    add_attachment :<%= table_name %>, :photo
+    add_attachment :album_photos, :photo
   end
   
   def self.down
-    remove_attachment :<%= table_name %>, :photo
+    remove_attachment :album_photos , :photo
   end
 end

data/lib/generators/ruby_gallery/install_generator.rb

@@ -6,7 +6,6 @@ module RubyGallery
   module Generators
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
-      
       source_root File.expand_path("../../templates", __FILE__)
       
       desc "Creates a Congig file and copy locate files to your application."
@@ -15,10 +14,64 @@ module RubyGallery
       
       def copy_jsfile
         copy_file "../../../app/assets/javascripts/ruby_gallery.js", "app/assets/javascripts/ruby_gallery.js"
+        copy_file "../../../app/assets/javascripts/jquery-ui.js", "app/assets/javascripts/jquery-ui.js"
+        copy_file "../../../app/assets/javascripts/jquery.colorbox.js", "app/assets/javascripts/jquery.colorbox.js"
       end
       
       def copy_cssfile
         copy_file "../../../app/assets/stylesheets/ruby_gallery.css.scss", "app/assets/stylesheets/ruby_gallery.css.scss"
+        copy_file "../../../app/assets/stylesheets/colorbox.css", "app/assets/stylesheets/colorbox.css"
+      end
+      
+      def copy_imgfile
+        copy_file "../../../app/assets/images/upload_processing.gif", "app/assets/images/upload_processing.gif"
+        copy_file "../../../app/assets/images/controls.png", "app/assets/images/controls.png"
+        copy_file "../../../app/assets/images/loading.gif", "app/assets/images/loading.gif"
+        copy_file "../../../app/assets/images/loading_background.png", "app/assets/images/loading_background.png"
+        copy_file "../../../app/assets/images/overlay.png", "app/assets/images/overlay.png"
+         copy_file "../../../app/assets/images/border.png", "app/assets/images/border.png"
+      end
+      
+      
+      
+      def inject_javascript
+        append_to_file 'app/assets/javascripts/application.js' do
+          out = "\n"
+          out << "//= require ruby_gallery"
+        end
+        
+        append_to_file 'app/assets/javascripts/application.js' do
+          out = "\n"
+          out << "//= require jquery.colorbox"
+        end
+        
+        append_to_file 'app/assets/javascripts/application.js' do
+          out = "\n"
+          out << "//= require jquery-fileupload/basic"
+        end
+        
+        append_to_file 'app/assets/javascripts/application.js' do
+          out = "\n"
+          out << "//= require jquery-ui"
+        end
+      end
+      
+      def inject_css
+        append_to_file 'app/assets/stylesheets/application.css' do
+          out = "\n"
+          out << "/* *= require ruby_gallery */"
+        end
+        
+        append_to_file 'app/assets/stylesheets/application.css' do
+          out = "\n"
+          out << "/* *= require colorbox */"
+        end
+        
+        append_to_file 'app/assets/stylesheets/application.css' do
+          out = "\n"
+          out << "/* *= require jquery.fileupload-ui */"
+        end
+        
       end
       
     end

data/lib/generators/ruby_gallery/orm_helpers.rb

@@ -0,0 +1,44 @@
+module RubyGallery
+  module Generators
+    module OrmHelpers
+      def model_contents
+<<-CONTENT
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :confirmable,
+  # :lockable, :timeoutable and :omniauthable
+  # devise :database_authenticatable, :registerable,
+  #          :recoverable, :rememberable, :trackable, :validatable
+  #          
+CONTENT
+      end
+
+      def model_exists?
+        File.exists?(File.join(destination_root, model_path))
+      end
+      
+      def controller_exists?
+        File.exists?(File.join(destination_root, controller_path))
+      end
+      
+      def migration_exists?(table_name)
+        Dir.glob("#{File.join(destination_root, migration_path)}/[0-9]*_*.rb").grep(/\d+_ruby_gallery_create_#{table_name}.rb$/).first
+      end
+      
+      def migration_add_columns_exists?(table_name)
+        Dir.glob("#{File.join(destination_root, migration_path)}/[0-9]*_*.rb").grep(/\d+_ruby_gallery_add_columns_to_#{table_name}.rb$/).first
+      end
+      
+      def migration_path
+        @migration_path ||= File.join("db", "migrate")
+      end
+
+      def model_path
+        @model_path ||= File.join("app", "models", "#{file_path}.rb")
+      end
+      
+      def controller_path
+        @controller_path ||= File.join("app", "controllers", "#{table_name}_controller.rb")
+      end
+    end
+  end
+end

data/lib/ruby_gallery.rb

@@ -1,7 +1,12 @@
 require 'rubygems'
+require 'jquery-fileupload-rails'
 require 'paperclip'
+require 'bourbon'
+require 'ruby_gallery/attachments_controller'
 
-module RubyGallery
+module RubyGallery  
   class Engine < Rails::Engine
+    ActionController::Base.send(:extend, RubyGallery::AttachmentsController)
+    # same as ActionController::Base.extend(RubyGallery::AttachmentsController)
   end
 end

data/lib/ruby_gallery/attachments_controller.rb

@@ -0,0 +1,45 @@
+module RubyGallery
+  module AttachmentsController
+    def upload_album_for(models)
+      class_name = models.to_s.singularize
+      class_object_name = class_name.classify # "Book"
+      class_object = class_object_name.constantize # Book
+      
+      
+      instance_eval do
+        define_method("upload_album") do
+          object = class_object.find(params[:id])
+          # 10.times {
+            
+            photo = object.album_photos.build({photo: (params[:file] and params[:file].is_a?(Array)) ? params[:file][0] : params[:file]})
+            photo.save
+          # }
+          
+          eval("@#{class_name} = #{class_object_name}.find(params[:id])")
+          render :partial => "shared/photo_box",locals: {photo: photo}
+          # render text: "successful"
+        end
+        
+        define_method("delete_photo") do
+          object = class_object.find(params[:id])
+          photo = object.album_photos.find(params[:photo_id])
+          photo.destroy
+          render text: "ok"
+        end
+        
+        define_method("update_ruby_gallery_position") do
+          object = class_object.find(params[:id])
+          json = params[:json]
+      	  json.each do |key,value|
+      	    id = value['id']
+      	    position = value['position'] 
+      	    photo = object.album_photos.find(id)
+      	    photo.update_attribute(:position, position)
+      	  end
+          render :text => "successful"
+        end
+        
+      end
+    end
+  end
+end

data/ruby_gallery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby_gallery"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Dang"]
-  s.date = "2013-03-21"
+  s.date = "2013-03-29"
   s.description = "Upload image use gallery"
   s.email = "peter@rubify.com"
   s.extra_rdoc_files = [
@@ -24,19 +24,35 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "VERSION",
+    "app/.DS_Store",
+    "app/assets/images/border.png",
+    "app/assets/images/controls.png",
+    "app/assets/images/loading.gif",
+    "app/assets/images/loading_background.png",
+    "app/assets/images/overlay.png",
+    "app/assets/images/upload_processing.gif",
+    "app/assets/javascripts/jquery-ui.js",
+    "app/assets/javascripts/jquery.colorbox.js",
     "app/assets/javascripts/ruby_gallery.js",
+    "app/assets/stylesheets/.DS_Store",
+    "app/assets/stylesheets/colorbox.css",
+    "app/assets/stylesheets/entypo.eot",
+    "app/assets/stylesheets/entypo.svg",
+    "app/assets/stylesheets/entypo.ttf",
+    "app/assets/stylesheets/entypo.woff",
     "app/assets/stylesheets/ruby_gallery.css.scss",
-    "app/controllers/attachments_controller.rb",
     "app/helpers/ruby_gallery/ruby_gallery_helper.rb",
-    "app/models/album_attachment.rb",
+    "app/helpers/ruby_gallery/test_helper.rb",
     "app/models/album_photo.rb",
+    "app/views/shared/_photo_box.html.erb",
     "lib/generators/active_record/ruby_gallery_generator.rb",
-    "lib/generators/active_record/templates/album_attachment_migration.rb",
     "lib/generators/active_record/templates/album_photo_migration.rb",
     "lib/generators/active_record/templates/migration.rb",
     "lib/generators/ruby_gallery/install_generator.rb",
+    "lib/generators/ruby_gallery/orm_helpers.rb",
     "lib/generators/ruby_gallery/ruby_gallery_generator.rb",
     "lib/ruby_gallery.rb",
+    "lib/ruby_gallery/attachments_controller.rb",
     "ruby_gallery.gemspec",
     "test/helper.rb",
     "test/test_ruby_gallery.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gallery
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -154,19 +154,35 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- app/.DS_Store
+- app/assets/images/border.png
+- app/assets/images/controls.png
+- app/assets/images/loading.gif
+- app/assets/images/loading_background.png
+- app/assets/images/overlay.png
+- app/assets/images/upload_processing.gif
+- app/assets/javascripts/jquery-ui.js
+- app/assets/javascripts/jquery.colorbox.js
 - app/assets/javascripts/ruby_gallery.js
+- app/assets/stylesheets/.DS_Store
+- app/assets/stylesheets/colorbox.css
+- app/assets/stylesheets/entypo.eot
+- app/assets/stylesheets/entypo.svg
+- app/assets/stylesheets/entypo.ttf
+- app/assets/stylesheets/entypo.woff
 - app/assets/stylesheets/ruby_gallery.css.scss
-- app/controllers/attachments_controller.rb
 - app/helpers/ruby_gallery/ruby_gallery_helper.rb
-- app/models/album_attachment.rb
+- app/helpers/ruby_gallery/test_helper.rb
 - app/models/album_photo.rb
+- app/views/shared/_photo_box.html.erb
 - lib/generators/active_record/ruby_gallery_generator.rb
-- lib/generators/active_record/templates/album_attachment_migration.rb
 - lib/generators/active_record/templates/album_photo_migration.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/ruby_gallery/install_generator.rb
+- lib/generators/ruby_gallery/orm_helpers.rb
 - lib/generators/ruby_gallery/ruby_gallery_generator.rb
 - lib/ruby_gallery.rb
+- lib/ruby_gallery/attachments_controller.rb
 - ruby_gallery.gemspec
 - test/helper.rb
 - test/test_ruby_gallery.rb
@@ -185,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 707823898086047540
+      hash: 392206747184538881
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/controllers/attachments_controller.rb

@@ -1,3 +0,0 @@
-class AttachmentsController < ApplicationController
-
-end

data/app/models/album_attachment.rb

@@ -1,3 +0,0 @@
-class AlbumAttachment < ActiveRecord::Base
-  has_many :album_photos, dependent: :destroy
-end

data/lib/generators/active_record/templates/album_attachment_migration.rb

@@ -1,9 +0,0 @@
-class RubyGalleryCreateAlbumAttachments < ActiveRecord::Migration
-  def change
-    create_table :album_attachments do |a|
-      a.string :parent_type
-      a.integer :parent_id
-      a.timestamps
-    end
-  end
-end