ecm_pictures2 1.1.2 → 2.0.0

data/db/migrate/003_create_ecm_pictures_attached_pictures.rb

@@ -2,9 +2,8 @@ class CreateEcmPicturesAttachedPictures < ActiveRecord::Migration
   def change
     create_table :ecm_pictures_attached_pictures do |t|
       t.references :ecm_pictures_picture
-      t.references :pictureable, :polymorphic => true
+      t.references :pictureable, polymorphic: true
       t.timestamps
     end
   end
 end
-

data/lib/ecm/pictures/active_admin/pictureable_helper.rb

@@ -1,54 +1,56 @@
-require 'active_admin'
+if Gem::Specification.find_all_by_name('activeadmin').any?
+  require 'active_admin'
 
-module Ecm::Pictures
-  module ActiveAdmin
-    module PictureableHelper
-      def form_inputs_for_pictureable(f)
-        f.inputs do
-          f.has_many :pictures do |p|
-            p.input :name
-            p.input :image, :as => :file, :hint => p.template.image_tag(p.object.image.url(:default_thumb))
-            p.input :description
-            p.input :markup_language, :as => :select, :collection => Ecm::Pictures::Configuration.markup_languages
-          end # f.has_many :pictures
-        end # f.inputs
+  module Ecm::Pictures
+    module ActiveAdmin
+      module PictureableHelper
+        def form_inputs_for_pictureable(f)
+          f.inputs do
+            f.has_many :pictures do |p|
+              p.input :name
+              p.input :image, as: :file, hint: p.template.image_tag(p.object.image.url(:default_thumb))
+              p.input :description
+              p.input :markup_language, as: :select, collection: Ecm::Pictures::Configuration.markup_languages
+            end
+          end
 
-        f.inputs do
-          f.has_many :attached_pictures do |p|
-            p.input :picture, :as => :select,
-                              :collection => Ecm::Pictures::Picture.all.collect do |picture|
-                                [picture, picture.id, {:style => "background-image: url('#{picture.image.url(:medium_thumb)}'); width: #{Ecm::Pictures::Configuration.paperclip_options[:styles][:medium_thumb].split('x').first}px; height: #{Ecm::Pictures::Configuration.paperclip_options[:styles][:medium_thumb].split('x').last}px; background-repeat: no-repeat; background-position: center;"}]
+          f.inputs do
+            f.has_many :attached_pictures do |p|
+              p.input :picture, as: :select,
+                                collection: Ecm::Pictures::Picture.all.collect do |picture|
+                [picture, picture.id, { style: "background-image: url('#{picture.image.url(:medium_thumb)}'); width: #{Ecm::Pictures::Configuration.paperclip_options[:styles][:medium_thumb].split('x').first}px; height: #{Ecm::Pictures::Configuration.paperclip_options[:styles][:medium_thumb].split('x').last}px; background-repeat: no-repeat; background-position: center;" }]
+              end
             end
-          end # f.has_many :attached_pictures
-        end # f.inputs
-      end # def
+          end
+        end
 
-      def panel_for_pictureable
-        panel Ecm::Pictures::PictureGallery.human_attribute_name(:pictures) do
-          table_for resource.pictures, :i18n => Ecm::Pictures::Picture do
-            sortable_columns
-            column :thumbnail do |picture|
-              link_to(image_tag(picture.image.url(:default_thumb)), [:admin, picture])
-            end # column
-            column :name
-            column :image_file_size, :sortable => :image_file_size do |picture|
-              number_to_human_size(picture.image_file_size)
-            end # column
-            column :created_at
-            column do |picture|
-              link_to(I18n.t('active_admin.view'), [:admin, picture], :class => "member_link view_link") +
-              link_to(I18n.t('active_admin.edit'), [:edit, :admin, picture], :class => "member_link edit_link") +
-              link_to(I18n.t('active_admin.delete'), [:admin, picture], :class => "member_link delete_link", :method => :delete) +
-              link_to(I18n.t('active_admin.delete_link'), [:admin, picture.attached_pictures.where(:pictureable_type => resource.class, :pictureable_id => resource).first], :class => "member_link delete_link", :method => :delete)
-            end # column
-          end # table_for
-        end # panel
-      end # def
-    end # module PictureableHelper
-  end # module ActiveAdmin
-end # module Ecm::Pictures
+        def panel_for_pictureable
+          panel Ecm::Pictures::PictureGallery.human_attribute_name(:pictures) do
+            table_for resource.pictures, i18n: Ecm::Pictures::Picture do
+              sortable_columns
+              column :thumbnail do |picture|
+                link_to(image_tag(picture.image.url(:default_thumb)), [:admin, picture])
+              end # column
+              column :name
+              column :image_file_size, sortable: :image_file_size do |picture|
+                number_to_human_size(picture.image_file_size)
+              end # column
+              column :created_at
+              column do |picture|
+                link_to(I18n.t('active_admin.view'), [:admin, picture], class: 'member_link view_link') +
+                  link_to(I18n.t('active_admin.edit'), [:edit, :admin, picture], class: 'member_link edit_link') +
+                  link_to(I18n.t('active_admin.delete'), [:admin, picture], class: 'member_link delete_link', method: :delete) +
+                  link_to(I18n.t('active_admin.delete_link'), [:admin, picture.attached_pictures.where(pictureable_type: resource.class, pictureable_id: resource).first], class: 'member_link delete_link', method: :delete)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
 
-::ActiveAdmin::ResourceDSL.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
-::ActiveAdmin::Views::Pages::Show.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
-::ActiveAdmin::Views::Pages::Form.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
-::ActiveAdmin::Views::ActiveAdminForm.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
+  ::ActiveAdmin::ResourceDSL.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper 
+  ::ActiveAdmin::Views::Pages::Show.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
+  ::ActiveAdmin::Views::Pages::Form.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
+  ::ActiveAdmin::Views::ActiveAdminForm.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
+end

data/lib/ecm/pictures/configuration.rb

@@ -28,10 +28,6 @@ module Ecm
       mattr_accessor :prevent_textile_rendering_in_html do
         true
       end
-
-      # def paperclip_options=(paperclip_options)
-      #   @@paperclip_options = picture_image_styles.with_indifferent_access
-      # end
     end
   end
 end

data/lib/ecm/pictures/engine.rb

@@ -3,10 +3,9 @@ module Ecm
     class Engine < Rails::Engine
       initializer :ecm_pictures_engine do
         ::ActiveAdmin.setup do |config|
-          config.load_paths << File.join(self.root, 'app/admin')
+          config.load_paths << File.join(root, 'app', 'admin')
         end
-      end
+      end if Gem::Specification.find_all_by_name('activeadmin').any?
     end
   end
 end
-

data/lib/ecm/pictures/routing.rb

@@ -9,14 +9,13 @@ module Ecm
       # This will only create the show action for picture galleries, but omit the index action.
       def self.routes(router, options = {})
         options.reverse_merge!(
-          { :picture_gallery_actions => [:index, :show], 
-            :picture_actions => [:index, :show] 
-          }
+          picture_gallery_actions: [:index, :show],
+          picture_actions: [:index, :show]
         )
-        
-        router.resources :ecm_pictures_picture_galleries, :only => options[:picture_gallery_actions], :controller => 'ecm/pictures/picture_galleries'
-        router.resources :ecm_pictures_pictures,:only => options[:picture_actions], :controller => 'ecm/pictures/pictures'      
-      end  
+
+        router.resources :ecm_pictures_picture_galleries, only: options[:picture_gallery_actions], controller: 'ecm/pictures/picture_galleries'
+        router.resources :ecm_pictures_pictures, only: options[:picture_actions], controller: 'ecm/pictures/pictures'
+      end
     end
   end
-end    
+end

data/lib/ecm/pictures/version.rb

@@ -1,6 +1,5 @@
 module Ecm
   module Pictures
-    VERSION = "1.1.2"
+    VERSION = '2.0.0'
   end
 end
-

data/lib/ecm_pictures2.rb

@@ -1,18 +1,17 @@
 require 'acts_as_list'
 require 'acts_as_markup'
-require 'active_admin-acts_as_list'
 require 'friendly_id'
 require 'paperclip'
+require 'active_admin-acts_as_list' if Gem::Specification.find_all_by_name('activeadmin').any?
 
 require 'ecm/pictures/engine'
 require 'ecm/pictures/configuration'
 require 'ecm/pictures/routing'
 require 'ecm/pictures/version'
-require 'ecm/pictures/active_admin/pictureable_helper'
+require 'ecm/pictures/active_admin/pictureable_helper' if Gem::Specification.find_all_by_name('activeadmin').any?
 
 module Ecm
   module Pictures
     extend Configuration
   end
 end
-

data/lib/generators/ecm/pictures/install/install_generator.rb

@@ -2,14 +2,20 @@ module Ecm
   module Pictures
     module Generators
       class InstallGenerator < Rails::Generators::Base
-        desc "Generates the intializer"
+        desc 'Generates the intializer'
 
-        source_root File.expand_path('../templates', __FILE__) 
-        
-        def generate_intializer
-          copy_file "ecm_pictures.rb", "config/initializers/ecm_pictures.rb"
-        end   
+        source_root File.expand_path('../templates', __FILE__)
+
+        def generate_initializer
+          copy_file 'initializer.rb', 'config/initializers/ecm_pictures.rb'
+        end
+
+        def generate_routes
+          inject_into_file 'config/routes.rb', before: "\nend" do
+            File.read(File.join(File.expand_path('../templates', __FILE__), 'routes.source'))
+          end
+        end
       end
     end
   end
-end        
+end

data/lib/generators/ecm/pictures/install/templates/{ecm_pictures.rb → initializer.rb}

@@ -2,7 +2,7 @@ Ecm::Pictures.configure do |config|
   # Accepted markup languages
   #
   # default: config.markup_languages = %w[ textile ]
-  config.markup_languages = %w[ textile ]
+  config.markup_languages = %w( textile )
 
   # Default markup language
   #
@@ -20,9 +20,9 @@ Ecm::Pictures.configure do |config|
   #              }
   config.paperclip_options = {
     styles: {
-      small_thumb:   "80x60",
-      medium_thumb:  "160x120",
-      default_thumb: "260x180"
+      small_thumb:   '80x60',
+      medium_thumb:  '160x120',
+      default_thumb: '260x180'
     }
   }
 
@@ -38,4 +38,3 @@ Ecm::Pictures.configure do |config|
   #
   config.prevent_textile_rendering_in_html = true
 end
-

data/lib/generators/ecm/pictures/install/templates/routes.source

@@ -0,0 +1,5 @@
+  
+  # ECM Pictures Frontend Routing
+  localized do
+    Ecm::Pictures::Routing.routes(self)
+  end

data/lib/generators/ecm/pictures/locales/locales_generator.rb

@@ -2,25 +2,24 @@ module Ecm
   module Pictures
     module Generators
       class LocalesGenerator < Rails::Generators::Base
-        desc "Copies the locale files to your application"
+        desc 'Copies the locale files to your application'
 
         source_root File.expand_path('../../../../../../config/locales', __FILE__)
 
         def generate_locales
-          copy_file "ecm.pictures.en.yml", "config/locales/ecm.pictures.en.yml"
-          copy_file "ecm.pictures.de.yml", "config/locales/ecm.pictures.de.yml"
+          copy_file 'ecm.pictures.en.yml', 'config/locales/ecm.pictures.en.yml'
+          copy_file 'ecm.pictures.de.yml', 'config/locales/ecm.pictures.de.yml'
 
-          copy_file "ecm.pictures.attached_picture.en.yml", "config/locales/ecm.pictures.attached_picture.en.yml"
-          copy_file "ecm.pictures.attached_picture.de.yml", "config/locales/ecm.pictures.attached_picture.de.yml"          
+          copy_file 'ecm.pictures.attached_picture.en.yml', 'config/locales/ecm.pictures.attached_picture.en.yml'
+          copy_file 'ecm.pictures.attached_picture.de.yml', 'config/locales/ecm.pictures.attached_picture.de.yml'
 
-          copy_file "ecm.pictures.picture.en.yml", "config/locales/ecm.pictures.picture.en.yml"
-          copy_file "ecm.pictures.picture.de.yml", "config/locales/ecm.pictures.picture.de.yml"
+          copy_file 'ecm.pictures.picture.en.yml', 'config/locales/ecm.pictures.picture.en.yml'
+          copy_file 'ecm.pictures.picture.de.yml', 'config/locales/ecm.pictures.picture.de.yml'
 
-          copy_file "ecm.pictures.picture_gallery.en.yml", "config/locales/ecm.pictures.picture_gallery.en.yml"
-          copy_file "ecm.pictures.picture_gallery.de.yml", "config/locales/ecm.pictures.picture_gallery.de.yml"
+          copy_file 'ecm.pictures.picture_gallery.en.yml', 'config/locales/ecm.pictures.picture_gallery.en.yml'
+          copy_file 'ecm.pictures.picture_gallery.de.yml', 'config/locales/ecm.pictures.picture_gallery.de.yml'
         end
       end
     end
   end
 end
-

data/lib/tasks/ecm_pictures_tasks.rake

@@ -1,37 +1,37 @@
 namespace :ecm do
   namespace :pictures do
     namespace :db do
-      desc "Purges and creates example data"
-      task :populate!, [] => [:environment] do |t, args|
-        Rake::Task["ecm:pictures:db:clear!"].execute
-        Rake::Task["ecm:pictures:db:populate"].execute
+      desc 'Purges and creates example data'
+      task :populate!, [] => [:environment] do |_t, _args|
+        Rake::Task['ecm:pictures:db:clear!'].execute
+        Rake::Task['ecm:pictures:db:populate'].execute
       end
 
-      desc "Clears all data!"
-      task :clear!, [] => [:environment] do |t, args|
-        Rake::Task["ecm:pictures:db:clear_galleries!"].execute
-        Rake::Task["ecm:pictures:db:clear_pictures!"].execute
+      desc 'Clears all data!'
+      task :clear!, [] => [:environment] do |_t, _args|
+        Rake::Task['ecm:pictures:db:clear_galleries!'].execute
+        Rake::Task['ecm:pictures:db:clear_pictures!'].execute
       end
 
-      desc "Clears all gallery data!"
-      task :clear_galleries!, [] => [:environment] do |t, args|
+      desc 'Clears all gallery data!'
+      task :clear_galleries!, [] => [:environment] do |_t, _args|
         Ecm::Pictures::PictureGallery.delete_all
       end
 
-      desc "Clears all picture data!"
-      task :clear_pictures!, [] => [:environment] do |t, args|
+      desc 'Clears all picture data!'
+      task :clear_pictures!, [] => [:environment] do |_t, _args|
         Ecm::Pictures::Picture.delete_all
       end
 
-      desc "Creates example data"
-      task :populate, [] => [:environment] do |t, args|
-        Rake::Task["ecm:pictures:db:populate_galleries"].execute
-        Rake::Task["ecm:pictures:db:populate_pictures"].execute
+      desc 'Creates example data'
+      task :populate, [] => [:environment] do |_t, _args|
+        Rake::Task['ecm:pictures:db:populate_galleries'].execute
+        Rake::Task['ecm:pictures:db:populate_pictures'].execute
       end
 
-      desc "Creates example data for galleries"
-      task :populate_galleries, [] => [:environment] do |t, args|
-        require "ffaker"
+      desc 'Creates example data for galleries'
+      task :populate_galleries, [] => [:environment] do |_t, _args|
+        require 'ffaker'
         5.times do |i|
           Ecm::Pictures::PictureGallery.create! do |pg|
             pg.name = "Picture Gallery #{i}"
@@ -40,17 +40,17 @@ namespace :ecm do
         end
       end
 
-      desc "Creates example data for pictures"
-      task :populate_pictures, [] => [:environment] do |t, args|
-        require "ffaker"
-        require "forgery"
+      desc 'Creates example data for pictures'
+      task :populate_pictures, [] => [:environment] do |_t, _args|
+        require 'ffaker'
+        require 'forgery'
 
         picture_galleries = Ecm::Pictures::PictureGallery.all
         50.times do
           Ecm::Pictures::Picture.create! do |p|
             p.picture_gallery = picture_galleries.choice
             p.image = File.open(File.join(Ecm::Pictures::Engine.root, 'spec/files', 'ecm/pictures/pictures', 'example.jpg'))
-            p.name = Faker::Product.brand if (rand(2) == 1)
+            p.name = Faker::Product.brand if rand(2) == 1
             p.description = Faker::Lorem.paragraph(rand(10))
           end
         end
@@ -58,5 +58,3 @@ namespace :ecm do
     end
   end
 end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_pictures2
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -59,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_admin-acts_as_list
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: friendly_id
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: rails-dummy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -115,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-dummy
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: less-rails
+  name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
+  name: less-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +193,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_admin-acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -255,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -300,16 +308,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -366,7 +374,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides picture galleries for active admin.
+description: ECM Picture galleries module for ruby on rails.
 email:
 - roberto@vasquez-angel.de
 executables: []
@@ -412,7 +420,8 @@ files:
 - lib/ecm/pictures/version.rb
 - lib/ecm_pictures2.rb
 - lib/generators/ecm/pictures/install/install_generator.rb
-- lib/generators/ecm/pictures/install/templates/ecm_pictures.rb
+- lib/generators/ecm/pictures/install/templates/initializer.rb
+- lib/generators/ecm/pictures/install/templates/routes.source
 - lib/generators/ecm/pictures/locales/locales_generator.rb
 - lib/tasks/ecm_pictures_tasks.rake
 homepage: https://github.com/robotex82/ecm_pictures
@@ -437,5 +446,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Picture galleries for active admin.
+summary: ECM Picture galleries module for ruby on rails.
 test_files: []
+has_rdoc: