family_gallery 0.0.4 → 0.0.5

data/config/locales/awesome_translations/app/helpers/family_gallery/da.yml

@@ -0,0 +1,6 @@
+---
+da:
+  helpers:
+    family_gallery:
+      users_helper:
+        no_user: ingen bruger

data/config/locales/awesome_translations/app/helpers/family_gallery/en.yml

@@ -0,0 +1,6 @@
+---
+en:
+  helpers:
+    family_gallery:
+      users_helper:
+        no_user: no user

data/config/locales/awesome_translations/app/models/family_gallery/da.yml

@@ -0,0 +1,6 @@
+---
+da:
+  models:
+    family_gallery:
+      user_role:
+        administrator: Administrator

data/config/locales/awesome_translations/app/models/family_gallery/en.yml

@@ -0,0 +1,6 @@
+---
+en:
+  models:
+    family_gallery:
+      user_role:
+        administrator: Administrator

data/config/locales/awesome_translations/app/views/family_gallery/user_roles/da.yml

@@ -0,0 +1,6 @@
+---
+da:
+  family_gallery:
+    user_roles:
+      new:
+        new_user_role_for: New brugerrolle for %{user_name}

data/config/locales/awesome_translations/app/views/family_gallery/user_roles/en.yml

@@ -0,0 +1,6 @@
+---
+en:
+  family_gallery:
+    user_roles:
+      new:
+        new_user_role_for: New user role for %{user_name}

data/config/locales/awesome_translations/models/family_gallery__user/da.yml

@@ -16,3 +16,10 @@ da:
         pictures_tagged_on: Tagget på billeder
         user_roles: Brugerroller
         uploaded_pictures: Uploadede billeder
+        id: ID
+        owned_groups: Ejede grupper
+        user_taggings: Brugertags
+        user_taggings_created: Oprettede brugertags
+        confirmed_at: Bekræftet d.
+        confirmation_sent_at: Bekræftelsesmail sendt d.
+        locked_at: Låst d.

data/config/locales/awesome_translations/models/family_gallery__user/en.yml

@@ -16,3 +16,10 @@ en:
         pictures_tagged_on: Tagged on pictures
         user_roles: User roles
         uploaded_pictures: Uploaded pictures
+        id: ID
+        owned_groups: Owned groups
+        user_taggings: User taggings
+        user_taggings_created: Created user taggings
+        confirmed_at: Confirmed at
+        confirmation_sent_at: Confirmation mail sent at
+        locked_at: Locked at

data/config/locales/simple_form.en.yml

@@ -0,0 +1,31 @@
+en:
+  simple_form:
+    "yes": 'Yes'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Please review the problems below:"
+    # Examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+    # include_blanks:
+    #   defaults:
+    #     age: 'Rather not say'
+    # prompts:
+    #   defaults:
+    #     age: 'Select your age'

data/config/routes.rb

@@ -12,10 +12,12 @@ FamilyGallery::Engine.routes.draw do
   resources :locales, only: :create
 
   resources :pictures do
-    resources :user_taggings
+    resources :user_taggings, only: [:new, :create, :destroy]
   end
 
-  resources :users
+  resources :users do
+    resources :user_roles, only: [:new, :create, :destroy]
+  end
 
   root "welcome#index"
 end

data/db/plugin_migrate/20150508081950_add_user_owner_to_groups.rb

@@ -0,0 +1,6 @@
+class AddUserOwnerToGroups < ActiveRecord::Migration
+  def change
+    add_column :family_gallery_groups, :user_owner_id, :integer, after: :id
+    add_index :family_gallery_groups, :user_owner_id
+  end
+end

data/lib/family_gallery/version.rb

@@ -1,3 +1,3 @@
 module FamilyGallery
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/templates/erb/scaffold/_form.html.erb

@@ -0,0 +1,13 @@
+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+  <%%= f.error_notification %>
+
+  <div class="form-inputs">
+  <%- attributes.each do |attribute| -%>
+    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+  <%- end -%>
+  </div>
+
+  <div class="form-actions">
+    <%%= f.button :submit %>
+  </div>
+<%% end %>

data/spec/controllers/family_gallery/groups_controller_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe FamilyGallery::GroupsController do
+  let(:group) { create :group, user_owner: user }
+  let(:user) { create :user }
+  let(:valid_params) do
+    {
+      name: Forgery::LoremIpsum.words(2)
+    }
+  end
+
+  render_views
+
+  routes { FamilyGallery::Engine.routes }
+
+  before do
+    sign_in user
+  end
+
+  it '#index' do
+    group
+    get :index
+    expect(assigns(:groups)).to eq [group]
+  end
+
+  it '#show' do
+    get :show, id: group.id
+    expect(response).to be_success
+  end
+
+  it '#new' do
+    get :new
+    expect(response).to be_success
+  end
+
+  it '#create' do
+    post :create, group: valid_params
+
+    created_group = assigns(:group)
+    expect(created_group).to be_valid
+
+    expect(response).to redirect_to created_group
+  end
+
+  it '#edit' do
+    get :edit, id: group.id
+    expect(response).to be_success
+  end
+
+  it '#update' do
+    put :update, id: group.id, group: valid_params
+
+    updated_group = assigns(:group)
+    expect(updated_group).to be_valid
+
+    expect(response).to redirect_to updated_group
+  end
+
+  it '#destroy' do
+    delete :destroy, id: group.id
+
+    expect { group.reload }.to raise_error(ActiveRecord::RecordNotFound)
+
+    expect(response).to redirect_to groups_url
+  end
+end

data/spec/controllers/family_gallery/locales_controller_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe FamilyGallery::LocalesController do
+  render_views
+
+  routes { FamilyGallery::Engine.routes }
+
+  it '#create' do
+    post :create, locale: "da"
+
+    expect(I18n.locale).to eq :da
+
+    expect(response.body.to_s).to eq JSON.dump(success: true)
+  end
+end

data/spec/controllers/family_gallery/pictures_controller_spec.rb

@@ -1,15 +1,17 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe FamilyGallery::PicturesController do
   let(:group) { create :group }
   let(:admin) { create :admin }
 
+  routes { FamilyGallery::Engine.routes }
+
   before do
     sign_in admin
   end
 
   it "#create" do
-    post :create, use_route: :family_gallery, picture: {title: "Test title", description: "Test test", image: fixture_file_upload("#{Rails.root}/../../spec/test_pictures/sigrid.jpg", "image/jpeg")}, group_id: group.id
+    post :create, picture: {title: "Test title", description: "Test test", image: fixture_file_upload(Rails.root.join('..', '..', 'spec', 'test_pictures', 'sigrid.jpg'), "image/jpeg")}, group_id: group.id
     last_picture = assigns(:picture)
     last_picture.errors.to_a.should eq []
     response.should redirect_to last_picture

data/spec/controllers/family_gallery/user_roles_controller_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe FamilyGallery::UserRolesController do
+  let(:admin) { create :admin }
+  let(:user) { create :user }
+  let(:user_role) { create :user_role, user: user }
+  let(:valid_params) do
+    {
+      role: 'administrator'
+    }
+  end
+
+  routes { FamilyGallery::Engine.routes }
+
+  render_views
+
+  before do
+    sign_in admin
+  end
+
+  it '#new' do
+    get :new, user_id: user.id
+    expect(response).to be_success
+  end
+
+  it '#create' do
+    post :create, user_id: user.id, user_role: valid_params
+    expect(response).to redirect_to user_url(user)
+  end
+
+  it '#destroy' do
+    delete :destroy, user_id: user.id, id: user_role.id
+
+    expect { user_role.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    expect(response).to redirect_to user_url(user)
+  end
+end

data/spec/controllers/family_gallery/user_taggings_controller_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe FamilyGallery::UserTaggingsController do
+  let(:user) { create :user }
+  let(:picture) { create :picture, user_owner: user }
+  let(:user_tagging) { create :user_tagging, picture: picture, user: user }
+  let(:valid_params) do
+    {
+      user_id: user.id,
+      position_top: 10,
+      position_left: 15
+    }
+  end
+
+  render_views
+
+  routes { FamilyGallery::Engine.routes }
+
+  before do
+    sign_in user
+  end
+
+  it '#new' do
+    get :new, picture_id: picture.id
+    expect(response).to be_success
+  end
+
+  it '#create' do
+    post :create, picture_id: picture.id, user_tagging: valid_params
+
+    created_tagging = assigns(:user_tagging)
+    expect(created_tagging).to be_valid
+
+    expect(response).to redirect_to picture
+  end
+
+  it '#destroy' do
+    delete :destroy, picture_id: picture.id, id: user_tagging.id
+
+    expect { user_tagging.reload }.to raise_error(ActiveRecord::RecordNotFound)
+
+    expect(response).to redirect_to picture
+  end
+end

data/spec/controllers/family_gallery/users_controller_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe FamilyGallery::UsersController do
+  let(:admin) { create :admin }
+  let(:user) { create :user }
+  let(:valid_params) do
+    {
+      first_name: Forgery::Name.first_name,
+      last_name: Forgery::Name.last_name,
+      email: Forgery::Internet.email_address
+    }
+  end
+
+  routes { FamilyGallery::Engine.routes }
+
+  render_views
+
+  before do
+    sign_in admin
+  end
+
+  it '#index' do
+    get :index
+    expect(assigns(:users)).to eq [admin]
+    expect(response).to be_success
+  end
+
+  it '#show' do
+    get :show, id: user.id
+    expect(response).to be_success
+  end
+
+  it '#new' do
+    get :new
+    expect(response).to be_success
+  end
+
+  it '#create' do
+    post :create, user: valid_params
+
+    created_user = assigns(:user)
+
+    expect(created_user).to be_valid
+    expect(response).to redirect_to user_url(created_user)
+  end
+
+  it '#edit' do
+    get :edit, id: user.id
+    expect(response).to be_success
+  end
+
+  it '#update' do
+    patch :update, id: user.id, user: valid_params
+
+    user_updated = assigns(:user)
+    expect(user_updated).to be_valid
+
+    expect(response).to redirect_to user_url(user)
+  end
+
+  it '#destroy' do
+    delete :destroy, id: user.id
+
+    expect { user.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    expect(response).to redirect_to users_url
+  end
+end

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

data/spec/dummy/db/schema.rb

@@ -11,11 +11,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150301144620) do
+ActiveRecord::Schema.define(version: 20150508081950) do
 
-  create_table "family_gallery_group_picture_links", force: true do |t|
-    t.integer  "group_id"
-    t.integer  "picture_id"
+  create_table "family_gallery_group_picture_links", force: :cascade do |t|
+    t.integer  "group_id",   limit: 4
+    t.integer  "picture_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -24,48 +24,51 @@ ActiveRecord::Schema.define(version: 20150301144620) do
   add_index "family_gallery_group_picture_links", ["group_id"], name: "index_family_gallery_group_picture_links_on_group_id", using: :btree
   add_index "family_gallery_group_picture_links", ["picture_id"], name: "index_family_gallery_group_picture_links_on_picture_id", using: :btree
 
-  create_table "family_gallery_group_translations", force: true do |t|
-    t.integer  "family_gallery_group_id", null: false
-    t.string   "locale",                  null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "name"
-    t.text     "description"
+  create_table "family_gallery_group_translations", force: :cascade do |t|
+    t.integer  "family_gallery_group_id", limit: 4,     null: false
+    t.string   "locale",                  limit: 255,   null: false
+    t.datetime "created_at",                            null: false
+    t.datetime "updated_at",                            null: false
+    t.string   "name",                    limit: 255
+    t.text     "description",             limit: 65535
   end
 
   add_index "family_gallery_group_translations", ["family_gallery_group_id"], name: "index_c7c2d0e178c1bd38d1d9010438b10c5b4240a1db", using: :btree
   add_index "family_gallery_group_translations", ["locale"], name: "index_family_gallery_group_translations_on_locale", using: :btree
 
-  create_table "family_gallery_groups", force: true do |t|
+  create_table "family_gallery_groups", force: :cascade do |t|
+    t.integer  "user_owner_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "family_gallery_picture_translations", force: true do |t|
-    t.integer  "family_gallery_picture_id", null: false
-    t.string   "locale",                    null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "title"
-    t.text     "description"
+  add_index "family_gallery_groups", ["user_owner_id"], name: "index_family_gallery_groups_on_user_owner_id", using: :btree
+
+  create_table "family_gallery_picture_translations", force: :cascade do |t|
+    t.integer  "family_gallery_picture_id", limit: 4,     null: false
+    t.string   "locale",                    limit: 255,   null: false
+    t.datetime "created_at",                              null: false
+    t.datetime "updated_at",                              null: false
+    t.string   "title",                     limit: 255
+    t.text     "description",               limit: 65535
   end
 
   add_index "family_gallery_picture_translations", ["family_gallery_picture_id"], name: "index_832f502cff7d47b4d637c290646c30a7e18d7e2f", using: :btree
   add_index "family_gallery_picture_translations", ["locale"], name: "index_family_gallery_picture_translations_on_locale", using: :btree
 
-  create_table "family_gallery_pictures", force: true do |t|
-    t.integer  "user_owner_id"
-    t.integer  "user_uploaded_id"
+  create_table "family_gallery_pictures", force: :cascade do |t|
+    t.integer  "user_owner_id",      limit: 4
+    t.integer  "user_uploaded_id",   limit: 4
     t.datetime "taken_at"
-    t.integer  "width"
-    t.integer  "height"
-    t.decimal  "latitude",           precision: 12, scale: 3
-    t.decimal  "longitude",          precision: 12, scale: 3
+    t.integer  "width",              limit: 4
+    t.integer  "height",             limit: 4
+    t.decimal  "latitude",                       precision: 10, scale: 8
+    t.decimal  "longitude",                      precision: 10, scale: 8
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "image_file_name"
-    t.string   "image_content_type"
-    t.integer  "image_file_size"
+    t.string   "image_file_name",    limit: 255
+    t.string   "image_content_type", limit: 255
+    t.integer  "image_file_size",    limit: 4
     t.datetime "image_updated_at"
   end
 
@@ -75,9 +78,9 @@ ActiveRecord::Schema.define(version: 20150301144620) do
   add_index "family_gallery_pictures", ["user_owner_id"], name: "index_family_gallery_pictures_on_user_owner_id", using: :btree
   add_index "family_gallery_pictures", ["user_uploaded_id"], name: "index_family_gallery_pictures_on_user_uploaded_id", using: :btree
 
-  create_table "family_gallery_user_roles", force: true do |t|
-    t.integer  "user_id"
-    t.string   "role"
+  create_table "family_gallery_user_roles", force: :cascade do |t|
+    t.integer  "user_id",    limit: 4
+    t.string   "role",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -85,12 +88,12 @@ ActiveRecord::Schema.define(version: 20150301144620) do
   add_index "family_gallery_user_roles", ["user_id", "role"], name: "index_family_gallery_user_roles_on_user_id_and_role", unique: true, using: :btree
   add_index "family_gallery_user_roles", ["user_id"], name: "index_family_gallery_user_roles_on_user_id", using: :btree
 
-  create_table "family_gallery_user_taggings", force: true do |t|
-    t.integer  "picture_id"
-    t.integer  "user_id"
-    t.integer  "tagged_by_id"
-    t.decimal  "position_top",  precision: 10, scale: 2
-    t.decimal  "position_left", precision: 10, scale: 2
+  create_table "family_gallery_user_taggings", force: :cascade do |t|
+    t.integer  "picture_id",    limit: 4
+    t.integer  "user_id",       limit: 4
+    t.integer  "tagged_by_id",  limit: 4
+    t.decimal  "position_top",            precision: 10, scale: 2
+    t.decimal  "position_left",           precision: 10, scale: 2
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -99,25 +102,25 @@ ActiveRecord::Schema.define(version: 20150301144620) do
   add_index "family_gallery_user_taggings", ["tagged_by_id"], name: "index_family_gallery_user_taggings_on_tagged_by_id", using: :btree
   add_index "family_gallery_user_taggings", ["user_id"], name: "index_family_gallery_user_taggings_on_user_id", using: :btree
 
-  create_table "family_gallery_users", force: true do |t|
-    t.string   "first_name"
-    t.string   "last_name"
-    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+  create_table "family_gallery_users", force: :cascade do |t|
+    t.string   "first_name",             limit: 255
+    t.string   "last_name",              limit: 255
+    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "encrypted_password",     limit: 255, default: "", null: false
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    t.integer  "sign_in_count",          limit: 4,   default: 0,  null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.string   "confirmation_token"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
+    t.string   "confirmation_token",     limit: 255
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.integer  "failed_attempts",        default: 0,  null: false
-    t.string   "unlock_token"
+    t.string   "unconfirmed_email",      limit: 255
+    t.integer  "failed_attempts",        limit: 4,   default: 0,  null: false
+    t.string   "unlock_token",           limit: 255
     t.datetime "locked_at"
     t.datetime "created_at"
     t.datetime "updated_at"