ecm_pictures 0.0.15 → 0.0.16

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012 Roberto Vasquez Angel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,4 +1,4 @@
-= EcmPictureGallery
+= Ecm::Pictures
 
 = Purpose
 

data/app/models/ecm/pictures/picture.rb

@@ -1,26 +1,41 @@
 class Ecm::Pictures::Picture < ActiveRecord::Base
   self.table_name = 'ecm_pictures_pictures'
-  
+
   # associations
   belongs_to :picture_gallery, :counter_cache => true
-  
+
+  # attributes
+  attr_accessible :description,
+                  :image,
+                  :name,
+                  :picture_gallery_id
+
   # acts as list
   acts_as_list :scope => :picture_gallery
   
+  # callbacks
+  before_validation :set_name_from_image_file_name, :if => Proc.new { |p| p.name.nil? }
+
   # default scope
   default_scope :order => "picture_gallery_id, position"
-  
+
   # friendly id
   extend FriendlyId
   friendly_id :name, :use => :slugged
-  
+
   # paperclip
-  has_attached_file :image, :styles => { :medium => "300x300>", :thumb => "100x100>" }
-  
-  # attributes
-  attr_accessible :description, :image, :name, :picture_gallery_id
-  
+  has_attached_file :image,
+                    :styles => { :medium => "300x300>", :thumb => "100x100>" }
+
   # validations
   # validates :image, :attachment_presence => true
   validates_attachment_presence :image
+  validates :name, :presence => true
+  
+  private
+  
+  def set_name_from_image_file_name
+    self.name = File.basename(image_file_name, File.extname(image_file_name)) unless image_file_name.nil?
+  end
 end
+

data/app/models/ecm/pictures/picture_gallery.rb

@@ -1,34 +1,41 @@
 class Ecm::Pictures::PictureGallery < ActiveRecord::Base
   self.table_name = 'ecm_pictures_picture_galleries'
-  
+
   # associations
   has_many :pictures, :dependent => :destroy
   accepts_nested_attributes_for :pictures, :allow_destroy => true
-  
+
+  # attributes
+  attr_accessible :description,
+                  :link_images,
+                  :name,
+                  :pictures_attributes
+
   # acts as list
   acts_as_list
   default_scope :order => 'position ASC'
-  
-  # defaults
+
+  # callbacks
   after_initialize :set_defaults
-  
+
   # friendly id
   extend FriendlyId
   friendly_id :name, :use => :slugged
-  
-  # attributes
-  attr_accessible :description, :link_images, :name  , :pictures_attributes
-  
+
   # validations
-  validates :name, :presence => true
-  
+  validates :name, :presence => true,
+                   :uniqueness => true
+
   def display_code
     "<%= render_picture_gallery '#{self.name}' %>"
   end
-  
+
+  private
+
   def set_defaults
     if new_record?
       self.link_images = true if self.link_images.nil?
     end
-  end  
+  end
 end
+

data/config/locales/ecm.pictures.picture.de.yml

@@ -1,18 +1,20 @@
 de:
   activerecord:
+    models:
+      ecm/pictures/picture:
+        one: Bild
+        other: Bilder
     attributes:
       ecm/pictures/picture:
-        created_at: "Erstellt am"
-        description: "Beschreibung"
-        image: "Datei"
-        image_file_size: "Größe"
-        image_fingerprint: "Fingerabdruck"
-        name: "Name"       
-        picture_gallery: "Gallerie"
-        position: "Position"
-        thumbnail: "Vorschau"
-        updated_at: "Aktualisiert am"
-    models:
-      ecm/pictures/picture: 
-        one: "Bild"
-        other: "Bilder"     
+        created_at: Erstellt am
+        description: Beschreibung
+        image: Datei
+        image_file: Datei
+        image_file_name: Dateiname
+        image_file_size: Größe
+        image_fingerprint: Fingerabdruck
+        name: Name
+        picture_gallery: Gallerie
+        position: Position
+        thumbnail: Vorschau
+        updated_at: Aktualisiert am

data/config/locales/ecm.pictures.picture_gallery.de.yml

@@ -1,17 +1,17 @@
 de:
   activerecord:
+    models:
+      ecm/pictures/picture_gallery:
+        one: Bildgallerie
+        other: Bildgallerien
     attributes:
       ecm/pictures/picture_gallery:
-        created_at: "Erstellt am"
-        description: "Beschreibung"
-        display_code: "Anzeigecode"
-        link_images: "Bilder verlinken"
-        name: "Name"
-        pictures: "Bilder"
-        pictures_count: "Bilder" 
-        position: "Position"
-        updated_at: "Aktualisiert am"
-    models:
-      ecm/pictures/picture_gallery: 
-        one: "Bildgallerie"
-        other: "Bildgallerien"
+        created_at: Erstellt am
+        description: Beschreibung
+        display_code: Anzeigecode
+        link_images: Bilder verlinken
+        name: Name
+        pictures: Bilder
+        pictures_count: Bilder
+        position: Position
+        updated_at: Aktualisiert am

data/lib/ecm/pictures/engine.rb

@@ -1,20 +1,8 @@
-require 'rubygems'
-
-require 'acts_as_list'
-require 'active_admin-acts_as_list'
-require 'friendly_id'
-require 'paperclip'
-
-# Ecm::Admin should do this!
-require 'activeadmin' 
-require 'sass-rails'
-require 'meta_search'
-
 module Ecm
   module Pictures
     class Engine < Rails::Engine
       paths["config/locales"] << File.dirname(__FILE__) + '/../../../config/locales'
-      
+
       # Enabling assets precompiling under rails 3.1 or greater
       if Rails.version >= '3.1'
         initializer "ecm_pictures.asset_pipeline" do |app|
@@ -22,16 +10,17 @@ module Ecm
           app.config.assets.precompile << 'ecm_pictures.css'
         end
       end
-      
+
       config.to_prepare do
         ApplicationController.helper(Ecm::PicturesHelper)
-      end  
-      
+      end
+
       initializer :ecm_pictures_engine do
         ActiveAdmin.setup do |active_admin_config|
-          active_admin_config.load_paths += Dir[File.dirname(__FILE__) + '/../../../app/admin']
+          active_admin_config.load_paths += Dir[File.dirname(__FILE__) + '/active_admin']
         end
-      end 
+      end
     end
-  end  
+  end
 end
+

data/lib/ecm/pictures/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Pictures
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
   end  
 end

data/lib/ecm_pictures.rb

@@ -1,2 +1,14 @@
+require 'rubygems'
+
+require 'acts_as_list'
+require 'active_admin-acts_as_list'
+require 'friendly_id'
+require 'paperclip'
+
+# Ecm::Admin should do this!
+require 'activeadmin' 
+require 'sass-rails'
+require 'meta_search'
+
 require 'ecm/pictures/engine'
 require 'ecm/pictures/version'

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_pictures
 version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
-  version: 0.0.15
+  segments: 
+  - 0
+  - 0
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-23 00:00:00 Z
+date: 2012-09-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -20,51 +25,75 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 2
+        - 5
         version: 3.2.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: paperclip
+  name: acts_as_list
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.7"
+        hash: 23
+        segments: 
+        - 0
+        - 1
+        - 6
+        version: 0.1.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: friendly_id
+  name: active_admin-acts_as_list
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 4.0.1
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
+        version: 0.0.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: acts_as_list
+  name: friendly_id
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.6
+        hash: 61
+        segments: 
+        - 4
+        - 0
+        - 1
+        version: 4.0.1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: active_admin-acts_as_list
+  name: paperclip
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.0.5
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -75,108 +104,214 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: thin
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: yard
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: activeadmin
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: guard-spork
+  name: sass-rails
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: factory_girl_rails
+  name: coffee-rails
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: capybara
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: activeadmin
+  name: rspec-rails
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: sass-rails
+  name: shoulda-matchers
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: meta_search
+  name: factory_girl_rails
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.pre
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
   version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: ffaker
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: forgery
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
+        version: 0.5.0
+  type: :development
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: rb-inotify
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 8
+        - 8
+        version: 0.8.8
+  type: :development
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: guard-bundler
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id020
 description: Provides picture galleries for active admin.
 email: 
 - roberto@vasquez-angel.de
@@ -190,8 +325,6 @@ files:
 - app/helpers/ecm/pictures_helper.rb
 - app/models/ecm/pictures/picture_gallery.rb
 - app/models/ecm/pictures/picture.rb
-- app/admin/ecm/pictures/pictures.rb
-- app/admin/ecm/pictures/picture_galleries.rb
 - app/assets/images/orangebox/buttons.png
 - app/assets/images/orangebox/loading.gif
 - app/assets/stylesheets/ecm_pictures.css.scss
@@ -206,6 +339,8 @@ files:
 - db/migrate/001_create_ecm_pictures_picture_galleries.rb
 - lib/tasks/ecm_pictures_tasks.rake
 - lib/ecm_pictures.rb
+- lib/ecm/pictures/active_admin/ecm_pictures_picture_galleries.rb
+- lib/ecm/pictures/active_admin/ecm_pictures_pictures.rb
 - lib/ecm/pictures/engine.rb
 - lib/ecm/pictures/version.rb
 - MIT-LICENSE
@@ -224,12 +359,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -240,3 +381,4 @@ specification_version: 3
 summary: Picture galleries for active admin.
 test_files: []
 
+has_rdoc: