poodle-rb 0.1.2 → 0.1.3

data/spec/dummy/spec/controllers/profile_pictures_controller_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe ProfilePicturesController, :type => :controller do
+
+  let(:user) {FactoryGirl.create(:user)}
+  let(:user_with_image) {FactoryGirl.create(:user_with_image)}
+
+  context "new" do
+    it "should display the form" do
+      xhr :get, :new, {image_type: "Image::ProfilePicture", imageable_type: "User", imageable_id: user.id}, {}
+      expect(assigns(:image)).to be_a Image::ProfilePicture
+      expect(assigns(:resource)).to eq(user)
+      expect(response.code).to eq("200")
+    end
+  end
+
+  context "create" do
+    it "positive case" do
+      image = Rack::Test::UploadedFile.new(Rails.root + 'spec/support/factories/test.jpg', 'image/jpg')
+      valid_params = {image: image, image_type: "Image::ProfilePicture", imageable_type: "User", imageable_id: user.id}
+      post :create, valid_params, {}
+      expect(assigns(:image)).to be_a Image::ProfilePicture
+      expect(assigns(:resource)).to eq(user)
+      expect(Image::ProfilePicture.count).to  eq 1
+      expect(response.status).to eq(200)
+    end
+  end
+
+  context "edit" do
+    it "should display the form" do
+      xhr :get, :edit, {id: user_with_image.profile_picture.id, image_type: "Image::ProfilePicture", imageable_type: "User", imageable_id: user_with_image.id}, {}
+      expect(assigns(:image)).to be_a Image::ProfilePicture
+      expect(assigns(:resource)).to eq(user_with_image)
+      expect(response.code).to eq("200")
+    end
+  end
+
+  context "update" do
+    it "positive case" do
+      image = Rack::Test::UploadedFile.new(Rails.root + 'spec/support/factories/test.jpg', 'image/jpg')
+      valid_params = {id: user_with_image.profile_picture.id, image: image, image_type: "Image::ProfilePicture", imageable_type: "User", imageable_id: user_with_image.id}
+      put :update, valid_params, {}
+      expect(assigns(:image)).to be_a Image::ProfilePicture
+      expect(assigns(:resource)).to eq(user_with_image)
+      expect(Image::ProfilePicture.count).to  eq 1
+      expect(response.status).to eq(200)
+    end
+  end
+
+end

data/spec/dummy/spec/helpers/image_helper_spec.rb

@@ -0,0 +1,129 @@
+require 'spec_helper'
+
+module Poodle
+  module ActionView
+    describe ImageHelper, type: :helper do
+
+      let(:user) { FactoryGirl.create(:user) }
+      let(:user_with_image) { FactoryGirl.create(:user_with_image, name: "Some Name") }
+
+      describe '#placeholdit' do
+        it "should return placeholdit url" do
+          expect(helper.placeholdit()).to eq("http://placehold.it/60x60&text=<No Image>")
+          expect(helper.placeholdit(width: 60, height: 40, text: "Not Found")).to eq("http://placehold.it/60x40&text=Not Found")
+        end
+      end
+
+      describe '#image_url' do
+        it "should return placeholder url for user without profile picture" do
+          expect(helper.image_url(user, "profile_picture.image.large.url")).to eq("http://placehold.it/60x60&text=<No Image>")
+          expect(helper.image_url(user, "profile_picture.image.thumb.url", width: 40, height: 10)).to eq("http://placehold.it/40x10&text=<No Image>")
+        end
+
+        it "should return careerwave url for user with profile picture" do
+          expect(helper.image_url(user_with_image, "profile_picture.image.large.url")).to eq("/spec/dummy/uploads/image/profile_picture/1/large_test.jpg")
+          expect(helper.image_url(user_with_image, "profile_picture.image.thumb.url")).to eq("/spec/dummy/uploads/image/profile_picture/1/thumb_test.jpg")
+        end
+      end
+
+      describe '#display_image' do
+        it "should return image tag with placeholder url for user without profile picture" do
+          exptected_result = image_tag(placeholdit(), class: "#{user.id}-poodle-thumb-image", width: "100%", height: "auto")
+          expect(helper.display_image(user, 'profile_picture.image.large.url')).to eq(exptected_result)
+
+          exptected_result = image_tag(placeholdit(width: 40, height: 50, text: "Hello World"), class: "#{user.id}-poodle-thumb-image", width: "100%", height: "auto")
+          expect(helper.display_image(user, 'profile_picture.image.large.url', place_holder: {width: 40, height: 50, text: "Hello World"})).to eq(exptected_result)
+        end
+
+        it "should return image tag with careerwave url for user with profile picture" do
+          exptected_result = image_tag(user_with_image.profile_picture.image.thumb.url, class: "#{user_with_image.id}-poodle-thumb-image", width: "100%", height: "auto")
+          expect(helper.display_image(user_with_image, 'profile_picture.image.thumb.url')).to eq(exptected_result)
+
+          exptected_result = image_tag(user_with_image.profile_picture.image.thumb.url, class: "#{user_with_image.id}-poodle-thumb-image", width: "30px", height: "50px")
+          expect(helper.display_image(user_with_image, 'profile_picture.image.thumb.url', width: "30px", height: "50px")).to eq(exptected_result)
+        end
+      end
+
+      describe '#display_user_image' do
+        it "should display placeholder image for user without image" do
+          exptected_result = content_tag(:div) do
+            content_tag(:div, class: "rounded", style: "width:60px;height:auto") do
+              image_tag(placeholdit(), {style: "width:100%;height:auto;cursor:default;", class: "#{user.id}-poodle-thumb-image"})
+            end
+          end
+          expect(helper.display_user_image(user, "profile_picture.image.thumb.url")).to eq(exptected_result)
+        end
+
+        it "should display placeholder image with custom width, height and text for user without image" do
+          exptected_result = content_tag(:div) do
+            content_tag(:div, class: "rounded", style: "width:60px;height:auto") do
+              image_tag(placeholdit(width: 100, height: 80, text: "Hello World"), {style: "width:100%;height:auto;cursor:default;", class: "#{user.id}-poodle-thumb-image"})
+            end
+          end
+          expect(helper.display_user_image(user, "profile_picture.image.thumb.url", place_holder: {width: 100, height: 80, text: "Hello World"})).to eq(exptected_result)
+        end
+
+        it "should display the profile picture for user with image" do
+          exptected_result = content_tag(:div) do
+            content_tag(:div, class: "rounded", style: "width:120px;height:auto") do
+              image_tag(user_with_image.profile_picture.image.thumb.url, {style: "width:100%;height:auto;cursor:default;", class: "#{user_with_image.id}-poodle-thumb-image"})
+            end
+          end
+          expect(helper.display_user_image(user_with_image, "profile_picture.image.thumb.url", width: "120px")).to eq(exptected_result)
+        end
+
+        it "should display the profile picture with popover" do
+          exptected_result = content_tag(:div) do
+            content_tag(:div, class: "rounded", style: "width:120px;height:auto") do
+              image_tag(user_with_image.profile_picture.image.thumb.url, {style: "width:100%;height:auto;cursor:pointer;", class: "#{user_with_image.id}-poodle-thumb-image", "data-toggle" => "popover", "data-placement" => "bottom", title: user_with_image.name, "data-content" => ""})
+            end
+          end
+          expect(helper.display_user_image(user_with_image, "profile_picture.image.thumb.url", width: "120px", popover: true)).to eq(exptected_result)
+
+          exptected_result = content_tag(:div) do
+            content_tag(:div, class: "rounded", style: "width:120px;height:auto") do
+              image_tag(user_with_image.profile_picture.image.thumb.url, {style: "width:100%;height:auto;cursor:pointer;", class: "#{user_with_image.id}-poodle-thumb-image", "data-toggle" => "popover", "data-placement" => "bottom", title: user_with_image.name, "data-content" => "Senior Engineer"})
+            end
+          end
+          expect(helper.display_user_image(user_with_image, "profile_picture.image.thumb.url", width: "120px", popover: "Senior Engineer")).to eq(exptected_result)
+        end
+      end
+
+      describe '#edit_image' do
+        it "should return an image with edit link" do
+          img_tag = helper.display_image(user, "profile_picture.image.thumb.url")
+          btn_display = raw(helper.theme_fa_icon('photo') + helper.theme_button_text("Change Image"))
+          edit_url = "www.qwinixtech.com"
+          exptected_result = link_to(img_tag, edit_url, :remote => true) + link_to(btn_display, edit_url, :class=>"btn btn-default btn-xs mt-10", :remote=>true)
+          expect(helper.edit_image(user, "profile_picture.image.thumb.url", edit_url)).to eq(exptected_result)
+        end
+      end
+
+      describe '#edit_user_image' do
+        it "should return an image with edit link" do
+          img_tag = helper.display_user_image(user, "profile_picture.image.thumb.url")
+          btn_display = raw(helper.theme_fa_icon('photo') + helper.theme_button_text("Change Image"))
+          edit_url = "www.qwinixtech.com"
+          exptected_result = link_to(img_tag, edit_url, :remote => true) + link_to(btn_display, edit_url, :class=>"btn btn-default btn-xs mt-10", :remote=>true)
+          expect(helper.edit_user_image(user, "profile_picture.image.thumb.url", edit_url)).to eq(exptected_result)
+        end
+      end
+
+      describe '#upload_image_link' do
+        it "should return new image path for user with no profile picture" do
+          expect(helper.upload_image_link(user, :profile_picture, nil)).to eq("/images/new?image_type=Image%3A%3AProfilePicture&imageable_id=#{user.id}&imageable_type=User")
+        end
+
+        it "should return edit image path for user with profile picture" do
+          expect(helper.upload_image_link(user_with_image, :profile_picture, nil)).to eq("/images/1/edit?image_type=Image%3A%3AProfilePicture&imageable_id=#{user_with_image.id}&imageable_type=User")
+        end
+
+        it "should return edit image path for user with profile picture for custom scope" do
+          expect(helper.upload_image_link(user, :profile_picture, :custom)).to eq("/custom/images/new?image_type=Image%3A%3AProfilePicture&imageable_id=#{user.id}&imageable_type=User")
+          expect(helper.upload_image_link(user_with_image, :profile_picture, :custom)).to eq("/custom/images/1/edit?image_type=Image%3A%3AProfilePicture&imageable_id=#{user_with_image.id}&imageable_type=User")
+        end
+      end
+
+    end
+  end
+end

data/spec/dummy/spec/helpers/theme_helper_spec.rb

@@ -4,6 +4,9 @@ module Poodle
   module ActionView
     describe ThemeHelper, type: :helper do
 
+      let(:user) { FactoryGirl.create(:user) }
+      let(:user_with_image) { FactoryGirl.create(:user_with_image, name: "Some Name") }
+
       describe '#theme_fa_icon' do
         it "theme_fa_icon" do
           expect(helper.theme_fa_icon("some-class")).to eq("<i class='fa fa-some-class'></i>")
@@ -48,7 +51,7 @@ module Poodle
 
       describe '#theme_heading' do
         it "theme_heading" do
-          expect(helper.theme_heading("Heading Text")).to eq("<div class=\"row mb-10\"><div class=\"fs-22 col-sm-12\"><i class='fa fa-rub fa-lg'></i> Heading Text</div></div>")
+          expect(helper.theme_heading("Heading Text")).to eq("<div class=\"row mb-10\"><div class=\"fs-22 col-sm-12\"><i class='fa fa- fa-lg'></i> Heading Text</div></div>")
           expect(helper.theme_heading("Heading Text2", icon='icon-abcd')).to eq("<div class=\"row mb-10\"><div class=\"fs-22 col-sm-12\"><i class='fa fa-icon-abcd fa-lg'></i> Heading Text2</div></div>")
         end
       end
@@ -73,16 +76,6 @@ module Poodle
         end
       end
 
-      describe '#theme_panel_message' do
-        it "theme_panel_message" do
-        end
-      end
-
-      describe '#theme_panel_title' do
-        it "theme_panel_title" do
-        end
-      end
-
       describe '#theme_item_title' do
         it "theme_item_title" do
         end
@@ -108,50 +101,28 @@ module Poodle
         end
       end
 
-      describe '#theme_panel_heading' do
-        it "theme_panel_heading" do
-        end
-      end
-
-      describe '#theme_panel_sub_heading' do
-        it "theme_panel_sub_heading" do
+      describe '#theme_panel_message' do
+        it "theme_panel_message" do
         end
       end
 
-      describe '#theme_panel_description' do
-        it "theme_panel_description" do
+      describe '#theme_panel_title' do
+        it "theme_panel_title" do
         end
       end
 
-      describe '#theme_image' do
-        it "theme_image" do
+      describe '#theme_panel_heading' do
+        it "theme_panel_heading" do
         end
       end
 
-      describe '#palceholdit' do
-        it "palceholdit" do
-          expect(helper.palceholdit()).to eq("http://placehold.it/60x60&text=<No Image>")
-          expect(helper.palceholdit(width: 60, height: 40, text: "Not Found")).to eq("http://placehold.it/60x40&text=Not Found")
+      describe '#theme_panel_sub_heading' do
+        it "theme_panel_sub_heading" do
         end
       end
 
-      describe '#theme_user_image' do
-        let(:user) { FactoryGirl.create(:user) }
-        let(:user_with_image) { FactoryGirl.create(:user_with_image, name: "Some Name") }
-        it "should display placeholder image for user without image" do
-          expect(helper.theme_user_image(user, "profile_picture.image_url(:thumb)")).to eq("<div><div class=\"rounded\" style=\"width:60px;height:60px;\"><img class=\"\" style=\"width:100%;height:auto;cursor:pointer;\" src=\"http://placehold.it/60x60&amp;text=&lt;No Image&gt;\" alt=\"60x60&amp;text=&lt;no image&gt;\" /></div></div>")
-        end
-
-        it "should display the profile picture user with image" do
-          # data-toggle=\"popover\" data-placement=\"bottom\" title=\"Some Name\" data-content=\"true\"
-          expect(helper.theme_user_image(user_with_image, "profile_picture.image_url(:thumb)")).to eq("<div><div class=\"rounded\" style=\"width:60px;height:60px;\"><img class=\"\" style=\"width:100%;height:auto;cursor:pointer;\" src=\"http://localhost:9001/uploads/profile_picture/image/1/thumb_test.jpg\" alt=\"Thumb test\" /></div></div>")
-        end
-
-        it "should display the profile picture with popover" do
-          expect(helper.theme_user_image(user_with_image, "profile_picture.image_url(:thumb)", popover: true)).to eq("<div><div class=\"rounded\" style=\"width:60px;height:60px;\"><img class=\"\" style=\"width:100%;height:auto;cursor:pointer;\" data-toggle=\"popover\" data-placement=\"bottom\" title=\"Some Name\" data-content=\"\" src=\"http://localhost:9001/uploads/profile_picture/image/1/thumb_test.jpg\" alt=\"Thumb test\" /></div></div>")
-
-          expect(helper.theme_user_image(user_with_image, "profile_picture.image_url(:thumb)", popover:
-            "Hello")).to eq("<div><div class=\"rounded\" style=\"width:60px;height:60px;\"><img class=\"\" style=\"width:100%;height:auto;cursor:pointer;\" data-toggle=\"popover\" data-placement=\"bottom\" title=\"Some Name\" data-content=\"Hello\" src=\"http://localhost:9001/uploads/profile_picture/image/1/thumb_test.jpg\" alt=\"Thumb test\" /></div></div>")
+      describe '#theme_panel_description' do
+        it "theme_panel_description" do
         end
       end
 

data/spec/dummy/spec/support/factories/profile_pictures.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
-  factory :profile_picture do
+  factory :profile_picture, :class => Image::ProfilePicture do
     image { Rack::Test::UploadedFile.new(Rails.root + 'spec/support/factories/test.jpg', 'image/jpg') }
-    user
+    association :imageable, :factory => :user
   end
 end

data/spec/dummy/spec/support/factories/users.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
 
   factory :user_with_image, parent: :user do
     after(:create) do |user|
-      FactoryGirl.create(:profile_picture, user: user)
+      FactoryGirl.create(:profile_picture, imageable: user)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poodle-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Krishnaprasad Varma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -309,8 +309,7 @@ files:
 - app/assets/fonts/fontawesome-webfont.woff
 - app/assets/javascripts/poodle/application.js
 - app/assets/javascripts/poodle/bootstrap.js
-- app/assets/javascripts/poodle/common.js
-- app/assets/javascripts/poodle/photo_upload.js
+- app/assets/javascripts/poodle/cropper.js
 - app/assets/javascripts/poodle/utilities.js
 - app/assets/javascripts/poodle/validations/sample.js
 - app/assets/stylesheets/poodle/application.css
@@ -319,6 +318,7 @@ files:
 - app/assets/stylesheets/poodle/font-awesome.css
 - app/assets/stylesheets/poodle/poodle-theme.css
 - app/controllers/poodle/admin_controller.rb
+- app/controllers/poodle/images_controller.rb
 - app/helpers/poodle/application_helper.rb
 - app/helpers/poodle/display_helper.rb
 - app/helpers/poodle/flash_helper.rb
@@ -326,8 +326,10 @@ files:
 - app/helpers/poodle/meta_tags_helper.rb
 - app/helpers/poodle/navigation_helper.rb
 - app/helpers/poodle/params_parser_helper.rb
+- app/helpers/poodle/render_helper.rb
 - app/helpers/poodle/title_helper.rb
 - app/helpers/poodle/url_helper.rb
+- app/uploaders/image_uploader.rb
 - app/views/kaminari/_first_page.html.erb
 - app/views/kaminari/_gap.html.erb
 - app/views/kaminari/_last_page.html.erb
@@ -340,9 +342,11 @@ files:
 - app/views/layouts/poodle/application/_header.html.erb
 - app/views/layouts/poodle/application/_sidebar.html.erb
 - app/views/layouts/poodle/common/_overlays.html.erb
+- app/views/layouts/poodle/image_upload.html.erb
 - app/views/layouts/poodle/public.html.erb
 - app/views/layouts/poodle/public/_footer.html.erb
 - app/views/layouts/poodle/public/_header.html.erb
+- app/views/layouts/poodle/public/public.html.erb
 - app/views/widgets/_more_details.html.erb
 - app/views/widgets/_more_details_table.html.erb
 - config/initializers/poodle_validators.rb
@@ -363,11 +367,22 @@ files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/profile_pictures_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/profile_picture.rb
+- spec/dummy/app/models/image/base.rb
+- spec/dummy/app/models/image/profile_picture.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/uploaders/image_uploader.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/profile_pictures/_crop_form.html.erb
+- spec/dummy/app/views/profile_pictures/_form.html.erb
+- spec/dummy/app/views/profile_pictures/_new.html.erb
+- spec/dummy/app/views/profile_pictures/_photos.html.erb
+- spec/dummy/app/views/profile_pictures/create.html.erb
+- spec/dummy/app/views/profile_pictures/crop.html.erb
+- spec/dummy/app/views/profile_pictures/edit.js.erb
+- spec/dummy/app/views/profile_pictures/new.js.erb
+- spec/dummy/app/views/profile_pictures/update.html.erb
+- spec/dummy/app/views/profile_pictures/update.js.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -381,6 +396,7 @@ files:
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/carrier_wave.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
@@ -389,23 +405,30 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
-- spec/dummy/db/migrate/20131108102728_create_profile_pictures.rb
+- spec/dummy/db/migrate/20131108102728_create_images.rb
 - spec/dummy/db/migrate/20140402113213_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/uploads/profile_picture/image/1/large_test.jpg
-- spec/dummy/public/uploads/profile_picture/image/1/medium_test.jpg
-- spec/dummy/public/uploads/profile_picture/image/1/test.jpg
-- spec/dummy/public/uploads/profile_picture/image/1/thumb_test.jpg
+- spec/dummy/spec/controllers/profile_pictures_controller_spec.rb
+- spec/dummy/spec/helpers/image_helper_spec.rb
 - spec/dummy/spec/helpers/theme_helper_spec.rb
 - spec/dummy/spec/support/factories/profile_pictures.rb
 - spec/dummy/spec/support/factories/test.jpg
 - spec/dummy/spec/support/factories/users.rb
+- spec/dummy/uploads/image/profile_picture/1/large_test.jpg
+- spec/dummy/uploads/image/profile_picture/1/medium_test.jpg
+- spec/dummy/uploads/image/profile_picture/1/test.jpg
+- spec/dummy/uploads/image/profile_picture/1/thumb_test.jpg
+- spec/dummy/uploads/image/profile_picture/2/large_test.jpg
+- spec/dummy/uploads/image/profile_picture/2/medium_test.jpg
+- spec/dummy/uploads/image/profile_picture/2/test.jpg
+- spec/dummy/uploads/image/profile_picture/2/thumb_test.jpg
 - spec/spec_helper.rb
 homepage: http://kpvarma.com
 licenses:
@@ -435,11 +458,22 @@ test_files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/profile_pictures_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/profile_picture.rb
+- spec/dummy/app/models/image/base.rb
+- spec/dummy/app/models/image/profile_picture.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/uploaders/image_uploader.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/profile_pictures/_crop_form.html.erb
+- spec/dummy/app/views/profile_pictures/_form.html.erb
+- spec/dummy/app/views/profile_pictures/_new.html.erb
+- spec/dummy/app/views/profile_pictures/_photos.html.erb
+- spec/dummy/app/views/profile_pictures/create.html.erb
+- spec/dummy/app/views/profile_pictures/crop.html.erb
+- spec/dummy/app/views/profile_pictures/edit.js.erb
+- spec/dummy/app/views/profile_pictures/new.js.erb
+- spec/dummy/app/views/profile_pictures/update.html.erb
+- spec/dummy/app/views/profile_pictures/update.js.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -452,6 +486,7 @@ test_files:
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/carrier_wave.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
@@ -461,24 +496,31 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
-- spec/dummy/db/migrate/20131108102728_create_profile_pictures.rb
+- spec/dummy/db/migrate/20131108102728_create_images.rb
 - spec/dummy/db/migrate/20140402113213_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/public/uploads/profile_picture/image/1/large_test.jpg
-- spec/dummy/public/uploads/profile_picture/image/1/medium_test.jpg
-- spec/dummy/public/uploads/profile_picture/image/1/test.jpg
-- spec/dummy/public/uploads/profile_picture/image/1/thumb_test.jpg
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/dummy/spec/controllers/profile_pictures_controller_spec.rb
+- spec/dummy/spec/helpers/image_helper_spec.rb
 - spec/dummy/spec/helpers/theme_helper_spec.rb
 - spec/dummy/spec/support/factories/profile_pictures.rb
 - spec/dummy/spec/support/factories/test.jpg
 - spec/dummy/spec/support/factories/users.rb
+- spec/dummy/uploads/image/profile_picture/1/large_test.jpg
+- spec/dummy/uploads/image/profile_picture/1/medium_test.jpg
+- spec/dummy/uploads/image/profile_picture/1/test.jpg
+- spec/dummy/uploads/image/profile_picture/1/thumb_test.jpg
+- spec/dummy/uploads/image/profile_picture/2/large_test.jpg
+- spec/dummy/uploads/image/profile_picture/2/medium_test.jpg
+- spec/dummy/uploads/image/profile_picture/2/test.jpg
+- spec/dummy/uploads/image/profile_picture/2/thumb_test.jpg
 - spec/spec_helper.rb
 has_rdoc: 

data/app/assets/javascripts/poodle/photo_upload.js

@@ -1,104 +0,0 @@
-var status;
-var maxPhotoUploadFileSize = 5000000;
-
-// Used to clone photo uploader
-function add_fields(link, association, content) {
-    var new_id = new Date().getTime();
-    var regexp = new RegExp("new_" + association, "g")
-    $(link).parent().before(content.replace(regexp, new_id));
-    var upload_label = $('label.upload_image');
-    if($(upload_label).length > 0) {
-        $(upload_label).text('browse');
-    }
-}
-
-// Remove a photo uploader
-function remove_fields(link) {
-    $(link).prev("input[type=hidden]").val("1");
-    $(link).closest("div.add-photos-path").hide();
-}
-
-// Remove Option filed
-function remove_option_field(link) {
-    $(link).prev("input[type=hidden]").val("1");
-    $(link).closest("div.div-new-field").hide();
-}
-
-/* Validate image file extension. The Supported formats are
-   .jpg, .jpeg, .ico, .png, .gif
-*/
-function validate_file_extn(filename) {
-    var image_extns = new Array(/^jpg$/i, /^png$/i, /^jpeg$/i, /^ico$/i, /^gif$/i)
-    var extn = filename.split('.');
-    for(var i = 0; i < image_extns.length; i++) {
-        if(extn[1].match(image_extns[i])) {
-            status = "true"
-            break;
-        }
-        else {
-            status = "false";
-        }
-    }
-    return status;
-}
-
-// Client side image preview before uploading to server
-
-function preview_image(input, element_id, width) {
-  
-  if(width == undefined){
-    width = 90;
-  }
-  
-    var filename = $(input).val().split('\\').pop();
-    var status = validate_file_extn(filename);
-    var reader = '';
-
-    if(status == "false") {
-        $(input).val('');
-        alert("File type is not supported");
-    }
-    else {
-
-        if(navigator.userAgent.match(/msie/i) && !navigator.userAgent.match(/msie 10/i)) {
-            if($('.div-sg-photo-preview').length > 0) {
-                $('.div-sg-photo-preview').css('border', '1px solid lightgray').html(filename);
-            }
-            else {
-                $(input).parents('.add-photos-path').find('.jquery-sg-image-container').
-                css('border-top', '1px solid gray').html(filename);
-            }
-        }
-        else if(navigator.userAgent.match(/msie/i) && navigator.userAgent.match(/msie 10/i)) {
-            reader = new FileReader();
-            reader.onload = function (e) {
-                $('#'+element_id)
-                .attr('src', e.target.result)
-                .width(width);
-            };
-
-            reader.readAsDataURL(input.files[0]);
-        }
-
-        else {
-
-            if (input.files && input.files[0]) {
-                if(input.files[0].size < maxPhotoUploadFileSize) {
-                    reader = new FileReader();
-                    reader.onload = function (e) {
-                        $('#'+element_id)
-                        .attr('src', e.target.result)
-                        .width(width);
-                    };
-
-                    reader.readAsDataURL(input.files[0]);
-                }
-                else {
-                    alert("Maximum Size is " + maxPhotoUploadFileSize + " KB");
-                }
-
-            }
-        }
-    }
-
-}

data/spec/dummy/app/models/profile_picture.rb

@@ -1,8 +0,0 @@
-class ProfilePicture < ActiveRecord::Base
-
-  # Associations
-  belongs_to :user
-
-  mount_uploader :image, ImageUploader
-
-end

data/spec/dummy/db/migrate/20131108102728_create_profile_pictures.rb

@@ -1,9 +0,0 @@
-class CreateProfilePictures < ActiveRecord::Migration
-  def change
-    create_table :profile_pictures do |t|
-      t.string  :image
-      t.references :user
-      t.timestamps
-    end
-  end
-end