lolita 4.0.11 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f512538546e16be6b740c2ea34357349be73d451
-  data.tar.gz: 9b245ac412ec1dc3c434d8cb2e07de1766f92a42
+  metadata.gz: 0217f3c46ff81621fc7747c2ebcd69d97e56e156
+  data.tar.gz: 546206df2c2088ac4c6e5616d0b75f1fa64e14ef
 SHA512:
-  metadata.gz: a278162bd18979ddf699810c6823b2562984fa833dc43b78ad1d31893cb7e420c84184e47f47f1a9564f6632edd3baed6ea0a325796f6efb75a401dc3815eec8
-  data.tar.gz: 64c913651929a8096421207ad66b7723cc976fb40441b137bc10653feead479b2211c98b2060b47b62b48300ef391284464efe16bac84d559b1e74a45e8ab6da
+  metadata.gz: c42fcefe4594902e737ace2b42397d9afa47abc3bc104e726ca30dc0604dfbc8d1eda78d47879650fee943bb458ae89e2a4ec26a504236043b6c234889aac962
+  data.tar.gz: d9f6ce013bd2bc9e4bb0ac503bf58d68eaf9d1e8b15a2e52ae33e7d8a2660e3ee5022a2818c77dbfddc922c72eb0692d5e396d700f4ed79b267b6ef0823c652d

data/Gemfile

@@ -18,10 +18,10 @@ end
 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.2.0"
+  gem "rspec-rails", "~> 2.14"
+  gem "coffee-rails", "~> 4.0.1"
+  gem "therubyracer", "~> 0.12.0"
 end
 
 group :mongoid do

data/app/assets/stylesheets/lolita/style.css.erb

@@ -81,8 +81,7 @@ header nav .username {margin-right: 15px;}
 #main .box form .field_string,
 #main .box form .field_integer,
 #main .box form .field_big_decimal,
-#main .box form .field_array,
-#main .box form .field_date { margin-top: 17px;}
+#main .box form .field_array { margin-top: 17px;}
 #main .box form .field-value { margin-top: 5px;}
 #main .box form .field-value input, #main .box form .field-value textarea {
   border: 1px solid #cdcdcd;

data/app/views/components/lolita/configuration/tab/_error_msg.html.haml

@@ -3,12 +3,12 @@
     - errors = resource.errors.keys.collect do |k|
       - title = if k.to_s.match(/\./)
         - assoc_name, attr_name = k.to_s.split(".")
-        - if tab.fields.by_name(attr_name.to_sym)
-          - klass = resource.lolita.dbi.reflect_on_association(assoc_name.to_sym).klass
+        - if tab.fields.by_name(attr_name.to_s)
+          - klass = resource.lolita.dbi.reflect_on_association(assoc_name.to_s).klass
           - klass.human_attribute_name(attr_name).downcase
-      - elsif tab.fields.by_name(k.to_sym)
+      - elsif tab.fields.by_name(k.to_s)
         - resource.class.human_attribute_name(k)
-      - elsif assoc = resource.lolita.dbi.reflect_on_association(k.to_sym)
+      - elsif assoc = resource.lolita.dbi.reflect_on_association(k.to_s)
         - assoc.klass.lolita_model_name.human
       - if title && resource.errors[k] && resource.errors[k].respond_to?(:any?) && resource.errors[k].any?
         - "#{title.to_s.capitalize}: #{resource.errors[k].join(" #{::I18n.t("lolita.shared.and")} ")}"

data/app/views/layouts/lolita/application.html.haml

@@ -3,28 +3,28 @@
 
   %head
     %meta{:charset => "utf-8"}
-    %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}
-    %title= Lolita.application.name
-    %meta{:content => "", :name => "description"}
-    %meta{:content => "", :name => "author"}
-    = favicon_link_tag "lolita/favicon.ico" rescue ""
-    = stylesheet_link_tag "lolita/application.css"
-    = yield :style
-    = javascript_include_tag "lolita/application.js"
-    = yield :script
-    = include_application_assets
-    = raw csrf_meta_tag
-    - if flash[:lolita_notice]
-      :javascript
-        $(function(){
-          show_notice_msg(Base64.decode('#{flash[:lolita_notice]}'));
-        })
-    - elsif flash[:lolita_alert]
-      :javascript
-        $(function(){
-          show_alert_msg(Base64.decode('#{flash[:lolita_alert]}'));
-        })
-  %body
+      %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}
+        %title= Lolita.application.name
+        %meta{:content => "", :name => "description"}
+          %meta{:content => "", :name => "author"}
+            = favicon_link_tag "lolita/favicon.ico" rescue ""
+            = stylesheet_link_tag "lolita/application.css"
+            = yield :style
+            = javascript_include_tag "lolita/application.js"
+            = yield :script
+            = include_application_assets
+            = raw csrf_meta_tag
+            - if flash[:lolita_notice]
+              :javascript
+                $(function(){
+                  show_notice_msg(Base64.decode('#{flash[:lolita_notice]}'));
+                })
+            - elsif flash[:lolita_alert]
+              :javascript
+                $(function(){
+                  show_alert_msg(Base64.decode('#{flash[:lolita_alert]}'));
+                })
+      %body
     = render_component :"lolita/shared", :flash
     #container
       = render_component :"lolita/shared", :header

data/lib/lolita/adapter/active_record.rb

@@ -128,7 +128,7 @@ module Lolita
           @name = @field.name
           @type = type_cast(@field.type)
           @options = {
-            :primary => @adapter.klass.primary_key == @field.name,
+            :primary => @field.name.ends_with?('_id'),
             :native_type => @field.type.to_s
           }
         end

data/lib/lolita/adapter/mongoid.rb

@@ -55,7 +55,7 @@ module Lolita
         unless @associations
           @associations = {}
           klass.relations.each{|name,association|
-            @associations[name.to_sym] = Association.new(association,self)
+            @associations[name.to_s] = Association.new(association,self)
           }
         end
         @associations

data/lib/lolita/configuration/base.rb

@@ -1,6 +1,6 @@
 module Lolita
   module Configuration
-    # This is superclass of other configuration classes, that is used to configure different parts of resource. 
+    # This is superclass of other configuration classes, that is used to configure different parts of resource.
     class Base
       include Lolita::Builder
       attr_reader :dbi
@@ -30,7 +30,11 @@ module Lolita
       def set_attributes(*args)
         options = args && args.extract_options! || {}
         options.each do |attr_name,value|
-          self.send("#{attr_name}=".to_sym,value)
+          if attr_name == :association_name
+            self.association_name = value
+          else
+            self.send("#{attr_name}=".to_sym,value)
+          end
         end
       end
 

data/lib/lolita/configuration/column.rb

@@ -165,7 +165,7 @@ module Lolita
       private
 
       def detect_association
-        @association ||= dbi.associations[name]
+        @association ||= dbi.associations[self.name.to_s]
       end
 
       def normalize_attributes

data/lib/lolita/configuration/factory/field.rb

@@ -11,7 +11,7 @@ module Lolita
         # *<tt>third</tt> - Pass dbi_field
         #   Field.add(dbi,:dbi_field => dbi.fields.first)
         def create(dbi,*args,&block)
-          
+
           options = args ? args.extract_options! : {}
           dbi_field = options[:dbi_field]
           name = args[0] || options[:name] || (dbi_field ? dbi_field.name : nil)
@@ -19,9 +19,9 @@ module Lolita
           dbi_field ||= dbi.field_by_association(name)
           association ||= detect_association(dbi,name)
 
-          type = args[1] || options[:type] || 
+          type = args[1] || options[:type] ||
             (association ? :array : nil ) ||
-            (dbi_field ? dbi_field.type : nil) || 
+            (dbi_field ? dbi_field.type : nil) ||
             :string
           options[:dbi_field] = dbi_field
           if !name || !type
@@ -35,15 +35,15 @@ module Lolita
         alias :add :create
 
         def detect_association(dbi,name)
-          dbi.associations[name.to_sym]
+          dbi.associations[name.to_s]
         end
 
         def field_class(name)
           ("Lolita::Configuration::Field::"+name.to_s.camelize).constantize
         end
-      end 
-      
+      end
+
       end
     end
   end
-end
+end

data/lib/lolita/configuration/field.rb

@@ -11,7 +11,7 @@ module Lolita
     #   form there are fields from profile that can be manipulated when user is changed or created.
     # * <tt>options</tt> - specific options for different type of fields, see Lolita::Configuration::FieldExtensions for details
     # * <tt>html_options</tt> - used to change field HTML output,like class or style etc.
-    # 
+    #
     # To define field in ORM class through lolita configuration block
     # ====Example
     #     lolita do
@@ -19,7 +19,7 @@ module Lolita
     #         field :email
     #         field :user_id, :type=>"string"
     #         field :body do
-    #            title "Full text" 
+    #            title "Full text"
     #            html_options :class=>"full_text"
     #         end
     #       end
@@ -33,7 +33,7 @@ module Lolita
         lolita_accessor :name,:title,:on,:field_set, :nested_form,:nested_for,:options, :html_options
         attr_reader :dbi,:nested_in
         attr_accessor :dbi_field
-        
+
         def initialize dbi,name,*args, &block
           @dbi=dbi
           self.name = name
@@ -49,7 +49,7 @@ module Lolita
           set_default_values
           validate
         end
-        
+
         def title(new_title = nil)
           if new_title
             @title = new_title
@@ -89,15 +89,15 @@ module Lolita
         end
 
         def nested_in=(dbi)
-          if !self.dbi.associations_class_names.include?(dbi.klass.to_s) && !dbi.associations_class_names.include?(self.dbi.klass.to_s) 
+          if !self.dbi.associations_class_names.include?(dbi.klass.to_s) && !dbi.associations_class_names.include?(self.dbi.klass.to_s)
             raise Lolita::ReferenceError, "There is no association between #{self.dbi.klass} and #{dbi.klass}"
           end
           if !dbi.is_a?(Lolita::DBI::Base) && !dbi.class.to_s.match(/Lolita::Adapter/)
-            raise ArgumentError, "Field can be nested only in Lolita::DBI::Base object." 
+            raise ArgumentError, "Field can be nested only in Lolita::DBI::Base object."
           end
           @nested_in=dbi
         end
-        
+
         def nested?
           !self.nested_in.nil?
         end
@@ -109,12 +109,16 @@ module Lolita
             self.nested_in && self.nested_in.klass==dbi_or_class
           end
         end
-      
+
         def set_attributes(attributes)
           excluded_keys = [:name,:type]
           attributes.each{|attr,value|
             unless excluded_keys.include?(attr.to_sym)
-              self.send(:"#{attr}=",value)
+              if attr == :dbi_field
+                self.dbi_field = value
+              else
+                self.send(:"#{attr}=",value)
+              end
             end
           }
         end
@@ -126,8 +130,8 @@ module Lolita
         end
 
         private
-       
-        def builder_local_variable_name 
+
+        def builder_local_variable_name
           :field
         end
 

data/lib/lolita/configuration/field/array.rb

@@ -1,18 +1,18 @@
 module Lolita
   module Configuration
     module Field
-      # Fields with Array is used to 
-      # * create select for belongs_to association or 
+      # Fields with Array is used to
+      # * create select for belongs_to association or
       # * has_and_belongs_to_many field for selecting all associated objects or
       # * for polymorphic belongs_to associations
       # ==Polymorphic builder (:polymorphic)
       # Create two select boxes one of all related classes and second with related records for that class.
       # Related classes can have <em>polymorphic_select_name</em> instance method, that is used to populate second
       # select with visible values by default it calles <em>text_method</em>. It will fallback first content column. Class should respond to one
-      # of these. 
+      # of these.
       class Array < Lolita::Configuration::Field::Base
         include Lolita::Hooks
-        MAX_RECORD_COUNT = 300
+        MAX_RECORD_COUNT = 100
 
         add_hook :after_association_loaded
 
@@ -74,7 +74,7 @@ module Lolita
           @association_values
         end
 
-        # Collect values for polymorphic association, you may pass 
+        # Collect values for polymorphic association, you may pass
         # * <tt>:klass</tt> - class that's records are used
         # * <tt>:record</tt> - record class that has polymorphic association. It is used to call to detect related object class.
         def polymorphic_association_values(options={})
@@ -129,7 +129,7 @@ module Lolita
 
         def detect_association
           unless @association
-            dbi.associations[self.name.to_sym]
+            dbi.associations[self.name.to_s]
           else
             @association
           end

data/lib/lolita/configuration/list.rb

@@ -32,7 +32,7 @@ module Lolita
       # Allow to crate nested list for list
       def list(*args, &block)
         if args && args.any? || block_given?
-          association = dbi.associations[args[0].to_s.to_sym]
+          association = dbi.associations[args[0].to_s]
           association_dbi = association && Lolita::DBI::Base.create(association.klass)
           raise Lolita::UnknownDBPError.new("No DBI specified for list sublist") unless association_dbi
           Lolita::LazyLoader.lazy_load(self,:@list,Lolita::Configuration::NestedList,association_dbi, self, :association_name => association.name,&block)

data/lib/lolita/configuration/nested_list.rb

@@ -2,14 +2,14 @@ module Lolita
   class ParentNotAListError < ArgumentError ; end
 
   module Configuration
-    
+
     class NestedList < Lolita::Configuration::List
       attr_accessor :parent,:association_name
 
       def initialize dbi,parent,options={},&block
         init_nested_list_attributes(parent)
         set_and_validate_dbi(dbi)
-        set_list_attributes do 
+        set_list_attributes do
           set_attributes(options)
           self.instance_eval(&block) if block_given?
         end
@@ -28,7 +28,7 @@ module Lolita
             self.parent.dbi.klass
           else
             dbi.klass
-          end 
+          end
           @mapping = Lolita::Mapping.new(:"#{mapping_class.to_s.downcase.pluralize}") || false
         end
         @mapping
@@ -88,7 +88,7 @@ module Lolita
       def init_nested_list_attributes parent
         @parent = parent
       end
-      
+
       def validate
         msg = "#{parent.class} must be kind of Lolita::Configuration::List or Lolita::Configuration::Column"
         raise(Lolita::ParentNotAListError, msg) unless [
@@ -99,4 +99,4 @@ module Lolita
     end
 
   end
-end
+end

data/lib/lolita/controllers/rails_helpers.rb

@@ -46,10 +46,8 @@ module Lolita
       end
 
       def resource_with_attributes(current_resource,attributes={})
-        attributes||=resource_attributes
-        attributes.each{|key,value|
-          current_resource.send(:"#{key}=",value)
-        }
+        permitted_attributes = ActionController::Parameters.new(attributes || resource_attributes).permit!
+        current_resource.attributes = permitted_attributes
         current_resource
       end
 
@@ -103,10 +101,6 @@ module Lolita
           end
         end
         date_attributes.each_pair do |k,v|
-          if v.values.all?{|va| va == 0}
-            attributes[k] = nil
-            next
-          end
           unless v.detect{|index,value| value == 0 && index<4}
             attributes[k] = v.size == 3 ? Date.new(v[1],v[2],v[3]) : Time.new(v[1],v[2],v[3],v[4],v[5])
           end

data/lib/lolita/extensions/authorization/pundit_adapter.rb

@@ -59,7 +59,7 @@ module Lolita
           if is_instance?(record)
             record
           elsif is_module?(record)
-            record.to_s.to_sym
+            Object.new
           else
             record.new
           end

data/lib/lolita/hooks.rb

@@ -102,7 +102,7 @@ module Lolita
 
       def run(&block)
         if !@options[:once] || (@options[:once] && !self.class.runned?(@options[:once],@hook_name))
-          self.class.singleton_hook(@options[:once],@hook_name)
+          self.class.singleton_hook(@options[:once] || Object,@hook_name)
           result = nil
           in_hooks_scope(@options[:scope],@options[:run_scope]) do
             callback = get_callback(@hook_name)
@@ -396,4 +396,4 @@ module Lolita
     end
 
   end
-end
+end

data/lib/lolita/mapping.rb

@@ -17,7 +17,7 @@ module Lolita
   # what controller to use, what model is related with it and so on. This is used to generate urls and paths.
   # Also eahc request containers information with mapping related to it.
   class Mapping
-    attr_reader :class_name,:path,:singular,:plural,:path_prefix,:module,:as,:controllers,:ref
+    attr_reader :class_name,:path,:singular,:plural,:path_prefix,:module,:as,:controllers
     attr_reader :visible, :only, :append_to, :title
     alias :name :singular
     
@@ -74,7 +74,7 @@ module Lolita
           end
           tree = parent_branch.children
         end
-        unless tree.branches.detect{|b| b.object.is_a?(Lolita::Mapping) && b.object.ref == self.ref}
+        unless tree.branches.detect{|b| b.object.is_a?(Lolita::Mapping) && b.object.to==self.to}
           tree.append(self, :title => @title)
         end
       end

data/lib/lolita/version.rb

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

data/spec/configuration/field_spec.rb

@@ -31,7 +31,7 @@ describe Lolita::Configuration::Field do
 #      Lolita::Configuration::Field.new(@dbi,:noname)
 #    }.should raise_error Lolita::FieldNameError
   end
-  
+
   it "should always set field title if not specified" do
     field=field_class.new(@dbi,:title)
     field.title.size.should > 0

data/spec/configuration/list_spec.rb

@@ -102,11 +102,11 @@ describe Lolita::Configuration::List do
       dummy_association = double("dummy_association")
       dummy_association.stub(:klass).and_return(Object)
       dummy_association.stub(:name).and_return("name")
-      dbp.stub(:associations).and_return({:dummy_association => dummy_association})
+      dbp.stub(:associations).and_return({'dummy_association' => dummy_association})
 
       nested_list = double("nested_list")
       Lolita::Configuration::NestedList.should_receive(:new).with(nested_dbp,list,{:association_name => "name"}).and_return(nested_list)
-      list.list :dummy_association
+      list.list 'dummy_association'
       list.list.should eq(nested_list)
     end
 
@@ -270,4 +270,4 @@ describe Lolita::Configuration::List do
     end
   end
 
-end
+end

data/spec/configuration/nested_list_spec.rb

@@ -10,7 +10,7 @@ describe Lolita::Configuration::NestedList do
     expect do
       Lolita::Configuration::NestedList.new(comment_dbi,list_class.new(dbi))
     end.not_to raise_error
-  end 
+  end
 
   it "should raise error when no list or nested list or column is given" do
     expect do
@@ -60,16 +60,16 @@ describe Lolita::Configuration::NestedList do
     main_list = list_class.new(dbi) do
       list(:comments){}
     end
-    main_list.list.association.name.should == dbi.associations[:comments].name
+    main_list.list.association.name.should == dbi.associations['comments'].name
   end
-  
+
   it "should return root" do
     list = list_class.new(dbi)
     nlist1 = nested_list_class.new(dbi,list)
     nlist2 = nested_list_class.new(dbi,nlist1)
     nlist2.root.should == list
   end
-  
+
   it "should create mapping for DBI class" do
     list = list_class.new(dbi)
     nlist = nested_list_class.new(comment_dbi,list, :association_name => "comments")
@@ -108,4 +108,4 @@ describe Lolita::Configuration::NestedList do
     new_list.list.nested_options_for(record)[:nested].keys.should == ["category_id",:parent,:path]
     new_list.list.list.nested_options_for(post)[:nested].keys.should == ["post_id",:parent,:path]
   end
-end
+end

data/spec/mapping_spec.rb

@@ -25,14 +25,5 @@ describe Lolita::Mapping do
 			mapping.url_name.should == "my_admin_posts"
 		end
 	end
-
-  it 'should add headless navigation items to tree' do
-    tree = Lolita::Navigation::Tree.new(:"left_side_navigation")
-    Lolita::Navigation::Tree.remember(tree)
-
-    described_class.new(:dashboard).add_to_navigation_tree
-    described_class.new(:data_import).add_to_navigation_tree
-    expect(Lolita.navigation.branches.size).to eq(2)
-  end
 end
 

data/spec/rails_app/app/orm/active_record/post.rb

@@ -4,7 +4,7 @@ class Post < ActiveRecord::Base
   has_and_belongs_to_many :tags
   has_many :comments, dependent: :destroy
   belongs_to :profile
-  validate :title, presence: true
+  validates :title, presence: true
   default_scope -> { order("title") }
   accepts_nested_attributes_for :comments, reject_if: :all_blank
 

data/spec/rails_app/config/routes.rb

@@ -1,6 +1,4 @@
 RailsApp::Application.routes.draw do
   lolita_for :posts
   lolita_for :comments
-  lolita_for :dashboard
-  lolita_for :data_import
 end

data/spec/spec_helper.rb

@@ -30,15 +30,16 @@ Benchmark.bm do |x|
     end
   end
 
-  x.report("Loading test stuff: ") do
+  #x.report("Loading test stuff: ") do
     require 'ffaker'
-  end
-  x.report("Loading factories") do
+  #end
+  #x.report("Loading factories") do
     Dir["#{File.dirname(__FILE__)}/fabricators/**/*_fabricator.rb"].each {|f| require f}
-  end
+  #end
   Dir["#{File.dirname(__FILE__)}/support/**/*[^_spec].rb"].each {|f| require f}
   RSpec.configure do |config|
     config.mock_with :rspec
     config.order = "rand:3455"
+    config.infer_spec_type_from_file_location!
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 4.0.11
+  version: 4.2.0
 platform: ruby
 authors:
 - ITHouse (Latvia) and Arturs Meisters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -428,8 +428,6 @@ files:
 - spec/orm/mongoid.rb
 - spec/orm/mongoid.yml
 - spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/dashboard_controller.rb
-- spec/rails_app/app/controllers/data_import_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/orm/active_record/address.rb
 - spec/rails_app/app/orm/active_record/category.rb
@@ -547,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Great web resources management tool
@@ -595,8 +593,6 @@ test_files:
 - spec/orm/mongoid.rb
 - spec/orm/mongoid.yml
 - spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/app/controllers/dashboard_controller.rb
-- spec/rails_app/app/controllers/data_import_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/orm/active_record/address.rb
 - spec/rails_app/app/orm/active_record/category.rb
@@ -690,3 +686,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/cleaner.rb
 - spec/support/formatter_spec.rb
+has_rdoc: 

data/spec/rails_app/app/controllers/dashboard_controller.rb

@@ -1,5 +0,0 @@
-class DashboardController < Lolita::RestController
-
-  def index
-  end
-end

data/spec/rails_app/app/controllers/data_import_controller.rb

@@ -1,5 +0,0 @@
-class DataImportController < Lolita::RestController
-
-  def index
-  end
-end