flms 0.0.3 → 0.1.0

data/app/views/flms/paragraph_layers/edit.html.haml

@@ -0,0 +1,2 @@
+.login.container
+  = render partial: 'form', locals: {caption: 'Update layer'}

data/app/views/flms/paragraph_layers/new.html.haml

@@ -0,0 +1,2 @@
+.login.container
+  = render partial: 'form', locals: {caption: 'Create a new paragraph layer'}

data/app/views/flms/text_layers/_form.html.haml

@@ -0,0 +1,43 @@
+= form_for [@block, @layer], html: {class: 'form-horizontal'} do |f|
+  %fieldset
+    %legend= caption
+
+    - if @layer.errors.any?
+      #error_explanation
+        %h2= "#{pluralize(@layer.errors.count, "error")} prohibited this layer from being saved:"
+        %ul
+          - @layer.errors.full_messages.each do |msg|
+            %li= msg
+
+  = render partial: 'flms/layers/common_fields', locals: { form_block: f }
+
+  %fieldset
+    %legend
+      Text
+    .control-group
+      = f.label :text, class: 'control-label'
+      .controls
+        = f.text_field :text
+
+    .control-group
+      = f.label :font_size, class: 'control-label'
+      .controls
+        .input-append
+          = f.text_field :font_size
+          %span.add-on em
+
+    .control-group
+      = f.label :color, class: 'control-label'
+      .controls
+        .input-prepend
+          %span.add-on #
+          = f.text_field :color
+
+  = render partial: 'flms/layers/keyframe_fields', locals: { form_block: f }
+
+  .control-group
+    .controls
+      .actions
+        = f.submit class: 'btn btn-primary'
+             
+        = link_to 'Cancel', edit_block_path(@block)

data/app/views/flms/text_layers/edit.html.haml

@@ -0,0 +1,2 @@
+.login.container
+  = render partial: 'form', locals: {caption: 'Update layer'}

data/app/views/flms/text_layers/new.html.haml

@@ -0,0 +1,2 @@
+.login.container
+  = render partial: 'form', locals: {caption: 'Create a new text layer'}

data/app/views/layouts/flms/_plain_styling.html.haml

@@ -0,0 +1 @@
+= yield

data/app/views/layouts/flms/admin.html.haml

@@ -16,17 +16,22 @@
 
       .masthead
         %ul.nav.nav-pills.pull-right
-          - clazz = params[:controller] == 'flms/dashboard' ? 'active' : ''
+          - clazz = nav_active_class('flms/dashboard')
           %li{class: clazz}
             %a{href: "/flms"}
               %d.icon-home
               Home
-          - clazz = ['flms/pages', 'flms/blocks'].include?(params[:controller]) ? 'active' : ''
+          - clazz = nav_active_class('flms/pages')
           %li{class: clazz}
             %a{href: "/flms/pages"}
               %i.icon-book
               Pages
-          - clazz = params[:controller] == 'flms/users' ? 'active' : ''
+          - clazz = nav_active_class('flms/blocks')
+          %li{class: clazz}
+            %a{href: "/flms/blocks"}
+              %i.icon-th-large
+              Blocks
+          - clazz = nav_active_class('flms/users')
           %li{class: clazz}
             %a{href: "/flms/users"}
               %i.icon-user

data/app/views/layouts/flms/public.html.haml

@@ -0,0 +1,13 @@
+!!! 5
+%html{lang: 'en'}
+  %head
+    %title= yield :title
+    %meta{ name:"viewport", content:"width=device-width, initial-scale=1.0" }
+    = stylesheet_link_tag 'flms/public', media: 'all'
+    = csrf_meta_tags
+
+  %body
+    = yield
+
+    = javascript_include_tag 'flms/public'
+    = yield :js

data/config/initializers/carrierwave.rb

@@ -1,12 +1,68 @@
 require 'carrierwave'
 
+# Load S3 credentials from s3.yml if we are in dev, otherwise use environment:
+unless Rails.env.test? or Rails.env.cucumber? or Rails.env.development?
+  raise "Need to set S3_BUCKET, S3_ACCESS_KEY, and S3_SECRET_KEY in environment." if ENV['S3_BUCKET'] == nil || ENV['S3_ACCESS_KEY'] == nil || ENV['S3_SECRET_KEY'] == nil
+end
+
+if Rails.env.development?
+  unless File.exists? "#{Rails.root}/config/s3.yml"
+    print %Q(
+             ERROR: NO config/s3.yml FOUND!
+           
+             FLMS relies on having Amazon S3 credentials to function correctly. Here is an example s3.yml file:
+             "
+             development:
+               bucket: YOUR_BUCKET_ID
+               access_key_id: YOUR_KEY_ID
+               secret_access_key: YOUR_SECRET_ACCESS_KEY
+
+             test:
+               bucket: YOUR_BUCKET_ID
+               access_key_id: YOUR_KEY_ID
+               secret_access_key: YOUR_SECRET_ACCESS_KEY
+
+             production:
+               bucket: YOUR_BUCKET_ID
+               access_key_id: YOUR_KEY_ID
+               secret_access_key: YOUR_SECRET_ACCESS_KEY
+               "
+
+             
+             For local development the filesystem is used instead of s3 but the file still must exist.
+
+  )
+    exit 1
+  end
+  s3_config = YAML.load_file "#{Rails.root}/config/s3.yml"
+  S3_CREDENTIALS = { bucket: s3_config[Rails.env]['bucket'],
+                     access_key_id: s3_config[Rails.env]['access_key_id'],
+                     secret_access_key: s3_config[Rails.env]['secret_access_key'] }
+else
+  S3_CREDENTIALS = { bucket: ENV['S3_BUCKET'],
+                     access_key_id: ENV['S3_ACCESS_KEY'],
+                     secret_access_key: ENV['S3_SECRET_KEY'] }
+end
+
+
 CarrierWave.configure do |config|
   config.cache_dir = "#{Rails.root}/tmp/uploads"
   config.root = Rails.root
+
+  # Store uploads locally if in test, otherwise to S3:
+  if Rails.env.test? or Rails.env.cucumber?
+    config.storage = :file
+    config.enable_processing = false
+    config.root = "#{Rails.root}/public"
+  else
+    config.storage = :fog
+    config.fog_credentials = { :provider               => 'AWS',
+                               :aws_access_key_id      => S3_CREDENTIALS[:access_key_id],
+                               :aws_secret_access_key  => S3_CREDENTIALS[:secret_access_key],
+                               :region                 => 'us-west-1',
+                               :host                   => 's3.amazonaws.com' }
+    config.fog_directory  = S3_CREDENTIALS[:bucket]
+    config.fog_public     = false
+    config.fog_attributes = { 'Cache-Control' => 'max-age=315576000' }
+  end
 end
-# if Rails.env.test? or Rails.env.cucumber?
-#   CarrierWave.configure do |config|
-#     config.storage = :file
-#     config.enable_processing = false
-#   end
-# end

data/config/initializers/mime_types.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Mime::Type.register "text/plain_html", :plain_html

data/config/initializers/validators.rb

@@ -0,0 +1 @@
+require 'flms/css_name_validator'

data/config/routes.rb

@@ -1,11 +1,18 @@
 Flms::Engine.routes.draw do
 
+  resources :blocks do
+    resources :layers, only: [:destroy]
+    resources :image_layers, except: [:index, :show, :destroy]
+    resources :text_layers, except: [:index, :show, :destroy]
+    resources :paragraph_layers, except: [:index, :show, :destroy]
+    resources :embed_layers, except: [:index, :show, :destroy]
+    resources :animation_layers, except: [:index, :show, :destroy]
+  end
+
   resources :pages do
-    put 'blocks', to: 'blocks#update_all'
-    resources :blocks do
-      resources :layers, only: [:destroy]
-      resources :image_layers, except: [:index]
-    end
+    put 'add_block'
+    delete 'remove_block'
+    put 'edit', to: 'pages#update_blocks'
   end
 
   devise_for :user,
@@ -24,4 +31,5 @@ Flms::Engine.routes.draw do
   resources :users, only: [:index, :new, :create, :destroy]
 
   root :to => 'dashboard#index'
+
 end

data/config/s3.yml.example

@@ -0,0 +1,14 @@
+development:
+  bucket: YOUR_BUCKET_ID
+  access_key_id: YOUR_KEY_ID
+  secret_access_key: YOUR_SECRET_ACCESS_KEY
+
+test:
+  bucket: YOUR_BUCKET_ID
+  access_key_id: YOUR_KEY_ID
+  secret_access_key: YOUR_SECRET_ACCESS_KEY
+
+production:
+  bucket: YOUR_BUCKET_ID
+  access_key_id: YOUR_KEY_ID
+  secret_access_key: YOUR_SECRET_ACCESS_KEY

data/db/migrate/{20130302011705_create_flms_blocks.rb → 20130302011705_flms_create_blocks.rb}

@@ -1,7 +1,9 @@
-class CreateFlmsBlocks < ActiveRecord::Migration
+class FlmsCreateBlocks < ActiveRecord::Migration
   def change
     create_table :flms_blocks do |t|
       t.string :name
+      t.string :title
+      t.string :thumbnail
 
       t.timestamps
     end

data/db/migrate/{20130302015459_create_flms_blocks_pages.rb → 20130302015459_flms_create_blocks_pages.rb}

@@ -1,4 +1,4 @@
-class CreateFlmsBlocksPages < ActiveRecord::Migration
+class FlmsCreateBlocksPages < ActiveRecord::Migration
   def change
     create_table :flms_blocks_pages do |t|
       t.integer :block_id

data/db/migrate/20130312220011_flms_create_layers.rb

@@ -0,0 +1,40 @@
+class FlmsCreateLayers < ActiveRecord::Migration
+  def change
+    create_table :flms_layers do |t|
+      t.string    :name
+      t.string    :type
+      t.integer   :block_id
+      t.float     :width
+      t.float     :height
+      t.string    :z_index, default: '0', null: false
+      t.string    :image_display_mode, default: 'cover'
+      t.boolean   :dom_remove, default: true, null: false
+      t.boolean   :active, default: true
+
+      # Image layer attributes
+      t.string    :image
+
+      # Text layer attributes
+      t.string    :text
+      t.float     :font_size
+      t.string    :color
+
+      # Paragraph layer attributes
+      t.string    :header
+      t.text      :body, limit: nil
+
+      # Embed layer attributes
+      t.text      :embed_code, limit: nil
+
+      # Animation layer attributes
+      t.integer   :frame_rate
+      t.integer   :frame_count
+      t.integer   :image_width
+      t.integer   :image_height
+
+      t.timestamps
+    end
+
+    add_index :flms_layers, :block_id
+  end
+end

data/db/migrate/20130327183815_flms_create_keyframes.rb

@@ -0,0 +1,24 @@
+class FlmsCreateKeyframes < ActiveRecord::Migration
+  def change
+    create_table :flms_keyframes do |t|
+      t.timestamps
+      t.integer   :layer_id, nil: false
+      t.string    :type
+
+      t.integer   :scroll_start
+      t.integer   :scroll_duration
+
+      t.float     :width
+      t.float     :height
+      t.float     :position_x
+      t.float     :position_y
+      t.float     :margin_left, default: 0, null: false
+      t.float     :margin_top, default: 0, null: false
+
+      t.float     :opacity
+      t.float     :scale
+      t.float     :blur
+
+    end
+  end
+end

data/lib/flms/css_name_validator.rb

@@ -0,0 +1,9 @@
+module Flms
+  class CssNameValidator < ActiveModel::EachValidator
+    def validate_each object, attribute, value
+      unless value =~ /^[_a-zA-Z]+[_a-zA-Z0-9-]*$/
+        object.errors[attribute] << (options[:message] || 'must be a valid CSS name')
+      end
+    end
+  end
+end

data/lib/flms/version.rb

@@ -1,3 +1,3 @@
 module Flms
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/tasks/flms_tasks.rake

@@ -1,3 +1,4 @@
+require 'io/console'
 namespace :flms do
 
   desc 'Creates a user account'
@@ -6,21 +7,60 @@ namespace :flms do
     # Check params.
     unless args.email
       puts "Error: parameter 'email' not provided."
+      puts "usage: rake flms:create_user[YourEmailAddressHere@example.com]"
       exit
     end
 
     # Read the password from the command line.
     print "Please enter the password for the new user: "
-    password = STDIN.gets.chomp
+    password = STDIN.noecho(&:gets).chomp
+    puts
 
     # Get user.
-    unless Flms::User.create email: args.email, password: password, password_confirmation: password
+    begin
+      Flms::User.create! email: args.email, password: password, password_confirmation: password
+    rescue => e
       puts "Error: user with email '#{args.email}' could not be created."
-      exit
+      puts e.message
+    else
+      puts "User #{args.email} created."
     end
 
-    puts "User #{args.email} created."
   end
-end
-
 
+  desc 'Update layers in DB from video to embed layer naming'
+  task :convert_video_to_embed => :environment do
+      Flms::Layer.update_all("type = 'Flms::EmbedLayer'", "type = 'Flms::VideoLayer'")
+  end
+  
+  namespace :generate do
+    desc 'Generate FLMS views in app for additional modification'
+    task :views do
+      flms_view_dir = File.expand_path("../../../app/views/flms/*", __FILE__)
+      unless Dir.exists?("app/views/flms")
+        FileUtils.mkdir "app/views/flms"
+        FileUtils.cp_r Dir[flms_view_dir], "app/views/flms/"
+      end
+    end
+    
+    desc "Generate FLMS assets in app for additional modification"
+    task :assets do
+      flms_assets_dir = File.expand_path("../../../app/assets/stylesheets/*",__FILE__)
+      unless Dir.exists?("app/assets/stylesheets/flms")
+        FileUtils.cp_r Dir[flms_assets_dir], "app/assets/stylesheets"
+      end
+    end
+  end
+  
+  namespace :destroy do
+    desc "Remove FLMS views from app"
+    task :views do
+      FileUtils.rm_rf "app/views/flms"
+    end
+    
+    desc "Remove FLMS assets from app"
+    task :assets do
+      FileUtils.rm_rf "app/assets/stylesheets/flms"
+    end
+  end
+end

data/spec/controllers/animation_layers_controller_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Flms::AnimationLayersController do
+  include NamedFactories
+
+  describe 'new' do
+    describe 'access control' do
+      let(:request) { get :new, block_id: block_1a.id, use_route: :flms }
+      it_should_behave_like 'an action accessible only to logged-in users'
+    end
+
+    describe 'functionality' do
+      it 'provides an animation layer with associated keyframes' do
+        sign_in user
+        get :new, block_id: block_1a.id, use_route: :flms
+        expect(assigns(:layer).start_state_keyframe).not_to be_nil
+        expect(assigns(:layer).target_state_keyframe).not_to be_nil
+        expect(assigns(:layer).end_state_keyframe).not_to be_nil
+      end
+    end
+  end
+
+  describe 'create' do
+    describe 'access control' do
+      let(:request) do
+        layer = attributes_for(:animation_layer).merge(start_state_keyframe_attributes: attributes_for(:start_state_keyframe),
+                                                       target_state_keyframe_attributes: attributes_for(:target_state_keyframe),
+                                                       end_state_keyframe_attributes: attributes_for(:end_state_keyframe))
+        post :create, block_id: block_1a.id, animation_layer: layer, use_route: :flms
+      end
+      let(:access_granted_check) { response.status == 302 && response.location == "http://test.host/flms/blocks/#{block_1a.id}/edit" }
+      let(:database_performed_check) { Flms::AnimationLayer.count == 1 }
+      it_should_behave_like 'an action accessible only to logged-in users'
+    end
+  end
+
+end
+