georgia 0.7.6 → 0.7.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/georgia/content-types/jpeg.jpg +0 -0
  3. data/app/assets/javascripts/georgia/components/portlets/slide.js.coffee +2 -0
  4. data/app/controllers/georgia/api/media_controller.rb +2 -7
  5. data/app/controllers/georgia/api/tags_controller.rb +3 -7
  6. data/app/controllers/georgia/application_controller.rb +1 -1
  7. data/app/controllers/georgia/concerns/frontendable.rb +16 -8
  8. data/app/controllers/georgia/media_controller.rb +1 -1
  9. data/app/controllers/georgia/revisions_controller.rb +6 -1
  10. data/app/controllers/georgia/slides_controller.rb +1 -1
  11. data/app/decorators/georgia/content_decorator.rb +9 -0
  12. data/app/helpers/georgia/internationalization_helper.rb +13 -0
  13. data/app/helpers/georgia/pages_helper.rb +8 -0
  14. data/app/helpers/georgia/ui_helper.rb +0 -8
  15. data/app/models/georgia/concerns/contentable.rb +2 -2
  16. data/app/models/georgia/concerns/slugable.rb +2 -0
  17. data/app/models/georgia/widget.rb +3 -3
  18. data/app/presenters/georgia/page_actions_presenter.rb +2 -4
  19. data/app/views/georgia/ckeditor/pictures/_picture.html.erb +1 -1
  20. data/app/views/georgia/revisions/edit.html.erb +2 -2
  21. data/app/views/georgia/revisions/fields/_content.html.erb +1 -14
  22. data/app/views/georgia/slides/new.html.erb +1 -1
  23. data/app/views/georgia/widgets/_widget.html.erb +4 -3
  24. data/app/views/georgia/widgets/index.html.erb +2 -0
  25. data/lib/georgia.rb +0 -1
  26. data/lib/georgia/engine.rb +2 -0
  27. data/lib/georgia/indexer.rb +6 -36
  28. data/lib/georgia/indexer/adapter.rb +44 -0
  29. data/lib/georgia/indexer/extensions/solr_adapter/acts_as_taggable_on/tag.rb +9 -0
  30. data/lib/georgia/indexer/extensions/tire_adapter/{acts_as_taggable_on_tag.rb → acts_as_taggable_on/tag.rb} +1 -1
  31. data/lib/georgia/indexer/extensions/tire_adapter/ckeditor/asset.rb +53 -0
  32. data/lib/georgia/indexer/extensions/tire_adapter/{georgia_page.rb → georgia/page.rb} +3 -3
  33. data/lib/georgia/indexer/solr_adapter.rb +9 -4
  34. data/lib/georgia/indexer/tire_adapter.rb +10 -9
  35. data/lib/georgia/version.rb +1 -1
  36. data/lib/tasks/assets.rake +0 -86
  37. data/lib/tasks/solr.rake +0 -9
  38. metadata +307 -307
  39. data/lib/georgia/assets.rb +0 -8
  40. data/lib/georgia/assets/cloud_files_connection.rb +0 -22
  41. data/lib/georgia/assets/transferable_picture.rb +0 -51
  42. data/lib/georgia/indexer/extensions/tire_adapter/ckeditor_asset.rb +0 -41
@@ -1,8 +0,0 @@
1
- module Georgia
2
- module Assets
3
-
4
- require 'georgia/assets/cloud_files_connection'
5
- require 'georgia/assets/transferable_picture'
6
-
7
- end
8
- end
@@ -1,22 +0,0 @@
1
- class CloudFilesConnection
2
-
3
- attr_accessor :connection
4
-
5
- def initialize
6
- @connection = CloudFiles::Connection.new(username: credentials[:rackspace_username], api_key: credentials[:rackspace_api_key])
7
- puts "Successfully logged in to Rackspace Cloud files\n"
8
- end
9
-
10
- def credentials
11
- @credentials ||= CarrierWave::Uploader::Base.fog_credentials
12
- end
13
-
14
- def container
15
- @container ||= connection.container(CarrierWave::Uploader::Base.fog_directory)
16
- end
17
-
18
- def asset_host
19
- @asset_host ||= CarrierWave::Uploader::Base.asset_host
20
- end
21
-
22
- end
@@ -1,51 +0,0 @@
1
- class TransferablePicture
2
-
3
- attr_accessor :asset, :container
4
-
5
- def initialize asset, container
6
- @asset = asset
7
- @container = container
8
- end
9
-
10
- def process
11
- copy_file
12
- recreate_versions!
13
- end
14
-
15
- private
16
-
17
- def asset_host
18
- @asset_host ||= CarrierWave::Uploader::Base.asset_host
19
- end
20
-
21
- def filename
22
- @filename ||= asset.data_file_name
23
- end
24
-
25
- def old_path
26
- @old_path ||= 'system/ckeditor_assets/pictures/' + filename
27
- end
28
-
29
- def new_path
30
- @new_path ||= "assets/#{asset.id}/" + filename
31
- end
32
-
33
- def copy_file
34
- if container.object_exists?(old_path)
35
- if !container.object_exists?(new_path)
36
- container.object(old_path).copy(name: new_path)
37
- # asset.remote_data_url = asset_host + '/' + new_path
38
- puts "#{filename} copied from #{old_path} to #{new_path}"
39
- else
40
- puts "#{new_path} destination already exists"
41
- end
42
- else
43
- puts "#{old_path} does not exists"
44
- end
45
- end
46
-
47
- def recreate_versions!
48
- puts "#{filename} versions recreated" if asset.data.recreate_versions!
49
- end
50
-
51
- end
@@ -1,41 +0,0 @@
1
- require 'active_support/concern'
2
-
3
- module Georgia
4
- module Indexer
5
- class TireAdapter
6
- module CkeditorAssetExtension
7
-
8
- extend ActiveSupport::Concern
9
-
10
- included do
11
-
12
- include ::Tire::Model::Search
13
- include ::Tire::Model::Callbacks
14
-
15
- mapping do
16
- indexes :id, :index => :not_analyzed
17
- indexes :filename
18
- indexes :tags
19
- indexes :extension
20
- indexes :updated_at, :type => 'date'
21
- end
22
-
23
- def self.search model, params
24
- model.tire.search(page: (params[:page] || 1), per_page: (params[:per] || 8)) do
25
- if params[:query].present?
26
- query do
27
- boolean do
28
- must { string params[:query], default_operator: "AND" }
29
- end
30
- end
31
- sort { by (params[:o] || :updated_at), (params[:dir] || :desc) }
32
- end
33
- end.results
34
- end
35
-
36
- end
37
-
38
- end
39
- end
40
- end
41
- end