lolita 4.0.6 → 4.0.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (85) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/lolita/PIE-custom.htc +87 -87
  3. data/app/assets/stylesheets/lolita/PIE.htc +81 -81
  4. data/app/assets/stylesheets/lolita/default.css.erb +170 -170
  5. data/app/assets/stylesheets/lolita/jquery-ui-1.8.16.lolita.css.erb +567 -567
  6. data/app/helpers/components/lolita/configuration/list_component.rb +10 -10
  7. data/app/views/components/lolita/configuration/column/header/_first.html.haml +1 -1
  8. data/app/views/components/lolita/configuration/columns/header/_display.html.haml +5 -5
  9. data/app/views/components/lolita/configuration/field/array/checkbox/_display.html.haml +7 -7
  10. data/app/views/components/lolita/configuration/search/_display.html.haml +2 -2
  11. data/app/views/kaminari/lolita/_first_page.html.erb +11 -11
  12. data/app/views/kaminari/lolita/_gap.html.erb +8 -8
  13. data/app/views/kaminari/lolita/_last_page.html.erb +11 -11
  14. data/app/views/kaminari/lolita/_next_page.html.erb +11 -11
  15. data/app/views/kaminari/lolita/_page.html.erb +12 -12
  16. data/app/views/kaminari/lolita/_paginator.html.erb +23 -23
  17. data/app/views/kaminari/lolita/_prev_page.html.erb +11 -11
  18. data/app/views/lolita/info/index.html.erb +232 -232
  19. data/author +1 -1
  20. data/lib/lolita/adapter/field_helper.rb +18 -18
  21. data/lib/lolita/configuration/field/array.rb +3 -3
  22. data/lib/lolita/configuration/field/big_decimal.rb +12 -12
  23. data/lib/lolita/configuration/field/boolean.rb +12 -12
  24. data/lib/lolita/configuration/field/date.rb +12 -12
  25. data/lib/lolita/configuration/field/hidden.rb +12 -12
  26. data/lib/lolita/configuration/field/integer.rb +11 -11
  27. data/lib/lolita/configuration/field/string.rb +16 -16
  28. data/lib/lolita/configuration/field/time.rb +13 -13
  29. data/lib/lolita/configuration/field_set.rb +25 -25
  30. data/lib/lolita/configuration/nested_form.rb +104 -104
  31. data/lib/lolita/dbi/base.rb +56 -56
  32. data/lib/lolita/hooks/named_hook.rb +125 -125
  33. data/lib/lolita/lazy_loader.rb +54 -54
  34. data/lib/lolita/navigation/tree.rb +132 -132
  35. data/lib/lolita/ruby_ext/accessors.rb +26 -26
  36. data/lib/lolita/search/simple.rb +75 -75
  37. data/lib/lolita/support/formatter.rb +62 -62
  38. data/lib/lolita/support/formatter/rails.rb +56 -56
  39. data/lib/lolita/test/matchers.rb +77 -77
  40. data/lib/lolita/version.rb +1 -1
  41. data/spec/builder_spec.rb +120 -120
  42. data/spec/mapping_spec.rb +1 -1
  43. data/spec/rails_app/app/controllers/application_controller.rb +3 -3
  44. data/spec/rails_app/app/helpers/application_helper.rb +3 -3
  45. data/spec/rails_app/app/views/components/lolita/configuration/list/_body_cell.html.erb +1 -1
  46. data/spec/rails_app/config/environment.rb +5 -5
  47. data/spec/rails_app/config/environments/production.rb +37 -37
  48. data/spec/rails_app/config/initializers/backtrace_silencers.rb +7 -7
  49. data/spec/rails_app/config/initializers/inflections.rb +2 -2
  50. data/spec/rails_app/config/initializers/secret_token.rb +1 -1
  51. data/spec/rails_app/lib/lolita/configuration/field/my_custom_collection.rb +13 -13
  52. data/spec/rails_app/public/javascripts/jquery-1.5.1.min.js +15 -15
  53. data/spec/rails_app/public/javascripts/lolita/main.js +6 -6
  54. data/spec/rails_app/public/javascripts/modernizr-1.7.min.js +1 -1
  55. data/spec/rails_app/public/javascripts/rails.js +137 -137
  56. data/spec/rails_app/public/javascripts/tinymce/langs/en.js +221 -221
  57. data/spec/rails_app/public/javascripts/tinymce/license.txt +504 -504
  58. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/about.htm +52 -52
  59. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/anchor.htm +26 -26
  60. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/charmap.htm +51 -51
  61. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/color_picker.htm +74 -74
  62. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/editor_template_src.js +1328 -1328
  63. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/image.htm +80 -80
  64. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/about.js +73 -73
  65. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/anchor.js +42 -42
  66. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/charmap.js +354 -354
  67. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/color_picker.js +329 -329
  68. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/image.js +247 -247
  69. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/link.js +153 -153
  70. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/js/source_editor.js +56 -56
  71. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/langs/en.js +68 -68
  72. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/langs/en_dlg.js +53 -53
  73. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/link.htm +57 -57
  74. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/shortcuts.htm +47 -47
  75. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/content.css +66 -66
  76. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/dialog.css +117 -117
  77. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/skins/cirkuit/ui.css +988 -988
  78. data/spec/rails_app/public/javascripts/tinymce/themes/advanced/source_editor.htm +25 -25
  79. data/spec/rails_app/public/javascripts/tinymce/tiny_mce_popup.js +4 -4
  80. data/spec/rails_app/public/stylesheets/lolita/default.css +169 -169
  81. data/spec/rails_app/public/stylesheets/lolita/style.css +214 -214
  82. data/vendor/assets/javascripts/jquery-numeric.js +279 -279
  83. data/vendor/assets/javascripts/modernizr_1_7_min.js +1 -1
  84. data/vendor/assets/stylesheets/jquery-ui-1.8.16.custom.css +567 -567
  85. metadata +3 -3
data/author CHANGED
@@ -1 +1 @@
1
- This software is developed by IT House (Latvia) and Artūrs Meisters
1
+ This software is developed by IT House (Latvia) and Artūrs Meisters
@@ -1,19 +1,19 @@
1
- module Lolita
2
- module Adapter
3
- module FieldHelper
4
- def technical?
5
- if self.name.to_s.match(/^created_at|updated_at|type$/)
6
- true
7
- elsif self.primary?
8
- true
9
- elsif adapter.klass.respond_to?(:uploaders)
10
- adapter.klass.uploaders.keys.include?(name.to_sym)
11
- end
12
- end
13
-
14
- def content?
15
- !technical?
16
- end
17
- end
18
- end
1
+ module Lolita
2
+ module Adapter
3
+ module FieldHelper
4
+ def technical?
5
+ if self.name.to_s.match(/^created_at|updated_at|type$/)
6
+ true
7
+ elsif self.primary?
8
+ true
9
+ elsif adapter.klass.respond_to?(:uploaders)
10
+ adapter.klass.uploaders.keys.include?(name.to_sym)
11
+ end
12
+ end
13
+
14
+ def content?
15
+ !technical?
16
+ end
17
+ end
18
+ end
19
19
  end
@@ -12,8 +12,8 @@ module Lolita
12
12
  # of these.
13
13
  class Array < Lolita::Configuration::Field::Base
14
14
  include Lolita::Hooks
15
- MAX_RECORD_COUNT = 100
16
-
15
+ MAX_RECORD_COUNT = 300
16
+
17
17
  add_hook :after_association_loaded
18
18
 
19
19
  lolita_accessor :text_method,:value_method,:association,:include_blank
@@ -23,7 +23,7 @@ module Lolita
23
23
  @include_blank=true
24
24
  super
25
25
  self.find_dbi_field unless self.dbi_field
26
-
26
+
27
27
  @association ||= self.dbi_field ? self.dbi_field.association : detect_association
28
28
  self.run(:after_association_loaded)
29
29
  self.builder = detect_builder unless @builder
@@ -1,12 +1,12 @@
1
- module Lolita
2
- module Configuration
3
- module Field
4
- class BigDecimal < Lolita::Configuration::Field::Base
5
- def initialize dbi,name,*args, &block
6
-
7
- super
8
- end
9
- end
10
- end
11
- end
12
- end
1
+ module Lolita
2
+ module Configuration
3
+ module Field
4
+ class BigDecimal < Lolita::Configuration::Field::Base
5
+ def initialize dbi,name,*args, &block
6
+
7
+ super
8
+ end
9
+ end
10
+ end
11
+ end
12
+ end
@@ -1,12 +1,12 @@
1
- module Lolita
2
- module Configuration
3
- module Field
4
- class Boolean < Lolita::Configuration::Field::Base
5
- def initialize dbi,name,*args, &block
6
-
7
- super
8
- end
9
- end
10
- end
11
- end
12
- end
1
+ module Lolita
2
+ module Configuration
3
+ module Field
4
+ class Boolean < Lolita::Configuration::Field::Base
5
+ def initialize dbi,name,*args, &block
6
+
7
+ super
8
+ end
9
+ end
10
+ end
11
+ end
12
+ end
@@ -1,13 +1,13 @@
1
- module Lolita
2
- module Configuration
3
- module Field
4
- class Date < Lolita::Configuration::Field::Base
5
- attr_accessor :format
6
- def initialize dbi,name,*args, &block
7
-
8
- super
9
- end
10
- end
11
- end
12
- end
1
+ module Lolita
2
+ module Configuration
3
+ module Field
4
+ class Date < Lolita::Configuration::Field::Base
5
+ attr_accessor :format
6
+ def initialize dbi,name,*args, &block
7
+
8
+ super
9
+ end
10
+ end
11
+ end
12
+ end
13
13
  end
@@ -1,12 +1,12 @@
1
- module Lolita
2
- module Configuration
3
- module Field
4
- class Hidden < Lolita::Configuration::Field::Base
5
- def initialize dbi,name,type,options, &block
6
-
7
- super
8
- end
9
- end
10
- end
11
- end
12
- end
1
+ module Lolita
2
+ module Configuration
3
+ module Field
4
+ class Hidden < Lolita::Configuration::Field::Base
5
+ def initialize dbi,name,type,options, &block
6
+
7
+ super
8
+ end
9
+ end
10
+ end
11
+ end
12
+ end
@@ -1,11 +1,11 @@
1
- module Lolita
2
- module Configuration
3
- module Field
4
- class Integer< Lolita::Configuration::Field::Base
5
- def initialize dbi,name,*args, &block
6
- super
7
- end
8
- end
9
- end
10
- end
11
- end
1
+ module Lolita
2
+ module Configuration
3
+ module Field
4
+ class Integer< Lolita::Configuration::Field::Base
5
+ def initialize dbi,name,*args, &block
6
+ super
7
+ end
8
+ end
9
+ end
10
+ end
11
+ end
@@ -1,16 +1,16 @@
1
- module Lolita
2
- module Configuration
3
- module Field
4
- class String < Lolita::Configuration::Field::Base
5
- lolita_accessor :simple, :rows
6
- def initialize dbi,name,*args, &block
7
- super
8
- if self.dbi_field && self.dbi_field.options[:native_type] == "text"
9
- self.builder = :text unless @builder
10
- end
11
- end
12
-
13
- end
14
- end
15
- end
16
- end
1
+ module Lolita
2
+ module Configuration
3
+ module Field
4
+ class String < Lolita::Configuration::Field::Base
5
+ lolita_accessor :simple, :rows
6
+ def initialize dbi,name,*args, &block
7
+ super
8
+ if self.dbi_field && self.dbi_field.options[:native_type] == "text"
9
+ self.builder = :text unless @builder
10
+ end
11
+ end
12
+
13
+ end
14
+ end
15
+ end
16
+ end
@@ -1,13 +1,13 @@
1
- module Lolita
2
- module Configuration
3
- module Field
4
- class Time < Lolita::Configuration::Field::Base
5
- attr_accessor :format
6
- def initialize dbi,name,*args, &block
7
-
8
- super
9
- end
10
- end
11
- end
12
- end
13
- end
1
+ module Lolita
2
+ module Configuration
3
+ module Field
4
+ class Time < Lolita::Configuration::Field::Base
5
+ attr_accessor :format
6
+ def initialize dbi,name,*args, &block
7
+
8
+ super
9
+ end
10
+ end
11
+ end
12
+ end
13
+ end
@@ -1,26 +1,26 @@
1
- module Lolita
2
- module Configuration
3
- class FieldSet
4
-
5
- @@last_fieldset=0
6
-
7
- attr_reader :parent
8
- attr_accessor :name
9
-
10
- def initialize parent,name=nil
11
- @parent=parent
12
- self.name=name || "fieldset_#{next_fieldset}"
13
- end
14
-
15
- def fields
16
- self.parent.fields.reject{|f| f.field_set!=self}
17
- end
18
-
19
- private
20
-
21
- def next_fieldset
22
- @@last_fieldset+=1
23
- end
24
- end
25
- end
1
+ module Lolita
2
+ module Configuration
3
+ class FieldSet
4
+
5
+ @@last_fieldset=0
6
+
7
+ attr_reader :parent
8
+ attr_accessor :name
9
+
10
+ def initialize parent,name=nil
11
+ @parent=parent
12
+ self.name=name || "fieldset_#{next_fieldset}"
13
+ end
14
+
15
+ def fields
16
+ self.parent.fields.reject{|f| f.field_set!=self}
17
+ end
18
+
19
+ private
20
+
21
+ def next_fieldset
22
+ @@last_fieldset+=1
23
+ end
24
+ end
25
+ end
26
26
  end
@@ -1,105 +1,105 @@
1
- module Lolita
2
- module Configuration
3
- # Accept those attributes
4
- # * <tt>:name</tt> - Name of nested relation, like :comments.
5
- # * <tt>:field_style</tt> - Is fields rendered with as normal (with lable and staff) or like in table (:simple). Default :simple
6
- # * <tt>:expandable</tt> - Show or not "Add new" and "Delete" links in form,
7
- # by default, it is expandable if association macro is :many
8
- # * <tt>:field_rejection_proc</tt> - Proc, that contains condition of how to reject field.
9
- # By default form rejects all fields from parent tab that doesn't have current form as field nested_form
10
- # ====Example
11
- # form = Lolita::Configuration::NestedForm.new(Lolita::Configuration::Tab::Content.new,:comments)
12
- # form.field_rejection_proc = Proc.new{|field|
13
- # field.name.to_s.match(/_id$/)
14
- # }
15
- # # form exclude all fields that ends with _id
16
- class NestedForm
17
- include Lolita::Builder
18
- @@last_nested_form=0
19
-
20
- attr_reader :parent, :options, :field_style
21
- attr_accessor :name, :expandable, :field_rejection_proc
22
- attr_writer :build_method
23
-
24
- def initialize parent,name=nil, options ={}
25
- @parent=parent
26
- @options = options
27
- self.name=name || "nested_form_#{next_nested_form}"
28
- set_attributes_from(options)
29
- end
30
-
31
- def allow_destroy?
32
- dbi.klass.nested_attributes_options[name][:allow_destroy]
33
- end
34
-
35
- def update_only?
36
- dbi.klass.nested_attributes_options[name][:update_only]
37
- end
38
-
39
- def build_method
40
- @build_method || self.name
41
- end
42
- # Set field style - normal or simple. Default - normal.
43
- def field_style=(value)
44
- allowed_values = [:normal,:simple]
45
- raise ArgumentError, "Only #{allowed_values.inspect} are allowed" unless allowed_values.include?(value)
46
- @field_style = value
47
- end
48
-
49
- # Detect if it's possible to add more than one field group, like if model has many other objects.
50
- def expandable?
51
- @expandable == true || (@expandable == nil && macro == :many)
52
- end
53
-
54
- # Create field, that is not real field, but represents nested attributes as one.
55
- # It is used to create label.
56
- def as_field
57
- Lolita::Configuration::Factory::Field.add(dbi,self.name, :string)
58
- end
59
-
60
- # Parent (a.k.a tab) dbi
61
- def dbi
62
- @parent.dbi
63
- end
64
-
65
- # Fields setter. Fields should be array and each element should be Lolita::Configuration::Field object.
66
- def fields=(new_fields)
67
- @fields = new_fields
68
- end
69
-
70
- # Return all fields. Each time fields ar returned from @fields if its defined or calculated by using #field_rejection_proc
71
- # or collected from parent (tab) where fields nested form is same with self.
72
- def fields
73
- if @fields
74
- @fields
75
- elsif field_rejection_proc
76
- self.parent.fields.reject(&field_rejection_proc)
77
- else
78
- self.parent.fields.reject{|f| f.nested_form!=self}
79
- end
80
- end
81
-
82
- # Parent (tab) dbi klass
83
- def klass
84
- dbi.reflect_on_association(name).klass
85
- end
86
-
87
- # Parent (tab) dbi klass reflection with #name and macros of that.
88
- def macro
89
- dbi.reflect_on_association(name).macro
90
- end
91
-
92
- private
93
-
94
- def next_nested_form
95
- @@last_nested_form+=1
96
- end
97
-
98
- def set_attributes_from(options)
99
- options.each{|key,value|
100
- instance_variable_set(:"@#{key}",value)
101
- }
102
- end
103
- end
104
- end
1
+ module Lolita
2
+ module Configuration
3
+ # Accept those attributes
4
+ # * <tt>:name</tt> - Name of nested relation, like :comments.
5
+ # * <tt>:field_style</tt> - Is fields rendered with as normal (with lable and staff) or like in table (:simple). Default :simple
6
+ # * <tt>:expandable</tt> - Show or not "Add new" and "Delete" links in form,
7
+ # by default, it is expandable if association macro is :many
8
+ # * <tt>:field_rejection_proc</tt> - Proc, that contains condition of how to reject field.
9
+ # By default form rejects all fields from parent tab that doesn't have current form as field nested_form
10
+ # ====Example
11
+ # form = Lolita::Configuration::NestedForm.new(Lolita::Configuration::Tab::Content.new,:comments)
12
+ # form.field_rejection_proc = Proc.new{|field|
13
+ # field.name.to_s.match(/_id$/)
14
+ # }
15
+ # # form exclude all fields that ends with _id
16
+ class NestedForm
17
+ include Lolita::Builder
18
+ @@last_nested_form=0
19
+
20
+ attr_reader :parent, :options, :field_style
21
+ attr_accessor :name, :expandable, :field_rejection_proc
22
+ attr_writer :build_method
23
+
24
+ def initialize parent,name=nil, options ={}
25
+ @parent=parent
26
+ @options = options
27
+ self.name=name || "nested_form_#{next_nested_form}"
28
+ set_attributes_from(options)
29
+ end
30
+
31
+ def allow_destroy?
32
+ dbi.klass.nested_attributes_options[name][:allow_destroy]
33
+ end
34
+
35
+ def update_only?
36
+ dbi.klass.nested_attributes_options[name][:update_only]
37
+ end
38
+
39
+ def build_method
40
+ @build_method || self.name
41
+ end
42
+ # Set field style - normal or simple. Default - normal.
43
+ def field_style=(value)
44
+ allowed_values = [:normal,:simple]
45
+ raise ArgumentError, "Only #{allowed_values.inspect} are allowed" unless allowed_values.include?(value)
46
+ @field_style = value
47
+ end
48
+
49
+ # Detect if it's possible to add more than one field group, like if model has many other objects.
50
+ def expandable?
51
+ @expandable == true || (@expandable == nil && macro == :many)
52
+ end
53
+
54
+ # Create field, that is not real field, but represents nested attributes as one.
55
+ # It is used to create label.
56
+ def as_field
57
+ Lolita::Configuration::Factory::Field.add(dbi,self.name, :string)
58
+ end
59
+
60
+ # Parent (a.k.a tab) dbi
61
+ def dbi
62
+ @parent.dbi
63
+ end
64
+
65
+ # Fields setter. Fields should be array and each element should be Lolita::Configuration::Field object.
66
+ def fields=(new_fields)
67
+ @fields = new_fields
68
+ end
69
+
70
+ # Return all fields. Each time fields ar returned from @fields if its defined or calculated by using #field_rejection_proc
71
+ # or collected from parent (tab) where fields nested form is same with self.
72
+ def fields
73
+ if @fields
74
+ @fields
75
+ elsif field_rejection_proc
76
+ self.parent.fields.reject(&field_rejection_proc)
77
+ else
78
+ self.parent.fields.reject{|f| f.nested_form!=self}
79
+ end
80
+ end
81
+
82
+ # Parent (tab) dbi klass
83
+ def klass
84
+ dbi.reflect_on_association(name).klass
85
+ end
86
+
87
+ # Parent (tab) dbi klass reflection with #name and macros of that.
88
+ def macro
89
+ dbi.reflect_on_association(name).macro
90
+ end
91
+
92
+ private
93
+
94
+ def next_nested_form
95
+ @@last_nested_form+=1
96
+ end
97
+
98
+ def set_attributes_from(options)
99
+ options.each{|key,value|
100
+ instance_variable_set(:"@#{key}",value)
101
+ }
102
+ end
103
+ end
104
+ end
105
105
  end