typus 3.1.0.rc9 → 3.1.0.rc10

data/Gemfile

@@ -3,13 +3,14 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in typus.gemspec
 gemspec
 
-gem 'sqlite3'
-gem 'jquery-rails'
+gem "sqlite3"
+gem "jquery-rails"
+gem "ckeditor-rails", "0.0.2"
 
 # And this stuff needed for the demo application.
-gem 'acts_as_list'
-gem 'acts_as_tree'
-gem 'factory_girl'
+gem "acts_as_list"
+gem "acts_as_tree"
+gem "factory_girl"
 gem "rails-trash", "~> 1.1.1"
 
 # Asset Management
@@ -18,42 +19,42 @@ gem "rack-cache", :require => "rack/cache"
 gem "paperclip"
 
 group :test do
-  gem 'shoulda-context'
-  gem 'mocha' # Make sure mocha is loaded at the end ...
+  gem "shoulda-context"
+  gem "mocha" # Make sure mocha is loaded at the end ...
 end
 
 group :development, :test do
 
   platforms :jruby do
-    gem 'activerecord-jdbc-adapter', :require => false
+    gem "activerecord-jdbc-adapter", :require => false
 
-    gem 'jdbc-mysql'
-    gem 'jdbc-postgres'
-    gem 'jdbc-sqlite3'
+    gem "jdbc-mysql"
+    gem "jdbc-postgres"
+    gem "jdbc-sqlite3"
 
-    gem 'jruby-openssl' # JRuby limited openssl loaded. http://jruby.org/openssl
+    gem "jruby-openssl" # JRuby limited openssl loaded. http://jruby.org/openssl
   end
 
   platforms :ruby do
-    gem 'mysql2'
-    gem 'pg'
-    gem 'sqlite3'
+    gem "mysql2"
+    gem "pg"
+    gem "sqlite3"
   end
 
 end
 
 group :production do
 
-  # gem 'mongoid'
+  # gem "mongoid"
 
   platforms :jruby do
-    gem 'activerecord-jdbc-adapter'
-    gem 'jdbc-sqlite3'
+    gem "activerecord-jdbc-adapter"
+    gem "jdbc-sqlite3"
   end
 
   platforms :ruby do
-    # gem 'bson_ext'
-    gem 'sqlite3'
+    # gem "bson_ext"
+    gem "sqlite3"
   end
 
 end

data/app/helpers/admin/resources/data_types/date_helper.rb

@@ -6,7 +6,7 @@ module Admin::Resources::DataTypes::DateHelper
     items += values.map { |v| [Typus::I18n.t(v.humanize), v] }
   end
 
-  alias :datetime_filter :date_filter
-  alias :timestamp_filter :date_filter
+  alias_method :datetime_filter, :date_filter
+  alias_method :timestamp_filter, :date_filter
 
 end

data/app/helpers/admin/resources/data_types/datetime_helper.rb

@@ -6,9 +6,9 @@ module Admin::Resources::DataTypes::DatetimeHelper
     end
   end
 
-  alias :table_date_field :table_datetime_field
-  alias :table_time_field :table_datetime_field
-  alias :table_timestamp_field :table_datetime_field
+  alias_method :table_date_field, :table_datetime_field
+  alias_method :table_time_field, :table_datetime_field
+  alias_method :table_timestamp_field, :table_datetime_field
 
   def display_datetime(item, attribute)
     I18n.l(item.send(attribute), :format => @resource.typus_date_format(attribute))

data/app/helpers/admin/resources/data_types/has_and_belongs_to_many_helper.rb

@@ -4,7 +4,7 @@ module Admin::Resources::DataTypes::HasAndBelongsToManyHelper
     item.send(attribute).map { |i| i.to_label }.join(", ")
   end
 
-  alias :table_has_many_field :table_has_and_belongs_to_many_field
+  alias_method :table_has_many_field, :table_has_and_belongs_to_many_field
 
   def typus_form_has_and_belongs_to_many(field)
     setup_relationship(field)

data/app/helpers/admin/resources/data_types/has_many_helper.rb

@@ -9,7 +9,7 @@ module Admin::Resources::DataTypes::HasManyHelper
     items += resource.order(resource.typus_order_by).map { |v| [v.to_label, v.id] }
   end
 
-  alias :has_and_belongs_to_many_filter :has_many_filter
+  alias_method :has_and_belongs_to_many_filter, :has_many_filter
 
   def typus_form_has_many(field)
     setup_relationship(field)

data/app/helpers/admin/resources/data_types/string_helper.rb

@@ -4,11 +4,11 @@ module Admin::Resources::DataTypes::StringHelper
     item.send(attribute)
   end
 
-  alias_method :display_text, :display_string
-  alias_method :display_position, :display_string
-  alias_method :display_integer, :display_string
   alias_method :display_decimal, :display_string
   alias_method :display_float, :display_string
+  alias_method :display_integer, :display_string
+  alias_method :display_position, :display_string
+  alias_method :display_text, :display_string
 
   def string_filter(filter)
     values = set_context.send(filter.to_s).to_a
@@ -22,10 +22,10 @@ module Admin::Resources::DataTypes::StringHelper
     (raw_content = item.send(attribute)).present? ? raw_content : "—".html_safe
   end
 
-  alias :table_decimal_field :table_string_field
-  alias :table_float_field :table_string_field
-  alias :table_integer_field :table_string_field
-  alias :table_virtual_field :table_string_field
-  alias :table_password_field :table_string_field
+  alias_method :table_decimal_field, :table_string_field
+  alias_method :table_float_field, :table_string_field
+  alias_method :table_integer_field, :table_string_field
+  alias_method :table_virtual_field, :table_string_field
+  alias_method :table_password_field, :table_string_field
 
 end

data/app/themes/default/assets/javascripts/typus.js

@@ -1,8 +1,7 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery.fancybox-1.3.4.pack.js
-//= require jquery.rails.autocomplete
+//= require jquery.fancybox-1.3.4.pack
 //= require jquery.searchField
-//= require jquery.tokeninput.js
+//= require jquery.tokeninput
 //= require typus/jquery.application
 //= require typus/application

data/app/themes/default/assets/javascripts/typus/jquery.application.js

@@ -1,44 +1,48 @@
+var CKEDITOR_BASEPATH = '/assets/ckeditor/';
+
 $(document).ready(function() {
 
-  $("#quicksearch").searchField();
+    $("#quicksearch").searchField();
 
-  $('.resource :input', document.myForm).bind("change", function() { setConfirmUnload(true); });
+    $('.resource :input', document.myForm).bind("change", function() { setConfirmUnload(true); });
 
-  $("a.fancybox").fancybox({
-    'titlePosition': 'over',
-    'type': 'image',
-    'centerOnScroll': true,
-    'scrolling': false,
-  });
+    $("a.fancybox").fancybox({
+        'titlePosition': 'over',
+        'type': 'image',
+        'centerOnScroll': true,
+        'scrolling': false,
+    });
 
-  $(".iframe").fancybox({
-    'width': 720,
-    'height': '90%',
-    'autoScale': false,
-    'transitionIn': 'none',
-    'transitionOut': 'none',
-    'type': 'iframe',
-    'centerOnScroll': true,
-    'scrolling': false,
-  });
+    $(".iframe").fancybox({
+        'width': 720,
+        'height': '90%',
+        'autoScale': false,
+        'transitionIn': 'none',
+        'transitionOut': 'none',
+        'type': 'iframe',
+        'centerOnScroll': true,
+        'scrolling': false,
+    });
 
+    // This method is used by Typus::Controller::Bulk
     $(".action-toggle").click(function() {
-      var status = this.checked;
-      $('input.action-select').each(function() { this.checked = status; });
-      $('.action-toggle').each(function() { this.checked = status; });
+        var status = this.checked;
+        $('input.action-select').each(function() { this.checked = status; });
+        $('.action-toggle').each(function() { this.checked = status; });
     });
 
-  if ($('textarea.ckeditor').length > 0) {
-    var data = $('textarea');
-    $.each(data, function(i) { CKEDITOR.replace(data[i].id); });
-  }
+    // This method is used by `text_with_ckeditor` template.
+    if ($('textarea.ckeditor').length > 0) {
+        var data = $('textarea');
+        $.each(data, function(i) { CKEDITOR.replace(data[i].id); });
+    }
 
 });
 
 function setConfirmUnload(on) {
-  window.onbeforeunload = (on) ? unloadMessage : null;
+    window.onbeforeunload = (on) ? unloadMessage : null;
 }
 
 function unloadMessage() {
-  return "You have entered new data on this page. If you navigate away from this page without first saving your data, the changes will be lost.";
+    return "You have entered new data on this page. If you navigate away from this page without first saving your data, the changes will be lost.";
 }

data/app/themes/default/assets/stylesheets/typus.css

@@ -1,6 +1,6 @@
 /*
-*= require jquery.fancybox-1.3.4.css
-*= require token-input.css
+*= require jquery.fancybox-1.3.4
+*= require token-input
 *= require typus/reset
 *= require typus/screen
 *= require typus/pagination

data/app/themes/default/views/admin/templates/_text_with_ckeditor.html.erb

@@ -1,5 +1,5 @@
 <% content_for :javascripts do %>
-  <%= javascript_include_tag 'ckeditor' %>
+  <%= javascript_include_tag 'ckeditor/ckeditor' %>
 <% end %>
 
 <%

data/app/themes/default/views/admin/templates/_text_with_ckeditor_and_assets.html.erb

@@ -1,5 +1,5 @@
 <% content_for :javascripts do %>
-  <%= javascript_include_tag 'ckeditor' %>
+  <%= javascript_include_tag 'ckeditor/ckeditor' %>
 <% end %>
 
 <%

data/lib/typus/authentication/session.rb

@@ -59,7 +59,13 @@ module Typus
           # Admin can update himself except setting the status to false!. Other
           # users can update their profile as the attributes (role & status)
           # are protected.
-          not_allowed if (admin_user.is_not_root? && !is_current_user) || current_user_is_root
+          status_changed = !(@item.status == params[@object_name][:status])
+          role_changed = !(@item.role == params[@object_name][:role])
+
+          root_changed_his_status_or_role = current_user_is_root && (status_changed || role_changed)
+          not_root_tries_to_change_another_user = admin_user.is_not_root? && !is_current_user
+
+          not_allowed if root_changed_his_status_or_role || not_root_tries_to_change_another_user
         end
       end
 

data/lib/typus/controller/actions.rb

@@ -2,11 +2,6 @@ module Typus
   module Controller
     module Actions
 
-      def self.included(base)
-#        base.helper_method :resource_actions
-#        base.helper_method :resources_actions
-      end
-
       protected
 
       ##
@@ -44,10 +39,6 @@ module Typus
         @resource_actions = @resource_actions.concat([args]) unless args.empty?
       end
 
-#      def resource_actions
-#        @resource_actions ||= []
-#      end
-
       ##
       # @resources_actions is used to build a list of custom actions which will
       # be appended beside "<h2></h2>" all the actions.
@@ -76,10 +67,6 @@ module Typus
         @resources_actions = @resources_actions.concat([args]) unless args.empty?
       end
 
-#      def resources_actions
-#        @resources_actions ||= []
-#      end
-
     end
   end
 end

data/lib/typus/orm/active_record/search.rb

@@ -59,8 +59,8 @@ module Typus
           { key => value }
         end
 
-        alias :build_integer_conditions :build_string_conditions
-        alias :build_belongs_to_conditions :build_string_conditions
+        alias_method :build_integer_conditions, :build_string_conditions
+        alias_method :build_belongs_to_conditions, :build_string_conditions
 
         def build_has_many_conditions(key, value)
           # TODO: Detect the primary_key for this object.

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc9"
+  VERSION = "3.1.0.rc10"
 end

data/typus.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.test_files    = []
   s.require_paths = ["lib"]
 
+  s.add_development_dependency "ckeditor-rails", "0.0.2"
   s.add_development_dependency "dragonfly", "~> 0.9"
   s.add_development_dependency "jquery-rails"
   s.add_development_dependency "paperclip"

data/vendor/assets/fancybox/jquery.easing-1.3.pack.js

@@ -0,0 +1,72 @@
+/*
+ * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
+ *
+ * Uses the built in easing capabilities added In jQuery 1.1
+ * to offer multiple easing options
+ *
+ * TERMS OF USE - jQuery Easing
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright © 2008 George McGinley Smith
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+*/
+
+// t: current time, b: begInnIng value, c: change In value, d: duration
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('h.i[\'1a\']=h.i[\'z\'];h.O(h.i,{y:\'D\',z:9(x,t,b,c,d){6 h.i[h.i.y](x,t,b,c,d)},17:9(x,t,b,c,d){6 c*(t/=d)*t+b},D:9(x,t,b,c,d){6-c*(t/=d)*(t-2)+b},13:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t+b;6-c/2*((--t)*(t-2)-1)+b},X:9(x,t,b,c,d){6 c*(t/=d)*t*t+b},U:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t+1)+b},R:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t+b;6 c/2*((t-=2)*t*t+2)+b},N:9(x,t,b,c,d){6 c*(t/=d)*t*t*t+b},M:9(x,t,b,c,d){6-c*((t=t/d-1)*t*t*t-1)+b},L:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t+b;6-c/2*((t-=2)*t*t*t-2)+b},K:9(x,t,b,c,d){6 c*(t/=d)*t*t*t*t+b},J:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t*t*t+1)+b},I:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t*t+b;6 c/2*((t-=2)*t*t*t*t+2)+b},G:9(x,t,b,c,d){6-c*8.C(t/d*(8.g/2))+c+b},15:9(x,t,b,c,d){6 c*8.n(t/d*(8.g/2))+b},12:9(x,t,b,c,d){6-c/2*(8.C(8.g*t/d)-1)+b},Z:9(x,t,b,c,d){6(t==0)?b:c*8.j(2,10*(t/d-1))+b},Y:9(x,t,b,c,d){6(t==d)?b+c:c*(-8.j(2,-10*t/d)+1)+b},W:9(x,t,b,c,d){e(t==0)6 b;e(t==d)6 b+c;e((t/=d/2)<1)6 c/2*8.j(2,10*(t-1))+b;6 c/2*(-8.j(2,-10*--t)+2)+b},V:9(x,t,b,c,d){6-c*(8.o(1-(t/=d)*t)-1)+b},S:9(x,t,b,c,d){6 c*8.o(1-(t=t/d-1)*t)+b},Q:9(x,t,b,c,d){e((t/=d/2)<1)6-c/2*(8.o(1-t*t)-1)+b;6 c/2*(8.o(1-(t-=2)*t)+1)+b},P:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6-(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b},H:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6 a*8.j(2,-10*t)*8.n((t*d-s)*(2*8.g)/p)+c+b},T:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d/2)==2)6 b+c;e(!p)p=d*(.3*1.5);e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);e(t<1)6-.5*(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b;6 a*8.j(2,-10*(t-=1))*8.n((t*d-s)*(2*8.g)/p)*.5+c+b},F:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*(t/=d)*t*((s+1)*t-s)+b},E:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*((t=t/d-1)*t*((s+1)*t+s)+1)+b},16:9(x,t,b,c,d,s){e(s==u)s=1.l;e((t/=d/2)<1)6 c/2*(t*t*(((s*=(1.B))+1)*t-s))+b;6 c/2*((t-=2)*t*(((s*=(1.B))+1)*t+s)+2)+b},A:9(x,t,b,c,d){6 c-h.i.v(x,d-t,0,c,d)+b},v:9(x,t,b,c,d){e((t/=d)<(1/2.k)){6 c*(7.q*t*t)+b}m e(t<(2/2.k)){6 c*(7.q*(t-=(1.5/2.k))*t+.k)+b}m e(t<(2.5/2.k)){6 c*(7.q*(t-=(2.14/2.k))*t+.11)+b}m{6 c*(7.q*(t-=(2.18/2.k))*t+.19)+b}},1b:9(x,t,b,c,d){e(t<d/2)6 h.i.A(x,t*2,0,c,d)*.5+b;6 h.i.v(x,t*2-d,0,c,d)*.5+c*.5+b}});',62,74,'||||||return||Math|function|||||if|var|PI|jQuery|easing|pow|75|70158|else|sin|sqrt||5625|asin|||undefined|easeOutBounce|abs||def|swing|easeInBounce|525|cos|easeOutQuad|easeOutBack|easeInBack|easeInSine|easeOutElastic|easeInOutQuint|easeOutQuint|easeInQuint|easeInOutQuart|easeOutQuart|easeInQuart|extend|easeInElastic|easeInOutCirc|easeInOutCubic|easeOutCirc|easeInOutElastic|easeOutCubic|easeInCirc|easeInOutExpo|easeInCubic|easeOutExpo|easeInExpo||9375|easeInOutSine|easeInOutQuad|25|easeOutSine|easeInOutBack|easeInQuad|625|984375|jswing|easeInOutBounce'.split('|'),0,{}))
+
+/*
+ *
+ * TERMS OF USE - EASING EQUATIONS
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright © 2001 Robert Penner
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+ */