lolita 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eb473bc7ecc5d3f8479d25b0afeb9d57a0fd5fa
-  data.tar.gz: a536d5c8f2d53b6e0e11ebd2a2efa74f858e2314
+  metadata.gz: 9ecde238f39add82144a021f79e9fe92c67f85b7
+  data.tar.gz: 7cfc0a8722cd3707f8870979a3e3bbefb20ca478
 SHA512:
-  metadata.gz: bee0d825101882719f5ffc50bbf513bf88599d417545b4bb77a09388f986be9a5c7f6ff0975b6c645be2e14a0b7197e2b16b8972bc597f3bcfad1ede04561d3b
-  data.tar.gz: 0543bfadce138033eb0cd3d4de38173f5f17219867178f037b2bb9f14ef61f7fd60c2fe1717749f8934ed5ed41bb42beae5b35c526bfe91095229bfc6029fb53
+  metadata.gz: 74a47007e7e24320173ae6ddc85275fe569cc49d3a7cb5241be0a91f9bb1ea5dc227acc83a6e0461f74a95dc5d3f29d550fc028459c3e3c65df770c4508c5028
+  data.tar.gz: 4deae66dae75aa62e668f2ce1b4d8438a8c533fbab0a8a77013a4a2498da1a1feb49d4afa2990ccccc506fd1094d0ce5c6b4c6446e9231bf15e0a8c3b9a1a431

data/Gemfile

@@ -6,26 +6,26 @@ group :test, :development do
   unless ENV['CI']
     gem 'pry-byebug'
   end
-  gem "fabrication", "~> 2.9.3"
-  gem "rspec", "~> 2.14"
-  gem "capybara", "~> 2"
-  gem "ffaker", "~> 1"
-  gem "generator_spec", "~> 0.9.0"
-  gem "sqlite3"
-  gem "database_cleaner"
+  gem 'fabrication', '~> 2.9.3'
+  gem 'rspec', '~> 2.14'
+  gem 'capybara', '~> 2'
+  gem 'ffaker', '~> 1'
+  gem 'generator_spec', '~> 0.9.0'
+  gem 'sqlite3'
+  gem 'database_cleaner'
 end
 
-gem 'simplecov', :require => false, :group => :test
+gem 'simplecov', require: false, group: :test
 
 group :rails do
-  gem "rails" , "~> 4.1.0"
-  gem "rspec-rails", "~> 2.14"
-  gem "coffee-rails", "~> 4.0.1"
-  gem "therubyracer", "~> 0.12.0"
+  gem 'rails', '~> 4.1.0'
+  gem 'rspec-rails', '~> 2.14'
+  gem 'coffee-rails', '~> 4.0.1'
+  gem 'therubyracer', '~> 0.12.0'
 end
 
 group :mongoid do
-  gem "bson_ext"
+  gem 'bson_ext'
   gem 'kaminari', '~> 0.16.1'
-  gem "mongoid", "~> 4.0.0"
+  gem 'mongoid', '~> 4.0.0'
 end

data/app/views/components/lolita/configuration/field/string/text/_display.html.haml

@@ -1,4 +1,4 @@
 = current_form.text_area field.name, :rows=>(field.rows || 20), :"data-simple"=>field.simple
 - if @textarea_component_include_tinymce_once.nil?
-  = tinymce Lolita.tinymce_configuration_set, selector: "textarea[data-simple!=true]", language: I18n.locale
+  = tinymce Lolita.tinymce_configuration_set, selector: "textarea[data-simple!=true]", language: I18n.locale.to_s[0..1]
 - @textarea_component_include_tinymce_once = "done"

data/lib/lolita/controllers/internal_helpers.rb

@@ -16,17 +16,17 @@ module Lolita
       def resource
         instance_variable_get(:"@#{resource_name}")
       end
-      
+
       def resource_name
-        lolita_mapping.class_name.underscore.to_sym
+        lolita_mapping.class_name.gsub(/::/, '_').underscore.to_sym
       end
-      
+
       def resource_class
         lolita_mapping.to
       end
-      
+
       def lolita_mapping(new_mapping = nil)
-        @lolita_mapping ||= request.env["lolita.mapping"]
+        @lolita_mapping ||= request.env['lolita.mapping']
       end
 
       def current_form=(form)
@@ -44,7 +44,7 @@ module Lolita
       end
 
       def use_mapping(new_mapping)
-        if block_given? 
+        if block_given?
           begin
             @old_mapping = lolita_mapping
             @lolita_mapping = new_mapping
@@ -63,12 +63,9 @@ module Lolita
 
       protected
 
-
       def resource=(new_resource)
-        instance_variable_set(:"@#{resource_name}",new_resource)
+        instance_variable_set(:"@#{resource_name}", new_resource)
       end
-
     end
-
   end
 end

data/lib/lolita/controllers/rails_helpers.rb

@@ -129,4 +129,4 @@ module Lolita
     end
 
   end
-end
+end

data/lib/lolita/rails/engine.rb

@@ -6,14 +6,20 @@ ActiveSupport.on_load(:action_controller) {
   include Lolita::Extensions
 }
 ActiveSupport.on_load(:action_view) {
+  if Rails::VERSION::MAJOR < 4
+    include Lolita::Controllers::UrlHelpers
+  end
   include Lolita::Controllers::ComponentHelpers
   include Lolita::Controllers::RailsHelpers
   include Lolita::Extensions
 }
 
-module ActionView
-  module RoutingUrlFor
-    include Lolita::Controllers::UrlHelpers
+
+if Rails::VERSION::MAJOR >= 4
+  module ActionView
+    module RoutingUrlFor
+      include Lolita::Controllers::UrlHelpers
+    end
   end
 end
 

data/lib/lolita/version.rb

@@ -2,7 +2,7 @@ module Lolita
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lolita.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |s|
   ]
   s.licenses = ["MIT"]
 
-  s.add_dependency(%q<kaminari>, [">= 0.16.1"])
+  s.add_dependency(%q<kaminari>, ["~> 0.16"])
   s.add_dependency(%q<abstract>, ["~> 1.0.0"])
   s.add_dependency(%q<haml>, [">= 3.0.0", "< 5.0.0"])
   s.add_dependency(%q<activesupport>, [">= 3.2.0"])
   s.add_dependency(%q<railties>, [">= 3.2.0"])
   s.add_dependency(%q<jquery-rails>, [">0"])
   s.add_dependency(%q<jquery-ui-rails>, [">0"])
-  s.add_dependency(%q<tinymce-rails>, [">= 4.0.0"])
-  s.add_dependency(%q<tinymce-rails-langs>, [">0"])
+  s.add_dependency(%q<tinymce-rails>, ["~> 4.1"])
+  s.add_dependency(%q<tinymce-rails-langs>, ["~> 4.0"])
 
   s.files = `git ls-files`.split($/)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - ITHouse (Latvia) and Arturs Meisters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: abstract
   requirement: !ruby/object:Gem::Requirement
@@ -118,30 +118,30 @@ dependencies:
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: tinymce-rails-langs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: Manage Rails, application backend with ease.
 email: support@ithouse.lv
 executables: []