ruby_gallery 0.1.1 → 0.1.2

data/Gemfile

@@ -9,7 +9,9 @@ group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.3.4"
-  gem "jeweler", "~> 1.8.4"
-  gem "paperclip", "~> 3.0"
+  gem "jeweler", "~> 1.8.4"  
   #gem "rcov", ">= 0"
 end
+
+gem "paperclip", "~> 3.0"
+gem "bourbon"

data/Gemfile.lock

@@ -13,6 +13,9 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
+    bourbon (3.0.0)
+      sass (>= 3.2.0)
+      thor
     bourne (1.4.0)
       mocha (~> 0.13.2)
     builder (3.0.4)
@@ -42,6 +45,7 @@ GEM
     rake (10.0.3)
     rdoc (3.12.2)
       json (~> 1.4)
+    sass (3.2.7)
     shoulda (3.4.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (~> 1.0, >= 1.4.1)
@@ -49,12 +53,14 @@ GEM
     shoulda-matchers (1.5.2)
       activesupport (>= 3.0.0)
       bourne (~> 1.3)
+    thor (0.17.0)
     tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bourbon
   bundler (~> 1.3.4)
   jeweler (~> 1.8.4)
   paperclip (~> 3.0)

data/Rakefile

@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Peter Dang"]
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+ Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/assets/javascripts/ruby_gallery.js

@@ -1,11 +1,12 @@
 
   clearInterval(window.refeshWork);
 	window.refeshWork = null;
-
-  $('#fileupload').fileupload({
+  
+  jQuery('#fileupload').fileupload({
      dropZone: $('#fileupload'),
   	 progressInterval: 20,		
      add: function(e,data){
+       
        if ($('span#upload_button').attr('status') == 'process'){
   	  		return false;
         } else {
@@ -26,6 +27,7 @@
   			// $('#file_box ul#photos_album li.new-photo').find('#progress div.bar').css('width',progress + '%' );
   	 },
   	 done: function(e, data){
+  	   
   		var report = '';
   		if(data.result != 'failed'){
   		  var res = data.result;

data/app/assets/stylesheets/ruby_gallery.css.scss

@@ -0,0 +1,92 @@
+@import "bourbon";
+form.fileupload{
+  width:110px;
+  float:left;
+}
+
+div.upload-box{
+  display: block;
+  margin: 0 auto !important;
+  width: 500px !important;
+}
+
+
+div.file-box{
+  
+  display:block;
+  margin-bottom: 5px;
+  height:185px;
+  span#attachment_display{
+    @include clearfix;
+    span{
+      float: left;
+      display:block;
+      height:20px;
+      float: left;
+    }
+    strong {
+      float:left;
+      margin-top: 20px;
+    }
+  }
+}
+
+
+
+ul.activities-button-list{
+  display:block;
+  width:305px;
+  margin-top:10px;
+  margin-left:98px;
+  li.btn{
+    display:block;
+    float:left;
+    width: 100px;
+    height:20px;
+    @include linear-gradient(lighten(#80C66D, 5%), darken(#80C66D, 10%));
+    border: 1px solid #ccc;
+    border-left:none;
+    padding-top: 5px;
+    text-align:center;
+    color:#fff;
+    &:hover{
+      cursor:pointer;
+    }
+    
+    &:active{
+      @include linear-gradient(#80C66D, darken(#80C66D, 20%));
+      @include box-shadow(inset 0 0 2px darken(#80C66D, 30%));
+    }
+    
+    &.selected{
+      @include linear-gradient(#80C66D, darken(#80C66D, 20%));
+      @include box-shadow(inset 0 0 2px darken(#80C66D, 30%));
+    }
+  }
+  
+  li.btn.first{
+    border-left: 1px solid #ccc;
+    border-radius: 5px 0px 0px 5px;
+  }
+  
+  li.btn.last{
+     border-left:none;
+     border-radius: 0px 5px 5px 0px;
+     
+  }
+  
+}
+
+span.upload-button {
+  float:none;
+  @include button(pill);
+}
+
+a.upload-button{
+   @include button(pill);
+}
+
+span.upload-button.have-file{
+  float:none;
+  @include button(pill,#FCF0BF);  
+}

data/app/helpers/ruby_gallery/ruby_gallery_helper.rb

@@ -2,12 +2,24 @@ module RubyGallery::RubyGalleryHelper
   def show_gallery_images(model_name, opts={})
     object = model_name.to_s.singularize.classify.constantize.find(params[:id])
     content_tag(:div, class: "upload-box") do
-      content_tag(:div, class: "legend", "#{t('details.upload_album')}"),
+      [content_tag(:div, 'upload album', class: "legend"),
       content_tag(:div, class: "form-box") do
-        content_tag(:form, id: "fileupload", class: "fileupload", method: "POST", enctype: "multipart/form-data") do
+        [content_tag(:form, id: "fileupload", class: "fileupload", method: "POST", enctype: "multipart/form-data", action: "/#{model_name}") do
+          content_tag(:span, id: "upload_button", class: "upload-button btn btn-success fileinput-button") do
+            [content_tag(:i, "", class: "icon-plus icon-white"),
+            content_tag(:span, "Upload picture"),
+            tag(:input, class: "upload-button-input", type: :file, multiple: "")].join.html_safe
+          end
+        end,
+        content_tag(:a, "Close", class: "cancel-button cancel-link", href: "#")].join.html_safe
+      end].join.html_safe +
+      
+      content_tag(:div , id: "file_box", class: "file-box") do
+        content_tag(:ul, id: "photos_album", class: "album") do
           
         end
       end
+    
     end
   end
-end
+end

data/lib/generators/active_record/ruby_gallery_generator.rb

@@ -1,5 +1,4 @@
 require 'rails/generators/active_record'
-
 module ActiveRecord
   module Generators
     class RubyGalleryGenerator < ActiveRecord::Generators::Base
@@ -8,9 +7,11 @@ module ActiveRecord
       source_root File.expand_path("../templates", __FILE__)
       
       def copy_ruby_gallery_migration
-        migration_template "album_photo_migration.rb", "db/migrate/create_ablum_photo_table"
+        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/create_album_attachment_table"
+        migration_template "album_attachment_migration.rb", "db/migrate/ruby_gallery_create_album_attachments"
       end
+    
+    end
   end
 end

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

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

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

@@ -1,12 +1,13 @@
-class CreateAlbumPhoto < ActiveRecord::Migration
-  def up
-    create_table :album_photos do |a|
-      a.integer :album_attachment_id
-      a.timestamps
-    end
-  end
-  
-  def down
+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.timestamps
+    end
+  end
+
+
 end

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

@@ -1,4 +1,4 @@
-class RubyGalleryAddColumnTo<%= table_name.camelize %> < ActiveRecord::Migration
+class RubyGalleryAddColumnsTo<%= table_name.camelize %> < ActiveRecord::Migration
   def self.up
     add_attachment :<%= table_name %>, :photo
   end

data/lib/generators/ruby_gallery/install_generator.rb

@@ -16,6 +16,11 @@ module RubyGallery
       def copy_jsfile
         copy_file "../../../app/assets/javascripts/ruby_gallery.js", "app/assets/javascripts/ruby_gallery.js"
       end
+      
+      def copy_cssfile
+        copy_file "../../../app/assets/stylesheets/ruby_gallery.css.scss", "app/assets/stylesheets/ruby_gallery.css.scss"
+      end
+      
     end
   end
 end

data/lib/ruby_gallery.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'paperclip'
+
 module RubyGallery
   class Engine < Rails::Engine
   end

data/ruby_gallery.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby_gallery"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Dang"]
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/assets/javascripts/ruby_gallery.js",
-    "app/assets/stylesheets/ruby_gallery.css",
+    "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",
@@ -51,24 +51,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<paperclip>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<bourbon>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.3.4"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<paperclip>, ["~> 3.0"])
     else
+      s.add_dependency(%q<paperclip>, ["~> 3.0"])
+      s.add_dependency(%q<bourbon>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.3.4"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<paperclip>, ["~> 3.0"])
     end
   else
+    s.add_dependency(%q<paperclip>, ["~> 3.0"])
+    s.add_dependency(%q<bourbon>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.3.4"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<paperclip>, ["~> 3.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_gallery
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,14 +12,30 @@ cert_chain: []
 date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: paperclip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bourbon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -28,29 +44,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +74,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,15 +90,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.8.4
 description: Upload image use gallery
 email: peter@rubify.com
 executables: []
@@ -107,7 +123,7 @@ files:
 - Rakefile
 - VERSION
 - app/assets/javascripts/ruby_gallery.js
-- app/assets/stylesheets/ruby_gallery.css
+- 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
@@ -137,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3522156934352762017
+      hash: -1535511572070158692
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: