lalala 4.0.0.dev.416 → 4.1.0.dev.299

data/lib/formtastic/inputs/haraway_input.rb

@@ -0,0 +1,151 @@
+class Formtastic::Inputs::HarawayInput
+  include Formtastic::Inputs::Base
+
+  def to_html
+    object = builder.object
+    klass = Formtastic::Inputs::HarawayInput
+    param_key = "#{object.class.table_name.singularize}[#{method}]"
+    title = method.to_s.pluralize.titleize
+    assets = object.send(method)
+    accepts = Haraway.configuration.profiles[method.to_s].try(:accepted_file_types)
+    accepts = accepts.join(", ") if accepts
+
+    sorted_assets = klass.sorted_assets(assets.clone).map do |asset|
+      klass.xfile_html(self, template, param_key, asset)
+    end
+
+    <<-EOT
+
+    <x-files profile="#{method}" accept="#{accepts}" name="#{param_key}">
+      <header>
+        <div class="col-a">
+          <span class="name">#{title}</span>
+          <a class="choose">Browse files</a>
+        </div>
+        <div class="col-b">
+          <div class="info-button"></div>
+          <div class="data-inspection"></div>
+        </div>
+      </header>
+
+      <template class="x-file-template">
+        <div class="title"></div>
+        <div class="status-bar">
+          <div class="upload-bar"></div>
+          <div class="process-bar"></div>
+        </div>
+
+        #{ klass.menu_html }
+      </template>
+
+      <template class="form-template">
+        #{ asset_attributes_form(template, param_key) }
+      </template>
+
+      <div class="file-container">
+        <div class="inner-wrapper">
+          #{ sorted_assets.join("") }
+        </div>
+      </div>
+
+      <div class="meta-versions">
+        #{ versions(method) }
+      </div>
+    </x-files>
+
+    EOT
+  end
+
+
+  def asset_attributes_form(template, param_key, asset=nil)
+    if block = @options[:block]
+      h = @builder.semantic_fields_for(@method, asset, index: "", &block)
+    else
+      h = ""
+    end
+
+    # select
+    h.gsub!("<select ", "<select class=\"bypass-chosen\" ")
+
+    # return
+    h
+  end
+
+
+  def versions(profile)
+    profile = Haraway.configuration.profiles[profile.to_s]
+
+    # collect data
+    if profile
+      versions = profile.versions.keys.map do |key|
+        version = profile.versions[key.to_s]
+
+        OpenStruct.new(
+          name: version.name,
+          params: version.steps.first.try(:[], "params")
+        )
+      end.compact
+
+    else
+      versions = []
+
+    end
+
+    # make html
+    versions.map do |version|
+      <<-EOS
+        <script class="version" data-name="#{version.name}" type="application/json">
+          #{version.params.to_json}
+        </script>
+      EOS
+    end.join("")
+  end
+
+
+  #
+  #  Utilities
+  #
+  def self.sorted_assets(array)
+    array
+  end
+
+
+  def self.xfile_html(input, template, param_key, asset)
+    asset_url_original = (asset.url(:original) rescue "")
+    asset_url_thumb = (asset.url(:thumb) rescue "")
+
+    <<-EOT
+
+    <x-file class="uploaded saved-to-db" data-src-original="#{ asset_url_original }">
+      <div class="thumb" style="background-image: url(#{ asset_url_thumb });"></div>
+
+      #{ Formtastic::Inputs::HarawayInput.menu_html }
+      #{ template.hidden_field_tag(param_key + "[][id]", asset.id) }
+      #{ template.hidden_field_tag(param_key + "[][_destroy]", "") }
+
+      <div class="attributes">
+        #{ input.asset_attributes_form(template, param_key, asset) }
+      </div>
+
+      <div class="meta">
+        <div class="row"></div>
+      </div>
+    </x-file>
+
+    EOT
+  end
+
+
+  def self.menu_html
+    <<-EOT
+
+    <div class="menu">
+      <a data-action="delete"></a>
+      <a data-action="meta"></a>
+      <a data-action="move"></a>
+    </div>
+
+    EOT
+  end
+
+end

data/lib/generators/lalala/assets/templates/bower.json.erb

@@ -4,7 +4,7 @@
   "version": "0.0.1",
   "main": "javascripts/application.js",
   "dependencies": {
-    "jquery": "~1",
+    "jquery": "~1.10.2",
     "modernizr": "~2.7.1",
     "respond": "~1.4.2",
     "normalize-scss": "~2.1.3"

data/lib/generators/lalala/install/install_generator.rb

@@ -60,30 +60,11 @@ module Lalala
         template 'dashboard.rb', 'app/admin/dashboard.rb'
       end
 
-      def setup_uploaders
-        empty_directory "app/uploaders"
-        copy_file "uploaders/file_uploader.rb", "app/uploaders/file_uploader.rb"
-        copy_file "uploaders/image_uploader.rb", "app/uploaders/image_uploader.rb"
-      end
-
       def setup_environment_configs
         template "staging.rb.erb", "config/environments/staging.rb"
         gsub_file "config/environments/production.rb", "  # config.assets.precompile += %w( search.js )", "  config.assets.precompile += %w( modernizr.js )"
       end
 
-      def setup_helpers
-        empty_directory "app/helpers"
-        copy_file "helpers/application_helper.rb", "app/helpers/application_helper.rb"
-        template "helpers/open_graph_helper.rb.erb", "app/helpers/open_graph_helper.rb"
-        copy_file "helpers/html_helper.rb", "app/helpers/html_helper.rb"
-        copy_file "helpers/pages_helper.rb", "app/helpers/pages_helper.rb"
-      end
-
-      def setup_locales
-        empty_directory 'config/locales'
-        copy_file 'locales/en.yml', 'config/locales/en.yml'
-      end
-
       def setup_forklift
         empty_directory ".forklift"
       end
@@ -92,10 +73,6 @@ module Lalala
         copy_file 'application_mailer.html.erb', 'app/views/layouts/application_mailer.html.erb'
       end
 
-      def copy_default_layout
-        copy_file 'application.html.erb', 'app/views/layouts/application.html.erb'
-      end
-
       def create_assets
         generate "lalala:assets"
       end

data/lib/lalala/admin/pages.rb

@@ -1,24 +1,11 @@
 if defined?(ActiveAdmin) and defined?(ApplicationPage)
   ActiveAdmin.register ApplicationPage, :as => 'Page' do
+
     menu priority: 20, html_options: { class: 'icon-page' }
 
     config.filters  = false
     config.paginate = false
 
-    # Remove action buttons in topbar
-    config.clear_action_items!
-
-    # Edit button in topbar only on show
-    action_item :only => [:show] do
-      if controller.action_methods.include?('edit')
-        link_to(I18n.t('active_admin.edit_model', :model => active_admin_config.resource_name), edit_resource_path)
-      end
-    end
-
-
-    #
-    # Index
-    #
     index as: :tree_table, paginator: false, download_links: false do
       selectable_column
 
@@ -57,10 +44,6 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage)
 
     end
 
-
-    #
-    # Form
-    #
     form do |f|
       h = "".html_safe
       if f.object.new_record?
@@ -71,10 +54,6 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage)
       h
     end
 
-
-    #
-    # Order action
-    #
     collection_action :order, :method => :put do
       unless Array === params[:ordered_ids]
         render status: 422
@@ -89,10 +68,6 @@ if defined?(ActiveAdmin) and defined?(ApplicationPage)
       render json: { status: "OK" }, status: 200
     end
 
-
-    #
-    # Controller
-    #
     controller do
 
       def new

data/lib/lalala/engine.rb

@@ -12,7 +12,6 @@ module Lalala
     config.lalala = ActiveSupport::OrderedOptions.new
     config.lalala.i18n = ActiveSupport::OrderedOptions.new
     config.lalala.i18n.adapter = nil
-    config.lalala.i18n.allow_accept_language = true
 
     initializer "lalala.migrations" do |app|
       app.class.configure do
@@ -115,9 +114,6 @@ module Lalala
     ActiveRecord::Base.send(
       :include, Lalala::ExtActiveRecord::I18nTranslationsWriter)
 
-    ActiveRecord::Base.send(
-      :include, Lalala::ExtActiveRecord::Assets)
-
   end
 
   ActiveSupport.on_load :action_controller do
@@ -125,9 +121,6 @@ module Lalala
     ActionDispatch::Routing::Mapper.send(
       :include, Lalala::Pages::RouteMapper)
 
-    ActionDispatch::Request.send(
-      :include, Lalala::ExtActionDispatch::MultiFileUpload)
-
     ActionDispatch::Request.send(
       :include, Lalala::ExtActionDispatch::PageName)
 

data/lib/lalala/ext_action_dispatch.rb

@@ -1,6 +1,5 @@
 module Lalala::ExtActionDispatch
   extend ActiveSupport::Autoload
 
-  autoload :MultiFileUpload
   autoload :PageName
 end

data/lib/lalala/ext_active_record/i18n_translations_writer.rb

@@ -21,7 +21,6 @@ module Lalala::ExtActiveRecord::I18nTranslationsWriter
       _locale = I18n.locale
 
       I18n.available_locales.each do |locale|
-        next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
         I18n.locale = locale
         attrs = attributes[locale.to_s]
         if attrs

data/lib/lalala/ext_active_record.rb

@@ -3,5 +3,4 @@ module Lalala::ExtActiveRecord
 
   autoload :Schema
   autoload :I18nTranslationsWriter
-  autoload :Assets
 end

data/lib/lalala/ext_i18n/input_helper.rb

@@ -31,7 +31,6 @@ module Lalala::ExtI18n::InputHelper
       ].flatten.compact
 
       locales.each do |locale|
-        next if Rails.application.config.lalala.i18n.excluded_locales.try(:include?, locale)
         I18n.locale  = locale
         @object_name = "#{_object_name}[translations_writer][#{locale}]"
 

data/lib/lalala/ext_i18n/negotiation_adapter.rb

@@ -28,8 +28,4 @@ class Lalala::ExtI18n::NegotiationAdapter
     %r{^/(lalala|assets)(/|$)} === env['PATH_INFO']
   end
 
-  def allow_accept_language
-    !!Rails.configuration.lalala.i18n.allow_accept_language
-  end
-
 end

data/lib/lalala/ext_i18n/test_negotiation_adapter.rb

@@ -18,8 +18,4 @@ class Lalala::ExtI18n::TestNegotiationAdapter < Lalala::ExtI18n::NegotiationAdap
     @domain_locales[hostname]
   end
 
-  def allow_accept_language
-    true
-  end
-
 end

data/lib/lalala/ext_rack/i18n_negotiator.rb

@@ -63,15 +63,13 @@ private
       return action(true)
     end
 
-    if @adapter.allow_accept_language
-      Rails.logger.debug "[I18n]: try Accept-Language..."
-      if m = accept_language_is_available?
-        @env['rack.locale']           = m[0]
-        @env['SCRIPT_NAME']           = m[1]
-        @env['lalala.cannonical_url'] = m[2]
-        @env['lalala.locale.source']  = 'header'
-        return action(false)
-      end
+    Rails.logger.debug "[I18n]: try Accept-Language..."
+    if m = accept_language_is_available?
+      @env['rack.locale']           = m[0]
+      @env['SCRIPT_NAME']           = m[1]
+      @env['lalala.cannonical_url'] = m[2]
+      @env['lalala.locale.source']  = 'header'
+      return action(false)
     end
 
     @env['rack.locale'] = default_locale_for_hostname.to_sym

data/lib/lalala/markdown/handlers/asset.rb

@@ -0,0 +1,24 @@
+class Lalala::Markdown::Handlers::Asset < Lalala::Markdown::Handlers::Base
+
+  def initialize(options={})
+    @options = options
+  end
+
+  def image(url, alt=nil, title=nil)
+    unless %r|^asset[:]//(.+)$| === url
+      return ""
+    end
+
+    id_with_version = $1.split("/")
+    id = id_with_version[0]
+    version = id_with_version[1] || "original"
+
+    url = "//" + File.join(
+      "c." + Haraway.configuration.endpoint,
+      id,
+      version.to_s)
+
+    "<img src=\"#{url}\" alt=\"#{alt}\" title=\"#{title}\" />"
+  end
+
+end

data/lib/lalala/markdown/handlers/youtube.rb

@@ -18,19 +18,15 @@ class Lalala::Markdown::Handlers::YouTube < Lalala::Markdown::Handlers::Base
 
     id = $1
 
-    helpers.content_tag :span, class: "embed-container is-youtube" do
-      helpers.content_tag(
-        :iframe,
-        "",
-        width:           @options[:width],
-        height:          @options[:height],
-        src:             "//www.youtube.com/embed/#{id}?rel=0",
-        frameborder:     0,
-        allowfullscreen: true
-      )
-    end
-
-
+    helpers.content_tag(
+      :iframe,
+      "",
+      width:           @options[:width],
+      height:          @options[:height],
+      src:             "http://www.youtube.com/embed/#{id}?rel=0",
+      frameborder:     0,
+      allowfullscreen: true
+    )
   end
 
 end

data/lib/lalala/markdown/html_renderer.rb

@@ -1,6 +1,6 @@
 class Lalala::Markdown::HtmlRenderer < Redcarpet::Render::HTML
 
-  URI_PATTERN = %r{\A(lalala|youtube|vimeo|soundcloud)[:][/]{2}.+\Z}
+  URI_PATTERN = %r{\A(lalala|youtube|vimeo|asset)[:][/]{2}.+\Z}
 
   def initialize(options)
     @options      = options.dup
@@ -57,7 +57,7 @@ class Lalala::Markdown::HtmlRenderer < Redcarpet::Render::HTML
     end
 
     options = (@options[:link_attributes] || {}).merge(title: title)
-    helpers.link_to(content.html_safe, link, options)
+    helpers.link_to(content, link, options)
   end
 
   def enhanced_autolink(scheme, link, link_type)

data/lib/lalala/markdown.rb

@@ -8,9 +8,8 @@ class Lalala::Markdown
 
   module Handlers
     require 'lalala/markdown/handlers/base'
+    require 'lalala/markdown/handlers/asset'
     require 'lalala/markdown/handlers/youtube'
-    require 'lalala/markdown/handlers/vimeo'
-    require 'lalala/markdown/handlers/soundcloud'
   end
 
   PARSER_OPTIONS = [
@@ -45,7 +44,7 @@ class Lalala::Markdown
     @parser_options = options.slice(*PARSER_OPTIONS)
     @parser_options = {
       no_intra_emphasis: true,
-      tables: true,
+      tables: false,
       fenced_code_blocks: true,
       autolink: true,
       strikethrough: true,

data/lib/lalala/utils/install_template.rb

@@ -2,15 +2,9 @@ class AppBuilder < Rails::AppBuilder
   include Thor::Actions
   include Thor::Shell
 
-  RUBY_VERSION   = "2.1.7"
-  LALALA_VERSION = "4.0.0.dev"
-
-  # You can test the generator locally by pointing to your local gems:
-  #
-  # gem 'lalala',             path: "~/Github/mrhenry/lalala-ng"
-  # gem 'lalala-development', path: "~/Github/mrhenry/lalala-ng", groups: [:development]
-  # gem 'lalala-assets',      path: "~/Github/mrhenry/lalala-ng", groups: [:development, :assets]
-  # gem 'lalala-test',        path: "~/Github/mrhenry/lalala-ng", groups: [:test]
+  RUBY_VERSION   = "2.0.0"
+  LALALA_VERSION = "4.1.0.dev"
+
   def gemfile
     create_file 'Gemfile', <<-DOC
 

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
-  VERSION = "4.0.0"
-  BUILD   = "416"
+  VERSION = "4.1.0"
+  BUILD   = "299"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/lib/lalala.rb

@@ -1,7 +1,7 @@
 module Lalala
 
-  unless RUBY_VERSION == "2.1.7"
-    raise "Lalala is only compatible with one version of ruby at a time (current: Ruby 2.1.7)"
+  unless RUBY_VERSION == "2.0.0"
+    raise "Lalala is only compatible with one version of ruby at a time (current: Ruby 2.0.0)"
   end
 
   require 'lalala/version'
@@ -12,18 +12,18 @@ module Lalala
 
   groups = Rails.groups(:assets => %w(development test)).map(&:to_sym)
 
+  require 'sentry-raven'
   require 'rails-i18n'
   require 'i18n-country-translations'
-  require 'carrierwave'
   require 'closure_tree'
   require 'globalize3'
   require 'jquery-rails'
   require 'meta_search'
-  require 'mini_magick'
   require 'redcarpet'
   require 'stringex'
   require 'country-select'
   require 'activeadmin'
+  require 'haraway'
 
   if groups.include?(:assets)
     require 'lalala/assets'
@@ -37,8 +37,8 @@ module Lalala
     require 'lalala/test'
   end
 
-  require 'formtastic/inputs/grid_input'
-  require 'formtastic/inputs/single_file_input'
+  require 'formtastic/inputs/haraway_input'
+  require 'formtastic/form_builder_ext'
 
   autoload :ExtActionDispatch
   autoload :ExtActiveRecord
@@ -48,7 +48,6 @@ module Lalala
 
   autoload :Markdown
   autoload :Pages
-  autoload :Uploaders
   autoload :Cache
 
   module Core

data/script/ci

@@ -41,54 +41,57 @@ if [[ "$TRAVIS_SECURE_ENV_VARS" == "true" && "$TRAVIS_PULL_REQUEST" == "false" ]
 then
 
   # Are we in the canonical environment?
-  if [[ "$TRAVIS_BRANCH" == "master" && "$DB" == "postgresql" ]]
+  if [[ "$DB" == "postgresql" ]]
   then
+    if [[ "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "haraway" ]]
+    then
 
-    announce "${yellow}" "Build development gems"
+      announce "${yellow}" "Build development gems"
 
-    export LALALA_BUILD_VERSION="$TRAVIS_BUILD_NUMBER"
+      export LALALA_BUILD_VERSION="$TRAVIS_BUILD_NUMBER"
 
-    { # set the build version
-      cd lib/lalala
-      mv version.rb version.rb_
-      cat version.rb_ | sed "s|{{BUILD_NUMBER}}|$LALALA_BUILD_VERSION|" > version.rb
-      rm version.rb_
-      cd -
-    } > /dev/null
+      { # set the build version
+        cd lib/lalala
+        mv version.rb version.rb_
+        cat version.rb_ | sed "s|{{BUILD_NUMBER}}|$LALALA_BUILD_VERSION|" > version.rb
+        rm version.rb_
+        cd -
+      } > /dev/null
 
 
-    step "${yellow}" "Building lalala"
-    rake lalala:build | indent
+      step "${yellow}" "Building lalala"
+      rake lalala:build | indent
 
-    step "${yellow}" "Building lalala-assets"
-    rake lalala-assets:build | indent
+      step "${yellow}" "Building lalala-assets"
+      rake lalala-assets:build | indent
 
-    step "${yellow}" "Building lalala-development"
-    rake lalala-development:build | indent
+      step "${yellow}" "Building lalala-development"
+      rake lalala-development:build | indent
 
-    step "${yellow}" "Building lalala-test"
-    rake lalala-test:build | indent
+      step "${yellow}" "Building lalala-test"
+      rake lalala-test:build | indent
 
 
-    announce "${yellow}" "Release development gems"
+      announce "${yellow}" "Release development gems"
 
-    mkdir -p "$HOME/.gem/"
-    echo -e "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}" > "$HOME/.gem/credentials"
-    chmod 0600 "$HOME/.gem/credentials"
+      mkdir -p "$HOME/.gem/"
+      echo -e "---\n:rubygems_api_key: ${RUBYGEMS_API_KEY}" > "$HOME/.gem/credentials"
+      chmod 0600 "$HOME/.gem/credentials"
 
-    step "${yellow}" "Releasing lalala"
-    gem push pkg/lalala-[0-9]*.gem | indent
+      step "${yellow}" "Releasing lalala"
+      gem push pkg/lalala-[0-9]*.gem | indent
 
-    step "${yellow}" "Releasing lalala-assets"
-    gem push pkg/lalala-assets-[0-9]*.gem | indent
+      step "${yellow}" "Releasing lalala-assets"
+      gem push pkg/lalala-assets-[0-9]*.gem | indent
 
-    step "${yellow}" "Releasing lalala-development"
-    gem push pkg/lalala-development-[0-9]*.gem | indent
+      step "${yellow}" "Releasing lalala-development"
+      gem push pkg/lalala-development-[0-9]*.gem | indent
 
-    step "${yellow}" "Releasing lalala-test"
-    gem push pkg/lalala-test-[0-9]*.gem | indent
+      step "${yellow}" "Releasing lalala-test"
+      gem push pkg/lalala-test-[0-9]*.gem | indent
 
 
+    fi
   fi
 
 fi