refinerycms-photo-gallery 0.1.2 → 0.2.0

data/config/locales/en.yml

@@ -20,11 +20,11 @@ en:
         submenu:
           collections:
             title: Collections
-            manage: Manage
+            manage: Manage Collections
             new: Create new collection
           albums:
             title: Albums
-            manage: Manage
+            manage: Manage Albums
             new: Create new album
         collections:
           collection:

data/config/locales/pl.yml

@@ -0,0 +1,110 @@
+pl:
+  chosen:
+    no_results: "Brak wyników"
+  refinery:
+    admin:
+      pages:
+        tabs:
+          form:
+            join_page_with_album: "Połącz stronę z albumem:"
+            choose_album: "Kliknij, aby dodać album"
+            flash:
+              connection_destroyed: "Połączenie pomiędzy stroną i albumem zostało usunięte"
+    plugins:
+      refinerycms_photo_gallery:
+        title: Galeria zdjęć
+        description: Zaawansowana galeria zdjęć
+        tab_name: Galeria zdjęć
+    photo_gallery:
+      admin:
+        submenu:
+          collections:
+            title: Kolekcje
+            manage: Przeglądaj
+            new: Dodaj nową kolekcję
+          albums:
+            title: Albumy
+            manage: Przeglądaj
+            new: Dodaj nowy album
+        collections:
+          collection:
+            view_live_html: Podgląd kolekcji <br/><em>(w nowym oknie)</em>
+            delete: Usuń tę kolekcję na zawsze
+            edit: Edytuj tę kolekcję
+          index:
+            no_items_yet: Nie ma jeszcze żadnych kolekcji. Kliknij "%{create}" aby dodać pierwszą kolekcję.
+          new:
+            title: Dodaj nową kolekcję
+          edit:
+            title: Edytuj kolekcję
+        albums:
+          album:
+            view_live_html: Podgląd albumu <br/><em>(w nowym oknie)</em>
+            delete: Usuń ten album na zawsze
+            edit: Edytuj ten album
+            upload_photos: Załaduj nowe zdjęcia do albumu
+            edit_photos: Edytuj zdjęcia w albumie
+          index:
+            no_items_yet: Nie ma jeszcze żadnych albumów. Kliknij "%{create}" aby dodać pierwszy album.
+          new:
+            title: Dodaj nowy album
+          edit:
+            title: Edytuj album
+          form:
+            album_belongs_to_collection: Album należy do kolekcji
+            more_options: Więcej opcji
+            more_options_tooltip: Włącz edycję dodakowych pól, takich jak adres, długość i szerokość geograficzna
+            choose_collection: Wybierz kolekcję/e
+            path_prefix: Prefix
+            number_of_photos: Zawiera %{number} zdjęć
+        photos:
+          updated: Zaktualizowane zdjęcia
+          title: Zdjęcia
+          manage: Przeglądaj
+          new: Załaduj nowe zdjęcia
+          edit_multiple:
+            no_photos_yet: Nie ma jeszcze zdjęć w tym albumie. Kliknij "%{create} aby dodać pierwsze zdjęcia.
+          photo:
+            delete: Usuń to zdjęcie na zawsze
+            deleted: Usunięto zdjęcie "%{title}"
+          form_fields:
+            use_decimal_format: Użyj formatu dziesiętnego
+      photo_pages:
+        show:
+          other: Inne strony
+      albums:
+        show:
+          no_photos: Nie ma jeszcze zdjęć w tym albumie
+        photos:
+          image: Obrazek
+      collections:
+        show:
+          no_albums: Nie ma jeszcze albumów w tej kolekcji
+        index:
+          no_collections: Nie ma jeszcze żadnej kolekcji
+  activerecord:
+    attributes:
+      refinery/photo_gallery/photo_page:
+        page_id: Strona
+      refinery/photo_gallery/collection:
+        title: Tytuł
+        description: Opis
+      refinery/photo_gallery/album:
+        title: Tytuł
+        description: Opis
+        longitude: Długość geograficzna
+        latitude: Szerokość geograficzna
+        path: Ścieżka
+        address: Adres
+        note: Notatka
+        tags: Tagi
+      refinery/photo_gallery/photo:
+        title: Tytuł
+        description: Opis
+        longitude: Długość geograficzna
+        latitude: Szerokość geograficzna
+        path: Ścieżka
+        file: Plik
+    models:
+      refinery/photo_gallery/collection: Album
+

data/config/locales/sk.yml

@@ -20,11 +20,11 @@ sk:
         submenu:
           collections:
             title: Skupiny albumov
-            manage: Spravovať
+            manage: Spravovať skupinu
             new: Vytvoriť novú skupinu albumov
           albums:
             title: Abumy
-            manage: Spravovať
+            manage: Spravovať albumy
             new: Vytvoriť nový albun
         collections:
           collection:

data/db/migrate/20120805222125_add_indexes.rb

@@ -5,8 +5,8 @@ class AddIndexes < ActiveRecord::Migration
     add_index Refinery::PhotoGallery::Photo.table_name, :id, :unique => true
 
 
-    add_index Refinery::PhotoGallery::CollectionAlbum.table_name, :collection_id
-    add_index Refinery::PhotoGallery::CollectionAlbum.table_name, :album_id
+    add_index Refinery::PhotoGallery::CollectionAlbum.table_name, :collection_id, :name=>"index_rpg_collection_albums_on_collection_id"
+    add_index Refinery::PhotoGallery::CollectionAlbum.table_name, :album_id, :name=>"index_rpg_collection_albums_on_album_id"
     add_index Refinery::PhotoGallery::Photo.table_name, :album_id
   end
 

data/db/migrate/20130127175559_add_url_to_photos.rb

@@ -0,0 +1,5 @@
+class AddUrlToPhotos < ActiveRecord::Migration
+  def change
+    add_column :refinery_photo_gallery_photos, :url, :string
+  end
+end

data/db/migrate/20130128173800_add_css_styles_and_show_original_fields_to_photos.rb

@@ -0,0 +1,6 @@
+class AddCssStylesAndShowOriginalFieldsToPhotos < ActiveRecord::Migration
+  def change
+    add_column :refinery_photo_gallery_photos, :css_class, :string
+    add_column :refinery_photo_gallery_photos, :preview_type, :string
+  end
+end

data/lib/generators/refinery/photo_gallery_generator.rb

@@ -1,11 +1,14 @@
 module Refinery
   class PhotoGalleryGenerator < Rails::Generators::Base
+
     source_root File.expand_path('../templates', __FILE__)
 
-    def generate_inquiries_initializer
+
+    def generate_photo_gallery_initializer
       template 'config/initializers/refinery/photo_gallery.rb.erb', File.join(destination_root, 'config', 'initializers', 'refinery', 'photo_gallery.rb')
     end
 
+
     def rake_db
       rake("refinery_photo_gallery:install:migrations")
     end
@@ -22,4 +25,4 @@ Refinery::PhotoGallery::Engine.load_seed
     end
 
   end
-end
+end

data/lib/generators/refinery/templates/config/initializers/refinery/photo_gallery.rb.erb

@@ -31,6 +31,7 @@ Refinery::PhotoGallery.configure do |config|
   # config.albums_per_page = <%= Refinery::PhotoGallery.albums_per_page.inspect %>
   # config.photos_per_page = <%= Refinery::PhotoGallery.photos_per_page.inspect %>
 
-
-
+  # config.admin_photo_options_show_url = <%= Refinery::PhotoGallery.admin_photo_options_show_url.inspect %>
+  # config.admin_photo_options_show_css_class = <%= Refinery::PhotoGallery.admin_photo_options_show_css_class.inspect %>
+  # config.admin_photo_options_show_preview_type = <%= Refinery::PhotoGallery.admin_photo_options_show_preview_type.inspect %>
 end

data/lib/refinery/photo_gallery.rb

@@ -1,5 +1,4 @@
 require 'refinerycms-core'
-require 'refinerycms-settings'
 
 
 module Refinery

data/lib/refinery/photo_gallery/configuration.rb

@@ -4,7 +4,9 @@ module Refinery
 
     config_accessor :runtimes, :max_file_size,:client_side_resize, :client_side_resize_params, :plupload_locale, :extension_white_list,:photo_gallery_dir,
                     :delete_uploaded_file,:collection_dimensions, :album_dimensions, :preview_dimensions, :single_dimensions, :photo_gallery_dir_relative_to_root,
-                    :photos_per_page, :albums_per_page, :collections_per_page
+                    :photos_per_page, :albums_per_page, :collections_per_page,
+                    :admin_photo_options_show_url, :admin_photo_options_show_css_class,
+                    :admin_photo_options_show_preview_type
 
 
 
@@ -27,5 +29,9 @@ module Refinery
     self.albums_per_page = 10
     self.collections_per_page = 10
     self.photos_per_page = 10
+
+    self.admin_photo_options_show_url = true
+    self.admin_photo_options_show_css_class = true
+    self.admin_photo_options_show_preview_type = true
   end
 end

data/lib/refinery/photo_gallery/engine.rb

@@ -17,7 +17,6 @@ module Refinery
           plugin.name = "refinerycms_photo_gallery"
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.photo_gallery_admin_albums_path }
           plugin.menu_match =  %r{refinery/photo_gallery(/.+?)?$}
-          plugin.activity = { :class_name => 'Refinery::PhotoGallery::Album' }
         end
       end
 

data/lib/refinery/photo_gallery/extensions/pages_extension.rb

@@ -5,7 +5,7 @@ module Refinery
         def has_one_page_album
           has_one :album_page, :as => :page, :dependent=> :destroy
           has_one :album, :through => :album_page
-          has_many :photos, :class_name => Refinery::PhotoGallery::Photo, :through => :album , :order=> "created_at ASC"
+          has_many :photos, -> {order "created_at ASC"}, class_name: Refinery::PhotoGallery::Photo, through: :album
 
 
           accepts_nested_attributes_for :album_page
@@ -13,9 +13,9 @@ module Refinery
           module_eval do
             def photos_for_page(params_page)
               Refinery::PhotoGallery::Photo.where("album_id = ?", self.album.id ).
-                                            includes(:album).
-                                            paginate(:page => params_page).
-                                            order("created_at ASC")
+                  includes(:album).
+                  paginate(:page => params_page).
+                  order("created_at ASC")
             end
 
 
@@ -29,22 +29,14 @@ module Refinery
               if album_page_params[:album_id].blank?
                 self.album_page.destroy
 
-                Refinery::Admin::AlbumPageSweeper.sweep
-
                 # create or update if changed
               elsif self.album_page.album_id.to_s != album_page_params[:album_id]
                 self.album_page.update_attributes( album_page_params)
                 self.album_page.save
-
-                Refinery::Admin::AlbumPageSweeper.sweep
               end
-
-
             end
           end
 
-          attr_accessible :album_page
-
         end
       end
     end

data/lib/refinery/photo_gallery/version.rb

@@ -2,8 +2,8 @@ module Refinery
   module PhotoGallery
     class Version
       @major = 0
-      @minor = 1
-      @tiny  = '2'
+      @minor = 2
+      @tiny  = '0'
 
       class << self
         attr_reader :major, :minor, :tiny

data/refinerycms-photo-gallery.gemspec

@@ -18,13 +18,12 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',     '~> 2.0.3'
-  s.add_dependency   'refinerycms-settings', '~> 2.0.1'
+  s.add_dependency    'refinerycms-core',     '~> 3.0.5'
   s.add_dependency    'mime-types'
   s.add_dependency    'carrierwave', '0.6.2'
   s.add_dependency    'mini_magick'
   s.add_dependency    'mini_exiftool'
 
   # Development dependencies
-  s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
+  s.add_development_dependency 'refinerycms-testing', '~> 3.0.5'
 end

data/spec/factories/album_photos.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :album_photo, parent: :photo do
+    album
+  end
+end

data/spec/factories/albums.rb

@@ -0,0 +1,23 @@
+FactoryGirl.define do
+  factory :album, class: Refinery::PhotoGallery::Album do
+    title { Faker::Lorem::word }
+    path "15_04"
+    description "describtion about album"
+    address "slovakia"
+
+    factory :album_with_photos do
+      transient do
+        photos_count 5
+      end
+
+      # the after(:create) yields two values; the user instance itself and the
+      # evaluator, which stores all values from the factory, including transient
+      # attributes; `create_list`'s second argument is the number of records
+      # to create and we make sure the user is associated properly to the post
+      after(:create) do |album, evaluator|
+        create_list(:photo, evaluator.photos_count, album: album)
+      end
+
+    end
+  end
+end

data/spec/factories/collections.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :collection, class: Refinery::PhotoGallery::Collection do
+    title { Faker::Lorem::word }
+    description "collection description"
+  end
+end

data/spec/factories/photos.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :photo, class: Refinery::PhotoGallery::Photo do
+    title "Photo"
+    description "description"
+    path "16_04"
+
+    #sequence(:title){|n| "Photo-#{n}" }
+    file  { Rack::Test::UploadedFile.new( File.open(File.join(File.join(Refinery.roots(:'refinery/photo_gallery'), 'spec', 'support', 'images', 'refinery-logo-trans.png'))), "image/png" ) }
+  end
+end
+
+

data/spec/factories/user.rb

@@ -0,0 +1,27 @@
+FactoryGirl.define do
+  factory :authentication_devise_user, :class => Refinery::Authentication::Devise::User do
+    sequence(:username) { |n| "refinery#{n}" }
+    sequence(:email) { |n| "refinery#{n}@example.com" }
+    password  "refinerycms"
+    password_confirmation "refinerycms"
+  end
+
+  factory :authentication_devise_refinery_user, :parent => :authentication_devise_user do
+    roles { [ ::Refinery::Authentication::Devise::Role[:refinery] ] }
+
+    after(:create) do |user|
+      ::Refinery::Plugins.registered.each_with_index do |plugin, index|
+        user.plugins.create(:name => plugin.name, :position => index)
+      end
+    end
+  end
+
+  factory :authentication_devise_refinery_superuser, :parent => :authentication_devise_refinery_user do
+    roles {
+      [
+          ::Refinery::Authentication::Devise::Role[:refinery],
+          ::Refinery::Authentication::Devise::Role[:superuser]
+      ]
+    }
+  end
+end

data/spec/features/manage_albums_spec.rb

@@ -0,0 +1,93 @@
+require "spec_helper"
+
+describe "manage album items", :type => :feature do
+  refinery_login_with_devise :authentication_devise_refinery_superuser
+
+  context "when no album items" do
+    it "invites to create one" do
+      #save_and_open_page
+
+      visit refinery.photo_gallery_admin_albums_path
+      expect(page).to have_content("There are no albums yet. Click \"Create new album\" to add your first album.")
+    end
+  end
+
+  describe "submenu links" do
+    it "should have submenu links" do
+      visit refinery.photo_gallery_admin_albums_path
+
+      within "#actions" do
+        expect(page).to have_content("Collections")
+        expect(page).to have_content("Manage")
+      end
+    end
+  end
+
+  describe "action links" do
+    it "shows create new album" do
+      visit refinery.photo_gallery_admin_albums_path
+
+      within "#actions" do
+        expect(page).to have_content("Create new album")
+        expect(page).to have_selector("a[href='/#{Refinery::Core.backend_route}/photo-gallery/albums/new']")
+      end
+    end
+
+    it "shows create new collection" do
+      visit refinery.photo_gallery_admin_albums_path
+
+      within "#actions" do
+        expect(page).to have_content("Create new collection")
+        expect(page).to have_selector("a[href='/#{Refinery::Core.backend_route}/photo-gallery/collections/new']")
+      end
+    end
+  end
+
+  describe "new/create" do
+    it "allows to create albums" do
+      visit refinery.photo_gallery_admin_albums_path
+
+      click_link "Create new album"
+
+      fill_in "Title", :with => "My first album"
+      fill_in "Path prefix", :with => "16_04"
+      fill_in "Description", :with => "This is long story description ... "
+      click_button "Save"
+
+      expect(page).to have_content("'My first album' was successfully added.")
+
+      expect(Refinery::PhotoGallery::Album.count).to eq(1)
+    end
+  end
+
+  describe "edit/update" do
+    before { FactoryGirl.create(:album, :title => "Update me") }
+
+    it "updates album" do
+      visit refinery.photo_gallery_admin_albums_path
+
+      expect(page).to have_content("Update me")
+
+      click_link "Edit this album"
+
+      fill_in "Title", :with => "Updated"
+      click_button "Save"
+
+      expect(page).to have_content("'Updated' was successfully updated.")
+    end
+  end
+
+  describe "destroy" do
+    before { FactoryGirl.create(:album, :title => "Delete me") }
+
+    it "removes album" do
+      visit refinery.photo_gallery_admin_albums_path
+
+      click_link "Remove this album forever"
+
+      expect(page).to have_content("'Delete me' was successfully removed.")
+
+      expect(Refinery::PhotoGallery::Album.count).to eq(0)
+    end
+  end
+end