tkh_illustrations 0.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27334d8297984cb0e711d7963da440ea780d06da
-  data.tar.gz: 925bcc25a6bf56f34fb5644a2268230762662b47
+  metadata.gz: 8d959cb0c0ee4e29518bf52a69affaa3fef6622a
+  data.tar.gz: 21e0d9c7edb6121a0f0efba648b2d7ebc17f6f6f
 SHA512:
-  metadata.gz: e13acb128c1d09344f890b2cf335ae392ded76f0727bd85608a28c6207bb801be2bcad72f8d523d2db9919b6e120300a764959019d39fdfde058fb9f8d6f43cd
-  data.tar.gz: ec7ad093b4e786608ed98d69697596f77e81ee874933f34964244618cf614c7d3a74e17994906075bdd78289f473bbae829f1fbc90e1a9e0979c82a0e905e084
+  metadata.gz: 6d99b19201c36a0eb27e80e98a9948fbb124d96e85d79b5f72bdf6c02bb7bac494b1132b633355b48e5a901cf842817e8c10c96f1a53c675579d69419d8e800f
+  data.tar.gz: c301088627b0426b2d41d14966f50a9e7b82586580bb5e0bd9d691a5b42eb7700248d2ffa52dad63921c78eb8e9b88f5a56d2876607866e9563ea4b5070f0d93

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # TKH Illustrations
 
 
+
+## 0.9.1
+
+* Various fixes and tweaks related to the upgrade
+* Added alphabetical scope to illustration model
+
+
 ## 0.9
 
 * Upgrading to Ruby 2.0 and Rails 4

data/app/controllers/illustrations_controller.rb

@@ -1,49 +1,57 @@
 class IllustrationsController < ApplicationController
-  
+
   before_filter :authenticate
   before_filter :authenticate_with_admin
-  
+
   def index
     @illustrations = Illustration.by_recent.paginate(:page => params[:page], :per_page => 25)
     switch_to_admin_layout
   end
-  
+
   def show
     @illustration = Illustration.find(params[:id])
     switch_to_admin_layout
   end
-  
+
   def new
     @illustration = Illustration.new
     switch_to_admin_layout
   end
-  
+
   def edit
     @illustration = Illustration.find(params[:id])
     switch_to_admin_layout
   end
-  
+
   def create
-    @illustration = Illustration.new(params[:illustration])
+    @illustration = Illustration.new(illustration_params)
     if @illustration.save
       redirect_to @illustration, notice: t('illustrations.create.notice')
     else
       render action: "new", layout: 'admin'
     end
   end
-  
+
   def update
     @illustration = Illustration.find(params[:id])
-    if @illustration.update_attributes(params[:illustration])
+    if @illustration.update_attributes(illustration_params)
       redirect_to @illustration, notice: t('illustrations.update.notice')
     else
       render action: "edit", layout: 'admin'
     end
   end
-  
+
   def destroy
     @illustration = Illustration.find(params[:id])
     @illustration.destroy
     redirect_to illustrations_url
   end
+
+  private
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def illustration_params
+    params.require(:illustration).permit(:name, :image)
+  end
+
 end

data/app/models/header.rb

@@ -1,21 +1,21 @@
 # this is needed for now to make mass assignment security compatible with the translation of globalize3
-Globalize::ActiveRecord::Translation.class_eval do
-  attr_accessible :locale
-end
+# Globalize::ActiveRecord::Translation.class_eval do
+#   attr_accessible :locale
+# end
 
 class Header < ActiveRecord::Base
-  
-  attr_accessible :photo, :name
-  
+
+  # attr_accessible :photo, :name
+
   validates_presence_of :name
-  
+
   translates :name
-  
+
   mount_uploader :photo, PhotoUploader
-  
+
   def to_param
     name ? "#{id}-#{name.to_url}" : id
   end
 
-  scope :by_recent, :order => 'updated_at desc'
+  scope :by_recent, -> { order('updated_at desc') }
 end

data/app/models/illustration.rb

@@ -1,21 +1,22 @@
 # this is needed for now to make mass assignment security compatible with the translation of globalize3
-Globalize::ActiveRecord::Translation.class_eval do
-  attr_accessible :locale
-end
+# Globalize::ActiveRecord::Translation.class_eval do
+#   attr_accessible :locale
+# end
 
 class Illustration < ActiveRecord::Base
-  
-  attr_accessible :image, :name
-  
+
+  # attr_accessible :image, :name
+
   validates_presence_of :name
-  
+
   translates :name
-  
+
   mount_uploader :image, ImageUploader
-  
+
   def to_param
     name ? "#{id}-#{name.to_url}" : id
   end
 
-  scope :by_recent, :order => 'updated_at desc'
+  scope :by_recent, -> { order('updated_at desc') }
+  scope :alphabetically, -> { order('name') }
 end

data/lib/tkh_illustrations/version.rb

@@ -1,3 +1,3 @@
 module TkhIllustrations
-  VERSION = "0.9"
+  VERSION = "0.9.1"
 end

data/lib/tkh_illustrations.rb

@@ -2,7 +2,7 @@ require "tkh_illustrations/version"
 require 'carrierwave'
 # require 'RMagick'
 require 'stringex'
-require 'globalize3'
+require 'globalize'
 require 'will_paginate'
 require 'bootstrap-will_paginate'
 

metadata

@@ -1,111 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: tkh_illustrations
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.1
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: globalize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 description: A Rails engine for carrierwave upload illustrations with minimum fuss.
@@ -115,6 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/controllers/headers_controller.rb
 - app/controllers/illustrations_controller.rb
 - app/models/header.rb
@@ -145,17 +163,16 @@ files:
 - lib/generators/tkh_illustrations/create_or_update_migrations/templates/create_headers.rb
 - lib/generators/tkh_illustrations/create_or_update_migrations/templates/create_illustrations.rb
 - lib/tasks/tkh_illustrations_tasks.rake
-- lib/tkh_illustrations/version.rb
 - lib/tkh_illustrations.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
-- CHANGELOG.md
+- lib/tkh_illustrations/version.rb
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -171,18 +188,16 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/test_helper.rb
 - test/tkh_illustrations_test.rb
 homepage: https://github.com/allesklar/tkh_illustrations
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -190,17 +205,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Rails engine for carrierwave illustrations.