flms 0.0.2 → 0.0.3

data/spec/dummy/tmp/pids/server.pid

@@ -0,0 +1 @@
+29252

data/spec/factories/image_layer.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :image_layer, class: Flms::ImageLayer do
+    name { Faker::Lorem.word }
+  end
+end
+

data/spec/features/layers/{create_spec.rb → image_layers/create_spec.rb}

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-feature 'Layers > Create' do
+feature 'ImageLayers > Create' do
   include NamedFactories
 
-  scenario 'creating a new layer' do
+  scenario 'creating a new image layer' do
     capybara_sign_in user_1
     visit "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
-    click_link 'New Layer'
+    click_link 'Add Image Layer'
     fill_in 'Name', with: 'my new layer'
-    click_button 'Create Layer'
+    click_button 'Create Image layer'
 
     # Expect to be back at the block page.
     expect(current_path).to eql "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
@@ -17,6 +17,7 @@ feature 'Layers > Create' do
     expect(Flms::Layer).to have(1).instances
     expect(block_1a.reload).to have(1).layers
     layer = block_1a.layers.first
+    expect(layer.class).to eql Flms::ImageLayer
     expect(layer.name).to eql 'my new layer'
   end
 end

data/spec/features/layers/image_layers/delete_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+feature 'ImageLayers > Delete', js: true do
+  include NamedFactories
+
+  scenario 'deleting an image layer' do
+    image_layer_1a1
+
+    capybara_sign_in user_1
+    visit "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
+
+    # Click on the 'delete' button.
+    page.execute_script 'window.confirm = function() { return true }'
+    find('.icon-trash').click
+
+    # Expect to be back at the block page.
+    expect(current_path).to eql "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
+
+    # Expect that the layer is deleted.
+    expect(Flms::Layer).to have(0).instances
+  end
+end
+

data/spec/features/layers/{update_spec.rb → image_layers/edit_spec.rb}

@@ -1,23 +1,25 @@
 require 'spec_helper'
 
-feature 'Layers > Update' do
+feature 'ImageLayers > Edit', js: true do
   include NamedFactories
 
-  scenario 'editing an existing layer' do
-    layer_1a1
+  scenario 'editing an existing image layer' do
+    image_layer_1a1
 
     capybara_sign_in user_1
     visit "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
-    click_link 'edit'
+
+    # click on the 'edit' button.
+    find('.btn.edit').click
+
     fill_in 'Name', with: 'new layer name'
-    click_button 'Update Layer'
+    click_button 'Update Image layer'
 
     # Expect to be back at the block page.
     expect(current_path).to eql "/flms/pages/#{page_1.url}/blocks/#{block_1a.id}"
 
     # Check database updates.
     expect(Flms::Layer).to have(1).instances
-    layer = block_1a.reload.layers.first
-    expect(layer.name).to eql 'new layer name'
+    expect(image_layer_1a1.reload.name).to eql 'new layer name'
   end
 end

data/spec/support/lets.rb

@@ -2,6 +2,7 @@ module NamedFactories
   extend ActiveSupport::Concern
 
   included do
+    let(:user) { create :user }
     let(:user_1) { create :user }
     let(:user_2) { create :user }
     let(:page_1) { create :page }
@@ -14,7 +15,7 @@ module NamedFactories
                      block.blocks_pages.create page: page_1, ordering: 2
                      block }
     let(:layer_1a1) { create :layer, block: block_1a, ordering: 1 }
-    let(:layer_1a2) { create :layer, block: block_1a, ordering: 2 }
+    let(:image_layer_1a1) { create :image_layer, block: block_1a, ordering: 1 }
 
     let(:default_access_granted_check) { response.success? }
   end

data/{app/assets/stylesheets/flms → vendor/assets/stylesheets}/bootstrap.css

@@ -2282,7 +2282,7 @@ table th[class*="span"],
   *margin-right: .3em;
   line-height: 14px;
   vertical-align: text-top;
-  background-image: url("../img/glyphicons-halflings.png");
+  background-image: url("/assets/glyphicons-halflings.png");
   background-position: 14px 14px;
   background-repeat: no-repeat;
 }
@@ -2306,7 +2306,7 @@ table th[class*="span"],
 .dropdown-submenu:focus > a > [class^="icon-"],
 .dropdown-submenu:hover > a > [class*=" icon-"],
 .dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url("../img/glyphicons-halflings-white.png");
+  background-image: url("/assets/glyphicons-halflings-white.png");
 }
 
 .icon-glass {

metadata

@@ -2,7 +2,7 @@
 name: flms
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kevin Goslar
@@ -43,6 +43,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :runtime
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -306,8 +322,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/images/img/glyphicons-halflings-white.png
-- app/assets/images/img/glyphicons-halflings.png
 - app/assets/javascripts/flms/admin.js
 - app/assets/javascripts/flms/blocks/index/block.coffee
 - app/assets/javascripts/flms/blocks/index/block_list.coffee
@@ -317,7 +331,6 @@ files:
 - app/assets/stylesheets/flms/admin.css
 - app/assets/stylesheets/flms/blocks/index.sass
 - app/assets/stylesheets/flms/blocks/show.sass
-- app/assets/stylesheets/flms/bootstrap.css
 - app/assets/stylesheets/flms/home.sass
 - app/assets/stylesheets/flms/layout.sass
 - app/assets/stylesheets/flms/login.sass
@@ -325,6 +338,7 @@ files:
 - app/controllers/flms/application_controller.rb
 - app/controllers/flms/blocks_controller.rb
 - app/controllers/flms/dashboard_controller.rb
+- app/controllers/flms/image_layers_controller.rb
 - app/controllers/flms/layers_controller.rb
 - app/controllers/flms/pages_controller.rb
 - app/controllers/flms/sessions_controller.rb
@@ -332,18 +346,20 @@ files:
 - app/helpers/flms/application_helper.rb
 - app/models/flms/block.rb
 - app/models/flms/blocks_page.rb
+- app/models/flms/image_layer.rb
 - app/models/flms/layer.rb
 - app/models/flms/page.rb
 - app/models/flms/user.rb
+- app/uploaders/image_uploader.rb
 - app/views/flms/blocks/_form.html.haml
 - app/views/flms/blocks/edit.html.haml
 - app/views/flms/blocks/index.html.haml
 - app/views/flms/blocks/new.html.haml
 - app/views/flms/blocks/show.html.haml
 - app/views/flms/dashboard/index.html.haml
-- app/views/flms/layers/_form.html.haml
-- app/views/flms/layers/edit.html.haml
-- app/views/flms/layers/new.html.haml
+- app/views/flms/image_layers/_form.html.haml
+- app/views/flms/image_layers/edit.html.haml
+- app/views/flms/image_layers/new.html.haml
 - app/views/flms/pages/_form.html.haml
 - app/views/flms/pages/edit.html.haml
 - app/views/flms/pages/index.html.haml
@@ -356,6 +372,7 @@ files:
 - app/views/layouts/flms/admin.html.haml
 - app/views/layouts/flms/admin_login.html.haml
 - app/views/layouts/flms/application.html.erb
+- config/initializers/carrierwave.rb
 - config/initializers/devise.rb
 - config/locales/devise.en.yml
 - config/routes.rb
@@ -364,12 +381,16 @@ files:
 - db/migrate/20130302011705_create_flms_blocks.rb
 - db/migrate/20130302015459_create_flms_blocks_pages.rb
 - db/migrate/20130312220011_create_flms_layers.rb
+- db/migrate/20130313002421_add_image_to_layers.rb
 - lib/flms/engine.rb
 - lib/flms/version.rb
 - lib/flms.rb
 - lib/tasks/flms_tasks.rake
+- vendor/assets/images/glyphicons-halflings-white.png
+- vendor/assets/images/glyphicons-halflings.png
 - vendor/assets/javascripts/bootstrapSwitch.js
 - vendor/assets/javascripts/jquery-ui.js
+- vendor/assets/stylesheets/bootstrap.css
 - vendor/assets/stylesheets/bootstrapSwitch.css
 - vendor/assets/stylesheets/jquery-ui.css
 - MIT-LICENSE
@@ -377,6 +398,7 @@ files:
 - README.md
 - spec/controllers/blocks_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
+- spec/controllers/layers_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
@@ -423,6 +445,7 @@ files:
 - spec/dummy/tmp/cache/assets/C8A/F50/sprockets%2F604b0fb8ee1c08f9036750897c890831
 - spec/dummy/tmp/cache/assets/CA9/AC0/sprockets%2F2f3e0ad16e81532007e094c081594f7e
 - spec/dummy/tmp/cache/assets/CAB/C80/sprockets%2Fc4e739111d82c7189113aeb228816ba8
+- spec/dummy/tmp/cache/assets/CB3/E00/sprockets%2F97a8391a80361fb1870669c06a27ae5c
 - spec/dummy/tmp/cache/assets/CBC/250/sprockets%2F1b2102711103acac21fe74936046ddb4
 - spec/dummy/tmp/cache/assets/CCF/210/sprockets%2F43b5c2ffc8a62726b4ed6234001571a4
 - spec/dummy/tmp/cache/assets/CD0/D40/sprockets%2F7e3d7254f3137e2108220770b3dd1bfc
@@ -432,6 +455,7 @@ files:
 - spec/dummy/tmp/cache/assets/CDB/510/sprockets%2Fd61745a24c4636f8813fa14038bac69a
 - spec/dummy/tmp/cache/assets/D06/AF0/sprockets%2F02a9a4f214368781ba86ed42d5bef203
 - spec/dummy/tmp/cache/assets/D09/5C0/sprockets%2F7cd3521c63623eb6f02dbb514991a6f6
+- spec/dummy/tmp/cache/assets/D0B/0C0/sprockets%2Fb2722b54d89845b9619cadda1a04158c
 - spec/dummy/tmp/cache/assets/D0C/570/sprockets%2F7e3d63e1412ae56b44b23d95547f0cc7
 - spec/dummy/tmp/cache/assets/D17/6B0/sprockets%2F43a81531e358ce9bb7af8417c875d63a
 - spec/dummy/tmp/cache/assets/D18/9C0/sprockets%2Ff92d239ff629c160ee015e3845a6c9c3
@@ -447,6 +471,7 @@ files:
 - spec/dummy/tmp/cache/assets/D44/A50/sprockets%2F7602cd388554ba54eb914c1b2d7ff68c
 - spec/dummy/tmp/cache/assets/D45/CC0/sprockets%2F741e31abcfe889c718bfa7ee58080305
 - spec/dummy/tmp/cache/assets/D46/210/sprockets%2F45a8d49c8edbaf91f38ab1495430384c
+- spec/dummy/tmp/cache/assets/D4C/DB0/sprockets%2F18810d4978693cfac8703a96dccbcf80
 - spec/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
 - spec/dummy/tmp/cache/assets/D50/0B0/sprockets%2F6c3a019b7442761786cc7bef8e8e7c6c
 - spec/dummy/tmp/cache/assets/D53/F80/sprockets%2F11d791b713f9b9cf2bb85bd7f6589b84
@@ -482,15 +507,20 @@ files:
 - spec/dummy/tmp/cache/assets/DCC/B80/sprockets%2Fb7ae6e7bfa8984c54a4dfaf0011617cd
 - spec/dummy/tmp/cache/assets/DCF/0B0/sprockets%2F23db7ab96a5549546bbdd0bc2e6ea86f
 - spec/dummy/tmp/cache/assets/DD4/990/sprockets%2F8dc6b77dc74dfdf830aa8f19b92c130d
+- spec/dummy/tmp/cache/assets/DDE/5C0/sprockets%2Ffc38a19244e2fceafe166b8b498fef18
 - spec/dummy/tmp/cache/assets/DF1/A10/sprockets%2Fa925a815ca0bff4d6f42fbdf0d323a4f
 - spec/dummy/tmp/cache/assets/DF3/820/sprockets%2Fede955e751bbec440cbbfc00473c34ec
 - spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
+- spec/dummy/tmp/cache/assets/E2D/E20/sprockets%2Fec8c39aa4e1ce3059eeab8f265ead07d
 - spec/dummy/tmp/cache/assets/E3A/110/sprockets%2Fb6d5158ff7ac6d2ca99bfe56a7ddd2e3
 - spec/dummy/tmp/cache/assets/E4B/EE0/sprockets%2F06c4dea4fc3cb561b87bd078aab0facc
+- spec/dummy/tmp/cache/assets/E5E/A60/sprockets%2Ff83d84dceff86c25a7bab27cbff33ac0
 - spec/dummy/tmp/cache/assets/E6D/8B0/sprockets%2F9edfdf7e85cdd1a69b0eb14c6ce8ed19
+- spec/dummy/tmp/pids/server.pid
 - spec/dummy/tmp/public/uploads/flms/image_layer/image/5/300px-BabySinclair.jpg
 - spec/dummy/tmp/uploads/flms/image_layer/image/4/300px-BabySinclair.jpg
 - spec/factories/blocks.rb
+- spec/factories/image_layer.rb
 - spec/factories/layer.rb
 - spec/factories/pages.rb
 - spec/factories/users.rb
@@ -500,9 +530,9 @@ files:
 - spec/features/blocks/edit_spec.rb
 - spec/features/blocks/show_spec.rb
 - spec/features/dashboard_spec.rb
-- spec/features/layers/create_spec.rb
-- spec/features/layers/index_spec.rb
-- spec/features/layers/update_spec.rb
+- spec/features/layers/image_layers/create_spec.rb
+- spec/features/layers/image_layers/delete_spec.rb
+- spec/features/layers/image_layers/edit_spec.rb
 - spec/features/login_spec.rb
 - spec/features/pages/create_spec.rb
 - spec/features/pages/delete_spec.rb
@@ -546,6 +576,7 @@ summary: Floating Layer Management System
 test_files:
 - spec/controllers/blocks_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
+- spec/controllers/layers_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
@@ -592,6 +623,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/C8A/F50/sprockets%2F604b0fb8ee1c08f9036750897c890831
 - spec/dummy/tmp/cache/assets/CA9/AC0/sprockets%2F2f3e0ad16e81532007e094c081594f7e
 - spec/dummy/tmp/cache/assets/CAB/C80/sprockets%2Fc4e739111d82c7189113aeb228816ba8
+- spec/dummy/tmp/cache/assets/CB3/E00/sprockets%2F97a8391a80361fb1870669c06a27ae5c
 - spec/dummy/tmp/cache/assets/CBC/250/sprockets%2F1b2102711103acac21fe74936046ddb4
 - spec/dummy/tmp/cache/assets/CCF/210/sprockets%2F43b5c2ffc8a62726b4ed6234001571a4
 - spec/dummy/tmp/cache/assets/CD0/D40/sprockets%2F7e3d7254f3137e2108220770b3dd1bfc
@@ -601,6 +633,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/CDB/510/sprockets%2Fd61745a24c4636f8813fa14038bac69a
 - spec/dummy/tmp/cache/assets/D06/AF0/sprockets%2F02a9a4f214368781ba86ed42d5bef203
 - spec/dummy/tmp/cache/assets/D09/5C0/sprockets%2F7cd3521c63623eb6f02dbb514991a6f6
+- spec/dummy/tmp/cache/assets/D0B/0C0/sprockets%2Fb2722b54d89845b9619cadda1a04158c
 - spec/dummy/tmp/cache/assets/D0C/570/sprockets%2F7e3d63e1412ae56b44b23d95547f0cc7
 - spec/dummy/tmp/cache/assets/D17/6B0/sprockets%2F43a81531e358ce9bb7af8417c875d63a
 - spec/dummy/tmp/cache/assets/D18/9C0/sprockets%2Ff92d239ff629c160ee015e3845a6c9c3
@@ -616,6 +649,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/D44/A50/sprockets%2F7602cd388554ba54eb914c1b2d7ff68c
 - spec/dummy/tmp/cache/assets/D45/CC0/sprockets%2F741e31abcfe889c718bfa7ee58080305
 - spec/dummy/tmp/cache/assets/D46/210/sprockets%2F45a8d49c8edbaf91f38ab1495430384c
+- spec/dummy/tmp/cache/assets/D4C/DB0/sprockets%2F18810d4978693cfac8703a96dccbcf80
 - spec/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
 - spec/dummy/tmp/cache/assets/D50/0B0/sprockets%2F6c3a019b7442761786cc7bef8e8e7c6c
 - spec/dummy/tmp/cache/assets/D53/F80/sprockets%2F11d791b713f9b9cf2bb85bd7f6589b84
@@ -651,15 +685,20 @@ test_files:
 - spec/dummy/tmp/cache/assets/DCC/B80/sprockets%2Fb7ae6e7bfa8984c54a4dfaf0011617cd
 - spec/dummy/tmp/cache/assets/DCF/0B0/sprockets%2F23db7ab96a5549546bbdd0bc2e6ea86f
 - spec/dummy/tmp/cache/assets/DD4/990/sprockets%2F8dc6b77dc74dfdf830aa8f19b92c130d
+- spec/dummy/tmp/cache/assets/DDE/5C0/sprockets%2Ffc38a19244e2fceafe166b8b498fef18
 - spec/dummy/tmp/cache/assets/DF1/A10/sprockets%2Fa925a815ca0bff4d6f42fbdf0d323a4f
 - spec/dummy/tmp/cache/assets/DF3/820/sprockets%2Fede955e751bbec440cbbfc00473c34ec
 - spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
+- spec/dummy/tmp/cache/assets/E2D/E20/sprockets%2Fec8c39aa4e1ce3059eeab8f265ead07d
 - spec/dummy/tmp/cache/assets/E3A/110/sprockets%2Fb6d5158ff7ac6d2ca99bfe56a7ddd2e3
 - spec/dummy/tmp/cache/assets/E4B/EE0/sprockets%2F06c4dea4fc3cb561b87bd078aab0facc
+- spec/dummy/tmp/cache/assets/E5E/A60/sprockets%2Ff83d84dceff86c25a7bab27cbff33ac0
 - spec/dummy/tmp/cache/assets/E6D/8B0/sprockets%2F9edfdf7e85cdd1a69b0eb14c6ce8ed19
+- spec/dummy/tmp/pids/server.pid
 - spec/dummy/tmp/public/uploads/flms/image_layer/image/5/300px-BabySinclair.jpg
 - spec/dummy/tmp/uploads/flms/image_layer/image/4/300px-BabySinclair.jpg
 - spec/factories/blocks.rb
+- spec/factories/image_layer.rb
 - spec/factories/layer.rb
 - spec/factories/pages.rb
 - spec/factories/users.rb
@@ -669,9 +708,9 @@ test_files:
 - spec/features/blocks/edit_spec.rb
 - spec/features/blocks/show_spec.rb
 - spec/features/dashboard_spec.rb
-- spec/features/layers/create_spec.rb
-- spec/features/layers/index_spec.rb
-- spec/features/layers/update_spec.rb
+- spec/features/layers/image_layers/create_spec.rb
+- spec/features/layers/image_layers/delete_spec.rb
+- spec/features/layers/image_layers/edit_spec.rb
 - spec/features/login_spec.rb
 - spec/features/pages/create_spec.rb
 - spec/features/pages/delete_spec.rb