mix-rails 0.23.0 → 0.23.1

data/MIX_RAILS_VERSION

@@ -1 +1 @@
-0.23.0
+0.23.1

data/README.md

@@ -10,7 +10,7 @@ MixRails is a CMS based on Ruby on Rails.
 
 Create a new rails project.
 
-    $ rails new myproject -T --skip-bundle --dummy-path=spec/dummy
+    $ rails new myproject -T --skip-bundle
 
 Add this line to your application's Gemfile:
 
@@ -19,7 +19,7 @@ Add this line to your application's Gemfile:
 And then execute:
     
     $ cd myproject
-    $ bundle
+    $ bundle install
 
 
 In your config/application.rb add require 'mix-rails/all'.
@@ -48,6 +48,9 @@ You can use Backbone, CoffeeScript, HAML,
 # Auth
 Mix-Rails uses [Devise](https://github.com/plataformatec/devise) for auth, you can see more docs at:
 
+# ACL 
+Rolify + Authority
+
 Create a default user.
 
     $ bundle exec rake create_user[yourname@example.com,mypassword]
@@ -67,8 +70,6 @@ Admix::namespace_path = "myadminpath"
 # You will access http://localhost:3000/myadminpath and see Admix running!!
 ```
 
-TODO: Add some docs for admix
-
 [![Admix](http://img233.imageshack.us/img233/6731/screenshotfrom201301221.png)]
 
 # Plugins (Extensions)

data/admix/app/views/admix/inherited/edit.html.haml

@@ -1,5 +1,5 @@
 - collection_name = resource_class.to_s.downcase.pluralize
 - resource_name = resource_class.to_s.downcase
 %h1= t('admix.crud.edit.title', resource: resource[@crumb_field])
-= render 'admix/inherited/form'
+= render 'form'
 = link_to t('admix.crud.back'), collection_url, class: 'btn'

data/admix/app/views/admix/inherited/index.html.haml

@@ -1,5 +1,5 @@
 %h1= t('admix.crud.listing', resources: t("#{@collection_name}.#{@collection_name}"))
 
 = datagrid_table @report, @assets, html: {class: 'table table-striped'}
-= will_paginate @assets
+= will_paginate @assets, :renderer => BootstrapPagination::Rails
 = link_to t('admix.crud.new.link'), new_resource_url, class: 'btn'

data/admix/app/views/admix/inherited/new.html.haml

@@ -1,3 +1,3 @@
 %h1= t('admix.crud.new.title')
-= render 'admix/inherited/form'
+= render 'form'
 = link_to t('admix.crud.back'), collection_url, class: 'btn'

data/admix/lib/admix.rb

@@ -4,6 +4,7 @@ require 'admix/navigation/navbar'
 
 
 require 'will_paginate'
+require 'will_paginate-bootstrap'
 require 'will_paginate/array'
 require 'datagrid'
 require 'admix/table-actions'

data/admix/lib/admix/version.rb

@@ -2,7 +2,7 @@ module Admix
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/mix-rails/admix.rb

@@ -1 +1,5 @@
-require 'admix'
+require 'mix-rails-core'
+require 'mix-rails-wireframe'
+require 'admix'
+require 'mix-rails-auth'
+require 'mix-rails-settings'

data/mix-rails-albums/app/models/concerns/album.rb

@@ -10,14 +10,14 @@ module Concerns::Album
     enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
     friendly_id :title, use: :slugged
 
-    has_many :photos, :as => :related
+    has_many :photos, :as => :related, dependent: :destroy
     belongs_to :related, :polymorphic => true
 
     validation_for_title
     validation_for_date
 
 
-    scope :published, where(status: :published).joins(:photos).having("count(photos.id) > 1")
+    scope :published, includes(:photos).where(status: :published).having('COUNT(photos.id) > 0')
 
   end
 

data/mix-rails-albums/app/uploaders/albums/image_uploader.rb

@@ -50,11 +50,8 @@ class Albums::ImageUploader < CarrierWave::Uploader::Base
       
       albums_watermark = Setting.albums_watermark
       
-      #raise albums_watermark.image
-
       watermark_image = if albums_watermark
-        gridfs_file = MixRailsCore::Gridfs::read_file(albums_watermark.image.url)
-        MiniMagick::Image.read(gridfs_file, "png")
+        MiniMagick::Image.open("#{Rails.root}/public#{albums_watermark.image.url}", "png")
       else
         # We can read a file from system too.
         #MiniMagick::Image.open("#{Rails.root}/app/assets/images/watermarks/watermark.png", "png")

data/mix-rails-albums/config/locales/albums.pt-BR.yml

@@ -3,8 +3,8 @@ pt-BR:
     albums: 'albuns'
     photos: 'fotos'
   will_paginate:
-    previous_label: "<< admix"
-    next_label: "próximo >>"
+    previous_label: "anterior"
+    next_label: "próximo"
   albums:
     published_yes: 'Sim'
     published_no: 'Não'

data/mix-rails-albums/lib/mix-rails-albums/version.rb

@@ -2,7 +2,7 @@ module MixRailsAlbums
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-auth/lib/mix-rails-auth/version.rb

@@ -2,7 +2,7 @@ module MixRailsAuth
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-core/app/models/attachment.rb

@@ -1,4 +1,7 @@
 class Attachment < ActiveRecord::Base
-  attr_accessible :file, :name
+  attr_accessible :file, :file_cache, :name
   mount_uploader :file, Core::FileUploader
+
+  belongs_to :related, polymorphic: true
+
 end

data/mix-rails-core/app/models/category.rb

@@ -1,4 +1,9 @@
 class Category < ActiveRecord::Base
   attr_accessible :name
   has_many :categorizations, :dependent => :restrict
+
+  def to_s
+    "#{name}"
+  end
+
 end

data/mix-rails-core/config/locales/core.pt-BR.yml

@@ -1,4 +1,6 @@
-pt-BR:
+pt-BR:  
+  boolean_true: 'Sim'
+  boolean_false: 'Não'
   enumerize:
     status:
       activeted: 'Ativado'

data/mix-rails-core/db/migrate/20130214134814_add_related_id_related_type_to_attachment.rb

@@ -0,0 +1,11 @@
+class AddRelatedIdRelatedTypeToAttachment < ActiveRecord::Migration
+  def up
+    add_column :attachments, :related_id, :integer
+    add_column :attachments, :related_type, :string
+  end
+
+  def down
+    remove_column :attachments, :related_id
+    remove_column :attachments, :related_type
+  end
+end

data/mix-rails-core/db/migrate/20130215145358_add_type_to_category.rb

@@ -0,0 +1,5 @@
+class AddTypeToCategory < ActiveRecord::Migration
+  def change
+    add_column :categories, :type, :string
+  end
+end

data/mix-rails-core/lib/mix-rails-core.rb

@@ -10,7 +10,6 @@ require 'simple-navigation-bootstrap'
 require 'breadcrumbs'
 require 'will_paginate'
 require 'coffee-script'
-require 'coffee-filter'
 require 'carrierwave'
 require 'mini_magick'
 require 'haml_coffee_assets'
@@ -23,4 +22,4 @@ require 'authority'
 require 'default_value_for'
 
 module MixRailsCore
-end
+end

data/mix-rails-core/lib/mix-rails-core/version.rb

@@ -2,7 +2,7 @@ module MixRailsCore
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-core/mix-rails-core.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "mail_form",    "~> 1.4.0"
   gem.add_dependency "simple_form",  "~> 2.0.0"
-  
+
   gem.add_dependency "enumerize"
 
   gem.add_dependency "activevalidators"
@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "carrierwave"
   gem.add_dependency "mini_magick"
   gem.add_dependency "haml_coffee_assets"
-  
+
   gem.add_dependency "rspec-rails"
   gem.add_dependency "database_cleaner"
 
@@ -42,7 +42,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "jquery-ui-rails"
 
   gem.add_dependency "coffee-script"
-  gem.add_dependency "coffee-filter"
   gem.add_dependency "rails-backbone"
   #gem.add_dependency "sass-rails"
 

data/mix-rails-core/spec/models/relationship_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Relationship do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/mix-rails-message-board/lib/mix-rails-message-board/version.rb

@@ -2,7 +2,7 @@ module MixRailsMessageBoard
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-settings/lib/mix-rails-settings/version.rb

@@ -2,7 +2,7 @@ module MixRailsSettings
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-songs/lib/mix-rails-songs/version.rb

@@ -2,7 +2,7 @@ module MixRailsSongs
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-videos/lib/mix-rails-videos/version.rb

@@ -2,7 +2,7 @@ module MixRailsVideos
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-vouchers/lib/mix-rails-vouchers/version.rb

@@ -2,7 +2,7 @@ module MixRailsVouchers
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-wireframe/lib/mix-rails-wireframe/version.rb

@@ -2,7 +2,7 @@ module MixRailsWireframe
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-writer/lib/mix-rails-writer/version.rb

@@ -2,7 +2,7 @@ module MixRailsWriter
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails.gemspec

@@ -36,8 +36,9 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rails", "~> 3.2.11"
   gem.add_dependency "default_value_for"
+  gem.add_dependency "acts-as-taggable-on", "~> 2.3.3"
   gem.add_dependency "fancybox-rails", "~> 0.1.4"
-  gem.add_dependency "bootstrap-sass", "~> 2.2.2.0"
+  gem.add_dependency "bootstrap-sass", "~> 2.3.0"
   gem.add_dependency "jquery-qtip2-rails", "~> 0.4.0"
 
   gem.add_dependency "haml-rails"
@@ -50,6 +51,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rolify"
   gem.add_dependency "authority"
   gem.add_dependency "will_paginate"
+  gem.add_dependency "will_paginate-bootstrap"
 
   gem.add_dependency "friendly_id", "~> 4.0.9"
 

data/version.rb

@@ -2,7 +2,7 @@ module MixRailsCore
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: acts-as-taggable-on
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: fancybox-rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: jquery-qtip2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: will_paginate-bootstrap
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +242,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +250,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-auth
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +258,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +266,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: admix
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +274,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -250,7 +282,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-settings
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +290,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +298,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-wireframe
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +306,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -282,7 +314,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-writer
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +322,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -298,7 +330,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-albums
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +338,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -314,7 +346,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-videos
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +354,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -330,7 +362,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-message-board
   requirement: !ruby/object:Gem::Requirement
@@ -338,7 +370,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -346,7 +378,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-vouchers
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +386,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -362,7 +394,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-songs
   requirement: !ruby/object:Gem::Requirement
@@ -370,7 +402,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -378,7 +410,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.23.1
 description: MixRails is a CMS and system based on Ruby on Rails
 email:
 - sadjow@gmail.com
@@ -2520,6 +2552,8 @@ files:
 - mix-rails-core/db/migrate/20130206195145_create_attachments.rb
 - mix-rails-core/db/migrate/20130206195329_create_categories.rb
 - mix-rails-core/db/migrate/20130207132351_create_categorizations.rb
+- mix-rails-core/db/migrate/20130214134814_add_related_id_related_type_to_attachment.rb
+- mix-rails-core/db/migrate/20130215145358_add_type_to_category.rb
 - mix-rails-core/lib/mix-rails-core.rb
 - mix-rails-core/lib/mix-rails-core/concerns/engine.rb
 - mix-rails-core/lib/mix-rails-core/engine.rb
@@ -2563,6 +2597,7 @@ files:
 - mix-rails-core/spec/models/attachment_spec.rb
 - mix-rails-core/spec/models/categorization_spec.rb
 - mix-rails-core/spec/models/category_spec.rb
+- mix-rails-core/spec/models/relationship_spec.rb
 - mix-rails-core/spec/spec_helper.rb
 - mix-rails-message-board/.gitignore
 - mix-rails-message-board/Gemfile
@@ -3043,7 +3078,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 500314951480395780
+      hash: 2483692345918815916
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -3052,7 +3087,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 500314951480395780
+      hash: 2483692345918815916
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24