lalala 4.0.0.dev.74 → 4.0.0.dev.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf0f41182685c5c91f623dcbd13be5443360e45
-  data.tar.gz: e385b24daef3931fd1f8a106dc7adf2dc455247c
+  metadata.gz: eca214b570a80c6ef65081749a0411536cbe2d80
+  data.tar.gz: 16afe6226f571dbfbba05f2169142f99af4b91ae
 SHA512:
-  metadata.gz: dbeca1d4d11adfc22e88bd7c173546f795d718b61fdf1d4bad97203b218c2437a846b4366d95b7f80d9603b557adc30a35ed3685878d93cd09ed14ec9c6725d2
-  data.tar.gz: e312e92cf0b2b31ed69d7bde78770f65cfa752ea2c3231dd6d67ff84533d230c3bb4da9ad420dbee90e4468e10ed6c57fc509af4a73034c24c90fb2a0e9f41ef
+  metadata.gz: 357b20d0754a830fc69307e156a6b7c12cc24e10165417262afcd51e5c47b74ff55ecfcaeb92137d3fb38d6868bf6a54c770bf1a5e38fee335d8020781765d04
+  data.tar.gz: c38ce6259edc9fe7ce8594e3093abcfa382ecb0d71407265f349ae11b75e34cb04576b0dfe8025cd67f732e2a090e27bd12e11731340140015e2ee360b141aaa

data/config/initializers/carrierwave.rb

@@ -1,65 +1,26 @@
-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
+#  Carrier Wave configuration block
 #
-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']
-    config.asset_host = "http://#{s3['vhost']}"
-  elsif s3['bucket'] and s3['bucket'].index(".")
-    config.asset_host = "http://#{s3['bucket']}.s3.amazonaws.com"
-  end
+CarrierWave.configure do |config|
 
-  config.fog_credentials = credentials
-  config.fog_directory = s3['vhost'] || s3['bucket']
-end
+  if Rails.env.production? or Rails.env.staging?
 
+    config.storage = :fog
+    config.root = Rails.root.join('tmp')
+    config.cache_dir = 'uploads'
 
-def configure_filesystem(config)
-  config.storage = :file
-end
+    config.fog_credentials = {
+      provider:              'AWS',
+      aws_access_key_id:     ENV["LALALA_S3_ACCESS_KEY"],
+      aws_secret_access_key: ENV["LALALA_S3_SECRET_KEY"]
+    }
 
+    config.fog_directory   = ENV["LALALA_S3_BUCKET"]
+    config.fog_attributes  = {'Cache-Control'=>'max-age=315576000'}
 
 
-#
-#  Carrier Wave configuration block
-#
-CarrierWave.configure do |config|
-  s3 = storage_config
+  else # dev
+    config.storage = :file
 
-  if s3
-    configure_s3(config, s3)
-  else
-    configure_filesystem(config)
   end
 end

data/lib/lalala/development.rb

@@ -5,6 +5,10 @@ module Lalala
   require 'pry-rails'
   require 'better_errors'
 
+  autoload :ExtBetterErrors
+
+  Lalala::ExtBetterErrors.patch!
+
 end
 
 if defined?(Rails::Generators)

data/lib/lalala/ext_better_errors/middleware.rb

@@ -0,0 +1,15 @@
+module Lalala::ExtBetterErrors::Middleware
+  extend ActiveSupport::Concern
+
+  included do
+    remove_method :allow_ip?
+    alias_method :allow_ip?, :_ng_allow_ip?
+  end
+
+private
+
+  def _ng_allow_ip?(env)
+    true
+  end
+
+end

data/lib/lalala/ext_better_errors.rb

@@ -0,0 +1,10 @@
+module Lalala::ExtBetterErrors
+  extend ActiveSupport::Autoload
+
+  autoload :Middleware
+
+  def self.patch!
+    BetterErrors::Middleware.send :include, Lalala::ExtBetterErrors::Middleware
+  end
+
+end

data/lib/lalala/uploaders/image.rb

@@ -5,7 +5,19 @@ class Lalala::Uploaders::Image < CarrierWave::Uploader::Base
   include Sprockets::Helpers::IsolatedHelper
 
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{model.id}"
+    if Rails.env.production? or Rails.env.staging?
+      "#{model.class.to_s.underscore}/#{model.id}"
+    else
+      "uploads/#{model.class.to_s.underscore}/#{model.id}"
+    end
+  end
+
+  def url(*)
+    if Rails.env.production? or Rails.env.staging?
+      File.join("/store/assets", super)
+    else
+      super
+    end
   end
 
   def extension_white_list

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "74"
+  BUILD   = "77"
 
   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.74
+  version: 4.0.0.dev.77
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -1469,6 +1469,8 @@ files:
 - lib/lalala/ext_active_record/schema.rb
 - lib/lalala/ext_active_record/schema/join_table.rb
 - lib/lalala/ext_active_record/schema/join_table_inverter.rb
+- lib/lalala/ext_better_errors.rb
+- lib/lalala/ext_better_errors/middleware.rb
 - lib/lalala/ext_i18n.rb
 - lib/lalala/ext_i18n/input_helper.rb
 - lib/lalala/ext_i18n/negotiation_adapter.rb