lalala 4.0.0.dev.59 → 4.0.0.dev.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e155b5eaa44f5404e533fa1b34ed2c022c8cbfb3
-  data.tar.gz: 80ca6f3dcd83419994e83b77a4f64756c86bf54a
+  metadata.gz: d45165d6eb01c7a399a1a3c65b3cba801970c56e
+  data.tar.gz: 0a7dd6a6a8a37c1ac557ac2d2e1341264c446471
 SHA512:
-  metadata.gz: 88785acc4ae3cba0cfaadb7d3d4f07367fdeb56eee02bac3e01127d8b4d56e433284a9c83a3c3e7929e20f2acd2f9e9e4a60a8ba51b420ef436cc5b37931737a
-  data.tar.gz: 925eb61bfffb558d6e4f9ca9ab188313a4d2d182b3532da2babb4f21125a5fc0d3286a1fd8a3785913503f306b66b5d8a740aacc12e1cb2cd58d3aafa9d3fcba
+  metadata.gz: d968fe1178068b322d6d4c1baa9edea4220354c9efa2fd4472aaea174d4548533c162c1a43fde8a89e62e388c1b99f1b1351cabaf899bf1245a7ab2b7a0e9dba
+  data.tar.gz: 4dbb37c1e019ff85d1103e29faacc9a970a7d87e316b1d06a61e485d969c797cc2dec42e3a02bd4546018814d11fb49c4c36f8bf511505b3c22891c3b3832ff2

data/config/initializers/carrierwave.rb

@@ -0,0 +1,63 @@
+def storage_config
+  path = File.join(Rails.root.to_s, 'config/filesystem.yml')
+  unless File.file?(path)
+    return nil
+  end
+
+  config = YAML::load(ERB.new(File.read(path)).result)
+  unless Hash === config
+    return nil
+  end
+
+  config = config[Rails.env.to_s]
+  unless Hash === config
+    return nil
+  end
+
+  config
+end
+
+
+
+#
+#  Configuration types
+#
+def configure_s3(config, s3)
+  config.storage = :fog
+  config.root = Rails.root.join('tmp')
+  config.cache_dir = 'uploads'
+
+  credentials = {
+    provider: 'AWS',
+    aws_access_key_id: s3['access_key_id'],
+    aws_secret_access_key: s3['secret_access_key'],
+    region: 'eu-west-1'
+  }
+
+  if s3['vhost']
+    credentials.merge!(host: s3['vhost'])
+  end
+
+  config.fog_credentials = credentials
+  config.fog_directory = s3['vhost'] || s3['bucket']
+end
+
+
+def configure_filesystem(config)
+  config.storage = :file
+end
+
+
+
+#
+#  Carrier Wave configuration block
+#
+CarrierWave.configure do |config|
+  s3 = storage_config
+
+  if s3
+    configure_s3(config, s3)
+  else
+    configure_filesystem(config)
+  end
+end

data/lalala.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |gem|
 
   # generic
   gem.add_runtime_dependency 'carrierwave',               '= 0.8.0'
+  gem.add_runtime_dependency 'fog',                       '= 1.10.0'
   gem.add_runtime_dependency 'globalize3',                '= 0.3.0'
   gem.add_runtime_dependency 'jquery-rails',              '= 2.2.1'
   gem.add_runtime_dependency 'meta_search',               '= 1.1.3'

data/lib/lalala/uploaders/image.rb

@@ -4,10 +4,8 @@ class Lalala::Uploaders::Image < CarrierWave::Uploader::Base
   include Sprockets::Helpers::RailsHelper
   include Sprockets::Helpers::IsolatedHelper
 
-  storage :file
-
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "uploads/#{model.class.to_s.underscore}/#{model.id}"
   end
 
   def extension_white_list

data/lib/lalala/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.59
+  version: 4.0.0.dev.60
 platform: ruby
 authors:
 - Simon Menke
@@ -29,6 +29,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: globalize3
   requirement: !ruby/object:Gem::Requirement
@@ -1396,7 +1410,6 @@ files:
 - app/assets/stylesheets/lalala/modules/_flashes.css.scss
 - app/assets/stylesheets/lalala/modules/_footer.css.scss
 - app/assets/stylesheets/lalala/modules/_grid.css.scss
-- app/assets/stylesheets/lalala/modules/_grids.css.scss
 - app/assets/stylesheets/lalala/modules/_header.css.scss
 - app/assets/stylesheets/lalala/modules/_index-as-table.css.scss
 - app/assets/stylesheets/lalala/modules/_index-as-tree-table.css.scss
@@ -1418,6 +1431,7 @@ files:
 - app/views/lalala/public/pages/show.html.erb
 - app/views/layouts/lalala/markdown.html.erb
 - config/initializers/active_admin.rb
+- config/initializers/carrierwave.rb
 - config/routes.rb
 - lalala-assets.gemspec
 - lalala-development.gemspec

data/app/assets/stylesheets/lalala/modules/_grids.css.scss

@@ -1,75 +0,0 @@
-/*
-
-  GRIDS
-  --------
-
-*/
-
-.mod-grid {
-  .images,
-  .input-fields {
-    overflow: hidden;
-  }
-
-  // [row]
-  li {
-    float: left;
-    margin: 0 11px 11px 0;
-    position: relative;
-
-    &, .image, .overlay {
-      height: 100px;
-      width: 100px;
-    }
-
-    &.move,
-    &.properties,
-    &.selected,
-    &.will-destroy { .overlay { display: block; }}
-  }
-
-  // [row]:types
-  li.move label { cursor: move; }
-  li.properties { cursor: pointer; }
-  li.selected .overlay { background: rgba($yellow, .5); }
-  li.will-destroy .overlay,
-  li.selected.will-destroy .overlay { background: rgba($red, .5); }
-
-  // image + overlay
-  li .image,
-  li .overlay {
-    left: 0;
-    position: absolute;
-    top: 0;
-  }
-
-  li .image {
-    z-index: 0;
-  }
-
-  li .overlay {
-    background: rgba(black, .5);
-    display: none;
-    z-index: 1;
-  }
-
-  // label
-  li label {
-    @include border-radius(2px);
-    background: #fff;
-    bottom: 6px;
-    color: #4f4f4f;
-    font-size: 9px;
-    height: 16px;
-    line-height: 16px;
-    left: 9px;
-    overflow: hidden;
-    padding: 2px 6px 1px;
-    position: absolute;
-    right: 9px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    z-index: 2;
-  }
-
-}